6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-17 03:30:28 +00:00
Code Issues Projects Releases Wiki Activity

Check the liveinterval, not the kill flag.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134228 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2011-07-01 02:35:06 +00:00
parent 5e9ae090d8
commit 1c8b97cbc0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CodeGen/RegisterCoalescer.cpp
View File

@ -1197,7 +1197,8 @@ static unsigned ComputeUltimateVN(VNInfo *VNI,
// which allows us to coalesce A and B. // which allows us to coalesce A and B.
// MI is the definition of B. LR is the life range of A that includes // MI is the definition of B. LR is the life range of A that includes
// the slot just before B. If we return true, we add "B = X" to DupCopies. // the slot just before B. If we return true, we add "B = X" to DupCopies.
static bool RegistersDefinedFromSameValue(const TargetRegisterInfo &tri, static bool RegistersDefinedFromSameValue(LiveIntervals &li,
const TargetRegisterInfo &tri,
CoalescerPair &CP, MachineInstr *MI, CoalescerPair &CP, MachineInstr *MI,
LiveRange *LR, LiveRange *LR,
SmallVector<MachineInstr*, 8> &DupCopies) { SmallVector<MachineInstr*, 8> &DupCopies) {
@ -1207,14 +1208,16 @@ static bool RegistersDefinedFromSameValue(const TargetRegisterInfo &tri,
if (!MI->isFullCopy() || CP.isPartial() || CP.isPhys()) if (!MI->isFullCopy() || CP.isPartial() || CP.isPhys())
return false; return false;
// FIXME: If "B = X" kills X, we have to move the kill back to its
// previous use. For now we just avoid the optimization in that case.
if (MI->getOperand(1).isKill())
return false;
unsigned Dst = MI->getOperand(0).getReg(); unsigned Dst = MI->getOperand(0).getReg();
unsigned Src = MI->getOperand(1).getReg(); unsigned Src = MI->getOperand(1).getReg();
// FIXME: If "B = X" kills X, we have to move the kill back to its
// previous use. For now we just avoid the optimization in that case.
SlotIndex CopyIdx = li.getInstructionIndex(MI).getNextIndex().getDefIndex();
LiveInterval &SrcInt = li.getInterval(Src);
if (SrcInt.killedAt(CopyIdx))
return false;
if (!TargetRegisterInfo::isVirtualRegister(Src) || if (!TargetRegisterInfo::isVirtualRegister(Src) ||
!TargetRegisterInfo::isVirtualRegister(Dst)) !TargetRegisterInfo::isVirtualRegister(Dst))
return false; return false;
@ -1332,7 +1335,7 @@ bool RegisterCoalescer::JoinIntervals(CoalescerPair &CP) {
// from the RHS interval, we can use its value #. // from the RHS interval, we can use its value #.
MachineInstr *MI = VNI->getCopy(); MachineInstr *MI = VNI->getCopy();
if (!CP.isCoalescable(MI) && if (!CP.isCoalescable(MI) &&
!RegistersDefinedFromSameValue(*tri_, CP, MI, lr, DupCopies)) !RegistersDefinedFromSameValue(*li_, *tri_, CP, MI, lr, DupCopies))
continue; continue;
LHSValsDefinedFromRHS[VNI] = lr->valno; LHSValsDefinedFromRHS[VNI] = lr->valno;
@ -1359,7 +1362,7 @@ bool RegisterCoalescer::JoinIntervals(CoalescerPair &CP) {
// from the LHS interval, we can use its value #. // from the LHS interval, we can use its value #.
MachineInstr *MI = VNI->getCopy(); MachineInstr *MI = VNI->getCopy();
if (!CP.isCoalescable(MI) && if (!CP.isCoalescable(MI) &&
!RegistersDefinedFromSameValue(*tri_, CP, MI, lr, DupCopies)) !RegistersDefinedFromSameValue(*li_, *tri_, CP, MI, lr, DupCopies))
continue; continue;
RHSValsDefinedFromLHS[VNI] = lr->valno; RHSValsDefinedFromLHS[VNI] = lr->valno;