replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable the insertion of empty indices into LiveInterals, thereby making renumbering possible. 

llvm-svn: 53961
This commit is contained in:
Owen Anderson 2008-07-23 21:37:49 +00:00
parent ecc851bb6e
commit 50d393a68d
1 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@ -81,6 +81,7 @@ void LiveIntervals::releaseMemory() {
void LiveIntervals::computeNumbering() { void LiveIntervals::computeNumbering() {
Index2MiMap OldI2MI = i2miMap_; Index2MiMap OldI2MI = i2miMap_;
std::vector<IdxMBBPair> OldI2MBB = Idx2MBBMap;
Idx2MBBMap.clear(); Idx2MBBMap.clear();
MBB2IdxMap.clear(); MBB2IdxMap.clear();
@ -98,21 +99,23 @@ void LiveIntervals::computeNumbering() {
MBB != E; ++MBB) { MBB != E; ++MBB) {
unsigned StartIdx = MIIndex; unsigned StartIdx = MIIndex;
// Insert an empty slot at the beginning of each block.
MIIndex += InstrSlots::NUM;
i2miMap_.push_back(0);
for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end(); for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end();
I != E; ++I) { I != E; ++I) {
bool inserted = mi2iMap_.insert(std::make_pair(I, MIIndex)).second; bool inserted = mi2iMap_.insert(std::make_pair(I, MIIndex)).second;
assert(inserted && "multiple MachineInstr -> index mappings"); assert(inserted && "multiple MachineInstr -> index mappings");
i2miMap_.push_back(I); i2miMap_.push_back(I);
MIIndex += InstrSlots::NUM; MIIndex += InstrSlots::NUM;
FunctionSize++; FunctionSize++;
}
// Insert an empty slot after every instruction.
if (StartIdx == MIIndex) {
// Empty MBB
MIIndex += InstrSlots::NUM; MIIndex += InstrSlots::NUM;
i2miMap_.push_back(0); i2miMap_.push_back(0);
} }
// Set the MBB2IdxMap entry for this MBB. // Set the MBB2IdxMap entry for this MBB.
MBB2IdxMap[MBB->getNumber()] = std::make_pair(StartIdx, MIIndex - 1); MBB2IdxMap[MBB->getNumber()] = std::make_pair(StartIdx, MIIndex - 1);
Idx2MBBMap.push_back(std::make_pair(StartIdx, MBB)); Idx2MBBMap.push_back(std::make_pair(StartIdx, MBB));
@ -120,90 +123,82 @@ void LiveIntervals::computeNumbering() {
std::sort(Idx2MBBMap.begin(), Idx2MBBMap.end(), Idx2MBBCompare()); std::sort(Idx2MBBMap.begin(), Idx2MBBMap.end(), Idx2MBBCompare());
if (!OldI2MI.empty()) if (!OldI2MI.empty())
for (iterator I = begin(), E = end(); I != E; ++I) for (iterator OI = begin(), OE = end(); OI != OE; ++OI)
for (LiveInterval::iterator LI = I->second.begin(), LE = I->second.end(); for (LiveInterval::iterator LI = OI->second.begin(),
LI != LE; ++LI) { LE = OI->second.end(); LI != LE; ++LI) {
// Remap the start index of the live range to the corresponding new // Remap the start index of the live range to the corresponding new
// number, or our best guess at what it _should_ correspond to if the // number, or our best guess at what it _should_ correspond to if the
// original instruction has been erased. This is either the following // original instruction has been erased. This is either the following
// instruction or its predecessor. // instruction or its predecessor.
unsigned index = LI->start / InstrSlots::NUM;
unsigned offset = LI->start % InstrSlots::NUM; unsigned offset = LI->start % InstrSlots::NUM;
if (OldI2MI[LI->start / InstrSlots::NUM]) if (offset == InstrSlots::LOAD) {
LI->start = mi2iMap_[OldI2MI[LI->start / InstrSlots::NUM]] + offset; std::vector<IdxMBBPair>::const_iterator I =
else { std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), index);
unsigned i = 0; // Take the pair containing the index
MachineInstr* newInstr = 0; std::vector<IdxMBBPair>::const_iterator J =
do { ((I != OldI2MBB.end() && I->first > index) ||
newInstr = OldI2MI[LI->start / InstrSlots::NUM + i]; (I == OldI2MBB.end() && OldI2MBB.size()>0)) ? (I-1): I;
i++;
} while (!newInstr);
if (mi2iMap_[newInstr] == LI->start = getMBBStartIdx(J->second);
MBB2IdxMap[newInstr->getParent()->getNumber()].first) } else {
LI->start = mi2iMap_[newInstr]; LI->start = mi2iMap_[OldI2MI[index]] + offset;
else
LI->start = mi2iMap_[newInstr] - InstrSlots::NUM + offset;
} }
// Remap the ending index in the same way that we remapped the start, // Remap the ending index in the same way that we remapped the start,
// except for the final step where we always map to the immediately // except for the final step where we always map to the immediately
// following instruction. // following instruction.
if (LI->end / InstrSlots::NUM < OldI2MI.size()) { index = LI->end / InstrSlots::NUM;
offset = LI->end % InstrSlots::NUM; offset = LI->end % InstrSlots::NUM;
if (OldI2MI[LI->end / InstrSlots::NUM]) if (offset == InstrSlots::STORE) {
LI->end = mi2iMap_[OldI2MI[LI->end / InstrSlots::NUM]] + offset; std::vector<IdxMBBPair>::const_iterator I =
else { std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), index);
unsigned i = 0; // Take the pair containing the index
MachineInstr* newInstr = 0; std::vector<IdxMBBPair>::const_iterator J =
do { ((I != OldI2MBB.end() && I->first > index) ||
newInstr = OldI2MI[LI->end / InstrSlots::NUM + i]; (I == OldI2MBB.end() && OldI2MBB.size()>0)) ? (I-1): I;
i++;
} while (!newInstr); LI->end = getMBBEndIdx(J->second) + 1;
LI->end = mi2iMap_[newInstr];
}
} else { } else {
LI->end = i2miMap_.size() * InstrSlots::NUM; LI->end = mi2iMap_[OldI2MI[index]] + offset;
} }
// Remap the VNInfo def index, which works the same as the // Remap the VNInfo def index, which works the same as the
// start indices above. // start indices above.
VNInfo* vni = LI->valno; VNInfo* vni = LI->valno;
index = vni->def / InstrSlots::NUM;
offset = vni->def % InstrSlots::NUM; offset = vni->def % InstrSlots::NUM;
if (OldI2MI[vni->def / InstrSlots::NUM]) if (offset == InstrSlots::LOAD) {
vni->def = mi2iMap_[OldI2MI[vni->def / InstrSlots::NUM]] + offset; std::vector<IdxMBBPair>::const_iterator I =
else { std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), index);
unsigned i = 0; // Take the pair containing the index
MachineInstr* newInstr = 0; std::vector<IdxMBBPair>::const_iterator J =
do { ((I != OldI2MBB.end() && I->first > index) ||
newInstr = OldI2MI[vni->def / InstrSlots::NUM + i]; (I == OldI2MBB.end() && OldI2MBB.size()>0)) ? (I-1): I;
i++;
} while (!newInstr);
if (mi2iMap_[newInstr] == vni->def = getMBBStartIdx(J->second);
MBB2IdxMap[newInstr->getParent()->getNumber()].first)
vni->def = mi2iMap_[newInstr]; } else {
else vni->def = mi2iMap_[OldI2MI[index]] + offset;
vni->def = mi2iMap_[newInstr] - InstrSlots::NUM + offset;
} }
// Remap the VNInfo kill indices, which works the same as // Remap the VNInfo kill indices, which works the same as
// the end indices above. // the end indices above.
for (size_t i = 0; i < vni->kills.size(); ++i) { for (size_t i = 0; i < vni->kills.size(); ++i) {
index = vni->kills[i] / InstrSlots::NUM;
offset = vni->kills[i] % InstrSlots::NUM; offset = vni->kills[i] % InstrSlots::NUM;
if (OldI2MI[vni->kills[i] / InstrSlots::NUM]) if (OldI2MI[vni->kills[i] / InstrSlots::NUM]) {
vni->kills[i] = mi2iMap_[OldI2MI[vni->kills[i] / InstrSlots::NUM]] + std::vector<IdxMBBPair>::const_iterator I =
offset; std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), index);
else { // Take the pair containing the index
unsigned e = 0; std::vector<IdxMBBPair>::const_iterator J =
MachineInstr* newInstr = 0; ((I != OldI2MBB.end() && I->first > index) ||
do { (I == OldI2MBB.end() && OldI2MBB.size()>0)) ? (I-1): I;
newInstr = OldI2MI[vni->kills[i] / InstrSlots::NUM + e];
e++; vni->kills[i] = getMBBEndIdx(J->second) + 1;
} while (!newInstr); } else {
vni->kills[i] = mi2iMap_[OldI2MI[index]] + offset;
vni->kills[i] = mi2iMap_[newInstr];
} }
} }
} }
@ -362,9 +357,7 @@ void LiveIntervals::handleVirtualRegisterDef(MachineBasicBlock *mbb,
// of the defining block, potentially live across some blocks, then is // of the defining block, potentially live across some blocks, then is
// live into some number of blocks, but gets killed. Start by adding a // live into some number of blocks, but gets killed. Start by adding a
// range that goes from this definition to the end of the defining block. // range that goes from this definition to the end of the defining block.
LiveRange NewLR(defIndex, LiveRange NewLR(defIndex, getMBBEndIdx(mbb)+1, ValNo);
getInstructionIndex(&mbb->back()) + InstrSlots::NUM,
ValNo);
DOUT << " +" << NewLR; DOUT << " +" << NewLR;
interval.addRange(NewLR); interval.addRange(NewLR);
@ -484,7 +477,7 @@ void LiveIntervals::handleVirtualRegisterDef(MachineBasicBlock *mbb,
CopyMI = mi; CopyMI = mi;
ValNo = interval.getNextValue(defIndex, CopyMI, VNInfoAllocator); ValNo = interval.getNextValue(defIndex, CopyMI, VNInfoAllocator);
unsigned killIndex = getInstructionIndex(&mbb->back()) + InstrSlots::NUM; unsigned killIndex = getMBBEndIdx(mbb) + 1;
LiveRange LR(defIndex, killIndex, ValNo); LiveRange LR(defIndex, killIndex, ValNo);
interval.addRange(LR); interval.addRange(LR);
interval.addKill(ValNo, killIndex); interval.addKill(ValNo, killIndex);
@ -522,8 +515,11 @@ void LiveIntervals::handlePhysicalRegisterDef(MachineBasicBlock *MBB,
// If it is not dead on definition, it must be killed by a // If it is not dead on definition, it must be killed by a
// subsequent instruction. Hence its interval is: // subsequent instruction. Hence its interval is:
// [defSlot(def), useSlot(kill)+1) // [defSlot(def), useSlot(kill)+1)
baseIndex += InstrSlots::NUM;
while (++mi != MBB->end()) { while (++mi != MBB->end()) {
baseIndex += InstrSlots::NUM; while (baseIndex / InstrSlots::NUM < i2miMap_.size() &&
getInstructionFromIndex(baseIndex) == 0)
baseIndex += InstrSlots::NUM;
if (mi->killsRegister(interval.reg, tri_)) { if (mi->killsRegister(interval.reg, tri_)) {
DOUT << " killed"; DOUT << " killed";
end = getUseIndex(baseIndex) + 1; end = getUseIndex(baseIndex) + 1;
@ -537,6 +533,8 @@ void LiveIntervals::handlePhysicalRegisterDef(MachineBasicBlock *MBB,
end = getDefIndex(start) + 1; end = getDefIndex(start) + 1;
goto exit; goto exit;
} }
baseIndex += InstrSlots::NUM;
} }
// The only case we should have a dead physreg here without a killing or // The only case we should have a dead physreg here without a killing or
@ -612,6 +610,9 @@ void LiveIntervals::handleLiveInRegister(MachineBasicBlock *MBB,
} }
baseIndex += InstrSlots::NUM; baseIndex += InstrSlots::NUM;
while (baseIndex / InstrSlots::NUM < i2miMap_.size() &&
getInstructionFromIndex(baseIndex) == 0)
baseIndex += InstrSlots::NUM;
++mi; ++mi;
} }
@ -643,6 +644,12 @@ void LiveIntervals::computeIntervals() {
<< ((Value*)mf_->getFunction())->getName() << '\n'; << ((Value*)mf_->getFunction())->getName() << '\n';
// Track the index of the current machine instr. // Track the index of the current machine instr.
unsigned MIIndex = 0; unsigned MIIndex = 0;
// Skip over empty initial indices.
while (MIIndex / InstrSlots::NUM < i2miMap_.size() &&
getInstructionFromIndex(MIIndex) == 0)
MIIndex += InstrSlots::NUM;
for (MachineFunction::iterator MBBI = mf_->begin(), E = mf_->end(); for (MachineFunction::iterator MBBI = mf_->begin(), E = mf_->end();
MBBI != E; ++MBBI) { MBBI != E; ++MBBI) {
MachineBasicBlock *MBB = MBBI; MachineBasicBlock *MBB = MBBI;
@ -673,9 +680,12 @@ void LiveIntervals::computeIntervals() {
} }
MIIndex += InstrSlots::NUM; MIIndex += InstrSlots::NUM;
// Skip over empty indices.
while (MIIndex / InstrSlots::NUM < i2miMap_.size() &&
getInstructionFromIndex(MIIndex) == 0)
MIIndex += InstrSlots::NUM;
} }
if (MBB->begin() == miEnd) MIIndex += InstrSlots::NUM; // Empty MBB
} }
} }