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

Minor spiller tweak to unfavor reload into load/store instructions.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52477 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2008-06-19 01:16:17 +00:00
parent 6c5e561668
commit bdf34bc12b
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/CodeGen/LiveIntervalAnalysis.h
View File

@@ -121,8 +121,12 @@ namespace llvm {
return getBaseIndex(index) + InstrSlots::STORE; return getBaseIndex(index) + InstrSlots::STORE;
} }
static float getSpillWeight(bool isDef, bool isUse, unsigned loopDepth) { static float getSpillWeight(bool isDef, bool isUse, bool isMem,
return (isDef + isUse) * powf(10.0F, (float)loopDepth); unsigned loopDepth) {
float Weight = isDef;
if (isUse)
Weight += isMem ? 1.2f : 1.0f;
return Weight * powf(10.0F, (float)loopDepth);
} }
typedef Reg2IntervalMap::iterator iterator; typedef Reg2IntervalMap::iterator iterator;

7
include/llvm/CodeGen/MachineRegisterInfo.h
View File

@@ -135,6 +135,13 @@ public:
assert(Reg < VRegInfo.size() && "Invalid vreg!"); assert(Reg < VRegInfo.size() && "Invalid vreg!");
return VRegInfo[Reg].first; return VRegInfo[Reg].first;
} }
/// setRegClass - Set the register class of the specified virtual register.
void setRegClass(unsigned Reg, const TargetRegisterClass *RC) {
Reg -= TargetRegisterInfo::FirstVirtualRegister;
assert(Reg < VRegInfo.size() && "Invalid vreg!");
VRegInfo[Reg].first = RC;
}
/// createVirtualRegister - Create and return a new virtual register in the /// createVirtualRegister - Create and return a new virtual register in the
/// function with the specified register class. /// function with the specified register class.

12
lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@@ -988,6 +988,7 @@ rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI,
unsigned loopDepth = loopInfo->getLoopDepth(MBB); unsigned loopDepth = loopInfo->getLoopDepth(MBB);
bool CanFold = false; bool CanFold = false;
RestartInstruction: RestartInstruction:
bool isMem = MI->getDesc().mayLoad() || MI->getDesc().mayStore();
for (unsigned i = 0; i != MI->getNumOperands(); ++i) { for (unsigned i = 0; i != MI->getNumOperands(); ++i) {
MachineOperand& mop = MI->getOperand(i); MachineOperand& mop = MI->getOperand(i);
if (!mop.isRegister()) if (!mop.isRegister())
@@ -1055,7 +1056,7 @@ rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI,
} }
// Update stack slot spill weight if we are splitting. // Update stack slot spill weight if we are splitting.
float Weight = getSpillWeight(HasDef, HasUse, loopDepth); float Weight = getSpillWeight(HasDef, HasUse, isMem, loopDepth);
if (!TrySplit) if (!TrySplit)
SSWeight += Weight; SSWeight += Weight;
@@ -1248,6 +1249,7 @@ rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit,
bool MIHasUse = rwi.HasUse; bool MIHasUse = rwi.HasUse;
bool MIHasDef = rwi.HasDef; bool MIHasDef = rwi.HasDef;
MachineInstr *MI = rwi.MI; MachineInstr *MI = rwi.MI;
bool isMem = MI->getDesc().mayLoad() || MI->getDesc().mayStore();
// If MI def and/or use the same register multiple times, then there // If MI def and/or use the same register multiple times, then there
// are multiple entries. // are multiple entries.
unsigned NumUses = MIHasUse; unsigned NumUses = MIHasUse;
@@ -1395,7 +1397,7 @@ rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit,
// Update spill weight. // Update spill weight.
unsigned loopDepth = loopInfo->getLoopDepth(MBB); unsigned loopDepth = loopInfo->getLoopDepth(MBB);
nI.weight += getSpillWeight(HasDef, HasUse, loopDepth); nI.weight += getSpillWeight(HasDef, HasUse, isMem, loopDepth);
} }
if (NewVReg && TrySplit && AllCanFold) { if (NewVReg && TrySplit && AllCanFold) {
@@ -1637,6 +1639,7 @@ addIntervalsForSpills(const LiveInterval &li,
LiveInterval &nI = getOrCreateInterval(VReg); LiveInterval &nI = getOrCreateInterval(VReg);
bool isReMat = vrm.isReMaterialized(VReg); bool isReMat = vrm.isReMaterialized(VReg);
MachineInstr *MI = getInstructionFromIndex(index); MachineInstr *MI = getInstructionFromIndex(index);
bool isMem = MI->getDesc().mayLoad() || MI->getDesc().mayStore();
bool CanFold = false; bool CanFold = false;
bool FoundUse = false; bool FoundUse = false;
Ops.clear(); Ops.clear();
@@ -1689,7 +1692,7 @@ addIntervalsForSpills(const LiveInterval &li,
// Update spill slot weight. // Update spill slot weight.
if (!isReMat) if (!isReMat)
SSWeight += getSpillWeight(true, false, loopDepth); SSWeight += getSpillWeight(true, false, isMem, loopDepth);
} }
Id = SpillMBBs.find_next(Id); Id = SpillMBBs.find_next(Id);
} }
@@ -1709,6 +1712,7 @@ addIntervalsForSpills(const LiveInterval &li,
LiveInterval &nI = getOrCreateInterval(VReg); LiveInterval &nI = getOrCreateInterval(VReg);
bool isReMat = vrm.isReMaterialized(VReg); bool isReMat = vrm.isReMaterialized(VReg);
MachineInstr *MI = getInstructionFromIndex(index); MachineInstr *MI = getInstructionFromIndex(index);
bool isMem = MI->getDesc().mayLoad() || MI->getDesc().mayStore();
bool CanFold = false; bool CanFold = false;
Ops.clear(); Ops.clear();
if (restores[i].canFold) { if (restores[i].canFold) {
@@ -1762,7 +1766,7 @@ addIntervalsForSpills(const LiveInterval &li,
// Update spill slot weight. // Update spill slot weight.
if (!isReMat) if (!isReMat)
SSWeight += getSpillWeight(false, true, loopDepth); SSWeight += getSpillWeight(false, true, isMem, loopDepth);
} }
Id = RestoreMBBs.find_next(Id); Id = RestoreMBBs.find_next(Id);
} }