[𝘀𝗽𝗿] changes to main this commit is based on

Created using spr 1.3.4

[skip ci]

Author: aaupov

bolt/include/bolt/Core/BinaryContext.h

@@ -775,11 +775,6 @@ class BinaryContext {
     uint64_t PseudoProbeLooseMatchedSampleCount{0};
     ///   the count of call matched samples
     uint64_t CallMatchedSampleCount{0};
-    ///   the number of stale functions that have matching number of blocks in
-    ///   the profile
-    uint64_t NumStaleFuncsWithEqualBlockCount{0};
-    ///   the number of blocks that have matching size but a differing hash
-    uint64_t NumStaleBlocksWithEqualIcount{0};
   } Stats;
 
   // Original binary execution count stats.

bolt/include/bolt/Profile/ProfileYAMLMapping.h

@@ -101,6 +101,9 @@ struct PseudoProbeInfo {
   std::vector<uint64_t> CallProbes;
   std::vector<uint64_t> IndCallProbes;
   std::vector<uint32_t> InlineTreeNodes;
+  uint32_t BlockProbe;
+  std::string BlockProbesStr;
+  std::string InlineTreeNodesStr;
 
   bool operator==(const PseudoProbeInfo &Other) const {
     return InlineTreeIndex == Other.InlineTreeIndex &&
@@ -112,10 +115,13 @@ struct PseudoProbeInfo {
 
 template <> struct MappingTraits<bolt::PseudoProbeInfo> {
   static void mapping(IO &YamlIO, bolt::PseudoProbeInfo &PI) {
+    YamlIO.mapOptional("bl", PI.BlockProbe, 0);
+    YamlIO.mapOptional("bs", PI.BlockProbesStr, "");
     YamlIO.mapOptional("blx", PI.BlockMask, 0);
     YamlIO.mapOptional("blk", PI.BlockProbes, std::vector<uint64_t>());
     YamlIO.mapOptional("call", PI.CallProbes, std::vector<uint64_t>());
     YamlIO.mapOptional("icall", PI.IndCallProbes, std::vector<uint64_t>());
+    YamlIO.mapOptional("is", PI.InlineTreeNodesStr, "");
     YamlIO.mapOptional("id", PI.InlineTreeIndex, 0);
     YamlIO.mapOptional("ids", PI.InlineTreeNodes, std::vector<uint32_t>());
   }

bolt/include/bolt/Profile/YAMLProfileReader.h

@@ -174,7 +174,7 @@ class YAMLProfileReader : public ProfileReaderBase {
 
   /// Maps profiled function id to function, for function matching with calls as
   /// anchors.
-  ProfileLookupMap IdToYamLBF;
+  ProfileLookupMap IdToYamlBF;
 
   /// For LTO symbol resolution.
   /// Map a common LTO prefix to a list of YAML profiles matching the prefix.
@@ -183,6 +183,10 @@ class YAMLProfileReader : public ProfileReaderBase {
   /// Map a common LTO prefix to a set of binary functions.
   StringMap<std::unordered_set<BinaryFunction *>> LTOCommonNameFunctionMap;
 
+  /// For pseudo probe function matching.
+  /// Map profile GUID to YAML profile.
+  std::unordered_map<uint64_t, yaml::bolt::BinaryFunctionProfile *> GUIDMap;
+
   /// Function names in profile.
   StringSet<> ProfileFunctionNames;
 
@@ -244,6 +248,10 @@ class YAMLProfileReader : public ProfileReaderBase {
 
   /// Check if the profile uses an event with a given \p Name.
   bool usesEvent(StringRef Name) const;
+
+  /// Dump profile as dot.
+  void dumpGraph(BinaryContext &BC, raw_ostream &OS,
+                 const yaml::bolt::BinaryFunctionProfile &YamlBF) const;
 };
 
 } // namespace bolt

bolt/lib/Passes/BinaryPasses.cpp

@@ -1505,12 +1505,6 @@ Error PrintProgramStats::runOnFunctions(BinaryContext &BC) {
   if (NumAllStaleFunctions) {
     const float PctStale =
         NumAllStaleFunctions / (float)NumAllProfiledFunctions * 100.0f;
-    const float PctStaleFuncsWithEqualBlockCount =
-        (float)BC.Stats.NumStaleFuncsWithEqualBlockCount /
-        NumAllStaleFunctions * 100.0f;
-    const float PctStaleBlocksWithEqualIcount =
-        (float)BC.Stats.NumStaleBlocksWithEqualIcount /
-        BC.Stats.NumStaleBlocks * 100.0f;
     auto printErrorOrWarning = [&]() {
       if (PctStale > opts::StaleThreshold)
         BC.errs() << "BOLT-ERROR: ";
@@ -1533,17 +1527,6 @@ Error PrintProgramStats::runOnFunctions(BinaryContext &BC) {
                 << "%) belong to functions with invalid"
                    " (possibly stale) profile.\n";
     }
-    BC.outs() << "BOLT-INFO: " << BC.Stats.NumStaleFuncsWithEqualBlockCount
-              << " stale function"
-              << (BC.Stats.NumStaleFuncsWithEqualBlockCount == 1 ? "" : "s")
-              << format(" (%.1f%% of all stale)",
-                        PctStaleFuncsWithEqualBlockCount)
-              << " have matching block count.\n";
-    BC.outs() << "BOLT-INFO: " << BC.Stats.NumStaleBlocksWithEqualIcount
-              << " stale block"
-              << (BC.Stats.NumStaleBlocksWithEqualIcount == 1 ? "" : "s")
-              << format(" (%.1f%% of all stale)", PctStaleBlocksWithEqualIcount)
-              << " have matching icount.\n";
     if (PctStale > opts::StaleThreshold) {
       return createFatalBOLTError(
           Twine("BOLT-ERROR: stale functions exceed specified threshold of ") +

bolt/lib/Profile/StaleProfileMatching.cpp

@@ -1023,7 +1023,7 @@ bool YAMLProfileReader::inferStaleProfile(
   // Match as many block/jump counts from the stale profile as possible
   size_t MatchedBlocks =
       matchWeights(BF.getBinaryContext(), BlockOrder, YamlBF, Func,
-                   YamlBP.Header.HashFunction, IdToYamLBF, BF, ProbeMatchSpecs);
+                   YamlBP.Header.HashFunction, IdToYamlBF, BF, ProbeMatchSpecs);
 
   // Adjust the flow function by marking unreachable blocks Unlikely so that
   // they don't get any counts assigned.