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

When merging live intervals, we also need to merge in any live ranges that are inputs to two-address instructions

Browse Source 
that themselves define a range we already care about.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54185 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2008-07-30 00:21:16 +00:00
parent 068acc3caa
commit b9fb8d1e69
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/CodeGen/StrongPHIElimination.cpp
View File

@ -793,19 +793,48 @@ void StrongPHIElimination::mergeLiveIntervals(unsigned primary,
RangeMergingIn->valno->copy, RangeMergingIn->valno->copy,
LI.getVNInfoAllocator()); LI.getVNInfoAllocator());
// If we discover that a live range was defined by a two-addr
// instruction, we need to merge over the input as well, even if
// it has a different VNInfo.
SmallPtrSet<VNInfo*, 4> MergedVNs;
MergedVNs.insert(RHSVN);
DenseMap<VNInfo*, VNInfo*> VNMap;
VNMap.insert(std::make_pair(RangeMergingIn->valno, NewVN));
bool changed = true;
while (changed) {
changed = false;
for (LiveInterval::iterator RI = RHS.begin(), RE = RHS.end(); for (LiveInterval::iterator RI = RHS.begin(), RE = RHS.end();
RI != RE; ) RI != RE; )
if (RI->valno == RHSVN) { if (MergedVNs.count(RI->valno)) {
NewVN->hasPHIKill = true; NewVN->hasPHIKill = true;
LiveRange NewRange(RI->start, RI->end, NewVN); LiveRange NewRange(RI->start, RI->end, VNMap[RI->valno]);
LHS.addRange(NewRange); LHS.addRange(NewRange);
MachineInstr* instr = LI.getInstructionFromIndex(RI->start);
for (unsigned i = 0; i < instr->getNumOperands(); ++i) {
if (instr->getOperand(i).isReg() &&
instr->getOperand(i).getReg() == secondary)
if (instr->isRegReDefinedByTwoAddr(secondary, i)) {
VNInfo* twoaddr = RHS.getLiveRangeContaining(RI->start-1)->valno;
MergedVNs.insert(twoaddr);
VNInfo* NextVN = LHS.getNextValue(twoaddr->def,
twoaddr->copy,
LI.getVNInfoAllocator());
VNMap.insert(std::make_pair(twoaddr, NextVN));
}
}
unsigned start = RI->start; unsigned start = RI->start;
unsigned end = RI->end; unsigned end = RI->end;
++RI; ++RI;
RHS.removeRange(start, end, true); RHS.removeRange(start, end, true);
changed = true;
} else } else
++RI; ++RI;
}
if (RHS.begin() == RHS.end()) if (RHS.begin() == RHS.end())
LI.removeInterval(RHS.reg); LI.removeInterval(RHS.reg);