From df27f44bd70ef7a1b32e6070e5cbb34ba424bd66 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 22 Aug 2013 00:51:19 +0000 Subject: [PATCH] FileCheck-ize tests. llvm-svn: 188971 --- .../LoopInfo/2003-05-15-NestingProblem.ll | 5 +++-- test/Analysis/PostDominators/pr1098.ll | 3 ++- .../2007-08-06-MisinterpretBranch.ll | 4 +++- .../ScalarEvolution/2007-08-06-Unsigned.ll | 4 +++- .../2007-09-27-LargeStepping.ll | 5 +++-- .../ScalarEvolution/2007-11-14-SignedAddRec.ll | 4 +++- .../2008-02-11-ReversedCondition.ll | 4 +++- .../ScalarEvolution/2008-02-15-UMax.ll | 4 +++- .../2008-05-25-NegativeStepToZero.ll | 5 +++-- .../2008-07-12-UnneededSelect1.ll | 5 ++++- .../2008-07-12-UnneededSelect2.ll | 5 ++++- .../ScalarEvolution/2008-07-19-InfiniteLoop.ll | 5 +++-- .../ScalarEvolution/2008-07-19-WrappingIV.ll | 5 +++-- .../2008-11-18-LessThanOrEqual.ll | 5 +++-- .../ScalarEvolution/2008-11-18-Stride1.ll | 5 +++-- .../ScalarEvolution/2008-11-18-Stride2.ll | 4 +++- .../ScalarEvolution/2008-12-08-FiniteSGE.ll | 4 +++- .../2008-12-14-StrideAndSigned.ll | 5 +++-- .../ScalarEvolution/2008-12-15-DontUseSDiv.ll | 4 +++- .../2009-01-02-SignedNegativeStride.ll | 5 ++++- .../ScalarEvolution/2009-04-22-TruncCast.ll | 18 ++++++++++++++++++ .../2009-05-09-PointerEdgeCount.ll | 5 ++++- test/Analysis/ScalarEvolution/and-xor.ll | 7 +++++-- test/Analysis/ScalarEvolution/avoid-smax-0.ll | 4 +++- test/Analysis/ScalarEvolution/div-overflow.ll | 5 +++-- test/Analysis/ScalarEvolution/do-loop.ll | 4 +++- 26 files changed, 98 insertions(+), 35 deletions(-) diff --git a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll index 7119007ffde..a87bab7cabf 100644 --- a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll +++ b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll @@ -1,8 +1,9 @@ ; This testcase was incorrectly computing that the loopentry.7 loop was ; not a child of the loopentry.6 loop. ; -; RUN: opt < %s -analyze -loops | \ -; RUN: grep "^ Loop at depth 4 containing: %loopentry.7
" +; RUN: opt < %s -analyze -loops | FileCheck %s + +; CHECK: Loop at depth 4 containing: %loopentry.7
define void @getAndMoveToFrontDecode() { br label %endif.2 diff --git a/test/Analysis/PostDominators/pr1098.ll b/test/Analysis/PostDominators/pr1098.ll index afb47769ee4..2eed2137127 100644 --- a/test/Analysis/PostDominators/pr1098.ll +++ b/test/Analysis/PostDominators/pr1098.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -postdomtree -analyze | grep entry +; RUN: opt < %s -postdomtree -analyze | FileCheck %s ; PR932 define void @foo(i1 %x) { +; CHECK: entry entry: br i1 %x, label %bb1, label %bb0 bb0: ; preds = %entry, bb0 diff --git a/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll b/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll index e67e4d00d62..fd09fd5f28c 100644 --- a/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll +++ b/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -indvars -adce -simplifycfg -S | grep "icmp s" +; RUN: opt < %s -indvars -adce -simplifycfg -S | FileCheck %s ; PR1598 +; CHECK: icmp s + define i32 @f(i32 %a, i32 %b, i32 %x, i32 %y) { entry: %tmp3 = icmp eq i32 %a, %b ; [#uses=1] diff --git a/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll b/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll index 036abf5b7c1..9e19ccab6eb 100644 --- a/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll +++ b/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %bb: backedge-taken count is (-1 + (-1 \* %x) + %y)" +; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s ; PR1597 +; CHECK: Loop %bb: backedge-taken count is (-1 + (-1 * %x) + %y) + define i32 @f(i32 %x, i32 %y) { entry: %tmp63 = icmp ult i32 %x, %y ; [#uses=1] diff --git a/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll b/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll index a3192b9c01f..b65a5250244 100644 --- a/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll +++ b/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 13" +; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s ; PR1706 +; CHECK: backedge-taken count is 13 + define i32 @f() { entry: br label %bb5 diff --git a/test/Analysis/ScalarEvolution/2007-11-14-SignedAddRec.ll b/test/Analysis/ScalarEvolution/2007-11-14-SignedAddRec.ll index 514920f0f6f..a2850d8c4b4 100644 --- a/test/Analysis/ScalarEvolution/2007-11-14-SignedAddRec.ll +++ b/test/Analysis/ScalarEvolution/2007-11-14-SignedAddRec.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -indvars -S | grep printd | grep 1206807378 +; RUN: opt < %s -indvars -S | FileCheck %s ; PR1798 +; CHECK: printd(i32 1206807378) + declare void @printd(i32) define i32 @test() { diff --git a/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll b/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll index d0644f7b3f9..6ebfa61de41 100644 --- a/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll +++ b/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll @@ -1,4 +1,6 @@ -; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %header: backedge-taken count is (0 smax %n)" +; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s + +; CHECK: Loop %header: backedge-taken count is (0 smax %n) define void @foo(i32 %n) { entry: diff --git a/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll b/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll index 52c7985045d..527fd273cd2 100644 --- a/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll +++ b/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution | grep umax +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s ; PR2003 +; CHECK: umax + define i32 @foo(i32 %n) { entry: br label %header diff --git a/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll b/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll index 41734d70f07..9a05d88c4ce 100644 --- a/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll +++ b/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 61" +; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s ; PR2364 +; CHECK: backedge-taken count is 61 + define i32 @func_6() nounwind { entry: br label %bb5 diff --git a/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll b/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll index 5cf17a21014..dcf8fc9dbdb 100644 --- a/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll +++ b/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll @@ -1,6 +1,9 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | not grep smax +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s ; PR2261 +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'foo' +; CHECK-NOT: smax + @lut = common global [256 x i8] zeroinitializer, align 32 ; <[256 x i8]*> [#uses=1] define void @foo(i32 %count, i32* %srcptr, i32* %dstptr) nounwind { diff --git a/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll b/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll index 195dfaaaee9..c804bd90551 100644 --- a/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll +++ b/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll @@ -1,6 +1,9 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | not grep smax +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s ; PR2070 +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'a' +; CHECK-NOT: smax + define i32 @a(i32 %x) nounwind { entry: icmp sgt i32 %x, 1 ; :0 [#uses=1] diff --git a/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll b/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll index 1865c059a99..ad34f6cedf6 100644 --- a/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll +++ b/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | grep Unpredictable +; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s ; PR2088 +; CHECK: Unpredictable + define void @fun() { entry: br label %loop diff --git a/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll b/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll index cbf200e40f9..82b9d560425 100644 --- a/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll +++ b/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 113" +; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s ; PR2088 +; CHECK: backedge-taken count is 113 + define void @fun() { entry: br label %loop diff --git a/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll b/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll index c25e4a3b2b2..46c6c59e92c 100644 --- a/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll +++ b/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll @@ -1,5 +1,6 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | \ -; RUN: grep "Loop %bb: backedge-taken count is (7 + (-1 \* %argc))" +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s + +; CHECK: Loop %bb: backedge-taken count is (7 + (-1 * %argc)) define i32 @main(i32 %argc, i8** %argv) nounwind { entry: diff --git a/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll b/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll index 56a83438830..74698795ca3 100644 --- a/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll +++ b/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll @@ -1,5 +1,6 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: | grep "Loop %bb: Unpredictable backedge-taken count\." +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s + +; CHECK: Loop %bb: Unpredictable backedge-taken count. ; ScalarEvolution can't compute a trip count because it doesn't know if ; dividing by the stride will have a remainder. This could theoretically diff --git a/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll b/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll index aaf6770676b..0ee69c6d306 100644 --- a/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll +++ b/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | grep "/u 3" +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s ; XFAIL: * +; CHECK: /u 3 + ; This is a tricky testcase for unsigned wrap detection which ScalarEvolution ; doesn't yet know how to do. diff --git a/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll b/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll index a1b3b719165..7a7a64001a6 100644 --- a/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll +++ b/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll @@ -1,4 +1,6 @@ -; RUN: opt < %s -analyze -scalar-evolution | grep "backedge-taken count is 255" +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s + +; CHECK: backedge-taken count is 255 define i32 @foo(i32 %x, i32 %y, i32* %lam, i32* %alp) nounwind { bb1.thread: diff --git a/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll b/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll index bb149193a0f..95aa1fc85e2 100644 --- a/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll +++ b/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll @@ -1,7 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | \ -; RUN: grep "(((-1 * %i0) + (100005 smax %i0)) /u 5)" +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s ; XFAIL: * +; CHECK: (((-1 * %i0) + (100005 smax %i0)) /u 5) + define i32 @foo0(i32 %i0) nounwind { entry: br label %bb1 diff --git a/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll b/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll index 70006260cb9..d40044e7f86 100644 --- a/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll +++ b/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | grep "/u 5" +; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s ; XFAIL: * +; CHECK: /u 5 + define i8 @foo0(i8 %i0) nounwind { entry: br label %bb1 diff --git a/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll b/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll index 82f2608e574..f19d18c72e6 100644 --- a/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll +++ b/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll @@ -1,6 +1,9 @@ -; RUN: opt < %s -analyze -scalar-evolution | not grep "/u -1" +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s ; PR3275 +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'func_15' +; CHECK-NOT: /u -1 + @g_16 = external global i16 ; [#uses=3] @.str = external constant [4 x i8] ; <[4 x i8]*> [#uses=0] diff --git a/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll b/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll index ebd9f7377d0..3dacfbb0a8d 100644 --- a/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll +++ b/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll @@ -1,35 +1,53 @@ ; RUN: opt < %s -analyze -scalar-evolution | grep "(trunc i" | not grep ext +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test1' +; CHECK-NOT: (trunc i{{.*}}ext + define i16 @test1(i8 %x) { %A = sext i8 %x to i32 %B = trunc i32 %A to i16 ret i16 %B } +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test2' +; CHECK-NOT: (trunc i{{.*}}ext + define i8 @test2(i16 %x) { %A = sext i16 %x to i32 %B = trunc i32 %A to i8 ret i8 %B } +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test3' +; CHECK-NOT: (trunc i{{.*}}ext + define i16 @test3(i16 %x) { %A = sext i16 %x to i32 %B = trunc i32 %A to i16 ret i16 %B } +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test4' +; CHECK-NOT: (trunc i{{.*}}ext + define i16 @test4(i8 %x) { %A = zext i8 %x to i32 %B = trunc i32 %A to i16 ret i16 %B } +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test5' +; CHECK-NOT: (trunc i{{.*}}ext + define i8 @test5(i16 %x) { %A = zext i16 %x to i32 %B = trunc i32 %A to i8 ret i8 %B } +; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test6' +; CHECK-NOT: (trunc i{{.*}}ext + define i16 @test6(i16 %x) { %A = zext i16 %x to i32 %B = trunc i32 %A to i16 diff --git a/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll b/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll index 8a780431345..5d1502da179 100644 --- a/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll +++ b/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll @@ -1,5 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution | grep "count is 2" +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s ; PR3171 + +; CHECK: count is 2 + target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" %struct.Foo = type { i32 } diff --git a/test/Analysis/ScalarEvolution/and-xor.ll b/test/Analysis/ScalarEvolution/and-xor.ll index 06f4a8582fa..404ab91e269 100644 --- a/test/Analysis/ScalarEvolution/and-xor.ll +++ b/test/Analysis/ScalarEvolution/and-xor.ll @@ -1,5 +1,8 @@ -; RUN: opt < %s -scalar-evolution -analyze \ -; RUN: | grep "\--> (zext" | count 2 +; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s + +; CHECK: --> (zext +; CHECK: --> (zext +; CHECK-NOT: --> (zext define i32 @foo(i32 %x) { %n = and i32 %x, 255 diff --git a/test/Analysis/ScalarEvolution/avoid-smax-0.ll b/test/Analysis/ScalarEvolution/avoid-smax-0.ll index 3d15c787fcf..8abb43074c5 100644 --- a/test/Analysis/ScalarEvolution/avoid-smax-0.ll +++ b/test/Analysis/ScalarEvolution/avoid-smax-0.ll @@ -1,4 +1,6 @@ -; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %bb3: backedge-taken count is (-1 + %n)" +; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s + +; CHECK: Loop %bb3: backedge-taken count is (-1 + %n) ; We don't want to use a max in the trip count expression in ; this testcase. diff --git a/test/Analysis/ScalarEvolution/div-overflow.ll b/test/Analysis/ScalarEvolution/div-overflow.ll index 28467975606..aca964ae62b 100644 --- a/test/Analysis/ScalarEvolution/div-overflow.ll +++ b/test/Analysis/ScalarEvolution/div-overflow.ll @@ -1,5 +1,6 @@ -; RUN: opt < %s -scalar-evolution -analyze \ -; RUN: | grep "\--> ((-128 \* %a) /u -128)" +; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s + +; CHECK: --> ((-128 * %a) /u -128) ; Don't let ScalarEvolution fold this div away. diff --git a/test/Analysis/ScalarEvolution/do-loop.ll b/test/Analysis/ScalarEvolution/do-loop.ll index 6e3295a920b..e35ea7d57e3 100644 --- a/test/Analysis/ScalarEvolution/do-loop.ll +++ b/test/Analysis/ScalarEvolution/do-loop.ll @@ -1,6 +1,8 @@ -; RUN: opt < %s -analyze -scalar-evolution | grep smax +; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s ; PR1614 +; CHECK: smax + define i32 @f(i32 %x, i32 %y) { entry: br label %bb