From 4f2527cd6d6abbb96e2fa131878591292cbb98f9 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 8 Sep 2009 22:41:33 +0000 Subject: [PATCH] Convert a few more opt | llvm-dis to opt -S. llvm-svn: 81261 --- llvm/test/Analysis/Andersens/modreftest.ll | 2 +- llvm/test/Analysis/Andersens/modreftest2.ll | 2 +- llvm/test/Analysis/BasicAA/gcsetest.ll | 4 ++-- llvm/test/Transforms/IndVarSimplify/loop_evaluate10.ll | 2 +- llvm/test/Transforms/IndVarSimplify/preserve-gep-remainder.ll | 2 +- .../Transforms/InstCombine/udiv_select_to_select_shift.ll | 2 +- llvm/test/Transforms/LoopSimplify/merge-exits.ll | 3 +-- .../Transforms/LoopStrengthReduce/2009-04-28-no-reduce-mul.ll | 2 +- llvm/test/Transforms/LoopStrengthReduce/dont_reverse.ll | 2 +- llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/llvm/test/Analysis/Andersens/modreftest.ll b/llvm/test/Analysis/Andersens/modreftest.ll index ac42fce66826..ffb7339419c1 100644 --- a/llvm/test/Analysis/Andersens/modreftest.ll +++ b/llvm/test/Analysis/Andersens/modreftest.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -anders-aa -gvn -instcombine | llvm-dis \ +; RUN: opt %s -anders-aa -gvn -instcombine -S \ ; RUN: | grep {ret i1 true} @G = internal global i32* null diff --git a/llvm/test/Analysis/Andersens/modreftest2.ll b/llvm/test/Analysis/Andersens/modreftest2.ll index f47f3d8e668a..67adcbd0d1ef 100644 --- a/llvm/test/Analysis/Andersens/modreftest2.ll +++ b/llvm/test/Analysis/Andersens/modreftest2.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -anders-aa -gvn | llvm-dis \ +; RUN: opt %s -anders-aa -gvn -S \ ; RUN: | not grep {ret i32 undef} ;; From PR 2160 diff --git a/llvm/test/Analysis/BasicAA/gcsetest.ll b/llvm/test/Analysis/BasicAA/gcsetest.ll index 5206b28826fc..716a5dce4fb3 100644 --- a/llvm/test/Analysis/BasicAA/gcsetest.ll +++ b/llvm/test/Analysis/BasicAA/gcsetest.ll @@ -2,8 +2,8 @@ ; disambiguating some obvious cases. All loads should be removable in ; this testcase. -; RUN: opt %s -basicaa -gvn -instcombine -dce \ -; RUN: | llvm-dis | not grep load +; RUN: opt %s -basicaa -gvn -instcombine -dce -S \ +; RUN: | not grep load @A = global i32 7 @B = global i32 8 diff --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate10.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate10.ll index 61ea7ad85c66..bccae9f19e6a 100644 --- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate10.ll +++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate10.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -indvars | llvm-dis \ +; RUN: opt %s -indvars -S \ ; RUN: | grep {%b.1 = phi i32 \\\[ 2, %bb \\\], \\\[ 1, %bb2 \\\]} ; This loop has multiple exits, and the value of %b1 depends on which diff --git a/llvm/test/Transforms/IndVarSimplify/preserve-gep-remainder.ll b/llvm/test/Transforms/IndVarSimplify/preserve-gep-remainder.ll index 1a7a41262feb..a877ba048aec 100644 --- a/llvm/test/Transforms/IndVarSimplify/preserve-gep-remainder.ll +++ b/llvm/test/Transforms/IndVarSimplify/preserve-gep-remainder.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -indvars | llvm-dis \ +; RUN: opt %s -indvars -S \ ; RUN: | grep {\[%\]p.2.ip.1 = getelementptr \\\[3 x \\\[3 x double\\\]\\\]\\* \[%\]p, i64 2, i64 \[%\]tmp, i64 1} ; Indvars shouldn't expand this to diff --git a/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll b/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll index d73271eeab85..9b059a6cc94d 100644 --- a/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll +++ b/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll @@ -1,7 +1,7 @@ ; Test that this transform works: ; udiv X, (Select Cond, C1, C2) --> Select Cond, (shr X, C1), (shr X, C2) ; -; RUN: opt %s -instcombine | llvm-dis -o %t +; RUN: opt < %s -instcombine -S -o %t ; RUN: not grep select %t ; RUN: grep lshr %t | count 2 ; RUN: not grep udiv %t diff --git a/llvm/test/Transforms/LoopSimplify/merge-exits.ll b/llvm/test/Transforms/LoopSimplify/merge-exits.ll index b1f6c9f31fa6..1d6562a79cc7 100644 --- a/llvm/test/Transforms/LoopSimplify/merge-exits.ll +++ b/llvm/test/Transforms/LoopSimplify/merge-exits.ll @@ -1,5 +1,4 @@ -; RUN: opt %s -loopsimplify -loop-rotate -instcombine -indvars \ -; RUN: | llvm-dis > %t +; RUN: opt %s -loopsimplify -loop-rotate -instcombine -indvars -S > %t ; RUN: not grep sext %t ; RUN: grep {phi i64} %t | count 1 diff --git a/llvm/test/Transforms/LoopStrengthReduce/2009-04-28-no-reduce-mul.ll b/llvm/test/Transforms/LoopStrengthReduce/2009-04-28-no-reduce-mul.ll index b535d3c0faa5..93900802a196 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/2009-04-28-no-reduce-mul.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/2009-04-28-no-reduce-mul.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -loop-reduce | llvm-dis \ +; RUN: opt %s -loop-reduce -S \ ; RUN: | grep {getelementptr.*%lsr.iv.*%lsr.iv.*} ; The multiply in bb2 must not be reduced to an add, as the sext causes the ; %1 argument to become negative after a while. diff --git a/llvm/test/Transforms/LoopStrengthReduce/dont_reverse.ll b/llvm/test/Transforms/LoopStrengthReduce/dont_reverse.ll index 3f6a78725a38..71d417d1309e 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/dont_reverse.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/dont_reverse.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -loop-reduce | llvm-dis \ +; RUN: opt %s -loop-reduce -S \ ; RUN: | grep {icmp eq i2 %lsr.iv.next, %xmp4344} ; Don't reverse the iteration if the rhs of the compare is defined diff --git a/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll b/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll index f1da1ba1624d..98fa8a5cd332 100644 --- a/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll +++ b/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll @@ -1,5 +1,5 @@ ; RUN: opt %s -simplifycfg -instcombine \ -; RUN: -simplifycfg | llvm-dis | not grep call +; RUN: -simplifycfg -S | not grep call declare void @bar()