diff options
| author | Bill Wendling <isanbard@gmail.com> | 2010-10-18 21:22:31 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2010-10-18 21:22:31 +0000 |
| commit | b41ee96d76ccf1eec2fd898def4cfd7c16868708 (patch) | |
| tree | 1e7d7ef803534136009e1c42f1c388bdc73ac0fa | |
| parent | 9d28fdd7225b344789ed7f54cf51b4019763b30b (diff) | |
Don't recompute MachineRegisterInfo in the Optimize* method.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116750 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Target/TargetInstrInfo.h | 1 | ||||
| -rw-r--r-- | lib/CodeGen/PeepholeOptimizer.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMBaseInstrInfo.cpp | 12 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMBaseInstrInfo.h | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index a2654c97de..6615ee4aac 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -600,6 +600,7 @@ public: /// *only* if a transformation took place. virtual bool OptimizeCompareInstr(MachineInstr *CmpInstr, unsigned SrcReg, int Mask, int Value, + const MachineRegisterInfo *MRI, MachineBasicBlock::iterator &) const { return false; } diff --git a/lib/CodeGen/PeepholeOptimizer.cpp b/lib/CodeGen/PeepholeOptimizer.cpp index b245692338..7ae6d5f78a 100644 --- a/lib/CodeGen/PeepholeOptimizer.cpp +++ b/lib/CodeGen/PeepholeOptimizer.cpp @@ -247,7 +247,7 @@ bool PeepholeOptimizer::OptimizeCmpInstr(MachineInstr *MI, return false; // Attempt to optimize the comparison instruction. - if (TII->OptimizeCompareInstr(MI, SrcReg, CmpMask, CmpValue, NextIter)) { + if (TII->OptimizeCompareInstr(MI, SrcReg, CmpMask, CmpValue, MRI, NextIter)) { ++NumEliminated; return true; } diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp index 26b4f0e54c..aca292abea 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -1490,13 +1490,13 @@ static bool isSuitableForMask(MachineInstr *&MI, unsigned SrcReg, /// iterator *only* if a transformation took place. bool ARMBaseInstrInfo:: OptimizeCompareInstr(MachineInstr *CmpInstr, unsigned SrcReg, int CmpMask, - int CmpValue, MachineBasicBlock::iterator &MII) const { + int CmpValue, const MachineRegisterInfo *MRI, + MachineBasicBlock::iterator &MII) const { if (CmpValue != 0) return false; - MachineRegisterInfo &MRI = CmpInstr->getParent()->getParent()->getRegInfo(); - MachineRegisterInfo::def_iterator DI = MRI.def_begin(SrcReg); - if (llvm::next(DI) != MRI.def_end()) + MachineRegisterInfo::def_iterator DI = MRI->def_begin(SrcReg); + if (llvm::next(DI) != MRI->def_end()) // Only support one definition. return false; @@ -1506,8 +1506,8 @@ OptimizeCompareInstr(MachineInstr *CmpInstr, unsigned SrcReg, int CmpMask, if (CmpMask != ~0) { if (!isSuitableForMask(MI, SrcReg, CmpMask, false)) { MI = 0; - for (MachineRegisterInfo::use_iterator UI = MRI.use_begin(SrcReg), - UE = MRI.use_end(); UI != UE; ++UI) { + for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(SrcReg), + UE = MRI->use_end(); UI != UE; ++UI) { if (UI->getParent() != CmpInstr->getParent()) continue; MachineInstr *PotentialAND = &*UI; if (!isSuitableForMask(PotentialAND, SrcReg, CmpMask, true)) diff --git a/lib/Target/ARM/ARMBaseInstrInfo.h b/lib/Target/ARM/ARMBaseInstrInfo.h index cbfd7529b1..36be3366d2 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.h +++ b/lib/Target/ARM/ARMBaseInstrInfo.h @@ -341,6 +341,7 @@ public: /// that we can remove a "comparison with zero". virtual bool OptimizeCompareInstr(MachineInstr *CmpInstr, unsigned SrcReg, int CmpMask, int CmpValue, + const MachineRegisterInfo *MRI, MachineBasicBlock::iterator &MII) const; virtual unsigned getNumMicroOps(const MachineInstr *MI, |