FileCheck-ize a test, and tidy it up a touch.

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

diff --git a/test/Transforms/Reassociate/mulfactor.ll b/test/Transforms/Reassociate/mulfactor.ll
index f279727c99307c558fbf1cae5404c9db10ab8554..0afcbf9c87bf3261b1199a895af98dc66df598a4 100644 (file)
--- a/test/Transforms/Reassociate/mulfactor.ll
+++ b/test/Transforms/Reassociate/mulfactor.ll
@@ -1,14 +1,19 @@
-; RUN: opt < %s -reassociate -instcombine -S | grep mul | count 2
-
-; This should have exactly 2 multiplies when we're done.
+; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
 
 define i32 @f(i32 %a, i32 %b) {
-       %tmp.2 = mul i32 %a, %a         ; <i32> [#uses=1]
-       %tmp.5 = shl i32 %a, 1          ; <i32> [#uses=1]
-       %tmp.6 = mul i32 %tmp.5, %b             ; <i32> [#uses=1]
-       %tmp.10 = mul i32 %b, %b                ; <i32> [#uses=1]
-       %tmp.7 = add i32 %tmp.6, %tmp.2         ; <i32> [#uses=1]
-       %tmp.11 = add i32 %tmp.7, %tmp.10               ; <i32> [#uses=1]
+; CHECK: @f
+; CHECK: mul
+; CHECK: mul
+; CHECK-NOT: mul
+; CHECK: ret
+
+entry:
+       %tmp.2 = mul i32 %a, %a
+       %tmp.5 = shl i32 %a, 1
+       %tmp.6 = mul i32 %tmp.5, %b
+       %tmp.10 = mul i32 %b, %b
+       %tmp.7 = add i32 %tmp.6, %tmp.2
+       %tmp.11 = add i32 %tmp.7, %tmp.10
        ret i32 %tmp.11
 }