reduce changes

Created using spr 1.3.4

Author: aaupov

bolt/include/bolt/Profile/Heatmap.h

@@ -9,7 +9,6 @@
 #ifndef BOLT_PROFILE_HEATMAP_H
 #define BOLT_PROFILE_HEATMAP_H
 
-#include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include <cstdint>
 #include <map>
@@ -46,10 +45,6 @@ class Heatmap {
   /// Map section names to their address range.
   const std::vector<SectionNameAndRange> TextSections;
 
-  uint64_t getNumBuckets(uint64_t Begin, uint64_t End) const {
-    return End / BucketSize + !!(End % BucketSize) - Begin / BucketSize;
-  };
-
 public:
   explicit Heatmap(uint64_t BucketSize = 4096, uint64_t MinAddress = 0,
                    uint64_t MaxAddress = std::numeric_limits<uint64_t>::max(),
@@ -82,22 +77,9 @@ class Heatmap {
 
   void printCDF(raw_ostream &OS) const;
 
-  /// Struct describing individual section hotness.
-  struct SectionStats {
-    uint64_t Samples{0};
-    uint64_t Buckets{0};
-  };
-
-  /// Mapping from section name to associated \p SectionStats. Special entries:
-  /// - [total] for total stats,
-  /// - [unmapped] for samples outside any section, if non-zero.
-  using SectionStatsMap = StringMap<SectionStats>;
-
-  SectionStatsMap computeSectionStats() const;
-
-  void printSectionHotness(const SectionStatsMap &, StringRef Filename) const;
+  void printSectionHotness(StringRef Filename) const;
 
-  void printSectionHotness(const SectionStatsMap &, raw_ostream &OS) const;
+  void printSectionHotness(raw_ostream &OS) const;
 
   size_t size() const { return Map.size(); }
 };

bolt/lib/Profile/DataAggregator.cpp

@@ -1357,12 +1357,10 @@ std::error_code DataAggregator::printLBRHeatMap() {
     HM.printCDF(opts::OutputFilename);
   else
     HM.printCDF(opts::OutputFilename + ".csv");
-  Heatmap::SectionStatsMap Stats = HM.computeSectionStats();
   if (opts::OutputFilename == "-")
-    HM.printSectionHotness(Stats, opts::OutputFilename);
+    HM.printSectionHotness(opts::OutputFilename);
   else
-    HM.printSectionHotness(Stats,
-                           opts::OutputFilename + "-section-hotness.csv");
+    HM.printSectionHotness(opts::OutputFilename + "-section-hotness.csv");
 
   return std::error_code();
 }

bolt/lib/Profile/Heatmap.cpp

@@ -284,32 +284,31 @@ void Heatmap::printCDF(raw_ostream &OS) const {
   Counts.clear();
 }
 
-void Heatmap::printSectionHotness(const Heatmap::SectionStatsMap &Stats,
-                                  StringRef FileName) const {
+void Heatmap::printSectionHotness(StringRef FileName) const {
   std::error_code EC;
   raw_fd_ostream OS(FileName, EC, sys::fs::OpenFlags::OF_None);
   if (EC) {
     errs() << "error opening output file: " << EC.message() << '\n';
     exit(1);
   }
-  printSectionHotness(Stats, OS);
+  printSectionHotness(OS);
 }
 
-StringMap<Heatmap::SectionStats> Heatmap::computeSectionStats() const {
+void Heatmap::printSectionHotness(raw_ostream &OS) const {
   uint64_t NumTotalCounts = 0;
-  StringMap<SectionStats> Stat;
+  StringMap<uint64_t> SectionHotness;
+  StringMap<uint64_t> SectionUtilization;
   unsigned TextSectionIndex = 0;
 
   if (TextSections.empty())
-    return Stat;
+    return;
 
   uint64_t UnmappedHotness = 0;
   auto RecordUnmappedBucket = [&](uint64_t Address, uint64_t Frequency) {
-    if (opts::Verbosity >= 1)
-      errs() << "Couldn't map the address bucket ["
-             << formatv("{0:x}, {1:x}", Address, Address + BucketSize)
-             << "] containing " << Frequency
-             << " samples to a text section in the binary.\n";
+    errs() << "Couldn't map the address bucket [0x" << Twine::utohexstr(Address)
+           << ", 0x" << Twine::utohexstr(Address + BucketSize)
+           << "] containing " << Frequency
+           << " samples to a text section in the binary.";
     UnmappedHotness += Frequency;
   };
 
@@ -326,48 +325,30 @@ StringMap<Heatmap::SectionStats> Heatmap::computeSectionStats() const {
       RecordUnmappedBucket(Address, Count);
       continue;
     }
-    SectionStats &SecStats = Stat[TextSections[TextSectionIndex].Name];
-    ++SecStats.Buckets;
-    SecStats.Samples += Count;
+    StringRef Name = TextSections[TextSectionIndex].Name;
+    SectionHotness[Name] += Count;
+    ++SectionUtilization[Name];
   }
-  Stat["[total]"] = SectionStats{NumTotalCounts, Map.size()};
-  if (UnmappedHotness)
-    Stat["[unmapped]"] = SectionStats{UnmappedHotness, 0};
-
-  return Stat;
-}
 
-void Heatmap::printSectionHotness(const StringMap<SectionStats> &Stats,
-                                  raw_ostream &OS) const {
-  if (TextSections.empty())
-    return;
+  auto getNumBuckets = [&](uint64_t Begin, uint64_t End) {
+    return End / BucketSize + !!(End % BucketSize) - Begin / BucketSize;
+  };
 
-  auto TotalIt = Stats.find("[total]");
-  assert(TotalIt != Stats.end() && "Malformed SectionStatsMap");
-  const uint64_t NumTotalCounts = TotalIt->second.Samples;
   assert(NumTotalCounts > 0 &&
          "total number of heatmap buckets should be greater than 0");
 
   OS << "Section Name, Begin Address, End Address, Percentage Hotness, "
      << "Utilization Pct\n";
   for (const auto [Name, Begin, End] : TextSections) {
-    uint64_t Samples = 0;
-    uint64_t Buckets = 0;
-    auto SectionIt = Stats.find(Name);
-    if (SectionIt != Stats.end()) {
-      Samples = SectionIt->second.Samples;
-      Buckets = SectionIt->second.Buckets;
-    }
-    const float RelHotness = 100. * Samples / NumTotalCounts;
-    const float BucketUtilization = 100. * Buckets / getNumBuckets(Begin, End);
+    const float RelHotness = 100. * SectionHotness[Name] / NumTotalCounts;
+    const float BucketUtilization =
+        100. * SectionUtilization[Name] / getNumBuckets(Begin, End);
     OS << formatv("{0}, {1:x}, {2:x}, {3:f4}, {4:f4}\n", Name, Begin, End,
                   RelHotness, BucketUtilization);
   }
-  auto UnmappedIt = Stats.find("[unmapped]");
-  if (UnmappedIt == Stats.end())
-    return;
-  const float UnmappedPct = 100. * UnmappedIt->second.Samples / NumTotalCounts;
-  OS << formatv("[unmapped], 0x0, 0x0, {0:f4}, 0\n", UnmappedPct);
+  if (UnmappedHotness > 0)
+    OS << formatv("[unmapped], 0x0, 0x0, {0:f4}, 0\n",
+                  100.0 * UnmappedHotness / NumTotalCounts);
 }
 } // namespace bolt
 } // namespace llvm