This commit is a 4x squash commit consisting of 4x functions converted to use FileChe...

Messages:
Converted test case trivial_codegen_tailcall.ll to use FileCheck.
Converted test return_constant.ll to use FileCheck instead of grep.
Converted test reorder_load.ll to use FileCheck instead of grep.
Converted test intervening-inst.ll to use FileCheck instead of grep.

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

diff --git a/test/Transforms/TailCallElim/intervening-inst.ll b/test/Transforms/TailCallElim/intervening-inst.ll
index 0c40bd5dc50d3bf525e98e015e6ace65718fbda2..10dffbd69425b84f558418596a75101011d175ad 100644 (file)
--- a/test/Transforms/TailCallElim/intervening-inst.ll
+++ b/test/Transforms/TailCallElim/intervening-inst.ll
@@ -1,5 +1,5 @@
 ; This function contains intervening instructions which should be moved out of the way
-; RUN: opt < %s -tailcallelim -S | not grep call
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
 
 define i32 @Test(i32 %X) {
 entry:
@@ -10,6 +10,7 @@ then.0:               ; preds = %entry
        ret i32 %tmp.4
 endif.0:               ; preds = %entry
        %tmp.10 = add i32 %X, -1                ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp.8 = call i32 @Test( i32 %tmp.10 )          ; <i32> [#uses=1]
        %DUMMY = add i32 %X, 1          ; <i32> [#uses=0]
        ret i32 %tmp.8

diff --git a/test/Transforms/TailCallElim/reorder_load.ll b/test/Transforms/TailCallElim/reorder_load.ll
index 7f5c36e4a207bf66611db5ef76a5adda27671406..53c65dab101b01defa496728f2da4c7963f19050 100644 (file)
--- a/test/Transforms/TailCallElim/reorder_load.ll
+++ b/test/Transforms/TailCallElim/reorder_load.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -tailcallelim -S | not grep call
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
 ; PR4323
 
 ; Several cases where tail call elimination should move the load above the call,
@@ -21,6 +21,7 @@ if:           ; preds = %entry
 
 else:          ; preds = %entry
        %tmp7 = add i32 %start_arg, 1           ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp8 = call fastcc i32 @raise_load_1(i32* %a_arg, i32 %a_len_arg, i32 %tmp7)           ; <i32> [#uses=1]
        %tmp9 = load i32* %a_arg                ; <i32> [#uses=1]
        %tmp10 = add i32 %tmp9, %tmp8           ; <i32> [#uses=1]
@@ -47,6 +48,7 @@ unwind:               ; preds = %else
 
 recurse:               ; preds = %else
        %tmp7 = add i32 %start_arg, 1           ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp8 = call fastcc i32 @raise_load_2(i32* %a_arg, i32 %a_len_arg, i32 %tmp7)           ; <i32> [#uses=1]
        %tmp9 = load i32* @global               ; <i32> [#uses=1]
        %tmp10 = add i32 %tmp9, %tmp8           ; <i32> [#uses=1]
@@ -66,6 +68,7 @@ if:           ; preds = %entry
 
 else:          ; preds = %entry
        %tmp7 = add i32 %start_arg, 1           ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp8 = call fastcc i32 @raise_load_3(i32* %a_arg, i32 %a_len_arg, i32 %tmp7)           ; <i32> [#uses=1]
        %tmp9 = load i32* @extern_weak_global           ; <i32> [#uses=1]
        %tmp10 = add i32 %tmp9, %tmp8           ; <i32> [#uses=1]
@@ -94,6 +97,7 @@ unwind:               ; preds = %else
 recurse:               ; preds = %else
        %tmp7 = add i32 %start_arg, 1           ; <i32> [#uses=1]
        %first = load i32* %a_arg               ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp8 = call fastcc i32 @raise_load_4(i32* %a_arg, i32 %first, i32 %tmp7)               ; <i32> [#uses=1]
        %second = load i32* %a_arg              ; <i32> [#uses=1]
        %tmp10 = add i32 %second, %tmp8         ; <i32> [#uses=1]

diff --git a/test/Transforms/TailCallElim/return_constant.ll b/test/Transforms/TailCallElim/return_constant.ll
index 48e5641bb57a3d99a667ce70ffb5326fc724b219..e99e57e1457dde1c88f280998e5be35fccdd24f5 100644 (file)
--- a/test/Transforms/TailCallElim/return_constant.ll
+++ b/test/Transforms/TailCallElim/return_constant.ll
@@ -1,7 +1,7 @@
 ; Though this case seems to be fairly unlikely to occur in the wild, someone
 ; plunked it into the demo script, so maybe they care about it.
 ;
-; RUN: opt < %s -tailcallelim -S | not grep call
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
 
 define i32 @aaa(i32 %c) {
 entry:
@@ -9,6 +9,7 @@ entry:
        br i1 %tmp.1, label %return, label %else
 else:          ; preds = %entry
        %tmp.5 = add i32 %c, -1         ; <i32> [#uses=1]
+; CHECK-NOT: call
        %tmp.3 = call i32 @aaa( i32 %tmp.5 )            ; <i32> [#uses=0]
        ret i32 0
 return:                ; preds = %entry

diff --git a/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll b/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll
index 3d01d1709952a3ebb0ee045e7517108875db27a2..7049e4d588d43b612c385ba93e4202c0668e7bbb 100644 (file)
--- a/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll
+++ b/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll
@@ -1,11 +1,11 @@
-; RUN: opt < %s -tailcallelim -S | \
-; RUN:    grep "tail call void @foo"
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
 
 
 declare void @foo()
 
 define void @bar() {
-       call void @foo( )
+; CHECK: tail call void @foo()
+       call void @foo()
        ret void
 }