Move calculateRegisterUsage out of cost model

Author: SamTebbs33

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -1022,12 +1022,6 @@ class LoopVectorizationCostModel {
     SmallMapVector<unsigned, unsigned, 4> MaxLocalUsers;
   };
 
-  /// \return Returns information about the register usages of the loop for the
-  /// given plan and vectorization factors.
-  SmallVector<LoopVectorizationCostModel::RegisterUsage, 8>
-  calculateRegisterUsage(VPlan &Plan, ArrayRef<ElementCount> VFs,
-                         const TargetTransformInfo &TTI);
-
   /// Collect values we want to ignore in the cost model.
   void collectValuesToIgnore();
 
@@ -4870,9 +4864,9 @@ void LoopVectorizationCostModel::collectElementTypesForWidening() {
 
 /// Estimate the register usage for \p Plan and vectorization factors in \p VFs.
 /// Returns the register usage for each VF in \p VFs.
-SmallVector<LoopVectorizationCostModel::RegisterUsage, 8>
-LoopVectorizationCostModel::calculateRegisterUsage(
-    VPlan &Plan, ArrayRef<ElementCount> VFs, const TargetTransformInfo &TTI) {
+static SmallVector<LoopVectorizationCostModel::RegisterUsage, 8>
+calculateRegisterUsage(VPlan &Plan, ArrayRef<ElementCount> VFs,
+                       const TargetTransformInfo &TTI) {
   // This function calculates the register usage by measuring the highest number
   // of values that are alive at a single location. Obviously, this is a very
   // rough estimation. We scan the loop in a topological order in order and
@@ -5159,7 +5153,7 @@ LoopVectorizationCostModel::selectInterleaveCount(VPlan &Plan, ElementCount VF,
       return 1;
   }
 
-  RegisterUsage R = calculateRegisterUsage(Plan, {VF}, TTI)[0];
+  RegisterUsage R = ::calculateRegisterUsage(Plan, {VF}, TTI)[0];
   // We divide by these constants so assume that we have at least one
   // instruction that uses at least one register.
   for (auto &Pair : R.MaxLocalUsers) {
@@ -7558,7 +7552,7 @@ VectorizationFactor LoopVectorizationPlanner::computeBestVF() {
 
   for (auto &P : VPlans) {
     SmallVector<ElementCount, 1> VFs(P->vectorFactors());
-    auto RUs = CM.calculateRegisterUsage(*P, VFs, TTI);
+    auto RUs = ::calculateRegisterUsage(*P, VFs, TTI);
     for (unsigned I = 0; I < VFs.size(); I++) {
       auto VF = VFs[I];
       if (VF.isScalar())
@@ -7609,8 +7603,8 @@ VectorizationFactor LoopVectorizationPlanner::computeBestVF() {
     SmallVector<ElementCount, 1> VFs = {BestFactor.Width};
 
     auto LegacyRUs =
-        CM.calculateRegisterUsage(getPlanFor(LegacyVF.Width), LegacyVFs, TTI);
-    auto RUs = CM.calculateRegisterUsage(BestPlan, VFs, TTI);
+        calculateRegisterUsage(getPlanFor(LegacyVF.Width), LegacyVFs, TTI);
+    auto RUs = calculateRegisterUsage(BestPlan, VFs, TTI);
 
     auto GetMaxUsage = [](SmallMapVector<unsigned, unsigned, 4> MaxLocalUsers) {
       unsigned Max = 0;