Selaa lähdekoodia

Rename variables for consistency.

No functional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190466 91177308-0d34-0410-b5e6-96231b3b80d8
Eli Friedman 12 vuotta sitten
vanhempi
commit
3b389cb74e

+ 6 - 6
lib/CodeGen/SelectionDAG/ResourcePriorityQueue.cpp

@@ -389,9 +389,9 @@ signed ResourcePriorityQueue::regPressureDelta(SUnit *SU, bool RawPressure) {
 // Constants used to denote relative importance of
 // Constants used to denote relative importance of
 // heuristic components for cost computation.
 // heuristic components for cost computation.
 static const unsigned PriorityOne = 200;
 static const unsigned PriorityOne = 200;
-static const unsigned PriorityThree = 50;
-static const unsigned PriorityFour = 15;
-static const unsigned PriorityFive = 5;
+static const unsigned PriorityTwo = 50;
+static const unsigned PriorityThree = 15;
+static const unsigned PriorityFour = 5;
 static const unsigned ScaleOne = 20;
 static const unsigned ScaleOne = 20;
 static const unsigned ScaleTwo = 10;
 static const unsigned ScaleTwo = 10;
 static const unsigned ScaleThree = 5;
 static const unsigned ScaleThree = 5;
@@ -448,7 +448,7 @@ signed ResourcePriorityQueue::SUSchedulingCost(SUnit *SU) {
     if (N->isMachineOpcode()) {
     if (N->isMachineOpcode()) {
       const MCInstrDesc &TID = TII->get(N->getMachineOpcode());
       const MCInstrDesc &TID = TII->get(N->getMachineOpcode());
       if (TID.isCall())
       if (TID.isCall())
-        ResCount += (PriorityThree + (ScaleThree*N->getNumValues()));
+        ResCount += (PriorityTwo + (ScaleThree*N->getNumValues()));
     }
     }
     else
     else
       switch (N->getOpcode()) {
       switch (N->getOpcode()) {
@@ -456,11 +456,11 @@ signed ResourcePriorityQueue::SUSchedulingCost(SUnit *SU) {
       case ISD::TokenFactor:
       case ISD::TokenFactor:
       case ISD::CopyFromReg:
       case ISD::CopyFromReg:
       case ISD::CopyToReg:
       case ISD::CopyToReg:
-        ResCount += PriorityFive;
+        ResCount += PriorityFour;
         break;
         break;
 
 
       case ISD::INLINEASM:
       case ISD::INLINEASM:
-        ResCount += PriorityFour;
+        ResCount += PriorityThree;
         break;
         break;
       }
       }
   }
   }

+ 3 - 3
lib/Target/Hexagon/HexagonMachineScheduler.cpp

@@ -457,7 +457,7 @@ static SUnit *getSingleUnscheduledSucc(SUnit *SU) {
 // Constants used to denote relative importance of
 // Constants used to denote relative importance of
 // heuristic components for cost computation.
 // heuristic components for cost computation.
 static const unsigned PriorityOne = 200;
 static const unsigned PriorityOne = 200;
-static const unsigned PriorityThree = 50;
+static const unsigned PriorityTwo = 50;
 static const unsigned ScaleTwo = 10;
 static const unsigned ScaleTwo = 10;
 static const unsigned FactorOne = 2;
 static const unsigned FactorOne = 2;
 
 
@@ -515,8 +515,8 @@ int ConvergingVLIWScheduler::SchedulingCost(ReadyQueue &Q, SUnit *SU,
   ResCount += (NumNodesBlocking * ScaleTwo);
   ResCount += (NumNodesBlocking * ScaleTwo);
 
 
   // Factor in reg pressure as a heuristic.
   // Factor in reg pressure as a heuristic.
-  ResCount -= (Delta.Excess.getUnitInc()*PriorityThree);
-  ResCount -= (Delta.CriticalMax.getUnitInc()*PriorityThree);
+  ResCount -= (Delta.Excess.getUnitInc()*PriorityTwo);
+  ResCount -= (Delta.CriticalMax.getUnitInc()*PriorityTwo);
 
 
   DEBUG(if (verbose) dbgs() << " Total(" << ResCount << ")");
   DEBUG(if (verbose) dbgs() << " Total(" << ResCount << ")");