Cleanup and FileCheck-ize a test.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147772 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/X86/fold-and-shift.ll b/test/CodeGen/X86/fold-and-shift.ll
index 9f79f7723b33dcdcbc043de71fff979413020489..c42a421a7c48d5a24b85582f38b2233e833d2a92 100644 (file)
--- a/test/CodeGen/X86/fold-and-shift.ll
+++ b/test/CodeGen/X86/fold-and-shift.ll
@@ -1,21 +1,33 @@
-; RUN: llc < %s -march=x86 | not grep and
+; RUN: llc < %s -march=x86 | FileCheck %s
 
 define i32 @t1(i8* %X, i32 %i) {
+; CHECK: t1:
+; CHECK-NOT: and
+; CHECK: movzbl
+; CHECK: movl (%{{...}},%{{...}},4),
+; CHECK: ret
+
 entry:
-       %tmp2 = shl i32 %i, 2           ; <i32> [#uses=1]
-       %tmp4 = and i32 %tmp2, 1020             ; <i32> [#uses=1]
-       %tmp7 = getelementptr i8* %X, i32 %tmp4         ; <i8*> [#uses=1]
-       %tmp78 = bitcast i8* %tmp7 to i32*              ; <i32*> [#uses=1]
-       %tmp9 = load i32* %tmp78, align 4               ; <i32> [#uses=1]
-       ret i32 %tmp9
+  %tmp2 = shl i32 %i, 2
+  %tmp4 = and i32 %tmp2, 1020
+  %tmp7 = getelementptr i8* %X, i32 %tmp4
+  %tmp78 = bitcast i8* %tmp7 to i32*
+  %tmp9 = load i32* %tmp78
+  ret i32 %tmp9
 }
 
 define i32 @t2(i16* %X, i32 %i) {
+; CHECK: t2:
+; CHECK-NOT: and
+; CHECK: movzwl
+; CHECK: movl (%{{...}},%{{...}},4),
+; CHECK: ret
+
 entry:
-       %tmp2 = shl i32 %i, 1           ; <i32> [#uses=1]
-       %tmp4 = and i32 %tmp2, 131070           ; <i32> [#uses=1]
-       %tmp7 = getelementptr i16* %X, i32 %tmp4                ; <i16*> [#uses=1]
-       %tmp78 = bitcast i16* %tmp7 to i32*             ; <i32*> [#uses=1]
-       %tmp9 = load i32* %tmp78, align 4               ; <i32> [#uses=1]
-       ret i32 %tmp9
+  %tmp2 = shl i32 %i, 1
+  %tmp4 = and i32 %tmp2, 131070
+  %tmp7 = getelementptr i16* %X, i32 %tmp4
+  %tmp78 = bitcast i16* %tmp7 to i32*
+  %tmp9 = load i32* %tmp78
+  ret i32 %tmp9
 }