[llvm-commits] [llvm] r115341 - /llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp

[Owen Anderson]

Author: resistor
Date: Fri Oct  1 15:33:47 2010
New Revision: 115341

URL: http://llvm.org/viewvc/llvm-project?rev=115341&view=rev
Log:
Make the spelling of the flags for old-style if-conversion heuristics consistent between ARM and Thumb2.

Modified:
    llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp?rev=115341&r1=115340&r2=115341&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp Fri Oct  1 15:33:47 2010
@@ -41,7 +41,7 @@
                cl::desc("Enable ARM 2-addr to 3-addr conv"));
 
 static cl::opt<bool>
-OldARMIfConv("old-arm-if-conversion", cl::Hidden,
+OldARMIfCvt("old-arm-ifcvt", cl::Hidden,
              cl::desc("Use old-style ARM if-conversion heuristics"));
 
 ARMBaseInstrInfo::ARMBaseInstrInfo(const ARMSubtarget& STI)
@@ -1206,11 +1206,11 @@
     return false;
   
   // Use old-style heuristics
-  if (OldARMIfConv) {
+  if (OldARMIfCvt) {
     if (Subtarget.getCPUString() == "generic")
       // Generic (and overly aggressive) if-conversion limits for testing.
       return NumInstrs <= 10;
-    else if (Subtarget.hasV7Ops())
+    if (Subtarget.hasV7Ops())
       return NumInstrs <= 3;
     return NumInstrs <= 2;
   }
@@ -1231,7 +1231,7 @@
                     MachineBasicBlock &FMBB, unsigned NumF,
                     float Probability) const {
   // Use old-style if-conversion heuristics
-  if (OldARMIfConv) {
+  if (OldARMIfCvt) {
     return NumT && NumF && NumT <= 2 && NumF <= 2;
   }