FileCheck-ize another X86 test, making it more precisely verify the
desired result based on the comments in the file.

llvm-svn: 134354
diff --git a/llvm/test/CodeGen/X86/shift-codegen.ll b/llvm/test/CodeGen/X86/shift-codegen.ll
index 4cba183..7d961e8 100644
--- a/llvm/test/CodeGen/X86/shift-codegen.ll
+++ b/llvm/test/CodeGen/X86/shift-codegen.ll
@@ -1,5 +1,4 @@
-; RUN: llc < %s -relocation-model=static -march=x86 | \
-; RUN:   grep {shll	\$3} | count 2
+; RUN: llc < %s -relocation-model=static -march=x86 | FileCheck %s
 
 ; This should produce two shll instructions, not any lea's.
 
@@ -9,19 +8,31 @@
 
 
 define void @fn1() {
-entry:
-        %tmp = load i32* @Y             ; <i32> [#uses=1]
-        %tmp1 = shl i32 %tmp, 3         ; <i32> [#uses=1]
-        %tmp2 = load i32* @X            ; <i32> [#uses=1]
-        %tmp3 = or i32 %tmp1, %tmp2             ; <i32> [#uses=1]
-        store i32 %tmp3, i32* @X
-        ret void
+; CHECK: fn1:
+; CHECK-NOT: ret
+; CHECK-NOT: lea
+; CHECK: shll $3
+; CHECK-NOT: lea
+; CHECK: ret
+
+  %tmp = load i32* @Y             ; <i32> [#uses=1]
+  %tmp1 = shl i32 %tmp, 3         ; <i32> [#uses=1]
+  %tmp2 = load i32* @X            ; <i32> [#uses=1]
+  %tmp3 = or i32 %tmp1, %tmp2             ; <i32> [#uses=1]
+  store i32 %tmp3, i32* @X
+  ret void
 }
 
 define i32 @fn2(i32 %X, i32 %Y) {
-entry:
-        %tmp2 = shl i32 %Y, 3           ; <i32> [#uses=1]
-        %tmp4 = or i32 %tmp2, %X                ; <i32> [#uses=1]
-        ret i32 %tmp4
+; CHECK: fn2:
+; CHECK-NOT: ret
+; CHECK-NOT: lea
+; CHECK: shll $3
+; CHECK-NOT: lea
+; CHECK: ret
+
+  %tmp2 = shl i32 %Y, 3           ; <i32> [#uses=1]
+  %tmp4 = or i32 %tmp2, %X                ; <i32> [#uses=1]
+  ret i32 %tmp4
 }