[BOLT][NFC] DataAggregator code cleanup

[rafauler]

LGTM

[Amir]

clang-format

[Amir]

Use make_second_range

[rafauler]

Nice

bolt/lib/Profile/DataAggregator.cpp

void DataAggregator::processProfile(BinaryContext &BC) {
   else if (opts::BasicAggregation)
     processBasicEvents();
   else
     processBranchEvents();
 
   processMemEvents();
 
   // Mark all functions with registered events as having a valid profile.
-  for (auto &BFI : BC.getBinaryFunctions()) {
-    BinaryFunction &BF = BFI.second;
-    if (getBranchData(BF) || getFuncSampleData(BF.getNames())) {
-      const auto Flags = opts::BasicAggregation ? BinaryFunction::PF_SAMPLE
-                                                : BinaryFunction::PF_LBR;
+  for (auto &BFI : BC.getBinaryFunctions()) {
+    BinaryFunction &BF = BFI.second;
+    if (getBranchData(BF) || getFuncSampleData(BF.getNames()))
       BF.markProfiled(Flags);
-    }
-  }
 
   // Release intermediate storage.
   clear(BranchLBRs);
   clear(FallthroughLBRs);
   clear(AggregatedLBRs);
   clear(BasicSamples);
   clear(MemSamples);
 }
bool DataAggregator::doIntraBranch(BinaryFunction &Func, uint64_t From,
   if (!AggrData) {
     AggrData = &NamesToBranches[Func.getOneName()];
     AggrData->Name = getLocationName(Func, Count);
     setBranchData(Func, AggrData);
   }
 
   From -= Func.getAddress();
   To -= Func.getAddress();
-  LLVM_DEBUG(dbgs() << "BOLT-DEBUG: bumpBranchCount: " << Func.getPrintName()
-                    << " @ " << Twine::utohexstr(From) << " -> "
-                    << Func.getPrintName() << " @ " << Twine::utohexstr(To)
-                    << '\n');
+  LLVM_DEBUG(dbgs() << "BOLT-DEBUG: bumpBranchCount: "
+                    << formatv("{0} @ {1:x} -> {0} @ {2:x}\n", Func, From, To));
   if (BAT) {
     From = BAT->translate(Func.getAddress(), From, /*IsBranchSrc=*/true);
     To = BAT->translate(Func.getAddress(), To, /*IsBranchSrc=*/false);
-    LLVM_DEBUG(dbgs() << "BOLT-DEBUG: BAT translation on bumpBranchCount: "
-                      << Func.getPrintName() << " @ " << Twine::utohexstr(From)
-                      << " -> " << Func.getPrintName() << " @ "
-                      << Twine::utohexstr(To) << '\n');
+    LLVM_DEBUG(
+        dbgs() << "BOLT-DEBUG: BAT translation on bumpBranchCount: "
+               << formatv("{0} @ {1:x} -> {0} @ {2:x}\n", Func, From, To));
   }
 
   AggrData->bumpBranchCount(From, To, Count, Mispreds);
   return true;
 }
 
 bool DataAggregator::doInterBranch(BinaryFunction *FromFunc,
                                    BinaryFunction *ToFunc, uint64_t From,
for (const PerfMemSample &Sample : MemSamples) {
     uint64_t Addr = Sample.Addr;
     StringRef FuncName;
     StringRef MemName;
 
     // Try to resolve symbol for PC
     BinaryFunction *Func = getBinaryFunctionContainingAddress(PC);
     if (!Func) {
       LLVM_DEBUG(if (PC != 0) {
-        dbgs() << "Skipped mem event: 0x" << Twine::utohexstr(PC) << " => 0x"
-               << Twine::utohexstr(Addr) << "\n";
+        dbgs() << formatv("Skipped mem event: {0:x} => {1:x}\n", PC, Addr);
       });
       continue;
     }
 
     FuncName = Func->getOneName();
     PC -= Func->getAddress();
 
     // Try to resolve symbol for memory load
while (hasData()) {
     MMapInfo.Forked = true;
     BinaryMMapInfo.insert(std::make_pair(MMapInfo.PID, MMapInfo));
   }
 
   outs() << "PERF2BOLT: input binary is associated with "
          << BinaryMMapInfo.size() << " PID(s)\n";
 
   LLVM_DEBUG({
-    for (std::pair<const uint64_t, MMapInfo> &MMI : BinaryMMapInfo)
-      outs() << "  " << MMI.second.PID << (MMI.second.Forked ? " (forked)" : "")
-             << ": (0x" << Twine::utohexstr(MMI.second.MMapAddress) << ": 0x"
-             << Twine::utohexstr(MMI.second.Size) << ")\n";
+    for (const MMapInfo &MMI : llvm::make_second_range(BinaryMMapInfo))
+      outs() << formatv("  {0}{1}: ({2:x}: {3:x})\n", MMI.PID,
+                        (MMI.Forked ? " (forked)" : ""), MMI.MMapAddress,
+                        MMI.Size);
   });
 
   return std::error_code();
 }
 
 std::optional<std::pair<StringRef, StringRef>>
 DataAggregator::parseNameBuildIDPair() {
   while (checkAndConsumeFS()) {