[llvm-commits] [llvm] r98784 - /llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Mar 17 19:23:47 2010
New Revision: 98784

URL: http://llvm.org/viewvc/llvm-project?rev=98784&view=rev
Log:
Revert "Change coalescer complexity from N^2 to N logN by changing one letter."

This reverts commit 98776. It broke the llvm-gcc boot strap.

Modified:
    llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp

Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=98784&r1=98783&r2=98784&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Wed Mar 17 19:23:47 2010
@@ -1682,9 +1682,20 @@
         // density, do not join them, instead mark the physical register as its
         // allocation preference.
         LiveInterval &JoinVInt = SrcIsPhys ? DstInt : SrcInt;
+        LiveInterval &JoinPInt = SrcIsPhys ? SrcInt : DstInt;
         unsigned JoinVReg = SrcIsPhys ? DstReg : SrcReg;
         unsigned JoinPReg = SrcIsPhys ? SrcReg : DstReg;
 
+        // Don't join with physregs that have a ridiculous number of live
+        // ranges. The data structure performance is really bad when that
+        // happens.
+        if (JoinPInt.ranges.size() > 1000) {
+          mri_->setRegAllocationHint(JoinVInt.reg, 0, JoinPReg);
+          ++numAborts;
+          DEBUG(dbgs() << "\tPhysical register too complicated, abort!\n");
+          return false;
+        }
+
         const TargetRegisterClass *RC = mri_->getRegClass(JoinVReg);
         unsigned Threshold = allocatableRCRegs_[RC].count() * 2;
         unsigned Length = li_->getApproximateInstructionCount(JoinVInt);
@@ -2159,7 +2170,7 @@
   // Update the liveintervals of sub-registers.
   if (TargetRegisterInfo::isPhysicalRegister(LHS.reg))
     for (const unsigned *AS = tri_->getSubRegisters(LHS.reg); *AS; ++AS)
-      li_->getOrCreateInterval(*AS).MergeInClobberRanges(*li_, RHS,
+      li_->getOrCreateInterval(*AS).MergeInClobberRanges(*li_, LHS,
                                                     li_->getVNInfoAllocator());
 
   return true;