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

llvm-svn: 81257

27 files changed, 33 insertions, 33 deletions

diff --git a/llvm/test/Transforms/Inline/2007-04-15-InlineEH.ll b/llvm/test/Transforms/Inline/2007-04-15-InlineEH.ll
index 8ed1d90ed7f..43ff4061404 100644
--- a/llvm/test/Transforms/Inline/2007-04-15-InlineEH.ll
+++ b/llvm/test/Transforms/Inline/2007-04-15-InlineEH.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | not grep {invoke void asm}
+; RUN: opt %s -inline -S | not grep {invoke void asm}
 ; PR1335
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
diff --git a/llvm/test/Transforms/Inline/2007-06-06-NoInline.ll b/llvm/test/Transforms/Inline/2007-06-06-NoInline.ll
index b7f5a86e17a..4a7ced8bed5 100644
--- a/llvm/test/Transforms/Inline/2007-06-06-NoInline.ll
+++ b/llvm/test/Transforms/Inline/2007-06-06-NoInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep "define internal i32 @bar"
+; RUN: opt %s -inline -S | grep "define internal i32 @bar"
 @llvm.noinline = appending global [1 x i8*] [ i8* bitcast (i32 (i32, i32)* @bar to i8*) ], section "llvm.metadata"		; <[1 x i8*]*> [#uses=0]
 
 define internal i32 @bar(i32 %x, i32 %y) {
diff --git a/llvm/test/Transforms/Inline/2007-06-25-WeakInline.ll b/llvm/test/Transforms/Inline/2007-06-25-WeakInline.ll
index 0abe7b5ec6f..941326efb4e 100644
--- a/llvm/test/Transforms/Inline/2007-06-25-WeakInline.ll
+++ b/llvm/test/Transforms/Inline/2007-06-25-WeakInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep call
+; RUN: opt %s -inline -S | grep call
 
 ; 'bar' can be overridden at link-time, don't inline it.
 
diff --git a/llvm/test/Transforms/Inline/2007-12-19-InlineNoUnwind.ll b/llvm/test/Transforms/Inline/2007-12-19-InlineNoUnwind.ll
index 5f7da15fc1b..962accec123 100644
--- a/llvm/test/Transforms/Inline/2007-12-19-InlineNoUnwind.ll
+++ b/llvm/test/Transforms/Inline/2007-12-19-InlineNoUnwind.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as %s -o - | opt -inline | llvm-dis | grep nounwind
-; RUN: llvm-as %s -o - | opt -inline | llvm-dis | grep unreachable
+; RUN: llvm-as %s -o - | opt -inline -S | grep nounwind
+; RUN: llvm-as %s -o - | opt -inline -S | grep unreachable
 
 declare i1 @extern()
 
diff --git a/llvm/test/Transforms/Inline/2008-09-02-AlwaysInline.ll b/llvm/test/Transforms/Inline/2008-09-02-AlwaysInline.ll
index 45c9a5a97e9..f8c95844e13 100644
--- a/llvm/test/Transforms/Inline/2008-09-02-AlwaysInline.ll
+++ b/llvm/test/Transforms/Inline/2008-09-02-AlwaysInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s  -inline-threshold=0 -inline | llvm-dis | not grep call 
+; RUN: opt %s  -inline-threshold=0 -inline -S | not grep call 
 
 define i32 @fn2() alwaysinline {
   ret i32 1
diff --git a/llvm/test/Transforms/Inline/2008-09-02-NoInline.ll b/llvm/test/Transforms/Inline/2008-09-02-NoInline.ll
index 65b80e449d5..cc0e51b1e0b 100644
--- a/llvm/test/Transforms/Inline/2008-09-02-NoInline.ll
+++ b/llvm/test/Transforms/Inline/2008-09-02-NoInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep call | count 1
+; RUN: opt %s -inline -S | grep call | count 1
 
 define i32 @fn2() noinline {
   ret i32 1
diff --git a/llvm/test/Transforms/Inline/2008-10-30-AlwaysInline.ll b/llvm/test/Transforms/Inline/2008-10-30-AlwaysInline.ll
index 12f9d2831e2..34b95b70ac0 100644
--- a/llvm/test/Transforms/Inline/2008-10-30-AlwaysInline.ll
+++ b/llvm/test/Transforms/Inline/2008-10-30-AlwaysInline.ll
@@ -1,7 +1,7 @@
-; RUN: opt %s -always-inline | llvm-dis | not grep call 
+; RUN: opt %s -always-inline -S | not grep call 
 
 ; Ensure that threshold doesn't disrupt always inline.
-; RUN: opt %s -inline-threshold=-2000000001 -always-inline | llvm-dis | not grep call 
+; RUN: opt %s -inline-threshold=-2000000001 -always-inline -S | not grep call 
 
 
 define internal i32 @if0() alwaysinline {
diff --git a/llvm/test/Transforms/Inline/2008-11-04-AlwaysInline.ll b/llvm/test/Transforms/Inline/2008-11-04-AlwaysInline.ll
index 36408ef7bbb..79c0302e329 100644
--- a/llvm/test/Transforms/Inline/2008-11-04-AlwaysInline.ll
+++ b/llvm/test/Transforms/Inline/2008-11-04-AlwaysInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -always-inline | llvm-dis | grep {@foo}
+; RUN: opt %s -always-inline -S | grep {@foo}
 ; Ensure that foo is not removed by always inliner
 ; PR 2945
 
diff --git a/llvm/test/Transforms/Inline/2009-01-08-NoInlineDynamicAlloca.ll b/llvm/test/Transforms/Inline/2009-01-08-NoInlineDynamicAlloca.ll
index cb9ab17f3dc..a34e6808b8f 100644
--- a/llvm/test/Transforms/Inline/2009-01-08-NoInlineDynamicAlloca.ll
+++ b/llvm/test/Transforms/Inline/2009-01-08-NoInlineDynamicAlloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep call
+; RUN: opt %s -inline -S | grep call
 ; Do not inline calls to variable-sized alloca.
 
 @q = common global i8* null		; <i8**> [#uses=1]
diff --git a/llvm/test/Transforms/Inline/2009-01-12-RecursiveInline.ll b/llvm/test/Transforms/Inline/2009-01-12-RecursiveInline.ll
index 4dd374835bb..b8ab4a3e6b5 100644
--- a/llvm/test/Transforms/Inline/2009-01-12-RecursiveInline.ll
+++ b/llvm/test/Transforms/Inline/2009-01-12-RecursiveInline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep {call.*fib} | count 4
+; RUN: opt %s -inline -S | grep {call.*fib} | count 4
 ; First call to fib from fib is inlined, producing 2 instead of 1, total 3.
 ; Second call to fib from fib is not inlined because new body of fib exceeds
 ; inlining limit of 200.  Plus call in main = 4 total.
diff --git a/llvm/test/Transforms/Inline/always_inline_dyn_alloca.ll b/llvm/test/Transforms/Inline/always_inline_dyn_alloca.ll
index 85ad66f18ec..a44d90682ad 100644
--- a/llvm/test/Transforms/Inline/always_inline_dyn_alloca.ll
+++ b/llvm/test/Transforms/Inline/always_inline_dyn_alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | not grep callee
+; RUN: opt %s -inline -S | not grep callee
 ; rdar://6655932
 
 ; If callee is marked alwaysinline, inline it! Even if callee has dynamic
diff --git a/llvm/test/Transforms/Inline/array_merge.ll b/llvm/test/Transforms/Inline/array_merge.ll
index ce2268570c4..9294a06c4d1 100644
--- a/llvm/test/Transforms/Inline/array_merge.ll
+++ b/llvm/test/Transforms/Inline/array_merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | FileCheck %s
+; RUN: opt %s -inline -S | FileCheck %s
 ; rdar://7173846
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin10.0"
diff --git a/llvm/test/Transforms/Inline/byval.ll b/llvm/test/Transforms/Inline/byval.ll
index 5fd871d3366..907e3e2c183 100644
--- a/llvm/test/Transforms/Inline/byval.ll
+++ b/llvm/test/Transforms/Inline/byval.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep {llvm.memcpy}
+; RUN: opt %s -inline -S | grep {llvm.memcpy}
 
 ; Inlining a byval struct should cause an explicit copy into an alloca.
 
diff --git a/llvm/test/Transforms/Inline/byval2.ll b/llvm/test/Transforms/Inline/byval2.ll
index e88c824983d..04c61ee34f0 100644
--- a/llvm/test/Transforms/Inline/byval2.ll
+++ b/llvm/test/Transforms/Inline/byval2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | not grep {llvm.memcpy}
+; RUN: opt %s -inline -S | not grep {llvm.memcpy}
 
 ; Inlining a byval struct should NOT cause an explicit copy 
 ; into an alloca if the function is readonly
diff --git a/llvm/test/Transforms/Inline/casts.ll b/llvm/test/Transforms/Inline/casts.ll
index f10200b4a2f..1b9902b027b 100644
--- a/llvm/test/Transforms/Inline/casts.ll
+++ b/llvm/test/Transforms/Inline/casts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | grep {ret i32 1}
+; RUN: opt %s -inline -S | grep {ret i32 1}
 ; ModuleID = 'short.opt.bc'
 
 define i32 @testBool(i1 %X) {
diff --git a/llvm/test/Transforms/Inline/cfg_preserve_test.ll b/llvm/test/Transforms/Inline/cfg_preserve_test.ll
index 33656e47724..021c9e73ba6 100644
--- a/llvm/test/Transforms/Inline/cfg_preserve_test.ll
+++ b/llvm/test/Transforms/Inline/cfg_preserve_test.ll
@@ -1,6 +1,6 @@
 ; This test ensures that inlining an "empty" function does not destroy the CFG
 ;
-; RUN: opt %s -inline | llvm-dis | not grep br
+; RUN: opt %s -inline -S | not grep br
 
 define i32 @func(i32 %i) {
         ret i32 %i
diff --git a/llvm/test/Transforms/Inline/dynamic_alloca_test.ll b/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
index b0bc4ded621..b6b0971e79a 100644
--- a/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
+++ b/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
@@ -3,9 +3,9 @@
 ; Functions with dynamic allocas can only be inlined into functions that
 ; already have dynamic allocas.
 
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:   grep llvm.stacksave
-; RUN: opt %s -inline | llvm-dis | not grep callee
+; RUN: opt %s -inline -S | not grep callee
 
 
 declare void @ext(i32*)
diff --git a/llvm/test/Transforms/Inline/externally_available.ll b/llvm/test/Transforms/Inline/externally_available.ll
index cc51f00c24b..c975131d6eb 100644
--- a/llvm/test/Transforms/Inline/externally_available.ll
+++ b/llvm/test/Transforms/Inline/externally_available.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline -constprop | llvm-dis > %t
+; RUN: opt %s -inline -constprop -S > %t
 ; RUN: not grep test_function %t
 ; RUN: grep {ret i32 5} %t
 
diff --git a/llvm/test/Transforms/Inline/inline-invoke-tail.ll b/llvm/test/Transforms/Inline/inline-invoke-tail.ll
index 0039b70e8d7..ce56fee9e3a 100644
--- a/llvm/test/Transforms/Inline/inline-invoke-tail.ll
+++ b/llvm/test/Transforms/Inline/inline-invoke-tail.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | not grep {tail call void @llvm.memcpy.i32}
+; RUN: opt %s -inline -S | not grep {tail call void @llvm.memcpy.i32}
 ; PR3550
 
 define internal void @foo(i32* %p, i32* %q) {
diff --git a/llvm/test/Transforms/Inline/inline-tail.ll b/llvm/test/Transforms/Inline/inline-tail.ll
index 3d437114ebc..8bb059d01a0 100644
--- a/llvm/test/Transforms/Inline/inline-tail.ll
+++ b/llvm/test/Transforms/Inline/inline-tail.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -inline | llvm-dis | not grep tail
+; RUN: opt < %s -inline -S | not grep tail
 
 declare void @bar(i32*)
 
diff --git a/llvm/test/Transforms/Inline/inline_cleanup.ll b/llvm/test/Transforms/Inline/inline_cleanup.ll
index 853a0ee42f2..915aef00da3 100644
--- a/llvm/test/Transforms/Inline/inline_cleanup.ll
+++ b/llvm/test/Transforms/Inline/inline_cleanup.ll
@@ -1,9 +1,9 @@
 ; Test that the inliner doesn't leave around dead allocas, and that it folds
 ; uncond branches away after it is done specializing.
 
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:    not grep {alloca.*uses=0}
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:    not grep {br label}
 @A = weak global i32 0		; <i32*> [#uses=1]
 @B = weak global i32 0		; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/Inline/inline_constprop.ll b/llvm/test/Transforms/Inline/inline_constprop.ll
index 9d5d3417053..3066d45ff4b 100644
--- a/llvm/test/Transforms/Inline/inline_constprop.ll
+++ b/llvm/test/Transforms/Inline/inline_constprop.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -inline | llvm-dis | not grep callee
-; RUN: opt %s -inline | llvm-dis | not grep div
+; RUN: opt %s -inline -S | not grep callee
+; RUN: opt %s -inline -S | not grep div
 
 
 define internal i32 @callee(i32 %A, i32 %B) {
diff --git a/llvm/test/Transforms/Inline/inline_dce.ll b/llvm/test/Transforms/Inline/inline_dce.ll
index 1b861ca8555..632a9e4ca0d 100644
--- a/llvm/test/Transforms/Inline/inline_dce.ll
+++ b/llvm/test/Transforms/Inline/inline_dce.ll
@@ -1,7 +1,7 @@
 ; This checks to ensure that the inline pass deletes functions if they get 
 ; inlined into all of their callers.
 
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:   not grep @reallysmall
 
 define internal i32 @reallysmall(i32 %A) {
diff --git a/llvm/test/Transforms/Inline/inline_prune.ll b/llvm/test/Transforms/Inline/inline_prune.ll
index c024032a0e2..62d4d223613 100644
--- a/llvm/test/Transforms/Inline/inline_prune.ll
+++ b/llvm/test/Transforms/Inline/inline_prune.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:    not grep {callee\[12\](}
-; RUN: opt %s -inline | llvm-dis | not grep mul
+; RUN: opt %s -inline -S | not grep mul
 
 define internal i32 @callee1(i32 %A, i32 %B) {
         %cond = icmp eq i32 %A, 123             ; <i1> [#uses=1]
diff --git a/llvm/test/Transforms/Inline/invoke_test-1.ll b/llvm/test/Transforms/Inline/invoke_test-1.ll
index 8eb140c109e..f611becda29 100644
--- a/llvm/test/Transforms/Inline/invoke_test-1.ll
+++ b/llvm/test/Transforms/Inline/invoke_test-1.ll
@@ -1,7 +1,7 @@
 ; Test that we can inline a simple function, turning the calls in it into invoke
 ; instructions
 
-; RUN: opt %s -inline | llvm-dis | \
+; RUN: opt %s -inline -S | \
 ; RUN:   not grep {call\[^e\]}
 
 declare void @might_throw()
diff --git a/llvm/test/Transforms/Inline/invoke_test-2.ll b/llvm/test/Transforms/Inline/invoke_test-2.ll
index e57b03f7c7b..b04f8abc34c 100644
--- a/llvm/test/Transforms/Inline/invoke_test-2.ll
+++ b/llvm/test/Transforms/Inline/invoke_test-2.ll
@@ -1,7 +1,7 @@
 ; Test that if an invoked function is inlined, and if that function cannot
 ; throw, that the dead handler is now unreachable.
 
-; RUN: opt %s -inline -simplifycfg | llvm-dis | \
+; RUN: opt %s -inline -simplifycfg -S | \
 ; RUN:   not grep UnreachableExceptionHandler
 
 declare void @might_throw()
diff --git a/llvm/test/Transforms/Inline/invoke_test-3.ll b/llvm/test/Transforms/Inline/invoke_test-3.ll
index 693fbee0c7d..b170ecfd048 100644
--- a/llvm/test/Transforms/Inline/invoke_test-3.ll
+++ b/llvm/test/Transforms/Inline/invoke_test-3.ll
@@ -1,7 +1,7 @@
 ; Test that any rethrown exceptions in an inlined function are automatically
 ; turned into branches to the invoke destination.
 
-; RUN: opt %s -inline | llvm-dis | not grep unwind$
+; RUN: opt %s -inline -S | not grep unwind$
 
 declare void @might_throw()