Transfer physical register spill info when load / store folding happens.
llvm-svn: 48246
This commit is contained in:
parent
44b4c07cd1
commit
a3891365b5
|
@ -779,6 +779,7 @@ bool LiveIntervals::tryFoldMemoryOperand(MachineInstr* &MI,
|
||||||
vrm.virtFolded(Reg, MI, fmi, (VirtRegMap::ModRef)MRInfo);
|
vrm.virtFolded(Reg, MI, fmi, (VirtRegMap::ModRef)MRInfo);
|
||||||
vrm.transferSpillPts(MI, fmi);
|
vrm.transferSpillPts(MI, fmi);
|
||||||
vrm.transferRestorePts(MI, fmi);
|
vrm.transferRestorePts(MI, fmi);
|
||||||
|
vrm.transferEmergencySpills(MI, fmi);
|
||||||
mi2iMap_.erase(MI);
|
mi2iMap_.erase(MI);
|
||||||
i2miMap_[InstrIdx /InstrSlots::NUM] = fmi;
|
i2miMap_[InstrIdx /InstrSlots::NUM] = fmi;
|
||||||
mi2iMap_[fmi] = InstrIdx;
|
mi2iMap_[fmi] = InstrIdx;
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
STATISTIC(NumSpills, "Number of register spills");
|
STATISTIC(NumSpills, "Number of register spills");
|
||||||
|
STATISTIC(NumPSpills,"Number of physical register spills");
|
||||||
STATISTIC(NumReMats, "Number of re-materialization");
|
STATISTIC(NumReMats, "Number of re-materialization");
|
||||||
STATISTIC(NumDRM , "Number of re-materializable defs elided");
|
STATISTIC(NumDRM , "Number of re-materializable defs elided");
|
||||||
STATISTIC(NumStores, "Number of stores added");
|
STATISTIC(NumStores, "Number of stores added");
|
||||||
|
@ -1079,7 +1080,7 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM) {
|
||||||
TII->loadRegFromStackSlot(MBB, next(MII), PhysReg, SS, RC);
|
TII->loadRegFromStackSlot(MBB, next(MII), PhysReg, SS, RC);
|
||||||
MachineInstr *LoadMI = next(MII);
|
MachineInstr *LoadMI = next(MII);
|
||||||
VRM.addSpillSlotUse(SS, LoadMI);
|
VRM.addSpillSlotUse(SS, LoadMI);
|
||||||
++NumSpills;
|
++NumPSpills;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -268,6 +268,8 @@ namespace llvm {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief - transfer spill point information from one instruction to
|
||||||
|
/// another.
|
||||||
void transferSpillPts(MachineInstr *Old, MachineInstr *New) {
|
void transferSpillPts(MachineInstr *Old, MachineInstr *New) {
|
||||||
std::map<MachineInstr*,std::vector<std::pair<unsigned,bool> > >::iterator
|
std::map<MachineInstr*,std::vector<std::pair<unsigned,bool> > >::iterator
|
||||||
I = SpillPt2VirtMap.find(Old);
|
I = SpillPt2VirtMap.find(Old);
|
||||||
|
@ -343,6 +345,21 @@ namespace llvm {
|
||||||
return EmergencySpillMap[MI];
|
return EmergencySpillMap[MI];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief - transfer emergency spill information from one instruction to
|
||||||
|
/// another.
|
||||||
|
void transferEmergencySpills(MachineInstr *Old, MachineInstr *New) {
|
||||||
|
std::map<MachineInstr*,std::vector<unsigned> >::iterator I =
|
||||||
|
EmergencySpillMap.find(Old);
|
||||||
|
if (I == EmergencySpillMap.end())
|
||||||
|
return;
|
||||||
|
while (!I->second.empty()) {
|
||||||
|
unsigned virtReg = I->second.back();
|
||||||
|
I->second.pop_back();
|
||||||
|
addEmergencySpill(virtReg, New);
|
||||||
|
}
|
||||||
|
EmergencySpillMap.erase(I);
|
||||||
|
}
|
||||||
|
|
||||||
/// @brief return or get a emergency spill slot for the register class.
|
/// @brief return or get a emergency spill slot for the register class.
|
||||||
int getEmergencySpillSlot(const TargetRegisterClass *RC);
|
int getEmergencySpillSlot(const TargetRegisterClass *RC);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue