From 9db9e1a6a4af2c108248a274df3a607bf6f6916c Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Thu, 29 May 2008 18:15:49 +0000 Subject: [PATCH] Renumbering needs to account for instruction slot offsets when performing lookups in the index maps. llvm-svn: 51691 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 976aa5a9245..228c0a92a0e 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -58,8 +58,6 @@ void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired(); AU.addPreservedID(MachineLoopInfoID); AU.addPreservedID(MachineDominatorsID); - AU.addPreservedID(PHIEliminationID); - AU.addRequiredID(PHIEliminationID); AU.addRequiredID(TwoAddressInstructionPassID); MachineFunctionPass::getAnalysisUsage(AU); } @@ -75,6 +73,8 @@ void LiveIntervals::releaseMemory() { delete ClonedMIs[i]; } +#include + void LiveIntervals::computeNumbering() { Index2MiMap OldI2MI = i2miMap_; @@ -112,14 +112,27 @@ void LiveIntervals::computeNumbering() { for (iterator I = begin(), E = end(); I != E; ++I) for (LiveInterval::iterator LI = I->second.begin(), LE = I->second.end(); LI != LE; ++LI) { - LI->start = mi2iMap_[OldI2MI[LI->start]]; - LI->end = mi2iMap_[OldI2MI[LI->end]]; + unsigned offset = LI->start % InstrSlots::NUM; + LI->start = mi2iMap_[OldI2MI[LI->start / InstrSlots::NUM]] + offset; + + if (LI->end / InstrSlots::NUM < OldI2MI.size()) { + // FIXME: Not correct when the instruction at LI->end has + // been removed + offset = LI->end % InstrSlots::NUM; + LI->end = mi2iMap_[OldI2MI[LI->end / InstrSlots::NUM]] + offset; + } else { + LI->end = i2miMap_.size() * InstrSlots::NUM; + } VNInfo* vni = LI->valno; - vni->def = mi2iMap_[OldI2MI[vni->def]]; + offset = vni->def % InstrSlots::NUM; + vni->def = mi2iMap_[OldI2MI[vni->def / InstrSlots::NUM]] + offset; - for (size_t i = 0; i < vni->kills.size(); ++i) - vni->kills[i] = mi2iMap_[OldI2MI[vni->kills[i]]]; + for (size_t i = 0; i < vni->kills.size(); ++i) { + offset = vni->kills[i] % InstrSlots::NUM; + vni->kills[i] = mi2iMap_[OldI2MI[vni->kills[i] / InstrSlots::NUM]] + + offset; + } } }