[llvm-branch-commits] [llvm-branch] r84844 - in /llvm/branches/Apple/Leela: lib/Target/ARM/ARMLoadStoreOptimizer.cpp lib/Target/ARM/ARMTargetMachine.cpp test/CodeGen/ARM/ifcvt5.ll

[Bill Wendling]

Author: void
Date: Thu Oct 22 02:03:24 2009
New Revision: 84844

URL: http://llvm.org/viewvc/llvm-project?rev=84844&view=rev
Log:
$ svn merge -c 84842 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r84842 into '.':
U    lib/Target/ARM/ARMLoadStoreOptimizer.cpp
$ svn merge -c 84843 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r84843 into '.':
U    test/CodeGen/ARM/ifcvt5.ll
U    lib/Target/ARM/ARMTargetMachine.cpp


Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMTargetMachine.cpp
    llvm/branches/Apple/Leela/test/CodeGen/ARM/ifcvt5.ll

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=84844&r1=84843&r2=84844&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Thu Oct 22 02:03:24 2009
@@ -974,6 +974,9 @@
     if (Advance) {
       ++Position;
       ++MBBI;
+      if (MBBI == E)
+        // Reach the end of the block, try merging the memory instructions.
+        TryMerge = true;
     } else
       TryMerge = true;
 

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMTargetMachine.cpp?rev=84844&r1=84843&r2=84844&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMTargetMachine.cpp Thu Oct 22 02:03:24 2009
@@ -104,18 +104,16 @@
 bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM,
                                         CodeGenOpt::Level OptLevel) {
   // FIXME: temporarily disabling load / store optimization pass for Thumb1.
-  if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only())
+  if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only()) {
     PM.add(createARMLoadStoreOptimizationPass());
+    PM.add(createIfConverterPass());
+  }
 
   return true;
 }
 
 bool ARMBaseTargetMachine::addPreEmitPass(PassManagerBase &PM,
                                           CodeGenOpt::Level OptLevel) {
-  // FIXME: temporarily disabling load / store optimization pass for Thumb1.
-  if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only())
-    PM.add(createIfConverterPass());
-
   if (Subtarget.isThumb2()) {
     PM.add(createThumb2ITBlockPass());
     PM.add(createThumb2SizeReductionPass());

Modified: llvm/branches/Apple/Leela/test/CodeGen/ARM/ifcvt5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/ARM/ifcvt5.ll?rev=84844&r1=84843&r2=84844&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/ARM/ifcvt5.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/ARM/ifcvt5.ll Thu Oct 22 02:03:24 2009
@@ -11,7 +11,8 @@
 
 define void @t1(i32 %a, i32 %b) {
 ; CHECK: t1:
-; CHECK: ldmltfd sp!, {r7, pc}
+; CHECK: movge
+; CHECK: blge _foo
 entry:
 	%tmp1 = icmp sgt i32 %a, 10		; <i1> [#uses=1]
 	br i1 %tmp1, label %cond_true, label %UnifiedReturnBlock