Local spiller kills a store if the folded restore is turned into a copy.
But this is incorrect if the spilled value live range extends beyond the
current BB.
It is currently controlled by a temporary option -spiller-check-liveout.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28024 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index 125a18d..c6dc2b9 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -271,14 +271,15 @@
// can do this, we don't need to insert spill code.
if (lv_)
lv_->instructionChanged(MI, fmi);
- vrm.virtFolded(li.reg, MI, i, fmi);
+ MachineBasicBlock &MBB = *MI->getParent();
+ bool LiveOut = li.liveAt(getInstructionIndex(&MBB.back()) +
+ InstrSlots::NUM);
+ vrm.virtFolded(li.reg, MI, i, fmi, LiveOut);
mi2iMap_.erase(MI);
i2miMap_[index/InstrSlots::NUM] = fmi;
mi2iMap_[fmi] = index;
- MachineBasicBlock &MBB = *MI->getParent();
MI = MBB.insert(MBB.erase(MI), fmi);
++numFolded;
-
// Folding the load/store can completely change the instruction in
// unpredictable ways, rescan it from the beginning.
goto for_operand;
diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp
index f0dd40d..6122dc1 100644
--- a/lib/CodeGen/VirtRegMap.cpp
+++ b/lib/CodeGen/VirtRegMap.cpp
@@ -50,6 +50,10 @@
clEnumVal(local, " local spiller"),
clEnumValEnd),
cl::init(local));
+
+ // TEMPORARY option to test a fix.
+ cl::opt<bool>
+ SpillerCheckLiveOut("spiller-check-liveout", cl::Hidden);
}
//===----------------------------------------------------------------------===//
@@ -81,7 +85,8 @@
}
void VirtRegMap::virtFolded(unsigned VirtReg, MachineInstr *OldMI,
- unsigned OpNo, MachineInstr *NewMI) {
+ unsigned OpNo, MachineInstr *NewMI,
+ bool LiveOut) {
// Move previous memory references folded to new instruction.
MI2VirtMapTy::iterator IP = MI2VirtMap.lower_bound(NewMI);
for (MI2VirtMapTy::iterator I = MI2VirtMap.lower_bound(OldMI),
@@ -96,6 +101,7 @@
MRInfo = isRef;
} else {
MRInfo = OldMI->getOperand(OpNo).isUse() ? isModRef : isMod;
+ if (LiveOut) MRInfo = (ModRef)(MRInfo | isLiveOut);
}
// add new memory reference
@@ -727,10 +733,14 @@
MaybeDeadStores.erase(MDSI);
else {
// If we get here, the store is dead, nuke it now.
- assert(MR == VirtRegMap::isMod && "Can't be modref!");
- MBB.erase(MDSI->second);
- MaybeDeadStores.erase(MDSI);
- ++NumDSE;
+ assert(!(MR & VirtRegMap::isRef) && "Can't be modref!");
+ // Don't nuke it if the value is needed in another block.
+ if (!SpillerCheckLiveOut || !(MR & VirtRegMap::isLiveOut)) {
+ DEBUG(std::cerr << " Killed store:\t" << *MDSI->second);
+ MBB.erase(MDSI->second);
+ MaybeDeadStores.erase(MDSI);
+ ++NumDSE;
+ }
}
}
diff --git a/lib/CodeGen/VirtRegMap.h b/lib/CodeGen/VirtRegMap.h
index d8c371c..343a4e0 100644
--- a/lib/CodeGen/VirtRegMap.h
+++ b/lib/CodeGen/VirtRegMap.h
@@ -26,7 +26,7 @@
class VirtRegMap {
public:
- enum ModRef { isRef = 1, isMod = 2, isModRef = 3 };
+ enum ModRef { isRef = 1, isMod = 2, isModRef = 3, isLiveOut = 4 };
typedef std::multimap<MachineInstr*,
std::pair<unsigned, ModRef> > MI2VirtMapTy;
@@ -128,7 +128,7 @@
/// folded into newMI machine instruction. The OpNum argument indicates the
/// operand number of OldMI that is folded.
void virtFolded(unsigned VirtReg, MachineInstr *OldMI, unsigned OpNum,
- MachineInstr *NewMI);
+ MachineInstr *NewMI, bool LiveOut);
/// @brief returns the virtual registers' values folded in memory
/// operands of this instruction