[llvm-branch-commits] [llvm-branch] r113583 - in /llvm/branches/release_28: ./ lib/Target/ARM/ARMLoadStoreOptimizer.cpp test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll

[Bill Wendling]

Author: void
Date: Fri Sep 10 05:21:50 2010
New Revision: 113583

URL: http://llvm.org/viewvc/llvm-project?rev=113583&view=rev
Log:
Approved by Evan.

$ svn merge -c 113576 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113576 into '.':
U    test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll
U    lib/Target/ARM/ARMLoadStoreOptimizer.cpp


Modified:
    llvm/branches/release_28/   (props changed)
    llvm/branches/release_28/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
    llvm/branches/release_28/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll

Propchange: llvm/branches/release_28/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 05:21:50 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485
+/llvm/trunk:113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485,113576

Modified: llvm/branches/release_28/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_28/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=113583&r1=113582&r2=113583&view=diff
==============================================================================
--- llvm/branches/release_28/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/branches/release_28/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Fri Sep 10 05:21:50 2010
@@ -458,9 +458,10 @@
   case ARM::t2STM:
   case ARM::VLDMS:
   case ARM::VSTMS:
+    return (MI->getNumOperands() - 4) * 4;
   case ARM::VLDMD:
   case ARM::VSTMD:
-    return (MI->getNumOperands() - 4) * 4;
+    return (MI->getNumOperands() - 4) * 8;
   }
 }
 

Modified: llvm/branches/release_28/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_28/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll?rev=113583&r1=113582&r2=113583&view=diff
==============================================================================
--- llvm/branches/release_28/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll (original)
+++ llvm/branches/release_28/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll Fri Sep 10 05:21:50 2010
@@ -1,11 +1,15 @@
-; RUN: llc < %s -march=arm -mattr=+v6,+vfp2
+; RUN: llc < %s -march=arm -mattr=+v6,+vfp2 | FileCheck %s
 
 @quant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
 @dequant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
 @A = external global [4 x [4 x i32]]		; <[4 x [4 x i32]]*> [#uses=1]
 
+; CHECK: dct_luma_sp:
 define fastcc i32 @dct_luma_sp(i32 %block_x, i32 %block_y, i32* %coeff_cost) {
 entry:
+; Make sure to use base-updating stores for saving callee-saved registers.
+; CHECK-NOT: sub sp
+; CHECK: vstmdb sp!
 	%predicted_block = alloca [4 x [4 x i32]], align 4		; <[4 x [4 x i32]]*> [#uses=1]
 	br label %cond_next489