more reviews

Author: spupyrev

llvm/include/llvm/Support/BalancedPartitioning.h

@@ -64,6 +64,19 @@ class BPFunctionNode {
     UtilityNodeT(uint32_t Id, uint32_t Weight = 1) : Id(Id), Weight(Weight) {}
     uint32_t Id;
     uint32_t Weight;
+
+    // Deduplicate utility nodes for a given function.
+    // TODO: One may experiment with accumulating the weights of duplicates.
+    static void sortAndDeduplicate(SmallVector<UtilityNodeT, 4> &UNs) {
+      llvm::sort(UNs, [](const UtilityNodeT &L, const UtilityNodeT &R) {
+        return L.Id < R.Id;
+      });
+      UNs.erase(std::unique(UNs.begin(), UNs.end(),
+                            [](const UtilityNodeT &L, const UtilityNodeT &R) {
+                              return L.Id == R.Id;
+                            }),
+                UNs.end());
+    }
   };
 
   /// \param UtilityNodes the set of utility nodes (must be unique'd)

llvm/lib/ProfileData/InstrProf.cpp

@@ -905,20 +905,6 @@ void InstrProfRecord::addValueData(uint32_t ValueKind, uint32_t Site,
     ValueSites.emplace_back(VData, VData + N);
 }
 
-// Deduplicate utility nodes for a given function.
-// TODO: One may experiment with accumulating the weights of duplicates.
-void sortAndDeduplicate(SmallVector<BPFunctionNode::UtilityNodeT, 4> &UNs) {
-  using UtilityNodeT = BPFunctionNode::UtilityNodeT;
-  llvm::sort(UNs, [](const UtilityNodeT &L, const UtilityNodeT &R) {
-    return L.Id < R.Id;
-  });
-  UNs.erase(std::unique(UNs.begin(), UNs.end(),
-                        [](const UtilityNodeT &L, const UtilityNodeT &R) {
-                          return L.Id == R.Id;
-                        }),
-            UNs.end());
-}
-
 std::vector<BPFunctionNode> TemporalProfTraceTy::createBPFunctionNodes(
     ArrayRef<TemporalProfTraceTy> Traces) {
   using IDT = BPFunctionNode::IDT;
@@ -954,7 +940,7 @@ std::vector<BPFunctionNode> TemporalProfTraceTy::createBPFunctionNodes(
   std::vector<BPFunctionNode> Nodes;
   for (auto Id : FunctionIds) {
     auto &UNs = FuncGroups[Id];
-    sortAndDeduplicate(UNs);
+    UtilityNodeT::sortAndDeduplicate(UNs);
     Nodes.emplace_back(Id, UNs);
   }
   return Nodes;

llvm/lib/Support/BalancedPartitioning.cpp

@@ -203,9 +203,8 @@ void BalancedPartitioning::runIterations(const FunctionNodeRange Nodes,
         Signatures[UN.Id].RightCount++;
       // Identical utility nodes (having the same UN.Id) have the same weight
       // (unless there are hash collisions mapping utilities to the same Id);
-      // thus, we can get a new weight only when the signature is uninitialized.
-      if (Signatures[UN.Id].Weight != UN.Weight)
-        Signatures[UN.Id].Weight = UN.Weight;
+      // thus, we get a new weight only when the signature is uninitialized.
+      Signatures[UN.Id].Weight = UN.Weight;
     }
   }