mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 03:23:01 +02:00
Make findLastUseBefore handle reg-unit liveness.
findLastUseBefore was previous considering virtreg liveness only, leading to incorrect live intervals for reg units when instrs with physreg operands were moved up. llvm-svn: 163685
This commit is contained in:
parent
24d6cafc79
commit
ec4a366e08
@ -1196,14 +1196,35 @@ private:
|
||||
// Return the last use of reg between NewIdx and OldIdx.
|
||||
SlotIndex findLastUseBefore(unsigned Reg, SlotIndex OldIdx) {
|
||||
SlotIndex LastUse = NewIdx;
|
||||
for (MachineRegisterInfo::use_nodbg_iterator
|
||||
UI = MRI.use_nodbg_begin(Reg),
|
||||
UE = MRI.use_nodbg_end();
|
||||
UI != UE; UI.skipInstruction()) {
|
||||
const MachineInstr* MI = &*UI;
|
||||
SlotIndex InstSlot = LIS.getSlotIndexes()->getInstructionIndex(MI);
|
||||
if (InstSlot > LastUse && InstSlot < OldIdx)
|
||||
LastUse = InstSlot;
|
||||
|
||||
if (TargetRegisterInfo::isVirtualRegister(Reg)) {
|
||||
for (MachineRegisterInfo::use_nodbg_iterator
|
||||
UI = MRI.use_nodbg_begin(Reg),
|
||||
UE = MRI.use_nodbg_end();
|
||||
UI != UE; UI.skipInstruction()) {
|
||||
const MachineInstr* MI = &*UI;
|
||||
SlotIndex InstSlot = LIS.getSlotIndexes()->getInstructionIndex(MI);
|
||||
if (InstSlot > LastUse && InstSlot < OldIdx)
|
||||
LastUse = InstSlot;
|
||||
}
|
||||
} else {
|
||||
MachineInstr* MI = LIS.getSlotIndexes()->getInstructionFromIndex(NewIdx);
|
||||
MachineBasicBlock::iterator MII(MI);
|
||||
++MII;
|
||||
MachineBasicBlock* MBB = MI->getParent();
|
||||
for (; MII != MBB->end() && LIS.getInstructionIndex(MII) < OldIdx; ++MII){
|
||||
for (MachineInstr::mop_iterator MOI = MII->operands_begin(),
|
||||
MOE = MII->operands_end();
|
||||
MOI != MOE; ++MOI) {
|
||||
const MachineOperand& mop = *MOI;
|
||||
if (!mop.isReg() || mop.getReg() == 0 ||
|
||||
TargetRegisterInfo::isVirtualRegister(mop.getReg()))
|
||||
continue;
|
||||
|
||||
if (TRI.hasRegUnit(mop.getReg(), Reg))
|
||||
LastUse = LIS.getInstructionIndex(MII);
|
||||
}
|
||||
}
|
||||
}
|
||||
return LastUse;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user