From c98af3370f899a0d1570b1dff01a2e36632f884f Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sun, 8 Aug 2010 05:04:59 +0000 Subject: [PATCH] Use the "isCompare" machine instruction attribute instead of calling the relatively expensive comparison analyzer on each instruction. Also rename the comparison analyzer method to something more in line with what it actually does. This pass is will eventually be folded into the Machine CSE pass. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110539 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetInstrInfo.h | 12 ++++++------ lib/CodeGen/OptimizeCmps.cpp | 10 +++++----- lib/Target/ARM/ARMBaseInstrInfo.cpp | 6 +++--- lib/Target/ARM/ARMBaseInstrInfo.h | 12 ++++++------ lib/Target/ARM/ARMInstrThumb2.td | 3 ++- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index 1c6ac1a61c7..520c41be742 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -577,17 +577,17 @@ public: virtual ScheduleHazardRecognizer* CreateTargetPostRAHazardRecognizer(const InstrItineraryData&) const = 0; - /// isCompareInstr - If the machine instruction is a comparison instruction, - /// then return true. Also return the source register in SrcReg and the value - /// it compares against in CmpValue. - virtual bool isCompareInstr(const MachineInstr *MI, + /// AnalyzeCompare - For a comparison instruction, return the source register + /// in SrcReg and the value it compares against in CmpValue. Return true if + /// the comparison instruction can be analyzed. + virtual bool AnalyzeCompare(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const { return false; } - /// convertToSetZeroFlag - Convert the instruction to set the zero flag so + /// ConvertToSetZeroFlag - Convert the instruction to set the zero flag so /// that we can remove a "comparison with zero". - virtual bool convertToSetZeroFlag(MachineInstr *Instr, + virtual bool ConvertToSetZeroFlag(MachineInstr *Instr, MachineInstr *CmpInstr) const { return false; } diff --git a/lib/CodeGen/OptimizeCmps.cpp b/lib/CodeGen/OptimizeCmps.cpp index 5b524cd6414..209c8b95047 100644 --- a/lib/CodeGen/OptimizeCmps.cpp +++ b/lib/CodeGen/OptimizeCmps.cpp @@ -72,9 +72,8 @@ bool OptimizeCmps::OptimizeCmpInstr(MachineInstr *MI, MachineBasicBlock *MBB) { // physical register, we can try to optimize it. unsigned SrcReg; int CmpValue; - if (!TII->isCompareInstr(MI, SrcReg, CmpValue) || - TargetRegisterInfo::isPhysicalRegister(SrcReg) || - CmpValue != 0) + if (!TII->AnalyzeCompare(MI, SrcReg, CmpValue) || + TargetRegisterInfo::isPhysicalRegister(SrcReg) || CmpValue != 0) return false; MachineRegisterInfo::def_iterator DI = MRI->def_begin(SrcReg); @@ -83,7 +82,7 @@ bool OptimizeCmps::OptimizeCmpInstr(MachineInstr *MI, MachineBasicBlock *MBB) { return false; // Attempt to convert the defining instruction to set the "zero" flag. - if (TII->convertToSetZeroFlag(&*DI, MI)) { + if (TII->ConvertToSetZeroFlag(&*DI, MI)) { ++NumEliminated; return true; } @@ -104,7 +103,8 @@ bool OptimizeCmps::runOnMachineFunction(MachineFunction &MF) { for (MachineBasicBlock::iterator MII = MBB->begin(), ME = MBB->end(); MII != ME; ) { MachineInstr *MI = &*MII++; - Changed |= OptimizeCmpInstr(MI, MBB); + if (MI->getDesc().isCompare()) + Changed |= OptimizeCmpInstr(MI, MBB); } } diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp index 68e35ed75e3..7e1c84e1a67 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -1355,7 +1355,7 @@ bool llvm::rewriteARMFrameIndex(MachineInstr &MI, unsigned FrameRegIdx, } bool ARMBaseInstrInfo:: -isCompareInstr(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const { +AnalyzeCompare(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const { switch (MI->getOpcode()) { default: break; case ARM::t2CMPri: @@ -1368,10 +1368,10 @@ isCompareInstr(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const { return false; } -/// convertToSetZeroFlag - Convert the instruction to set the "zero" flag so +/// ConvertToSetZeroFlag - Convert the instruction to set the "zero" flag so /// that we can remove a "comparison with zero". bool ARMBaseInstrInfo:: -convertToSetZeroFlag(MachineInstr *MI, MachineInstr *CmpInstr) const { +ConvertToSetZeroFlag(MachineInstr *MI, MachineInstr *CmpInstr) const { // Conservatively refuse to convert an instruction which isn't in the same BB // as the comparison. if (MI->getParent() != CmpInstr->getParent()) diff --git a/lib/Target/ARM/ARMBaseInstrInfo.h b/lib/Target/ARM/ARMBaseInstrInfo.h index 4f1c4539243..2547ad1c22d 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.h +++ b/lib/Target/ARM/ARMBaseInstrInfo.h @@ -337,15 +337,15 @@ public: return NumInstrs && NumInstrs == 1; } - /// isCompareInstr - If the machine instruction is a comparison instruction, - /// then return true. Also return the source register in SrcReg and the value - /// it compares against in CmpValue. - virtual bool isCompareInstr(const MachineInstr *MI, unsigned &SrcReg, + /// AnalyzeCompare - For a comparison instruction, return the source register + /// in SrcReg and the value it compares against in CmpValue. Return true if + /// the comparison instruction can be analyzed. + virtual bool AnalyzeCompare(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const; - /// convertToSetZeroFlag - Convert the instruction to set the zero flag so + /// ConvertToSetZeroFlag - Convert the instruction to set the zero flag so /// that we can remove a "comparison with zero". - virtual bool convertToSetZeroFlag(MachineInstr *Instr, + virtual bool ConvertToSetZeroFlag(MachineInstr *Instr, MachineInstr *CmpInstr) const; }; diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td index 4ec71c46e13..a73aefcacde 100644 --- a/lib/Target/ARM/ARMInstrThumb2.td +++ b/lib/Target/ARM/ARMInstrThumb2.td @@ -2155,11 +2155,12 @@ def : T2Pat<(or (and rGPR:$src1, 0xFFFF0000), //===----------------------------------------------------------------------===// // Comparison Instructions... // - +let isCompare = 1 in { defm t2CMP : T2I_cmp_irs<0b1101, "cmp", BinOpFrag<(ARMcmp node:$LHS, node:$RHS)>>; defm t2CMPz : T2I_cmp_irs<0b1101, "cmp", BinOpFrag<(ARMcmpZ node:$LHS, node:$RHS)>>; +} //FIXME: Disable CMN, as CCodes are backwards from compare expectations // Compare-to-zero still works out, just not the relationals