diff options
author | Evan Cheng <evan.cheng@apple.com> | 2007-11-28 01:28:46 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2007-11-28 01:28:46 +0000 |
commit | cada245d06959831b90f8c29f92e77beda4b71cb (patch) | |
tree | 8f5f41026ad83ede602555eb137a7fac454eda36 /lib/CodeGen/VirtRegMap.h | |
parent | e4ad9c70e4a1261c212b11623d99e2477ef02783 (diff) | |
download | external_llvm-cada245d06959831b90f8c29f92e77beda4b71cb.zip external_llvm-cada245d06959831b90f8c29f92e77beda4b71cb.tar.gz external_llvm-cada245d06959831b90f8c29f92e77beda4b71cb.tar.bz2 |
Recover compile time regression.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44386 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/VirtRegMap.h')
-rw-r--r-- | lib/CodeGen/VirtRegMap.h | 75 |
1 files changed, 25 insertions, 50 deletions
diff --git a/lib/CodeGen/VirtRegMap.h b/lib/CodeGen/VirtRegMap.h index dc2f1cd..f7e5c08 100644 --- a/lib/CodeGen/VirtRegMap.h +++ b/lib/CodeGen/VirtRegMap.h @@ -80,12 +80,7 @@ namespace llvm { /// SpillPt2VirtMap - This records the virtual registers which should /// be spilled right after the MachineInstr due to live interval /// splitting. - DenseMap<MachineInstr*, std::vector<unsigned> > SpillPt2VirtMap; - - /// Virt2SplitMap - This records the MachineInstrs where a virtual - /// register should be spilled due to live interval splitting. - IndexedMap<std::vector<MachineInstr*>, VirtReg2IndexFunctor> - Virt2SpillPtsMap; + std::map<MachineInstr*, std::vector<unsigned> > SpillPt2VirtMap; /// ReMatId - Instead of assigning a stack slot to a to be rematerialized /// virtual register, an unique id is being assigned. This keeps track of @@ -209,6 +204,11 @@ namespace llvm { ReMatMap[virtReg] = def; } + /// @brief returns true if the specified MachineInstr is a spill point. + bool isSpillPt(MachineInstr *Pt) const { + return SpillPt2VirtMap.find(Pt) != SpillPt2VirtMap.end(); + } + /// @brief returns the virtual registers that should be spilled due to /// splitting right after the specified MachineInstr. std::vector<unsigned> &getSpillPtSpills(MachineInstr *Pt) { @@ -217,52 +217,26 @@ namespace llvm { /// @brief records the specified MachineInstr as a spill point for virtReg. void addSpillPoint(unsigned virtReg, MachineInstr *Pt) { - SpillPt2VirtMap[Pt].push_back(virtReg); - Virt2SpillPtsMap[virtReg].push_back(Pt); - } - - /// @brief remove the virtReg from the list of registers that should be - /// spilled (due to splitting) right after the specified MachineInstr. - void removeRegFromSpillPt(MachineInstr *Pt, unsigned virtReg) { - std::vector<unsigned> &Regs = SpillPt2VirtMap[Pt]; - if (Regs.back() == virtReg) // Most common case. - Regs.pop_back(); - for (unsigned i = 0, e = Regs.size(); i != e; ++i) - if (Regs[i] == virtReg) { - Regs.erase(Regs.begin()+i-1); - break; - } - } - - /// @brief specify virtReg is no longer being spilled due to splitting. - void removeAllSpillPtsForReg(unsigned virtReg) { - std::vector<MachineInstr*> &SpillPts = Virt2SpillPtsMap[virtReg]; - for (unsigned i = 0, e = SpillPts.size(); i != e; ++i) - removeRegFromSpillPt(SpillPts[i], virtReg); - Virt2SpillPtsMap[virtReg].clear(); - } - - /// @brief remove the specified MachineInstr as a spill point for the - /// specified register. - void removeRegSpillPt(unsigned virtReg, MachineInstr *Pt) { - std::vector<MachineInstr*> &SpillPts = Virt2SpillPtsMap[virtReg]; - if (SpillPts.back() == Pt) // Most common case. - SpillPts.pop_back(); - for (unsigned i = 0, e = SpillPts.size(); i != e; ++i) - if (SpillPts[i] == Pt) { - SpillPts.erase(SpillPts.begin()+i-1); - break; - } + if (SpillPt2VirtMap.find(Pt) != SpillPt2VirtMap.end()) + SpillPt2VirtMap[Pt].push_back(virtReg); + else { + std::vector<unsigned> Virts; + Virts.push_back(virtReg); + SpillPt2VirtMap.insert(std::make_pair(Pt, Virts)); + } } void transferSpillPts(MachineInstr *Old, MachineInstr *New) { - std::vector<unsigned> &OldRegs = SpillPt2VirtMap[Old]; - while (!OldRegs.empty()) { - unsigned virtReg = OldRegs.back(); - OldRegs.pop_back(); - removeRegSpillPt(virtReg, Old); + std::map<MachineInstr*,std::vector<unsigned> >::iterator I = + SpillPt2VirtMap.find(Old); + if (I == SpillPt2VirtMap.end()) + return; + while (!I->second.empty()) { + unsigned virtReg = I->second.back(); + I->second.pop_back(); addSpillPoint(virtReg, New); } + SpillPt2VirtMap.erase(I); } /// @brief Updates information about the specified virtual register's value @@ -282,10 +256,11 @@ namespace llvm { return MI2VirtMap.equal_range(MI); } - /// RemoveFromFoldedVirtMap - If the specified machine instruction is in - /// the folded instruction map, remove its entry from the map. - void RemoveFromFoldedVirtMap(MachineInstr *MI) { + /// RemoveMachineInstrFromMaps - MI is being erased, remove it from the + /// the folded instruction map and spill point map. + void RemoveMachineInstrFromMaps(MachineInstr *MI) { MI2VirtMap.erase(MI); + SpillPt2VirtMap.erase(MI); } void print(std::ostream &OS) const; |