mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 11:42:57 +01:00
When the scavenger is looking for a good candidate location to restore from a
spill, it should avoid doing so inside the live range of a virtual register. llvm-svn: 85026
This commit is contained in:
parent
06621f065a
commit
7af2399458
@ -227,7 +227,7 @@ unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RC) const {
|
||||
///
|
||||
/// No more than InstrLimit instructions are inspected.
|
||||
///
|
||||
unsigned RegScavenger::findSurvivorReg(MachineBasicBlock::iterator MI,
|
||||
unsigned RegScavenger::findSurvivorReg(MachineBasicBlock::iterator StartMI,
|
||||
BitVector &Candidates,
|
||||
unsigned InstrLimit,
|
||||
MachineBasicBlock::iterator &UseMI) {
|
||||
@ -235,19 +235,37 @@ unsigned RegScavenger::findSurvivorReg(MachineBasicBlock::iterator MI,
|
||||
assert(Survivor > 0 && "No candidates for scavenging");
|
||||
|
||||
MachineBasicBlock::iterator ME = MBB->getFirstTerminator();
|
||||
assert(MI != ME && "MI already at terminator");
|
||||
assert(StartMI != ME && "MI already at terminator");
|
||||
MachineBasicBlock::iterator RestorePointMI = StartMI;
|
||||
MachineBasicBlock::iterator MI = StartMI;
|
||||
|
||||
bool inVirtLiveRange = false;
|
||||
for (++MI; InstrLimit > 0 && MI != ME; ++MI, --InstrLimit) {
|
||||
bool isVirtKillInsn = false;
|
||||
bool isVirtDefInsn = false;
|
||||
// Remove any candidates touched by instruction.
|
||||
for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
|
||||
const MachineOperand &MO = MI->getOperand(i);
|
||||
if (!MO.isReg() || MO.isUndef() || !MO.getReg() ||
|
||||
TargetRegisterInfo::isVirtualRegister(MO.getReg()))
|
||||
if (!MO.isReg() || MO.isUndef() || !MO.getReg())
|
||||
continue;
|
||||
if (TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
|
||||
if (MO.isDef())
|
||||
isVirtDefInsn = true;
|
||||
else if (MO.isKill())
|
||||
isVirtKillInsn = true;
|
||||
continue;
|
||||
}
|
||||
Candidates.reset(MO.getReg());
|
||||
for (const unsigned *R = TRI->getAliasSet(MO.getReg()); *R; R++)
|
||||
Candidates.reset(*R);
|
||||
}
|
||||
// If we're not in a virtual reg's live range, this is a valid
|
||||
// restore point.
|
||||
if (!inVirtLiveRange) RestorePointMI = MI;
|
||||
|
||||
// Update whether we're in the live range of a virtual register
|
||||
if (isVirtKillInsn) inVirtLiveRange = false;
|
||||
if (isVirtDefInsn) inVirtLiveRange = true;
|
||||
|
||||
// Was our survivor untouched by this instruction?
|
||||
if (Candidates.test(Survivor))
|
||||
@ -259,9 +277,13 @@ unsigned RegScavenger::findSurvivorReg(MachineBasicBlock::iterator MI,
|
||||
|
||||
Survivor = Candidates.find_first();
|
||||
}
|
||||
// If we ran off the end, that's where we want to restore.
|
||||
if (MI == ME) RestorePointMI = ME;
|
||||
assert (RestorePointMI != StartMI &&
|
||||
"No available scavenger restore location!");
|
||||
|
||||
// We ran out of candidates, so stop the search.
|
||||
UseMI = MI;
|
||||
UseMI = RestorePointMI;
|
||||
return Survivor;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user