Fixed a bug in spill cost estimation

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1500 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/RegAlloc/RegClass.cpp b/lib/CodeGen/RegAlloc/RegClass.cpp
index 3ee79e328e863715d83b29a3d96cb958a38ca275..3918871d69f16f71ea94632caf78306acf1cff11 100644 (file)
--- a/lib/CodeGen/RegAlloc/RegClass.cpp
+++ b/lib/CodeGen/RegAlloc/RegClass.cpp
@@ -150,9 +150,9 @@ IGNode * RegClass::getIGNodeWithMinSpillCost()
 {
 
   unsigned int IGNodeListSize = IG.getIGNodeList().size(); 
-  long MinSpillCost = -1;
+  double MinSpillCost;
   IGNode *MinCostIGNode = NULL;
-
+  bool isFirstNode = true;
 
   // pass over IGNodeList to find the IGNode with minimum spill cost
   // among all IGNodes that are not yet pushed on to the stack
@@ -165,11 +165,13 @@ IGNode * RegClass::getIGNodeWithMinSpillCost()
 
     if( ! IGNode->isOnStack() ) {
 
-      long SpillCost = (long) IGNode->getParentLR()->getSpillCost();
+      double SpillCost = (double) IGNode->getParentLR()->getSpillCost() /
+       (double) (IGNode->getCurDegree() + 1);
     
-      if( MinSpillCost == -1) {         // for the first IG node
+      if( isFirstNode ) {         // for the first IG node
        MinSpillCost = SpillCost;
        MinCostIGNode = IGNode;
+       isFirstNode = false;
       }
 
       else if( MinSpillCost > SpillCost) {

diff --git a/lib/Target/SparcV9/RegAlloc/RegClass.cpp b/lib/Target/SparcV9/RegAlloc/RegClass.cpp
index 3ee79e328e863715d83b29a3d96cb958a38ca275..3918871d69f16f71ea94632caf78306acf1cff11 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/RegClass.cpp
+++ b/lib/Target/SparcV9/RegAlloc/RegClass.cpp
@@ -150,9 +150,9 @@ IGNode * RegClass::getIGNodeWithMinSpillCost()
 {
 
   unsigned int IGNodeListSize = IG.getIGNodeList().size(); 
-  long MinSpillCost = -1;
+  double MinSpillCost;
   IGNode *MinCostIGNode = NULL;
-
+  bool isFirstNode = true;
 
   // pass over IGNodeList to find the IGNode with minimum spill cost
   // among all IGNodes that are not yet pushed on to the stack
@@ -165,11 +165,13 @@ IGNode * RegClass::getIGNodeWithMinSpillCost()
 
     if( ! IGNode->isOnStack() ) {
 
-      long SpillCost = (long) IGNode->getParentLR()->getSpillCost();
+      double SpillCost = (double) IGNode->getParentLR()->getSpillCost() /
+       (double) (IGNode->getCurDegree() + 1);
     
-      if( MinSpillCost == -1) {         // for the first IG node
+      if( isFirstNode ) {         // for the first IG node
        MinSpillCost = SpillCost;
        MinCostIGNode = IGNode;
+       isFirstNode = false;
       }
 
       else if( MinSpillCost > SpillCost) {