[llvm-branch-commits] [llvm-branch] r105400 - in /llvm/branches/Apple/Troughton: ./ lib/CodeGen/MachineCSE.cpp test/CodeGen/ARM/machine-cse-cmp.ll

[Bob Wilson]

Author: bwilson
Date: Thu Jun  3 13:30:04 2010
New Revision: 105400

URL: http://llvm.org/viewvc/llvm-project?rev=105400&view=rev
Log:
--- Merging r105399 into '.':
D    test/CodeGen/ARM/machine-cse-cmp.ll
U    lib/CodeGen/MachineCSE.cpp

Removed:
    llvm/branches/Apple/Troughton/test/CodeGen/ARM/machine-cse-cmp.ll
Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/CodeGen/MachineCSE.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
    svn:mergeinfo = /llvm/trunk:105399

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/MachineCSE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/MachineCSE.cpp?rev=105400&r1=105399&r2=105400&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/MachineCSE.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/MachineCSE.cpp Thu Jun  3 13:30:04 2010
@@ -31,6 +31,9 @@
 STATISTIC(NumCoalesces, "Number of copies coalesced");
 STATISTIC(NumCSEs,      "Number of common subexpression eliminated");
 
+static cl::opt<bool> CSEPhysDef("machine-cse-phys-defs",
+                                cl::init(false), cl::Hidden);
+
 namespace {
   class MachineCSE : public MachineFunctionPass {
     const TargetInstrInfo *TII;
@@ -373,7 +376,7 @@
 
       // ... Unless the CS is local and it also defines the physical register
       // which is not clobbered in between.
-      if (PhysDef) {
+      if (PhysDef && CSEPhysDef) {
         unsigned CSVN = VNT.lookup(MI);
         MachineInstr *CSMI = Exps[CSVN];
         if (PhysRegDefReaches(CSMI, MI, PhysDef))

Removed: llvm/branches/Apple/Troughton/test/CodeGen/ARM/machine-cse-cmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/test/CodeGen/ARM/machine-cse-cmp.ll?rev=105399&view=auto
==============================================================================
--- llvm/branches/Apple/Troughton/test/CodeGen/ARM/machine-cse-cmp.ll (original)
+++ llvm/branches/Apple/Troughton/test/CodeGen/ARM/machine-cse-cmp.ll (removed)
@@ -1,18 +0,0 @@
-; RUN: llc < %s -march=arm | FileCheck %s
-;rdar://8003725
-
- at G1 = external global i32
- at G2 = external global i32
-
-define i32 @f1(i32 %cond1, i32 %x1, i32 %x2, i32 %x3) {
-entry:
-; CHECK: cmp
-; CHECK: moveq
-; CHECK-NOT: cmp
-; CHECK: moveq
-    %tmp1 = icmp eq i32 %cond1, 0
-    %tmp2 = select i1 %tmp1, i32 %x1, i32 %x2
-    %tmp3 = select i1 %tmp1, i32 %x2, i32 %x3
-    %tmp4 = add i32 %tmp2, %tmp3
-    ret i32 %tmp4
-}