Use opt -S instead of piping bitcode output through llvm-dis.

llvm-svn: 81257

18 files changed, 20 insertions, 20 deletions

diff --git a/llvm/test/Transforms/ConstProp/2002-05-03-NotOperator.ll b/llvm/test/Transforms/ConstProp/2002-05-03-NotOperator.ll
index 0164252d755..295ef0c0bc8 100644
--- a/llvm/test/Transforms/ConstProp/2002-05-03-NotOperator.ll
+++ b/llvm/test/Transforms/ConstProp/2002-05-03-NotOperator.ll
@@ -4,7 +4,7 @@
 
 ; Fix #2: The unary not instruction now no longer exists. Change to xor.
 
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:   not grep {i32 0}
 
 define i32 @test1() {
diff --git a/llvm/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll b/llvm/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
index 6eadb0a77eb..c3600673d57 100644
--- a/llvm/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
+++ b/llvm/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
@@ -1,6 +1,6 @@
 ; SetCC on boolean values was not implemented!
 
-; RUN: opt %s -constprop -die | llvm-dis | \
+; RUN: opt %s -constprop -die -S | \
 ; RUN:   not grep set
 
 define i1 @test1() {
diff --git a/llvm/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll b/llvm/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
index c99c3b85290..6a7f7944143 100644
--- a/llvm/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
+++ b/llvm/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:    not grep {ret i1 false}
 
 @b = external global [2 x {  }]         ; <[2 x {  }]*> [#uses=2]
diff --git a/llvm/test/Transforms/ConstProp/2006-11-30-vector-cast.ll b/llvm/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
index c6313524990..571e460573f 100644
--- a/llvm/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
+++ b/llvm/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:   grep {i32 -1}
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:   not grep zeroinitializer
 
 define <4 x i32> @test() {
diff --git a/llvm/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll b/llvm/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
index c7769616a9a..07d6220ec76 100644
--- a/llvm/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
+++ b/llvm/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {ret i1 false}
 define i1 @test() {
         %X = trunc i32 320 to i1                ; <i1> [#uses=1]
diff --git a/llvm/test/Transforms/ConstProp/2006-12-01-bool-casts.ll b/llvm/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
index 29b4667b921..a32191c76f1 100644
--- a/llvm/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
+++ b/llvm/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:    grep {ret i32 -1}
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:    grep {ret i32 1}
 
 define i32 @test1() {
diff --git a/llvm/test/Transforms/ConstProp/2007-02-05-BitCast.ll b/llvm/test/Transforms/ConstProp/2007-02-05-BitCast.ll
index 9211aeb635e..cb69564144f 100644
--- a/llvm/test/Transforms/ConstProp/2007-02-05-BitCast.ll
+++ b/llvm/test/Transforms/ConstProp/2007-02-05-BitCast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -constprop | llvm-dis | grep 1065353216
+; RUN: opt %s -constprop -S | grep 1065353216
 
 define i32 @test() {
         %A = bitcast float 1.000000e+00 to i32          ; <i32> [#uses=1]
diff --git a/llvm/test/Transforms/ConstProp/2007-11-23-cttz.ll b/llvm/test/Transforms/ConstProp/2007-11-23-cttz.ll
index 93e3c4b904f..0fba0808822 100644
--- a/llvm/test/Transforms/ConstProp/2007-11-23-cttz.ll
+++ b/llvm/test/Transforms/ConstProp/2007-11-23-cttz.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -constprop | llvm-dis | grep {ret i13 13}
+; RUN: opt %s -constprop -S | grep {ret i13 13}
 ; PR1816
 declare i13 @llvm.cttz.i13(i13)
 
diff --git a/llvm/test/Transforms/ConstProp/basictest.ll b/llvm/test/Transforms/ConstProp/basictest.ll
index 07516764da7..900a9afeaa5 100644
--- a/llvm/test/Transforms/ConstProp/basictest.ll
+++ b/llvm/test/Transforms/ConstProp/basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: opt %s -constprop -die | llvm-dis | not grep add
+; RUN: opt %s -constprop -die -S | not grep add
 
 define i32 @test(i1 %B) {
         br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/ConstProp/bitcast2.ll b/llvm/test/Transforms/ConstProp/bitcast2.ll
index b2bc122f28f..5c5eab1879c 100644
--- a/llvm/test/Transforms/ConstProp/bitcast2.ll
+++ b/llvm/test/Transforms/ConstProp/bitcast2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep bitcast
+; RUN: opt < %s -instcombine -S | not grep bitcast
 ; PR2165
 
 define <1 x i64> @test() {
diff --git a/llvm/test/Transforms/ConstProp/bswap.ll b/llvm/test/Transforms/ConstProp/bswap.ll
index 0c4f0454d74..df1ee491e50 100644
--- a/llvm/test/Transforms/ConstProp/bswap.ll
+++ b/llvm/test/Transforms/ConstProp/bswap.ll
@@ -1,6 +1,6 @@
 ; bswap should be constant folded when it is passed a constant argument
 
-; RUN: opt %s -constprop | llvm-dis | not grep call
+; RUN: opt %s -constprop -S | not grep call
 
 declare i16 @llvm.bswap.i16(i16)
 
diff --git a/llvm/test/Transforms/ConstProp/calls.ll b/llvm/test/Transforms/ConstProp/calls.ll
index 4337cca1bdb..3c266fe62ed 100644
--- a/llvm/test/Transforms/ConstProp/calls.ll
+++ b/llvm/test/Transforms/ConstProp/calls.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -constprop | llvm-dis | not grep call
+; RUN: opt < %s -constprop -S | not grep call
 
 declare double @cos(double)
 
diff --git a/llvm/test/Transforms/ConstProp/div-zero.ll b/llvm/test/Transforms/ConstProp/div-zero.ll
index 74c7449f02a..e96061d3b69 100644
--- a/llvm/test/Transforms/ConstProp/div-zero.ll
+++ b/llvm/test/Transforms/ConstProp/div-zero.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 0}
+; RUN: opt %s -instcombine -S | grep {ret i32 0}
 ; PR4424
 declare void @ext()
 
diff --git a/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll b/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
index f65d51e41b7..8ab76d997b1 100644
--- a/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
+++ b/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -constprop | llvm-dis | \
+; RUN: opt %s -constprop -S | \
 ; RUN:    grep -F {ret i32* null} | count 2
 
 define i32* @test1() {
diff --git a/llvm/test/Transforms/ConstProp/logicaltest.ll b/llvm/test/Transforms/ConstProp/logicaltest.ll
index 022e6ae11e6..7a90a7199f8 100644
--- a/llvm/test/Transforms/ConstProp/logicaltest.ll
+++ b/llvm/test/Transforms/ConstProp/logicaltest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of logical instructions is working correctly.
 
-; RUN: opt %s -constprop -die | llvm-dis | \
+; RUN: opt < %s -constprop -die -S | \
 ; RUN:   not egrep {and|or|xor}
 
 define i32 @test1() {
diff --git a/llvm/test/Transforms/ConstProp/nottest.ll b/llvm/test/Transforms/ConstProp/nottest.ll
index d1fb83abd16..f7a18d45c3f 100644
--- a/llvm/test/Transforms/ConstProp/nottest.ll
+++ b/llvm/test/Transforms/ConstProp/nottest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of 'not' instructions is working correctly.
 
-; RUN: opt %s -constprop -die | llvm-dis | not grep xor
+; RUN: opt %s -constprop -die -S | not grep xor
 
 define i32 @test1() {
         %R = xor i32 4, -1              ; <i32> [#uses=1]
diff --git a/llvm/test/Transforms/ConstProp/phi.ll b/llvm/test/Transforms/ConstProp/phi.ll
index 9ec87766bde..3d9e284457c 100644
--- a/llvm/test/Transforms/ConstProp/phi.ll
+++ b/llvm/test/Transforms/ConstProp/phi.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: opt %s -constprop -die | llvm-dis | not grep phi
+; RUN: opt < %s -constprop -die -S | not grep phi
 
 define i32 @test(i1 %B) {
 BB0:
diff --git a/llvm/test/Transforms/ConstProp/remtest.ll b/llvm/test/Transforms/ConstProp/remtest.ll
index ac9509d5f4e..efd2d48332a 100644
--- a/llvm/test/Transforms/ConstProp/remtest.ll
+++ b/llvm/test/Transforms/ConstProp/remtest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propagation of remainder instructions is working correctly.
 
-; RUN: opt %s -constprop -die | llvm-dis | not grep rem
+; RUN: opt < %s -constprop -die -S | not grep rem
 
 define i32 @test1() {
         %R = srem i32 4, 3              ; <i32> [#uses=1]