Convert a few tests to FileCheck for PR5307.

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

diff --git a/test/Transforms/ConstProp/float-to-ptr-cast.ll b/test/Transforms/ConstProp/float-to-ptr-cast.ll
index d8eb3e8b652c89a272fceec8cf7d7751627f0f3e..937f606bf1366870a4beecedef63cae9c677e9dc 100644 (file)
--- a/test/Transforms/ConstProp/float-to-ptr-cast.ll
+++ b/test/Transforms/ConstProp/float-to-ptr-cast.ll
@@ -1,12 +1,15 @@
-; RUN: opt < %s -constprop -S | \
-; RUN:    grep -F {ret i32* null} | count 2
+; RUN: opt < %s -constprop -S | FileCheck %s
 
 define i32* @test1() {
         %X = inttoptr i64 0 to i32*             ; <i32*> [#uses=1]
         ret i32* %X
 }
 
+; CHECK:  ret i32* null
+
 define i32* @test2() {
         ret i32* null
 }
 
+; CHECK:  ret i32* null
+

diff --git a/test/Transforms/InstCombine/preserve-sminmax.ll b/test/Transforms/InstCombine/preserve-sminmax.ll
index dbfd56acc58b1df3ccb58b5462c3dd35c4c0b9e6..00232ccf3186d607a4f6a25366afb92fd77cfe86 100644 (file)
--- a/test/Transforms/InstCombine/preserve-sminmax.ll
+++ b/test/Transforms/InstCombine/preserve-sminmax.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep { i32 \[%\]sd, \[\[:alnum:\]\]* \\?1\\>} | count 4
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 ; Instcombine normally would fold the sdiv into the comparison,
 ; making "icmp slt i32 %h, 2", but in this case the sdiv has
@@ -13,6 +13,11 @@ define i32 @foo(i32 %h) {
   ret i32 %r
 }
 
+; CHECK:  %sd = sdiv i32 %h, 2
+; CHECK:  %t = icmp slt i32 %sd, 1
+; CHECK:  %r = select i1 %t, i32 %sd, i32 1
+; CHECK:  ret i32 %r
+
 define i32 @bar(i32 %h) {
   %sd = sdiv i32 %h, 2
   %t = icmp sgt i32 %sd, 1
@@ -20,3 +25,8 @@ define i32 @bar(i32 %h) {
   ret i32 %r
 }
 
+; CHECK:  %sd = sdiv i32 %h, 2
+; CHECK:  %t = icmp sgt i32 %sd, 1
+; CHECK:  %r = select i1 %t, i32 %sd, i32 1
+; CHECK:  ret i32 %r
+

diff --git a/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll b/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
index 78103093843863bcec6589852699d1d8d4267a50..723440f101e55dea61e4e286a7cd105f23073dc1 100644 (file)
--- a/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
+++ b/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
@@ -1,15 +1,23 @@
-; RUN: opt < %s -licm -enable-licm-constant-variables -S | grep -A 1 entry | grep load.*@a
+; RUN: opt < %s -licm -enable-licm-constant-variables -S | FileCheck %s
+
 @a = external constant float*
 
 define void @test(i32 %count) {
 entry:
         br label %forcond
 
+; CHECK:  %tmp3 = load float** @a
+; CHECK:  br label %forcond
+
 forcond:
         %i.0 = phi i32 [ 0, %entry ], [ %inc, %forbody ]
         %cmp = icmp ult i32 %i.0, %count
         br i1 %cmp, label %forbody, label %afterfor
 
+; CHECK:  %i.0 = phi i32 [ 0, %entry ], [ %inc, %forbody ]
+; CHECK:  %cmp = icmp ult i32 %i.0, %count
+; CHECK:  br i1 %cmp, label %forbody, label %afterfor
+
 forbody:
         %tmp3 = load float** @a
         %arrayidx = getelementptr float* %tmp3, i32 %i.0
@@ -18,6 +26,14 @@ forbody:
         %inc = add i32 %i.0, 1
         br label %forcond
 
+; CHECK:  %arrayidx = getelementptr float* %tmp3, i32 %i.0
+; CHECK:  %tmp7 = uitofp i32 %i.0 to float
+; CHECK:  store float %tmp7, float* %arrayidx
+; CHECK:  %inc = add i32 %i.0, 1
+; CHECK:  br label %forcond
+
 afterfor:
         ret void
 }
+
+; CHECK:  ret void