[llvm-branch-commits] [llvm-branch] r106331 - in /llvm/branches/Apple/Troughton: lib/CodeGen/IfConversion.cpp test/CodeGen/ARM/ifcvt6-tc.ll test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll test/CodeGen/Thumb2/thumb2-ifcvt2.ll

[Evan Cheng]

Author: evancheng
Date: Fri Jun 18 17:20:05 2010
New Revision: 106331

URL: http://llvm.org/viewvc/llvm-project?rev=106331&view=rev
Log:
Merge 106330.

Modified:
    llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp
    llvm/branches/Apple/Troughton/test/CodeGen/ARM/ifcvt6-tc.ll
    llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll
    llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/thumb2-ifcvt2.ll

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp?rev=106331&r1=106330&r2=106331&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp Fri Jun 18 17:20:05 2010
@@ -369,7 +369,7 @@
   Roots.clear();
   BBAnalysis.clear();
 
-  if (MadeChange && !IfCvtBranchFold) {
+  if (MadeChange && IfCvtBranchFold) {
     BranchFolder BF(false);
     BF.OptimizeFunction(MF, TII,
                         MF.getTarget().getRegisterInfo(),

Modified: llvm/branches/Apple/Troughton/test/CodeGen/ARM/ifcvt6-tc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/test/CodeGen/ARM/ifcvt6-tc.ll?rev=106331&r1=106330&r2=106331&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/test/CodeGen/ARM/ifcvt6-tc.ll (original)
+++ llvm/branches/Apple/Troughton/test/CodeGen/ARM/ifcvt6-tc.ll Fri Jun 18 17:20:05 2010
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=arm -mtriple=arm-apple-darwin | \
 ; RUN:   grep cmpne | count 1
 ; RUN: llc < %s -march=arm -mtriple=arm-apple-darwin | \
-; RUN:   grep bhi | count 1
+; RUN:   grep bls | count 1
 ; Here, tail call wins over eliminating branches.  It is 1 fewer instruction
 ; and removes all stack accesses, so seems like a win.
 

Modified: llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll?rev=106331&r1=106330&r2=106331&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll (original)
+++ llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/2009-10-15-ITBlockBranch.ll Fri Jun 18 17:20:05 2010
@@ -12,8 +12,6 @@
 ; CHECK: _ZNKSs7compareERKSs:
 ; CHECK:      it  eq
 ; CHECK-NEXT: subeq.w r0, r6, r8
-; CHECK-NEXT: %bb
-; CHECK-NEXT: %bb1
 ; CHECK-NEXT: ldmia.w sp, {r4, r5, r6, r8, r9, pc}
 entry:
   %0 = tail call arm_aapcs_vfpcc  i32 @_ZNKSs4sizeEv(%"struct.std::basic_string<char,std::char_traits<char>,std::allocator<char> >"* %this) ; <i32> [#uses=3]

Modified: llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/thumb2-ifcvt2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/thumb2-ifcvt2.ll?rev=106331&r1=106330&r2=106331&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/thumb2-ifcvt2.ll (original)
+++ llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/thumb2-ifcvt2.ll Fri Jun 18 17:20:05 2010
@@ -31,7 +31,7 @@
 ; CHECK: CountTree:
 ; CHECK: it eq
 ; CHECK: cmpeq
-; CHECK: beq
+; CHECK: bne
 ; CHECK: itt eq
 ; CHECK: moveq
 ; CHECK: popeq