Address reviewers 4

Author: kaadam

bolt/lib/Profile/DataAggregator.cpp

@@ -190,10 +190,12 @@ void DataAggregator::start() {
     // P/M: whether branch was Predicted or Mispredicted.
     // N: optionally appears when the branch was Not-Taken (ie fall-through)
     // 12345  0x123/0x456/PN/-/-/8/RET/-
-    launchPerfProcess("SPE brstack events", MainEventsPPI,
-                      "script -F pid,brstack --itrace=bl",
-                      /*Wait = */ false);
-  } else if (opts::BasicAggregation) {
+    opts::ITraceAggregation = "bl";
+    opts::ParseMemProfile = true;
+    opts::BasicAggregation = false;
+  }
+
+  if (opts::BasicAggregation) {
     launchPerfProcess("events without LBR", MainEventsPPI,
                       "script -F pid,event,ip",
                       /*Wait = */ false);
@@ -1524,8 +1526,8 @@ std::error_code DataAggregator::parseBranchEvents() {
   std::string BranchEventTypeStr =
       opts::ArmSPE ? "SPE branch events in LBR-format" : "branch events";
   outs() << "PERF2BOLT: parse " << BranchEventTypeStr << "...\n";
-  NamedRegionTimer T("parseBranch", "Parsing " + BranchEventTypeStr,
-                     TimerGroupName, TimerGroupDesc, opts::TimeAggregator);
+  NamedRegionTimer T("parseBranch", "Parsing branch events", TimerGroupName,
+                     TimerGroupDesc, opts::TimeAggregator);
 
   uint64_t NumEntries = 0;
   uint64_t NumSamples = 0;

bolt/test/perf2bolt/AArch64/perf2bolt-spe.test

@@ -8,5 +8,5 @@ RUN: perf record -e cycles -q -o %t.perf.data -- %t.exe 2> /dev/null
 
 RUN: (perf2bolt -p %t.perf.data -o %t.perf.boltdata --spe %t.exe 2> /dev/null; exit 0) | FileCheck %s --check-prefix=CHECK-SPE-LBR
 
-CHECK-SPE-LBR: PERF2BOLT: spawning perf job to read SPE brstack events
+CHECK-SPE-LBR: PERF2BOLT: parse SPE branch events in LBR-format