merge two tests and convert to filecheck.

llvm-svn: 112613

diff --git a/llvm/test/Transforms/TailCallElim/accum_recursion.ll b/llvm/test/Transforms/TailCallElim/accum_recursion.ll
index b2a9ed2813d62d4263ae004734eb22ef31b9d323..66928a30324fc11154beb57bf28108b4283c22c7 100644 (file)
--- a/llvm/test/Transforms/TailCallElim/accum_recursion.ll
+++ b/llvm/test/Transforms/TailCallElim/accum_recursion.ll
@@ -1,15 +1,40 @@
-; RUN: opt < %s -tailcallelim -S | not grep call
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
 
-define i32 @factorial(i32 %x) {
+define i32 @test1_factorial(i32 %x) {
 entry:
        %tmp.1 = icmp sgt i32 %x, 0             ; <i1> [#uses=1]
        br i1 %tmp.1, label %then, label %else
 then:          ; preds = %entry
        %tmp.6 = add i32 %x, -1         ; <i32> [#uses=1]
-       %tmp.4 = call i32 @factorial( i32 %tmp.6 )              ; <i32> [#uses=1]
+       %tmp.4 = call i32 @test1_factorial( i32 %tmp.6 )                ; <i32> [#uses=1]
        %tmp.7 = mul i32 %tmp.4, %x             ; <i32> [#uses=1]
        ret i32 %tmp.7
 else:          ; preds = %entry
        ret i32 1
 }
 
+; CHECK: define i32 @test1_factorial
+; CHECK: phi i32
+; CHECK-NOT: call i32
+; CHECK: else:
+
+; This is a more aggressive form of accumulator recursion insertion, which 
+; requires noticing that X doesn't change as we perform the tailcall.
+
+define i32 @test2_mul(i32 %x, i32 %y) {
+entry:
+       %tmp.1 = icmp eq i32 %y, 0              ; <i1> [#uses=1]
+       br i1 %tmp.1, label %return, label %endif
+endif:         ; preds = %entry
+       %tmp.8 = add i32 %y, -1         ; <i32> [#uses=1]
+       %tmp.5 = call i32 @test2_mul( i32 %x, i32 %tmp.8 )              ; <i32> [#uses=1]
+       %tmp.9 = add i32 %tmp.5, %x             ; <i32> [#uses=1]
+       ret i32 %tmp.9
+return:                ; preds = %entry
+       ret i32 %x
+}
+
+; CHECK: define i32 @test2_mul
+; CHECK: phi i32
+; CHECK-NOT: call i32
+; CHECK: return:
\ No newline at end of file

diff --git a/llvm/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll b/llvm/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll
deleted file mode 100644 (file)
index 2a90cf3..0000000
--- a/llvm/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-; This is a more aggressive form of accumulator recursion insertion, which 
-; requires noticing that X doesn't change as we perform the tailcall.  Thanks
-; go out to the anonymous users of the demo script for "suggesting" 
-; optimizations that should be done.  :)
-
-; RUN: opt < %s -tailcallelim -S | not grep call
-
-define i32 @mul(i32 %x, i32 %y) {
-entry:
-       %tmp.1 = icmp eq i32 %y, 0              ; <i1> [#uses=1]
-       br i1 %tmp.1, label %return, label %endif
-endif:         ; preds = %entry
-       %tmp.8 = add i32 %y, -1         ; <i32> [#uses=1]
-       %tmp.5 = call i32 @mul( i32 %x, i32 %tmp.8 )            ; <i32> [#uses=1]
-       %tmp.9 = add i32 %tmp.5, %x             ; <i32> [#uses=1]
-       ret i32 %tmp.9
-return:                ; preds = %entry
-       ret i32 %x
-}
-