diff options
| -rw-r--r-- | include/llvm/CodeGen/LiveIntervalAnalysis.h | 6 | ||||
| -rw-r--r-- | lib/CodeGen/LiveIntervalAnalysis.cpp | 12 | ||||
| -rw-r--r-- | test/CodeGen/X86/misched-new.ll | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h index bd3604c429..bb547c3519 100644 --- a/include/llvm/CodeGen/LiveIntervalAnalysis.h +++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h @@ -347,6 +347,12 @@ namespace llvm { return *LI; } + /// getCachedRegUnit - Return the live range for Unit if it has already + /// been computed, or NULL if it hasn't been computed yet. + LiveInterval *getCachedRegUnit(unsigned Unit) { + return RegUnitIntervals[Unit]; + } + /// trackingRegUnits - Does LiveIntervals curently track register units? /// This function will be removed when regunit tracking is permanently /// enabled. diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 6b8cc88704..153d1c37df 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -1196,11 +1196,15 @@ private: if (TargetRegisterInfo::isPhysicalRegister(Reg) && LIS.isReserved(Reg)) continue; + // Collect ranges for register units. These live ranges are computed on + // demand, so just skip any that haven't been computed yet. if (TargetRegisterInfo::isPhysicalRegister(Reg) && LIS.trackingRegUnits()) - for (MCRegUnitIterator Units(Reg, &TRI); Units.isValid(); ++Units) - collectRanges(MO, &LIS.getRegUnit(*Units), - Entering, Internal, Exiting, OldIdx); - else if (LIS.hasInterval(Reg)) + for (MCRegUnitIterator Units(Reg, &TRI); Units.isValid(); ++Units) + if (LiveInterval *LI = LIS.getCachedRegUnit(*Units)) + collectRanges(MO, LI, Entering, Internal, Exiting, OldIdx); + + // Collect ranges for individual registers. + if (LIS.hasInterval(Reg)) collectRanges(MO, &LIS.getInterval(Reg), Entering, Internal, Exiting, OldIdx); } diff --git a/test/CodeGen/X86/misched-new.ll b/test/CodeGen/X86/misched-new.ll index 8f2f6f7697..f7b1467300 100644 --- a/test/CodeGen/X86/misched-new.ll +++ b/test/CodeGen/X86/misched-new.ll @@ -1,4 +1,5 @@ ; RUN: llc -march=x86-64 -mcpu=core2 -enable-misched -misched=shuffle -misched-bottomup < %s +; RUN: llc -march=x86-64 -mcpu=core2 -enable-misched -misched=shuffle -misched-bottomup -live-regunits < %s ; REQUIRES: asserts ; ; Interesting MachineScheduler cases. |