[llvm-branch-commits] [llvm-branch] r88992 - in /llvm/branches/Apple/Leela: lib/Target/ARM/ARMBaseRegisterInfo.cpp test/CodeGen/Thumb2/thumb2-shifter.ll

[Jim Grosbach]

Author: grosbach
Date: Mon Nov 16 17:20:09 2009
New Revision: 88992

URL: http://llvm.org/viewvc/llvm-project?rev=88992&view=rev
Log:
merge 88991

Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseRegisterInfo.cpp
    llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-shifter.ll

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

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseRegisterInfo.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseRegisterInfo.cpp Mon Nov 16 17:20:09 2009
@@ -1489,7 +1489,7 @@
     }
 
     virtual const char *getPassName() const {
-      return "ARM Maximal Stack Alignment Calculator";
+      return "ARM Stack Required Alignment Auto-Detector";
     }
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {

Modified: llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-shifter.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-shifter.ll?rev=88992&r1=88991&r2=88992&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-shifter.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-shifter.ll Mon Nov 16 17:20:09 2009
@@ -1,22 +1,29 @@
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | grep lsl
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | grep lsr
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | grep asr
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | grep ror
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | not grep mov
+; RUN: llc < %s -march=thumb -mattr=+thumb2 | FileCheck %s
+; xRUN: llc < %s -march=thumb -mattr=+thumb2 | grep lsl
+; xRUN: llc < %s -march=thumb -mattr=+thumb2 | grep lsr
+; xRUN: llc < %s -march=thumb -mattr=+thumb2 | grep asr
+; xRUN: llc < %s -march=thumb -mattr=+thumb2 | grep ror
+; xRUN: llc < %s -march=thumb -mattr=+thumb2 | not grep mov
 
 define i32 @t2ADDrs_lsl(i32 %X, i32 %Y) {
+; CHECK: t2ADDrs_lsl
+; CHECK: add.w  r0, r0, r1, lsl #16
         %A = shl i32 %Y, 16
         %B = add i32 %X, %A
         ret i32 %B
 }
 
 define i32 @t2ADDrs_lsr(i32 %X, i32 %Y) {
+; CHECK: t2ADDrs_lsr
+; CHECK: add.w  r0, r0, r1, lsr #16
         %A = lshr i32 %Y, 16
         %B = add i32 %X, %A
         ret i32 %B
 }
 
 define i32 @t2ADDrs_asr(i32 %X, i32 %Y) {
+; CHECK: t2ADDrs_asr
+; CHECK: add.w  r0, r0, r1, asr #16
         %A = ashr i32 %Y, 16
         %B = add i32 %X, %A
         ret i32 %B
@@ -24,6 +31,8 @@
 
 ; i32 ror(n) = (x >> n) | (x << (32 - n))
 define i32 @t2ADDrs_ror(i32 %X, i32 %Y) {
+; CHECK: t2ADDrs_ror
+; CHECK: add.w  r0, r0, r1, ror #16
         %A = lshr i32 %Y, 16
         %B = shl  i32 %Y, 16
         %C = or   i32 %B, %A
@@ -32,6 +41,10 @@
 }
 
 define i32 @t2ADDrs_noRegShift(i32 %X, i32 %Y, i8 %sh) {
+; CHECK: t2ADDrs_noRegShift
+; CHECK: uxtb r2, r2
+; CHECK: lsls r1, r2
+; CHECK: add  r0, r1
         %shift.upgrd.1 = zext i8 %sh to i32
         %A = shl i32 %Y, %shift.upgrd.1
         %B = add i32 %X, %A