6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 02:24:22 +00:00
Code Issues Projects Releases Wiki Activity

Do not lose rematerialization info when spilling already split live intervals.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44443 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2007-11-29 23:02:50 +00:00
parent 1fb136464d
commit cb3c330d39
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@ -720,7 +720,7 @@ rewriteInstructionForSpills(const LiveInterval &li, bool TrySplit,
continue; continue;
bool TryFold = !DefIsReMat; bool TryFold = !DefIsReMat;
bool FoldSS = true; bool FoldSS = true; // Default behavior unless it's a remat.
int FoldSlot = Slot; int FoldSlot = Slot;
if (DefIsReMat) { if (DefIsReMat) {
// If this is the rematerializable definition MI itself and // If this is the rematerializable definition MI itself and
@ -734,8 +734,7 @@ rewriteInstructionForSpills(const LiveInterval &li, bool TrySplit,
// If def for this use can't be rematerialized, then try folding. // If def for this use can't be rematerialized, then try folding.
// If def is rematerializable and it's a load, also try folding. // If def is rematerializable and it's a load, also try folding.
TryFold = !ReMatOrigDefMI || TryFold = !ReMatDefMI || (ReMatDefMI && (MI == ReMatOrigDefMI || isLoad));
(ReMatOrigDefMI && (MI == ReMatOrigDefMI || isLoad));
if (isLoad) { if (isLoad) {
// Try fold loads (from stack slot, constant pool, etc.) into uses. // Try fold loads (from stack slot, constant pool, etc.) into uses.
FoldSS = isLoadSS; FoldSS = isLoadSS;
@ -810,6 +809,12 @@ rewriteInstructionForSpills(const LiveInterval &li, bool TrySplit,
} else { } else {
vrm.assignVirt2StackSlot(NewVReg, Slot); vrm.assignVirt2StackSlot(NewVReg, Slot);
} }
} else if (HasUse && HasDef &&
vrm.getStackSlot(NewVReg) == VirtRegMap::NO_STACK_SLOT) {
// If this interval hasn't been assigned a stack slot (because earlier
// def is a deleted remat def), do it now.
assert(Slot != VirtRegMap::NO_STACK_SLOT);
vrm.assignVirt2StackSlot(NewVReg, Slot);
} }
// create a new register interval for this spill / remat. // create a new register interval for this spill / remat.
@ -984,17 +989,6 @@ rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit,
SpillMBBs.set(MBBId); SpillMBBs.set(MBBId);
} }
} }
/// FIXME: Move this else where.
if (!IsNew) {
// It this interval hasn't been assigned a stack slot
// (because earlier def is remat), do it now.
int SS = vrm.getStackSlot(NewVReg);
if (SS != (int)Slot) {
assert(SS == VirtRegMap::NO_STACK_SLOT);
vrm.assignVirt2StackSlot(NewVReg, Slot);
}
}
} }
if (HasUse) { if (HasUse) {
@ -1110,6 +1104,7 @@ addIntervalsForSpills(const LiveInterval &li,
// are two-address instructions that re-defined the value. Only the // are two-address instructions that re-defined the value. Only the
// first def can be rematerialized! // first def can be rematerialized!
if (IsFirstRange) { if (IsFirstRange) {
// Note ReMatOrigDefMI has already been deleted.
rewriteInstructionsForSpills(li, false, I, NULL, ReMatDefMI, rewriteInstructionsForSpills(li, false, I, NULL, ReMatDefMI,
Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, Slot, LdSlot, isLoad, isLoadSS, DefIsReMat,
false, vrm, RegMap, rc, ReMatIds, loopInfo, false, vrm, RegMap, rc, ReMatIds, loopInfo,