RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-21 02:59:15 +00:00
Code Issues Actions Packages 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.

llvm-svn: 54185
This commit is contained in:
Owen Anderson 2008-07-30 00:21:16 +00:00
parent 81169f2e1b
commit 6147af0f8c
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/CodeGen/StrongPHIElimination.cpp
View File

@ -792,20 +792,49 @@ void StrongPHIElimination::mergeLiveIntervals(unsigned primary,
VNInfo* NewVN = LHS.getNextValue(RangeMergingIn->valno->def,
RangeMergingIn->valno->copy,
LI.getVNInfoAllocator());
for (LiveInterval::iterator RI = RHS.begin(), RE = RHS.end();
RI != RE; )
if (RI->valno == RHSVN) {
NewVN->hasPHIKill = true;
LiveRange NewRange(RI->start, RI->end, NewVN);
LHS.addRange(NewRange);
// 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();
RI != RE; )
if (MergedVNs.count(RI->valno)) {
NewVN->hasPHIKill = true;
LiveRange NewRange(RI->start, RI->end, VNMap[RI->valno]);
LHS.addRange(NewRange);
unsigned start = RI->start;
unsigned end = RI->end;
++RI;
RHS.removeRange(start, end, true);
} else
++RI;
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 end = RI->end;
++RI;
RHS.removeRange(start, end, true);
changed = true;
} else
++RI;
}
if (RHS.begin() == RHS.end())
LI.removeInterval(RHS.reg);