6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

Use existing LiveInterval methods to simplify live interval merging. Thanks to Evan for pointing these out.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54225 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson
2008-07-30 18:27:35 +00:00
parent 1053502486
commit d723f722b2
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/CodeGen/StrongPHIElimination.cpp
View File

@ -802,38 +802,39 @@ void StrongPHIElimination::mergeLiveIntervals(unsigned primary,
DenseMap<VNInfo*, VNInfo*> VNMap; DenseMap<VNInfo*, VNInfo*> VNMap;
VNMap.insert(std::make_pair(RangeMergingIn->valno, NewVN)); VNMap.insert(std::make_pair(RangeMergingIn->valno, NewVN));
bool changed = true; // Find all VNs that are the inputs to two-address instructiosn
while (changed) { // chaining upwards from the VN we're trying to merge.
changed = false; bool addedVN = true;
for (LiveInterval::iterator RI = RHS.begin(), RE = RHS.end(); while (addedVN) {
RI != RE; ) addedVN = false;
if (MergedVNs.count(RI->valno)) { unsigned defIndex = RHSVN->def;
NewVN->hasPHIKill = true;
LiveRange NewRange(RI->start, RI->end, VNMap[RI->valno]); if (defIndex != ~0U) {
LHS.addRange(NewRange); MachineInstr* instr = LI.getInstructionFromIndex(defIndex);
MachineInstr* instr = LI.getInstructionFromIndex(RI->start);
for (unsigned i = 0; i < instr->getNumOperands(); ++i) { for (unsigned i = 0; i < instr->getNumOperands(); ++i) {
if (instr->getOperand(i).isReg() && if (instr->getOperand(i).isReg() &&
instr->getOperand(i).getReg() == secondary) instr->getOperand(i).getReg() == secondary)
if (instr->isRegReDefinedByTwoAddr(secondary, i)) { if (instr->isRegReDefinedByTwoAddr(secondary, i)) {
VNInfo* twoaddr = RHS.getLiveRangeContaining(RI->start-1)->valno; RHSVN = RHS.getLiveRangeContaining(defIndex-1)->valno;
MergedVNs.insert(twoaddr); addedVN = true;
VNInfo* NextVN = LHS.getNextValue(twoaddr->def, VNInfo* NextVN = LHS.getNextValue(RHSVN->def,
twoaddr->copy, RHSVN->copy,
LI.getVNInfoAllocator()); LI.getVNInfoAllocator());
VNMap.insert(std::make_pair(twoaddr, NextVN)); VNMap.insert(std::make_pair(RHSVN, NextVN));
break;
}
}
} }
} }
unsigned start = RI->start; // Merge VNs from RHS into LHS using the mapping we computed above.
unsigned end = RI->end; for (DenseMap<VNInfo*, VNInfo*>::iterator VI = VNMap.begin(),
++RI; VE = VNMap.end(); VI != VE; ++VI) {
RHS.removeRange(start, end, true); LHS.MergeValueInAsValue(RHS, VI->first, VI->second);
changed = true; RHS.removeValNo(VI->first);
} else
++RI;
} }
if (RHS.begin() == RHS.end()) if (RHS.begin() == RHS.end())