[llvm-commits] [llvm] r85171 - in /llvm/trunk/test/Transforms: ConstProp/float-to-ptr-cast.ll InstCombine/preserve-sminmax.ll LICM/2008-07-22-LoadGlobalConstant.ll

[Edward O'Callaghan]

Author: evocallaghan
Date: Mon Oct 26 17:52:03 2009
New Revision: 85171

URL: http://llvm.org/viewvc/llvm-project?rev=85171&view=rev
Log:
Convert a few tests to FileCheck for PR5307.

Modified:
    llvm/trunk/test/Transforms/ConstProp/float-to-ptr-cast.ll
    llvm/trunk/test/Transforms/InstCombine/preserve-sminmax.ll
    llvm/trunk/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll

Modified: llvm/trunk/test/Transforms/ConstProp/float-to-ptr-cast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/float-to-ptr-cast.ll?rev=85171&r1=85170&r2=85171&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/float-to-ptr-cast.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/float-to-ptr-cast.ll Mon Oct 26 17:52:03 2009
@@ -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
+

Modified: llvm/trunk/test/Transforms/InstCombine/preserve-sminmax.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/preserve-sminmax.ll?rev=85171&r1=85170&r2=85171&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/preserve-sminmax.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/preserve-sminmax.ll Mon Oct 26 17:52:03 2009
@@ -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 @@
   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 @@
   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
+

Modified: llvm/trunk/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll?rev=85171&r1=85170&r2=85171&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll (original)
+++ llvm/trunk/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll Mon Oct 26 17:52:03 2009
@@ -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 @@
         %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