[BOLT] Handle recursive calls as inter-branches in DataAggregator

[Amir]

Summary

Align yaml and fdata profiles by applying the same treatment to recursive
calls (direct, indirect, tail). fdata profile increments entry count when
handling recursive calls. Make perf/pre-aggregated perf reader (DataAggregator)
do the same.

Test Plan:
In pre-aggregated-perf.test, add a dummy pre-aggregated branch entry between
an indirect call in frame_dummy function and its entry point.
Check that YAML profile gets incremented entry count for this function.

End-to-end test: https://github.com/rafaelauler/bolt-tests/pull/24

[maksfb]

LGTM

bolt/lib/Profile/DataAggregator.cpp

 
 bool DataAggregator::doBranch(uint64_t From, uint64_t To, uint64_t Count,
                               uint64_t Mispreds) {
   BinaryFunction *FromFunc = getBinaryFunctionContainingAddress(From);
   BinaryFunction *ToFunc = getBinaryFunctionContainingAddress(To);
   if (!FromFunc && !ToFunc)
     return false;
 
-  if (FromFunc == ToFunc) {
+  // Treat recursive control transfers as inter-branches.
+  if (FromFunc == ToFunc && (To != ToFunc->getAddress())) {
     recordBranch(*FromFunc, From - FromFunc->getAddress(),
                  To - FromFunc->getAddress(), Count, Mispreds);
     return doIntraBranch(*FromFunc, From, To, Count, Mispreds);
   }
 
   return doInterBranch(FromFunc, ToFunc, From, To, Count, Mispreds);
 }
 

bolt/test/X86/Inputs/pre-aggregated.txt

 B X:7f36d18d60c0 400bbc 2 0
 B 400ad1 400e00 2 0
 B 400b10 4005f0 1 0
 B 400bb7 400610 1 0
 B 4005f0 X:7f36d18f2ce0 1 0
 B 4011a0 4011a9 33 4
 B 4011ad 401180 58 0
 F 401170 4011b2 22
+B 400dae 400d90 1 0

bolt/test/X86/pre-aggregated-perf.test

 PERF2BOLT: 1 main 537 0 [unknown] 400610 0 1
 PERF2BOLT: 1 usqrt 30 1 usqrt 32 0 22
 PERF2BOLT: 1 usqrt 30 1 usqrt 39 4 33
 PERF2BOLT: 1 usqrt 35 1 usqrt 39 0 22
 PERF2BOLT: 1 usqrt 3d 1 usqrt 10 0 58
 PERF2BOLT: 1 usqrt 3d 1 usqrt 3f 0 22
 PERF2BOLT: 1 usqrt a 1 usqrt 10 0 22
 
+NEWFORMAT:  - name:            'frame_dummy/1'
+NEWFORMAT:    fid:             3
+NEWFORMAT:    hash:            0x24496F7F9594E89F
+NEWFORMAT:    exec:            1
+
 NEWFORMAT:  - name:            usqrt
 NEWFORMAT:    fid:             7
 NEWFORMAT:    exec:            0
 NEWFORMAT:    nblocks:         5
 NEWFORMAT:    blocks:
 NEWFORMAT:      - bid:             0
 NEWFORMAT:        insns:           4
 NEWFORMAT:        succ:            [ { bid: 1, cnt: 22 } ]