6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-29 10:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Minimize the slot indexes spanned by register ranges created when splitting.

Browse Source 
When an interfering live range ends at a dead slot index between two
instructions, make sure that the inserted copy instruction gets a slot index
after the dead ones. This makes it possible to avoid the interference.

Ideally, there shouldn't be interference ending at a deleted instruction, but
physical register coalescing can sometimes do that to sub-registers.

This fixes PR9823.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130687 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2011-05-02 05:29:58 +00:00
parent 8e33095cd4
commit bb30dd40ed
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/LiveRangeEdit.cpp
View File

@@ -140,11 +140,13 @@ SlotIndex LiveRangeEdit::rematerializeAt(MachineBasicBlock &MBB,
const Remat &RM, const Remat &RM,
LiveIntervals &lis, LiveIntervals &lis,
const TargetInstrInfo &tii, const TargetInstrInfo &tii,
const TargetRegisterInfo &tri) { const TargetRegisterInfo &tri,
bool Late) {
assert(RM.OrigMI && "Invalid remat"); assert(RM.OrigMI && "Invalid remat");
tii.reMaterialize(MBB, MI, DestReg, 0, RM.OrigMI, tri); tii.reMaterialize(MBB, MI, DestReg, 0, RM.OrigMI, tri);
rematted_.insert(RM.ParentVNI); rematted_.insert(RM.ParentVNI);
return lis.InsertMachineInstrInMaps(--MI).getDefIndex(); return lis.getSlotIndexes()->insertMachineInstrInMaps(--MI, Late)
.getDefIndex();
} }
void LiveRangeEdit::eraseVirtReg(unsigned Reg, LiveIntervals &LIS) { void LiveRangeEdit::eraseVirtReg(unsigned Reg, LiveIntervals &LIS) {

3
lib/CodeGen/LiveRangeEdit.h
View File

@@ -165,7 +165,8 @@ public:
const Remat &RM, const Remat &RM,
LiveIntervals&, LiveIntervals&,
const TargetInstrInfo&, const TargetInstrInfo&,
const TargetRegisterInfo&); const TargetRegisterInfo&,
bool Late = false);
/// markRematerialized - explicitly mark a value as rematerialized after doing /// markRematerialized - explicitly mark a value as rematerialized after doing
/// it manually. /// it manually.

9
lib/CodeGen/SplitKit.cpp
View File

@@ -579,15 +579,20 @@ VNInfo *SplitEditor::defFromParent(unsigned RegIdx,
SlotIndex Def; SlotIndex Def;
LiveInterval *LI = Edit->get(RegIdx); LiveInterval *LI = Edit->get(RegIdx);
// We may be trying to avoid interference that ends at a deleted instruction,
// so always begin RegIdx 0 early and all others late.
bool Late = RegIdx != 0;
// Attempt cheap-as-a-copy rematerialization. // Attempt cheap-as-a-copy rematerialization.
LiveRangeEdit::Remat RM(ParentVNI); LiveRangeEdit::Remat RM(ParentVNI);
if (Edit->canRematerializeAt(RM, UseIdx, true, LIS)) { if (Edit->canRematerializeAt(RM, UseIdx, true, LIS)) {
Def = Edit->rematerializeAt(MBB, I, LI->reg, RM, LIS, TII, TRI); Def = Edit->rematerializeAt(MBB, I, LI->reg, RM, LIS, TII, TRI, Late);
} else { } else {
// Can't remat, just insert a copy from parent. // Can't remat, just insert a copy from parent.
CopyMI = BuildMI(MBB, I, DebugLoc(), TII.get(TargetOpcode::COPY), LI->reg) CopyMI = BuildMI(MBB, I, DebugLoc(), TII.get(TargetOpcode::COPY), LI->reg)
.addReg(Edit->getReg()); .addReg(Edit->getReg());
Def = LIS.InsertMachineInstrInMaps(CopyMI).getDefIndex(); Def = LIS.getSlotIndexes()->insertMachineInstrInMaps(CopyMI, Late)
.getDefIndex();
} }
// Define the value in Reg. // Define the value in Reg.