mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-22 11:55:12 +00:00
RegAllocFast: Do not allocate registers for undef uses
Do not actually allocate a register for an undef use. Previously we we would create unnecessary reload instruction for undef uses where the register wasn't live. Patch by Matthias Braun llvm-svn: 356501
This commit is contained in:
parent
be591983cd
commit
abfe49c4b1
@ -203,6 +203,7 @@ namespace {
|
||||
}
|
||||
|
||||
void allocVirtReg(MachineInstr &MI, LiveReg &LR, unsigned Hint);
|
||||
void allocVirtRegUndef(MachineOperand &MO);
|
||||
MCPhysReg defineVirtReg(MachineInstr &MI, unsigned OpNum, unsigned VirtReg,
|
||||
unsigned Hint);
|
||||
LiveReg &reloadVirtReg(MachineInstr &MI, unsigned OpNum, unsigned VirtReg,
|
||||
@ -616,6 +617,31 @@ void RegAllocFast::allocVirtReg(MachineInstr &MI, LiveReg &LR, unsigned Hint) {
|
||||
assignVirtToPhysReg(LR, BestReg);
|
||||
}
|
||||
|
||||
void RegAllocFast::allocVirtRegUndef(MachineOperand &MO) {
|
||||
assert(MO.isUndef() && "expected undef use");
|
||||
unsigned VirtReg = MO.getReg();
|
||||
assert(TargetRegisterInfo::isVirtualRegister(VirtReg) && "Expected virtreg");
|
||||
|
||||
LiveRegMap::const_iterator LRI = findLiveVirtReg(VirtReg);
|
||||
MCPhysReg PhysReg;
|
||||
if (LRI != LiveVirtRegs.end() && LRI->PhysReg) {
|
||||
PhysReg = LRI->PhysReg;
|
||||
} else {
|
||||
const TargetRegisterClass &RC = *MRI->getRegClass(VirtReg);
|
||||
ArrayRef<MCPhysReg> AllocationOrder = RegClassInfo.getOrder(&RC);
|
||||
assert(!AllocationOrder.empty() && "Allocation order must not be empty");
|
||||
PhysReg = AllocationOrder[0];
|
||||
}
|
||||
|
||||
unsigned SubRegIdx = MO.getSubReg();
|
||||
if (SubRegIdx != 0) {
|
||||
PhysReg = TRI->getSubReg(PhysReg, SubRegIdx);
|
||||
MO.setSubReg(0);
|
||||
}
|
||||
MO.setReg(PhysReg);
|
||||
MO.setIsRenamable(true);
|
||||
}
|
||||
|
||||
/// Allocates a register for VirtReg and mark it as dirty.
|
||||
MCPhysReg RegAllocFast::defineVirtReg(MachineInstr &MI, unsigned OpNum,
|
||||
unsigned VirtReg, unsigned Hint) {
|
||||
@ -933,12 +959,18 @@ void RegAllocFast::allocateInstruction(MachineInstr &MI) {
|
||||
|
||||
// Second scan.
|
||||
// Allocate virtreg uses.
|
||||
bool HasUndefUse = false;
|
||||
for (unsigned I = 0; I != VirtOpEnd; ++I) {
|
||||
MachineOperand &MO = MI.getOperand(I);
|
||||
if (!MO.isReg()) continue;
|
||||
unsigned Reg = MO.getReg();
|
||||
if (!TargetRegisterInfo::isVirtualRegister(Reg)) continue;
|
||||
if (MO.isUse()) {
|
||||
if (MO.isUndef()) {
|
||||
HasUndefUse = true;
|
||||
// There is no need to allocate a register for an undef use.
|
||||
continue;
|
||||
}
|
||||
LiveReg &LR = reloadVirtReg(MI, I, Reg, CopyDstReg);
|
||||
MCPhysReg PhysReg = LR.PhysReg;
|
||||
CopySrcReg = (CopySrcReg == Reg || CopySrcReg == PhysReg) ? PhysReg : 0;
|
||||
@ -947,6 +979,22 @@ void RegAllocFast::allocateInstruction(MachineInstr &MI) {
|
||||
}
|
||||
}
|
||||
|
||||
// Allocate undef operands. This is a separate step because in a situation
|
||||
// like ` = OP undef %X, %X` both operands need the same register assign
|
||||
// so we should perform the normal assignment first.
|
||||
if (HasUndefUse) {
|
||||
for (MachineOperand &MO : MI.uses()) {
|
||||
if (!MO.isReg() || !MO.isUse())
|
||||
continue;
|
||||
unsigned Reg = MO.getReg();
|
||||
if (!TargetRegisterInfo::isVirtualRegister(Reg))
|
||||
continue;
|
||||
|
||||
assert(MO.isUndef() && "Should only have undef virtreg uses left");
|
||||
allocVirtRegUndef(MO);
|
||||
}
|
||||
}
|
||||
|
||||
// Track registers defined by instruction - early clobbers and tied uses at
|
||||
// this point.
|
||||
UsedInInstr.clear();
|
||||
|
Loading…
x
Reference in New Issue
Block a user