Coalesing bug fix - now checks for the same regType instead of the same

regClass since FP class has two reg Types.

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

diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
index a4c3aabe10134b8ce9ca54d223ab9ce509e28077..c07227539a231f5e1e432ef08f1eaa04a3c60133 100644 (file)
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
@@ -253,7 +253,7 @@ void LiveRangeInfo::coalesceLRs()
      for each machine instruction (inst)
        for each definition (def) in inst
          for each operand (op) of inst that is a use
-           if the def and op are of the same register class
+           if the def and op are of the same register type
             if the def and op do not interfere //i.e., not simultaneously live
               if (degree(LR of def) + degree(LR of op)) <= # avail regs
                 if both LRs do not have suggested colors
@@ -312,9 +312,12 @@ void LiveRangeInfo::coalesceLRs()
            if( LROfUse == LROfDef)     // nothing to merge if they are same
              continue;
 
-           RegClass *const RCOfUse = LROfUse->getRegClass();
+           //RegClass *const RCOfUse = LROfUse->getRegClass();
+           //if( RCOfDef == RCOfUse ) {  // if the reg classes are the same
 
-           if( RCOfDef == RCOfUse ) {  // if the reg classes are the same
+           if( MRI.getRegType(LROfDef) == MRI.getRegType(LROfUse) ) {
+
+             // If the two RegTypes are the same
 
              if( ! RCOfDef->getInterference(LROfDef, LROfUse) ) {
 

diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
index a4c3aabe10134b8ce9ca54d223ab9ce509e28077..c07227539a231f5e1e432ef08f1eaa04a3c60133 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
+++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
@@ -253,7 +253,7 @@ void LiveRangeInfo::coalesceLRs()
      for each machine instruction (inst)
        for each definition (def) in inst
          for each operand (op) of inst that is a use
-           if the def and op are of the same register class
+           if the def and op are of the same register type
             if the def and op do not interfere //i.e., not simultaneously live
               if (degree(LR of def) + degree(LR of op)) <= # avail regs
                 if both LRs do not have suggested colors
@@ -312,9 +312,12 @@ void LiveRangeInfo::coalesceLRs()
            if( LROfUse == LROfDef)     // nothing to merge if they are same
              continue;
 
-           RegClass *const RCOfUse = LROfUse->getRegClass();
+           //RegClass *const RCOfUse = LROfUse->getRegClass();
+           //if( RCOfDef == RCOfUse ) {  // if the reg classes are the same
 
-           if( RCOfDef == RCOfUse ) {  // if the reg classes are the same
+           if( MRI.getRegType(LROfDef) == MRI.getRegType(LROfUse) ) {
+
+             // If the two RegTypes are the same
 
              if( ! RCOfDef->getInterference(LROfDef, LROfUse) ) {