From 7aeb9b5e4ca94fe15d476c3b417b29bef7298932 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@auroraux.org>
Date: Mon, 12 Oct 2009 07:18:14 +0000
Subject: [PATCH] Convert the rest of the InstCombine tests from notcast to
 FileCheck.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83828 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Transforms/InstCombine/IntPtrCast.ll     |  3 +-
 test/Transforms/InstCombine/apint-cast.ll     | 10 ++-
 test/Transforms/InstCombine/apint-zext1.ll    |  4 +-
 test/Transforms/InstCombine/apint-zext2.ll    |  4 +-
 test/Transforms/InstCombine/binop-cast.ll     |  4 +-
 .../Transforms/InstCombine/cast-mul-select.ll | 12 ++-
 test/Transforms/InstCombine/cast-set.ll       | 14 +++-
 test/Transforms/InstCombine/cast.ll           | 77 ++++++++++++++++++-
 test/Transforms/InstCombine/cast2.ll          |  9 ++-
 test/Transforms/InstCombine/fpcast.ll         |  6 +-
 10 files changed, 131 insertions(+), 12 deletions(-)

diff --git a/test/Transforms/InstCombine/IntPtrCast.ll b/test/Transforms/InstCombine/IntPtrCast.ll
index 448c58d5620..4ecbccd86a4 100644
--- a/test/Transforms/InstCombine/IntPtrCast.ll
+++ b/test/Transforms/InstCombine/IntPtrCast.ll
@@ -1,9 +1,10 @@
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 target datalayout = "e-p:32:32"
 
 define i32* @test(i32* %P) {
         %V = ptrtoint i32* %P to i32            ; <i32> [#uses=1]
         %P2 = inttoptr i32 %V to i32*           ; <i32*> [#uses=1]
         ret i32* %P2
+; CHECK: ret i32* %P
 }
 
diff --git a/test/Transforms/InstCombine/apint-cast.ll b/test/Transforms/InstCombine/apint-cast.ll
index 6fad5577625..9bc539ed8b2 100644
--- a/test/Transforms/InstCombine/apint-cast.ll
+++ b/test/Transforms/InstCombine/apint-cast.ll
@@ -1,20 +1,28 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i17 @test1(i17 %a) {
         %tmp = zext i17 %a to i37               ; <i37> [#uses=2]
         %tmp21 = lshr i37 %tmp, 8               ; <i37> [#uses=1]
+; CHECK: %tmp21 = lshr i17 %a, 8
         %tmp5 = shl i37 %tmp, 8         ; <i37> [#uses=1]
+; CHECK: %tmp5 = shl i17 %a, 8
         %tmp.upgrd.32 = or i37 %tmp21, %tmp5            ; <i37> [#uses=1]
+; CHECK: %tmp.upgrd.32 = or i17 %tmp21, %tmp5
         %tmp.upgrd.3 = trunc i37 %tmp.upgrd.32 to i17   ; <i17> [#uses=1]
         ret i17 %tmp.upgrd.3
+; CHECK: ret i17 %tmp.upgrd.32
 }
 
 define i167 @test2(i167 %a) {
         %tmp = zext i167 %a to i577               ; <i577> [#uses=2]
         %tmp21 = lshr i577 %tmp, 9               ; <i577> [#uses=1]
+; CHECK: %tmp21 = lshr i167 %a, 9
         %tmp5 = shl i577 %tmp, 8         ; <i577> [#uses=1]
+; CHECK: %tmp5 = shl i167 %a, 8
         %tmp.upgrd.32 = or i577 %tmp21, %tmp5            ; <i577> [#uses=1]
+; CHECK: %tmp.upgrd.32 = or i167 %tmp21, %tmp5
         %tmp.upgrd.3 = trunc i577 %tmp.upgrd.32 to i167  ; <i167> [#uses=1]
         ret i167 %tmp.upgrd.3
+; CHECK: ret i167 %tmp.upgrd.32
 }
diff --git a/test/Transforms/InstCombine/apint-zext1.ll b/test/Transforms/InstCombine/apint-zext1.ll
index 2b596936409..40de360bb69 100644
--- a/test/Transforms/InstCombine/apint-zext1.ll
+++ b/test/Transforms/InstCombine/apint-zext1.ll
@@ -1,9 +1,11 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
-; RUN: opt < %s -instcombine -S | notcast {} {%c1.*}
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i47 @test_sext_zext(i11 %A) {
     %c1 = zext i11 %A to i39
     %c2 = sext i39 %c1 to i47
     ret i47 %c2
+; CHECK: %c2 = zext i11 %A to i47
+; CHECK: ret i47 %c2
 }
diff --git a/test/Transforms/InstCombine/apint-zext2.ll b/test/Transforms/InstCombine/apint-zext2.ll
index 264b4b2e36e..886dcf2826c 100644
--- a/test/Transforms/InstCombine/apint-zext2.ll
+++ b/test/Transforms/InstCombine/apint-zext2.ll
@@ -1,9 +1,11 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
-; RUN: opt < %s -instcombine -S | notcast {} {%c1.*}
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i1024 @test_sext_zext(i77 %A) {
     %c1 = zext i77 %A to i533
     %c2 = sext i533 %c1 to i1024
     ret i1024 %c2
+; CHECK: %c2 = zext i77 %A to i1024
+; CHECK: ret i1024 %c2
 }
diff --git a/test/Transforms/InstCombine/binop-cast.ll b/test/Transforms/InstCombine/binop-cast.ll
index ee43fe00d16..3dbca7ef148 100644
--- a/test/Transforms/InstCombine/binop-cast.ll
+++ b/test/Transforms/InstCombine/binop-cast.ll
@@ -1,7 +1,9 @@
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i32 @testAdd(i32 %X, i32 %Y) {
 	%tmp = add i32 %X, %Y
+; CHECK: %tmp = add i32 %X, %Y
 	%tmp.l = bitcast i32 %tmp to i32
 	ret i32 %tmp.l
+; CHECK: ret i32 %tmp
 }
diff --git a/test/Transforms/InstCombine/cast-mul-select.ll b/test/Transforms/InstCombine/cast-mul-select.ll
index 7c59e2d9b8b..fcb7e2301d7 100644
--- a/test/Transforms/InstCombine/cast-mul-select.ll
+++ b/test/Transforms/InstCombine/cast-mul-select.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i32 @mul(i32 %x, i32 %y) {
   %A = trunc i32 %x to i8
@@ -6,6 +6,9 @@ define i32 @mul(i32 %x, i32 %y) {
   %C = mul i8 %A, %B
   %D = zext i8 %C to i32
   ret i32 %D
+; CHECK: %C = mul i32 %x, %y
+; CHECK: %D = and i32 %C, 255
+; CHECK: ret i32 %D
 }
 
 define i32 @select1(i1 %cond, i32 %x, i32 %y, i32 %z) {
@@ -16,6 +19,10 @@ define i32 @select1(i1 %cond, i32 %x, i32 %y, i32 %z) {
   %E = select i1 %cond, i8 %C, i8 %D
   %F = zext i8 %E to i32
   ret i32 %F
+; CHECK: %D = add i32 %x, %y
+; CHECK: %E = select i1 %cond, i32 %z, i32 %D
+; CHECK: %F = and i32 %E, 255
+; CHECK: ret i32 %F
 }
 
 define i8 @select2(i1 %cond, i8 %x, i8 %y, i8 %z) {
@@ -26,4 +33,7 @@ define i8 @select2(i1 %cond, i8 %x, i8 %y, i8 %z) {
   %E = select i1 %cond, i32 %C, i32 %D
   %F = trunc i32 %E to i8
   ret i8 %F
+; CHECK: %D = add i8 %x, %y
+; CHECK: %E = select i1 %cond, i8 %z, i8 %D
+; CHECK: ret i8 %E
 }
diff --git a/test/Transforms/InstCombine/cast-set.ll b/test/Transforms/InstCombine/cast-set.ll
index ed920b94c77..611ded473ef 100644
--- a/test/Transforms/InstCombine/cast-set.ll
+++ b/test/Transforms/InstCombine/cast-set.ll
@@ -1,13 +1,15 @@
 ; This tests for various complex cast elimination cases instcombine should
 ; handle.
 
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i1 @test1(i32 %X) {
         %A = bitcast i32 %X to i32              ; <i32> [#uses=1]
         ; Convert to setne int %X, 12
         %c = icmp ne i32 %A, 12         ; <i1> [#uses=1]
         ret i1 %c
+; CHECK: %c = icmp ne i32 %X, 12
+; CHECK: ret i1 %c
 }
 
 define i1 @test2(i32 %X, i32 %Y) {
@@ -16,6 +18,8 @@ define i1 @test2(i32 %X, i32 %Y) {
         ; Convert to setne int %X, %Y
         %c = icmp ne i32 %A, %B         ; <i1> [#uses=1]
         ret i1 %c
+; CHECK: %c = icmp ne i32 %X, %Y
+; CHECK: ret i1 %c
 }
 
 define i32 @test4(i32 %A) {
@@ -23,6 +27,8 @@ define i32 @test4(i32 %A) {
         %C = shl i32 %B, 2              ; <i32> [#uses=1]
         %D = bitcast i32 %C to i32              ; <i32> [#uses=1]
         ret i32 %D
+; CHECK: %C = shl i32 %A, 2
+; CHECK: ret i32 %C
 }
 
 define i16 @test5(i16 %A) {
@@ -30,22 +36,28 @@ define i16 @test5(i16 %A) {
         %C = and i32 %B, 15             ; <i32> [#uses=1]
         %D = trunc i32 %C to i16                ; <i16> [#uses=1]
         ret i16 %D
+; CHECK: %C = and i16 %A, 15
+; CHECK: ret i16 %C
 }
 
 define i1 @test6(i1 %A) {
         %B = zext i1 %A to i32          ; <i32> [#uses=1]
         %C = icmp ne i32 %B, 0          ; <i1> [#uses=1]
         ret i1 %C
+; CHECK: ret i1 %A
 }
 
 define i1 @test6a(i1 %A) {
         %B = zext i1 %A to i32          ; <i32> [#uses=1]
         %C = icmp ne i32 %B, -1         ; <i1> [#uses=1]
         ret i1 %C
+; CHECK: ret i1 true
 }
 
 define i1 @test7(i8* %A) {
         %B = bitcast i8* %A to i32*             ; <i32*> [#uses=1]
         %C = icmp eq i32* %B, null              ; <i1> [#uses=1]
         ret i1 %C
+; CHECK: %C = icmp eq i8* %A, null
+; CHECK: ret i1 %C
 }
diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll
index 59d7cd051d3..9835d657c9b 100644
--- a/test/Transforms/InstCombine/cast.ll
+++ b/test/Transforms/InstCombine/cast.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt < %s -instcombine -S | grep %c | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 @inbuf = external global [32832 x i8]           ; <[32832 x i8]*> [#uses=1]
 
@@ -7,6 +7,7 @@ define i32 @test1(i32 %A) {
         %c1 = bitcast i32 %A to i32             ; <i32> [#uses=1]
         %c2 = bitcast i32 %c1 to i32            ; <i32> [#uses=1]
         ret i32 %c2
+; CHECK: ret i32 %A
 }
 
 define i64 @test2(i8 %A) {
@@ -14,6 +15,8 @@ define i64 @test2(i8 %A) {
         %c2 = zext i16 %c1 to i32               ; <i32> [#uses=1]
         %Ret = zext i32 %c2 to i64              ; <i64> [#uses=1]
         ret i64 %Ret
+; CHECK: %Ret = zext i8 %A to i64
+; CHECK: ret i64 %Ret
 }
 
 ; This function should just use bitwise AND
@@ -21,6 +24,8 @@ define i64 @test3(i64 %A) {
         %c1 = trunc i64 %A to i8                ; <i8> [#uses=1]
         %c2 = zext i8 %c1 to i64                ; <i64> [#uses=1]
         ret i64 %c2
+; CHECK: %c2 = and i64 %A, 255
+; CHECK: ret i64 %c2
 }
 
 define i32 @test4(i32 %A, i32 %B) {
@@ -30,6 +35,9 @@ define i32 @test4(i32 %A, i32 %B) {
         ; for the cast elim purpose
         %result = zext i8 %c to i32             ; <i32> [#uses=1]
         ret i32 %result
+; CHECK: %COND = icmp slt i32 %A, %B
+; CHECK: %result = zext i1 %COND to i32
+; CHECK: ret i32 %result
 }
 
 define i32 @test5(i1 %B) {
@@ -38,36 +46,46 @@ define i32 @test5(i1 %B) {
         ; this cast        
         %result = zext i8 %c to i32             ; <i32> [#uses=1]
         ret i32 %result
+; CHECK: %result = zext i1 %B to i32
+; CHECK: ret i32 %result
 }
 
 define i32 @test6(i64 %A) {
         %c1 = trunc i64 %A to i32               ; <i32> [#uses=1]
         %res = bitcast i32 %c1 to i32           ; <i32> [#uses=1]
         ret i32 %res
+; CHECK: %res = trunc i64 %A to i32
+; CHECK: ret i32 %res
 }
 
 define i64 @test7(i1 %A) {
         %c1 = zext i1 %A to i32         ; <i32> [#uses=1]
         %res = sext i32 %c1 to i64              ; <i64> [#uses=1]
         ret i64 %res
+; CHECK: %res = zext i1 %A to i64
+; CHECK: ret i64 %res
 }
 
 define i64 @test8(i8 %A) {
         %c1 = sext i8 %A to i64         ; <i64> [#uses=1]
         %res = bitcast i64 %c1 to i64           ; <i64> [#uses=1]
         ret i64 %res
+; CHECK: %res = sext i8 %A to i64
+; CHECK: ret i64 %res
 }
 
 define i16 @test9(i16 %A) {
         %c1 = sext i16 %A to i32                ; <i32> [#uses=1]
         %c2 = trunc i32 %c1 to i16              ; <i16> [#uses=1]
         ret i16 %c2
+; CHECK: ret i16 %A
 }
 
 define i16 @test10(i16 %A) {
         %c1 = sext i16 %A to i32                ; <i32> [#uses=1]
         %c2 = trunc i32 %c1 to i16              ; <i16> [#uses=1]
         ret i16 %c2
+; CHECK: ret i16 %A
 }
 
 declare void @varargs(i32, ...)
@@ -76,22 +94,31 @@ define void @test11(i32* %P) {
         %c = bitcast i32* %P to i16*            ; <i16*> [#uses=1]
         call void (i32, ...)* @varargs( i32 5, i16* %c )
         ret void
+; CHECK: call void (i32, ...)* @varargs(i32 5, i32* %P)
+; CHECK: ret void
 }
 
 define i32* @test12() {
         %p = malloc [4 x i8]            ; <[4 x i8]*> [#uses=1]
         %c = bitcast [4 x i8]* %p to i32*               ; <i32*> [#uses=1]
         ret i32* %c
+; CHECK: %p = malloc i32
+; CHECK: ret i32* %p
 }
+
 define i8* @test13(i64 %A) {
         %c = getelementptr [0 x i8]* bitcast ([32832 x i8]* @inbuf to [0 x i8]*), i64 0, i64 %A             ; <i8*> [#uses=1]
         ret i8* %c
+; CHECK: %c = getelementptr [32832 x i8]* @inbuf, i64 0, i64 %A
+; CHECK: ret i8* %c
 }
 
 define i1 @test14(i8 %A) {
         %c = bitcast i8 %A to i8                ; <i8> [#uses=1]
         %X = icmp ult i8 %c, -128               ; <i1> [#uses=1]
         ret i1 %X
+; CHECK: %X = icmp sgt i8 %A, -1
+; CHECK: ret i1 %X
 }
 
 
@@ -105,24 +132,32 @@ define i1 @test14(i8 %A) {
 define i1 @test16(i32* %P) {
         %c = icmp ne i32* %P, null              ; <i1> [#uses=1]
         ret i1 %c
+; CHECK: %c = icmp ne i32* %P, null
+; CHECK: ret i1 %c
 }
 
 define i16 @test17(i1 %tmp3) {
         %c = zext i1 %tmp3 to i32               ; <i32> [#uses=1]
         %t86 = trunc i32 %c to i16              ; <i16> [#uses=1]
         ret i16 %t86
+; CHECK: %t86 = zext i1 %tmp3 to i16
+; CHECK: ret i16 %t86
 }
 
 define i16 @test18(i8 %tmp3) {
         %c = sext i8 %tmp3 to i32               ; <i32> [#uses=1]
         %t86 = trunc i32 %c to i16              ; <i16> [#uses=1]
         ret i16 %t86
+; CHECK: %t86 = sext i8 %tmp3 to i16
+; CHECK: ret i16 %t86
 }
 
 define i1 @test19(i32 %X) {
         %c = sext i32 %X to i64         ; <i64> [#uses=1]
         %Z = icmp slt i64 %c, 12345             ; <i1> [#uses=1]
         ret i1 %Z
+; CHECK: %Z = icmp slt i32 %X, 12345
+; CHECK: ret i1 %Z
 }
 
 define i1 @test20(i1 %B) {
@@ -130,6 +165,7 @@ define i1 @test20(i1 %B) {
         %D = icmp slt i32 %c, -1                ; <i1> [#uses=1]
         ;; false
         ret i1 %D
+; CHECK: ret i1 false
 }
 
 define i32 @test21(i32 %X) {
@@ -138,6 +174,8 @@ define i32 @test21(i32 %X) {
         %c2 = sext i8 %c1 to i32                ; <i32> [#uses=1]
         %RV = and i32 %c2, 255          ; <i32> [#uses=1]
         ret i32 %RV
+; CHECK: %c21 = and i32 %X, 255
+; CHECK: ret i32 %c21
 }
 
 define i32 @test22(i32 %X) {
@@ -146,6 +184,8 @@ define i32 @test22(i32 %X) {
         %c2 = sext i8 %c1 to i32                ; <i32> [#uses=1]
         %RV = shl i32 %c2, 24           ; <i32> [#uses=1]
         ret i32 %RV
+; CHECK: %RV = shl i32 %X, 24
+; CHECK: ret i32 %RV
 }
 
 define i32 @test23(i32 %X) {
@@ -154,6 +194,8 @@ define i32 @test23(i32 %X) {
         ;; and Z are signed.
         %c2 = zext i16 %c1 to i32               ; <i32> [#uses=1]
         ret i32 %c2
+; CHECK: %c2 = and i32 %X, 65535
+; CHECK: ret i32 %c2
 }
 
 define i1 @test24(i1 %C) {
@@ -161,6 +203,7 @@ define i1 @test24(i1 %C) {
         ;; Fold cast into select
         %c = icmp ne i32 %X, 0          ; <i1> [#uses=1]
         ret i1 %c
+; CHECK: ret i1 true
 }
 
 define void @test25(i32** %P) {
@@ -168,6 +211,8 @@ define void @test25(i32** %P) {
         ;; Fold cast into null
         store float* null, float** %c
         ret void
+; CHECK: store i32* null, i32** %P
+; CHECK: ret void
 }
 
 define i32 @test26(float %F) {
@@ -175,16 +220,22 @@ define i32 @test26(float %F) {
         %c = fpext float %F to double           ; <double> [#uses=1]
         %D = fptosi double %c to i32            ; <i32> [#uses=1]
         ret i32 %D
+; CHECK: %D = fptosi float %F to i32
+; CHECK: ret i32 %D
 }
 
 define [4 x float]* @test27([9 x [4 x float]]* %A) {
         %c = bitcast [9 x [4 x float]]* %A to [4 x float]*              ; <[4 x float]*> [#uses=1]
         ret [4 x float]* %c
+; CHECK: %c = getelementptr inbounds [9 x [4 x float]]* %A, i64 0, i64 0
+; CHECK: ret [4 x float]* %c
 }
 
 define float* @test28([4 x float]* %A) {
         %c = bitcast [4 x float]* %A to float*          ; <float*> [#uses=1]
         ret float* %c
+; CHECK: %c = getelementptr inbounds [4 x float]* %A, i64 0, i64 0
+; CHECK: ret float* %c
 }
 
 define i32 @test29(i32 %c1, i32 %c2) {
@@ -193,6 +244,9 @@ define i32 @test29(i32 %c1, i32 %c2) {
         %tmp = or i8 %tmp4.mask, %tmp1          ; <i8> [#uses=1]
         %tmp10 = zext i8 %tmp to i32            ; <i32> [#uses=1]
         ret i32 %tmp10
+; CHECK: %tmp2 = or i32 %c2, %c1
+; CHECK: %tmp10 = and i32 %tmp2, 255
+; CHECK: ret i32 %tmp10
 }
 
 define i32 @test30(i32 %c1) {
@@ -200,6 +254,9 @@ define i32 @test30(i32 %c1) {
         %c3 = xor i8 %c2, 1             ; <i8> [#uses=1]
         %c4 = zext i8 %c3 to i32                ; <i32> [#uses=1]
         ret i32 %c4
+; CHECK: %c3 = and i32 %c1, 255
+; CHECK: %c4 = xor i32 %c3, 1
+; CHECK: ret i32 %c4
 }
 
 define i1 @test31(i64 %A) {
@@ -207,6 +264,9 @@ define i1 @test31(i64 %A) {
         %C = and i32 %B, 42             ; <i32> [#uses=1]
         %D = icmp eq i32 %C, 10         ; <i1> [#uses=1]
         ret i1 %D
+; CHECK: %C1 = and i64 %A, 42
+; CHECK: %D = icmp eq i64 %C1, 10
+; CHECK: ret i1 %D
 }
 
 define void @test32(double** %tmp) {
@@ -214,12 +274,17 @@ define void @test32(double** %tmp) {
         %tmp8.upgrd.1 = bitcast [16 x i8]* %tmp8 to double*             ; <double*> [#uses=1]
         store double* %tmp8.upgrd.1, double** %tmp
         ret void
+; CHECK: %tmp81 = malloc [2 x double]
+; CHECK: %tmp81.sub = getelementptr inbounds [2 x double]* %tmp81, i64 0, i64 0
+; CHECK: store double* %tmp81.sub, double** %tmp
+; CHECK: ret void
 }
 
 define i32 @test33(i32 %c1) {
         %x = bitcast i32 %c1 to float           ; <float> [#uses=1]
         %y = bitcast float %x to i32            ; <i32> [#uses=1]
         ret i32 %y
+; CHECK: ret i32 %c1
 }
 
 define i16 @test34(i16 %a) {
@@ -227,6 +292,8 @@ define i16 @test34(i16 %a) {
         %tmp21 = lshr i32 %c1, 8                ; <i32> [#uses=1]
         %c2 = trunc i32 %tmp21 to i16           ; <i16> [#uses=1]
         ret i16 %c2
+; CHECK: %tmp21 = lshr i16 %a, 8
+; CHECK: ret i16 %tmp21
 }
 
 define i16 @test35(i16 %a) {
@@ -234,6 +301,8 @@ define i16 @test35(i16 %a) {
         %tmp2 = lshr i16 %c1, 8         ; <i16> [#uses=1]
         %c2 = bitcast i16 %tmp2 to i16          ; <i16> [#uses=1]
         ret i16 %c2
+; CHECK: %tmp2 = lshr i16 %a, 8
+; CHECK: ret i16 %tmp2
 }
 
 ; icmp sgt i32 %a, -1
@@ -243,6 +312,8 @@ define i1 @test36(i32 %a) {
         %c = trunc i32 %b to i8
         %d = icmp eq i8 %c, 0
         ret i1 %d
+; CHECK: %d = icmp sgt i32 %a, -1
+; CHECK: ret i1 %d
 }
 
 ; ret i1 false
@@ -252,6 +323,7 @@ define i1 @test37(i32 %a) {
         %d = trunc i32 %c to i8
         %e = icmp eq i8 %d, 11
         ret i1 %e
+; CHECK: ret i1 false
 }
 
 define i64 @test38(i32 %a) {
@@ -260,4 +332,7 @@ define i64 @test38(i32 %a) {
 	%3 = xor i8 %2, 1
 	%4 = zext i8 %3 to i64
         ret i64 %4
+; CHECK: %1 = icmp ne i32 %a, -2
+; CHECK: %2 = zext i1 %1 to i64
+; CHECK: ret i64 %2
 }
diff --git a/test/Transforms/InstCombine/cast2.ll b/test/Transforms/InstCombine/cast2.ll
index 80366bd3851..0ae869fa493 100644
--- a/test/Transforms/InstCombine/cast2.ll
+++ b/test/Transforms/InstCombine/cast2.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt < %s -instcombine -S | notcast
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i16 @test1(i16 %a) {
         %tmp = zext i16 %a to i32               ; <i32> [#uses=2]
@@ -8,6 +8,8 @@ define i16 @test1(i16 %a) {
         %tmp.upgrd.32 = or i32 %tmp21, %tmp5            ; <i32> [#uses=1]
         %tmp.upgrd.3 = trunc i32 %tmp.upgrd.32 to i16           ; <i16> [#uses=1]
         ret i16 %tmp.upgrd.3
+; CHECK: %tmp.upgrd.32 = call i16 @llvm.bswap.i16(i16 %a)
+; CHECK: ret i16 %tmp.upgrd.32
 }
 
 define i16 @test2(i16 %a) {
@@ -17,6 +19,10 @@ define i16 @test2(i16 %a) {
         %tmp.upgrd.32 = or i32 %tmp21, %tmp5            ; <i32> [#uses=1]
         %tmp.upgrd.3 = trunc i32 %tmp.upgrd.32 to i16           ; <i16> [#uses=1]
         ret i16 %tmp.upgrd.3
+; CHECK: %tmp21 = lshr i16 %a, 9
+; CHECK: %tmp5 = shl i16 %a, 8
+; CHECK: %tmp.upgrd.32 = or i16 %tmp21, %tmp5
+; CHECK: ret i16 %tmp.upgrd.32
 }
 
 ; PR1263
@@ -24,6 +30,7 @@ define i32* @test3(i32* %tmp1) {
         %tmp64 = bitcast i32* %tmp1 to { i32 }*         ; <{ i32 }*> [#uses=1]
         %tmp65 = getelementptr { i32 }* %tmp64, i32 0, i32 0            ; <i32*> [#uses=1]
         ret i32* %tmp65
+; CHECK: ret i32* %tmp1
 }
 
 
diff --git a/test/Transforms/InstCombine/fpcast.ll b/test/Transforms/InstCombine/fpcast.ll
index d61273d7cd8..bc6aa0a6891 100644
--- a/test/Transforms/InstCombine/fpcast.ll
+++ b/test/Transforms/InstCombine/fpcast.ll
@@ -1,15 +1,15 @@
 ; Test some floating point casting cases
-; RUN: opt < %s -instcombine -S | notcast
-; RUN: opt < %s -instcombine -S | \
-; RUN:   egrep {ret i8 \(-1\)\|\(255\)}
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define i8 @test1() {
         %x = fptoui float 2.550000e+02 to i8            ; <i8> [#uses=1]
         ret i8 %x
+; CHECK: ret i8 -1
 }
 
 define i8 @test2() {
         %x = fptosi float -1.000000e+00 to i8           ; <i8> [#uses=1]
         ret i8 %x
+; CHECK: ret i8 -1
 }
 
-- 
2.34.1