replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a LiveRangeEdit delegate callback before shrinking a live range. 

The register allocator needs to adjust its live interval unions when that happens.

llvm-svn: 127774
This commit is contained in:
Jakob Stoklund Olesen 2011-03-16 22:56:16 +00:00
parent c738c96519
commit e14b2b226f
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/CodeGen/LiveRangeEdit.cpp
View File

@ -201,8 +201,11 @@ void LiveRangeEdit::eliminateDeadDefs(SmallVectorImpl<MachineInstr*> &Dead,
break; break;
// Shrink just one live interval. Then delete new dead defs. // Shrink just one live interval. Then delete new dead defs.
LIS.shrinkToUses(ToShrink.back(), &Dead); LiveInterval *LI = ToShrink.back();
ToShrink.pop_back(); ToShrink.pop_back();
if (delegate_)
delegate_->LRE_WillShrinkVirtReg(LI->reg);
LIS.shrinkToUses(LI, &Dead);
} }
} }

3
llvm/lib/CodeGen/LiveRangeEdit.h
View File

@ -39,6 +39,9 @@ public:
/// its deletion from LiveIntervals. /// its deletion from LiveIntervals.
virtual bool LRE_CanEraseVirtReg(unsigned) { return true; } virtual bool LRE_CanEraseVirtReg(unsigned) { return true; }
/// Called before shrinking the live range of a virtual register.
virtual void LRE_WillShrinkVirtReg(unsigned) {}
virtual ~Delegate() {} virtual ~Delegate() {}
}; };

12
llvm/lib/CodeGen/RegAllocGreedy.cpp
View File

@ -162,6 +162,7 @@ public:
private: private:
void LRE_WillEraseInstruction(MachineInstr*); void LRE_WillEraseInstruction(MachineInstr*);
bool LRE_CanEraseVirtReg(unsigned); bool LRE_CanEraseVirtReg(unsigned);
void LRE_WillShrinkVirtReg(unsigned);
bool checkUncachedInterference(LiveInterval&, unsigned); bool checkUncachedInterference(LiveInterval&, unsigned);
LiveInterval *getSingleInterference(LiveInterval&, unsigned); LiveInterval *getSingleInterference(LiveInterval&, unsigned);
@ -260,6 +261,17 @@ bool RAGreedy::LRE_CanEraseVirtReg(unsigned VirtReg) {
return false; return false;
} }
void RAGreedy::LRE_WillShrinkVirtReg(unsigned VirtReg) {
unsigned PhysReg = VRM->getPhys(VirtReg);
if (!PhysReg)
return;
// Register is assigned, put it back on the queue for reassignment.
LiveInterval &LI = LIS->getInterval(VirtReg);
unassign(LI, PhysReg);
enqueue(&LI);
}
void RAGreedy::releaseMemory() { void RAGreedy::releaseMemory() {
SpillerInstance.reset(0); SpillerInstance.reset(0);
LRStage.clear(); LRStage.clear();