Change tests from "opt %s" to "opt < %s" so that opt doesn't see the

input filename so that opt doesn't print the input filename in the
output so that grep lines in the tests don't unintentionally match
strings in the input filename.

llvm-svn: 81537

60 files changed, 60 insertions, 60 deletions

diff --git a/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
index eadafdb2e32..414235ba7cd 100644
--- a/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   grep {br label}
 ;
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll b/llvm/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
index 9f945a833a2..055386b3475 100644
--- a/llvm/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
@@ -4,7 +4,7 @@
 ;
 ; Which is not valid SSA
 ;
-; RUN: opt %s -simplifycfg | llvm-dis
+; RUN: opt < %s -simplifycfg | llvm-dis
 
 define void @test() {
 ; <label>:0
diff --git a/llvm/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll b/llvm/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
index ef5a4f4f533..9a1206221fb 100644
--- a/llvm/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg
+; RUN: opt < %s -simplifycfg
 
 define i32 @test(i32 %A, i32 %B, i1 %cond) {
 J:
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll b/llvm/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
index edef456a5f3..87620461994 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define void @test(i32* %ldo, i1 %c, i1 %d) {
 bb9:
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
index 3e6b20829d7..c019931c07e 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define i32 @test() {
 	%A = invoke i32 @test( )
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
index 610f7b55a60..15cd7730449 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: opt %s -simplifycfg -S | grep invoke
+; RUN: opt < %s -simplifycfg -S | grep invoke
 
 define i32 @test() {
 	invoke i32 @test( )
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
index 018d21f7cc0..8ac9ae44372 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
@@ -1,7 +1,7 @@
 ; This test checks to make sure that 'br X, Dest, Dest' is folded into 
 ; 'br Dest'
 
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep {br i1 %c2}
 
 declare void @noop()
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
index ebcbe2be6e7..888e187b6b4 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
@@ -3,7 +3,7 @@
 ; due to the fact that the SimplifyCFG function does not use 
 ; the ConstantFoldTerminator function.
 
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep {br i1 %c2}
 
 declare void @noop()
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch-dbg.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch-dbg.ll
index 90a521a37ce..577d65013e5 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch-dbg.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch-dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep switch
 
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
index 8ba0ae99864..93f851c6f9e 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep switch
 
 ; Test normal folding
diff --git a/llvm/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll b/llvm/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
index f0331a46641..fafe73b2b4e 100644
--- a/llvm/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define void @symhash_add() {
 entry:
diff --git a/llvm/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll b/llvm/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
index 8e6bccb1dfe..90be6803a5c 100644
--- a/llvm/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; PR584
 @g_38098584 = external global i32		; <i32*> [#uses=1]
 @g_60187400 = external global i32		; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll b/llvm/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
index 64e73567c48..c30bfa1379c 100644
--- a/llvm/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; END.
 
 define void @main() {
diff --git a/llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll b/llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
index 5b172b496f5..477c9c9e3a0 100644
--- a/llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; END.
 
 	%arraytype.1.Char = type { i32, [0 x i8] }
diff --git a/llvm/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll b/llvm/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
index 7f6e244b01b..778aa3b1f7b 100644
--- a/llvm/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define i1 @foo() {
 	%X = invoke i1 @foo( )
diff --git a/llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll b/llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
index 8e91e997c2e..760aa139bf7 100644
--- a/llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
@@ -1,6 +1,6 @@
 ; Make sure this doesn't turn into an infinite loop
 
-; RUN: opt %s -simplifycfg -constprop -simplifycfg |\
+; RUN: opt < %s -simplifycfg -constprop -simplifycfg |\
 ; RUN:   llvm-dis | grep bb86
 ; END.
 	
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll b/llvm/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
index 6ee83a48a5a..32f49e66788 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define void @polnel_() {
 entry:
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll b/llvm/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
index 4e975b04d99..21cfb2615ff 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; END.
 
 define void @main(i32 %c) {
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll b/llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll
index eb5a55f46ca..2c84c937ae3 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -gvn -simplifycfg \
+; RUN: opt < %s -gvn -simplifycfg \
 ; RUN:   -disable-output
 ; PR867
 ; END.
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll b/llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
index 5e54b4fe30c..009d1c8cc4d 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
@@ -1,5 +1,5 @@
 ; PR957
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep select
 
 @G = extern_weak global i32
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/llvm/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
index ecc51247e20..dba41c9b111 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; END.
 	%struct..4._102 = type { %struct.QVectorData* }
 	%struct..5._125 = type { %struct.QMapData* }
diff --git a/llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll b/llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
index 955a36ad3d9..af865ce7fac 100644
--- a/llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg | llvm-dis
+; RUN: opt < %s -simplifycfg | llvm-dis
 ; END.
 
 ; ModuleID = '2006-12-08-Ptr-ICmp-Branch.ll'
diff --git a/llvm/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll b/llvm/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll
index 9f01d85c2a3..a20c46e1ad1 100644
--- a/llvm/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep invoke
+; RUN: opt < %s -simplifycfg -S | not grep invoke
 
 declare i32 @func(i8*) nounwind
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2007-12-21-Crash.ll b/llvm/test/Transforms/SimplifyCFG/2007-12-21-Crash.ll
index 22814959d72..46df0f0ed07 100644
--- a/llvm/test/Transforms/SimplifyCFG/2007-12-21-Crash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2007-12-21-Crash.ll
@@ -1,4 +1,4 @@
-;RUN: opt %s -simplifycfg -disable-output
+;RUN: opt < %s -simplifycfg -disable-output
 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"
 
 define i32 @bork() nounwind  {
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll b/llvm/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
index 194d2a57cac..00f2d5bcf13 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
@@ -1,5 +1,5 @@
 ; The phi should not be eliminated in this case, because the fp op could trap.
-; RUN: opt %s -simplifycfg -S | grep {= phi double}
+; RUN: opt < %s -simplifycfg -S | grep {= phi double}
 
 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 = "i686-apple-darwin8"
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-04-23-MergeMultipleResultRet.ll b/llvm/test/Transforms/SimplifyCFG/2008-04-23-MergeMultipleResultRet.ll
index 145ec556bc2..8e05a3cddca 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-04-23-MergeMultipleResultRet.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-04-23-MergeMultipleResultRet.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; rdar://5882392
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
 target triple = "x86_64-apple-darwin9"
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-04-27-MultipleReturnCrash.ll b/llvm/test/Transforms/SimplifyCFG/2008-04-27-MultipleReturnCrash.ll
index c3813a02814..ba33d84f84a 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-04-27-MultipleReturnCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-04-27-MultipleReturnCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; PR2256
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
 target triple = "x86_64-mingw32"
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll b/llvm/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll
index 377c5846641..59e886b2ddb 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S > %t
+; RUN: opt < %s -simplifycfg -S > %t
 ; RUN: not grep {^BB.tomerge} %t
 ; RUN  grep {^BB.nomerge} %t | count 2
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll b/llvm/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll
index 0b01c44d2c1..d025dee85f2 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep {%outval = phi i32 .*mux}
+; RUN: opt < %s -simplifycfg -S | grep {%outval = phi i32 .*mux}
 ; PR2540
 ; Outval should end up with a select from 0/2, not all constants.
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-09-08-MultiplePred.ll b/llvm/test/Transforms/SimplifyCFG/2008-09-08-MultiplePred.ll
index 3bbba1c5fbd..ac9622d43c3 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-09-08-MultiplePred.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-09-08-MultiplePred.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; PR 2777
 @g_103 = common global i32 0		; <i32*> [#uses=1]
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-09-17-SpeculativeHoist.ll b/llvm/test/Transforms/SimplifyCFG/2008-09-17-SpeculativeHoist.ll
index 1746fa99983..f864184eb84 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-09-17-SpeculativeHoist.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-09-17-SpeculativeHoist.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; PR 2800
 
 define void @foo() {
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-10-03-SpeculativelyExecuteBeforePHI.ll b/llvm/test/Transforms/SimplifyCFG/2008-10-03-SpeculativelyExecuteBeforePHI.ll
index 0006e4a5d3d..bb137c1babc 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-10-03-SpeculativelyExecuteBeforePHI.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-10-03-SpeculativelyExecuteBeforePHI.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg
+; RUN: opt < %s -simplifycfg
 ; PR2855
 
 define i32 @_Z1fPii(i32* %b, i32 %f) nounwind {
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-12-06-SingleEntryPhi.ll b/llvm/test/Transforms/SimplifyCFG/2008-12-06-SingleEntryPhi.ll
index 6dffdf1598a..d3c7c320cee 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-12-06-SingleEntryPhi.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-12-06-SingleEntryPhi.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg | llvm-dis
+; RUN: opt < %s -simplifycfg | llvm-dis
 define i32 @test() {
 entry:
 	br label %T
diff --git a/llvm/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll b/llvm/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
index 7ad0c4b65ae..727102435fc 100644
--- a/llvm/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep icmp
+; RUN: opt < %s -simplifycfg -S | not grep icmp
 ; ModuleID = '/tmp/x.bc'
 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 = "i686-pc-linux-gnu"
diff --git a/llvm/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll b/llvm/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll
index b43ce8a3679..7b8a9187c41 100644
--- a/llvm/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg | llvm-dis
+; RUN: opt < %s -simplifycfg | llvm-dis
 ; PR3016
 ; Dead use caused invariant violation.
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll b/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll
index 1fefa0868a6..33167bd5c66 100644
--- a/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep {br i1 } | count 4
+; RUN: opt < %s -simplifycfg -S | grep {br i1 } | count 4
 ; PR3354
 ; Do not merge bb1 into the entry block, it might trap.
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2009-03-05-Speculative-Hoist-Dbg.ll b/llvm/test/Transforms/SimplifyCFG/2009-03-05-Speculative-Hoist-Dbg.ll
index 617cdfb53b8..9caa9a1a0fb 100644
--- a/llvm/test/Transforms/SimplifyCFG/2009-03-05-Speculative-Hoist-Dbg.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2009-03-05-Speculative-Hoist-Dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep select
+; RUN: opt < %s -simplifycfg -S | grep select
         %llvm.dbg.anchor.type = type { i32, i32 }
         %llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8*, i1, i1, i8* }
 
diff --git a/llvm/test/Transforms/SimplifyCFG/2009-05-12-externweak.ll b/llvm/test/Transforms/SimplifyCFG/2009-05-12-externweak.ll
index 9d71dd8c46d..419feb6b56a 100644
--- a/llvm/test/Transforms/SimplifyCFG/2009-05-12-externweak.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2009-05-12-externweak.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep select
+; RUN: opt < %s -simplifycfg -S | not grep select
 ; ModuleID = '<stdin>'
 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/SimplifyCFG/2009-06-15-InvokeCrash.ll b/llvm/test/Transforms/SimplifyCFG/2009-06-15-InvokeCrash.ll
index bcc4b8727b4..72a15b1c8b2 100644
--- a/llvm/test/Transforms/SimplifyCFG/2009-06-15-InvokeCrash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2009-06-15-InvokeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 ; END.
 	%struct..4._102 = type { %struct.QVectorData* }
 	%struct..5._125 = type { %struct.QMapData* }
diff --git a/llvm/test/Transforms/SimplifyCFG/BrUnwind.ll b/llvm/test/Transforms/SimplifyCFG/BrUnwind.ll
index 3afb6b262b5..b19a27dea04 100644
--- a/llvm/test/Transforms/SimplifyCFG/BrUnwind.ll
+++ b/llvm/test/Transforms/SimplifyCFG/BrUnwind.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN: not grep {br label}
 
 define void @test(i1 %C) {
diff --git a/llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll b/llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll
index 6bc54abce90..83394628cc4 100644
--- a/llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll
+++ b/llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep {icmp eq}
 
 ; Check that simplifycfg deletes a dead 'seteq' instruction when it
diff --git a/llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
index 8104715fcab..912c7556e00 100644
--- a/llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks with phi nodes.
 ;
-; RUN: opt %s -simplifycfg -S | not grep N:
+; RUN: opt < %s -simplifycfg -S | not grep N:
 ;
 
 define i32 @test(i1 %a) {
diff --git a/llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll b/llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll
index 1e746c421f3..9f3bd4ee510 100644
--- a/llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll
+++ b/llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll
@@ -3,7 +3,7 @@
 
 ; If this test is successful, the function should be reduced to 'call; ret'
 
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not egrep {\\(invoke\\)|\\(br\\)}
 
 declare void @bar()
diff --git a/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll b/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
index 3ef1fe2969d..a648efd1740 100644
--- a/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: opt %s -simplifycfg -S | not grep N:
+; RUN: opt < %s -simplifycfg -S | not grep N:
 ;
 
 define i32 @test(i1 %a, i1 %b) {
diff --git a/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
index 89a7e598b99..fb5d600f114 100644
--- a/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
+++ b/llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
@@ -2,7 +2,7 @@
 ; where the mergedinto block doesn't have any PHI nodes, and is in fact 
 ; dominated by the block-to-be-eliminated
 ;
-; RUN: opt %s -simplifycfg -S | not grep N:
+; RUN: opt < %s -simplifycfg -S | not grep N:
 ;
 
 declare i1 @foo()
diff --git a/llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll b/llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll
index a877a1f1a25..73cf466a4f7 100644
--- a/llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll
+++ b/llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll
@@ -3,7 +3,7 @@
 ; nodes away allows the branches to be eliminated, performing a simple form of
 ; 'if conversion'.
 
-; RUN: opt %s -simplifycfg -S > %t.xform
+; RUN: opt < %s -simplifycfg -S > %t.xform
 ; RUN:   not grep phi %t.xform 
 ; RUN:   grep ret %t.xform
 
diff --git a/llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll b/llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll
index ccca831e099..e9902e09442 100644
--- a/llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll
+++ b/llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep select
 
 ;; The PHI node in this example should not be turned into a select, as we are
diff --git a/llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll b/llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll
index bbc8619b006..bf9d9535d63 100644
--- a/llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll
+++ b/llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll
@@ -2,7 +2,7 @@
 ; a PHI node and a return.  Make sure the simplify cfg can straighten out this
 ; important case.  This is basically the most trivial form of tail-duplication.
 
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:    not grep {br label}
 
 define i32 @test(i1 %B, i32 %A, i32 %B.upgrd.1) {
diff --git a/llvm/test/Transforms/SimplifyCFG/UnreachableEliminate.ll b/llvm/test/Transforms/SimplifyCFG/UnreachableEliminate.ll
index a9623efee81..7133d9875ca 100644
--- a/llvm/test/Transforms/SimplifyCFG/UnreachableEliminate.ll
+++ b/llvm/test/Transforms/SimplifyCFG/UnreachableEliminate.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep unreachable
+; RUN: opt < %s -simplifycfg -S | not grep unreachable
 
 define void @test1(i1 %C, i1* %BP) {
         br i1 %C, label %T, label %F
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-branch-dbginfo.ll b/llvm/test/Transforms/SimplifyCFG/branch-branch-dbginfo.ll
index 8769f7954ef..761f0d53905 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-branch-dbginfo.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-branch-dbginfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep {br i1} | count 1
+; RUN: opt < %s -simplifycfg -S | grep {br i1} | count 1
 
 ; ModuleID = '<stdin>'
 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:32:32"
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll b/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll
index 98fa8a5cd33..f73e01ca476 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -instcombine \
+; RUN: opt < %s -simplifycfg -instcombine \
 ; RUN:   -simplifycfg -S | not grep call
 
 declare void @bar()
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-cond-prop.ll b/llvm/test/Transforms/SimplifyCFG/branch-cond-prop.ll
index 1ba62262001..448934e7250 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-cond-prop.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-cond-prop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep call
+; RUN: opt < %s -simplifycfg -S | not grep call
 
 declare void @bar()
 
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-fold.ll b/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
index c3d51c19df4..266609b52a5 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep {br i1} | count 1
+; RUN: opt < %s -simplifycfg -S | grep {br i1} | count 1
 
 define void @test(i32* %P, i32* %Q, i1 %A, i1 %B) {
         br i1 %A, label %a, label %b
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll b/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
index 1d926d58dd7..f52d979ecd3 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -adce -S | \
+; RUN: opt < %s -simplifycfg -adce -S | \
 ; RUN:   not grep {call void @f1}
 ; END.
 
diff --git a/llvm/test/Transforms/SimplifyCFG/dbginfo.ll b/llvm/test/Transforms/SimplifyCFG/dbginfo.ll
index c9b7b86e219..1a9f20ac871 100644
--- a/llvm/test/Transforms/SimplifyCFG/dbginfo.ll
+++ b/llvm/test/Transforms/SimplifyCFG/dbginfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep "br label"
+; RUN: opt < %s -simplifycfg -S | not grep "br label"
 
 	%llvm.dbg.anchor.type = type { i32, i32 }
 	%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
diff --git a/llvm/test/Transforms/SimplifyCFG/iterative-simplify.ll b/llvm/test/Transforms/SimplifyCFG/iterative-simplify.ll
index 5f5a1b04749..a3974110576 100644
--- a/llvm/test/Transforms/SimplifyCFG/iterative-simplify.ll
+++ b/llvm/test/Transforms/SimplifyCFG/iterative-simplify.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep bb17
+; RUN: opt < %s -simplifycfg -S | not grep bb17
 ; PR1786
 
 define i32 @main() {
diff --git a/llvm/test/Transforms/SimplifyCFG/noreturn-call.ll b/llvm/test/Transforms/SimplifyCFG/noreturn-call.ll
index 16cebc2e313..b4547782837 100644
--- a/llvm/test/Transforms/SimplifyCFG/noreturn-call.ll
+++ b/llvm/test/Transforms/SimplifyCFG/noreturn-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep unreachable
+; RUN: opt < %s -simplifycfg -S | grep unreachable
 ; PR1796
 
 declare void @Finisher(i32) noreturn
diff --git a/llvm/test/Transforms/SimplifyCFG/switch-simplify-crash.ll b/llvm/test/Transforms/SimplifyCFG/switch-simplify-crash.ll
index 6d10ebfcfbd..bbc0bd78da7 100644
--- a/llvm/test/Transforms/SimplifyCFG/switch-simplify-crash.ll
+++ b/llvm/test/Transforms/SimplifyCFG/switch-simplify-crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -disable-output
+; RUN: opt < %s -simplifycfg -disable-output
 
 define void @NewExtractNames() {
 entry:
diff --git a/llvm/test/Transforms/SimplifyCFG/switch_thread.ll b/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
index eff4717cc24..bd85fccd527 100644
--- a/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
+++ b/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | \
+; RUN: opt < %s -simplifycfg -S | \
 ; RUN:   not grep {call void @DEAD}
 
 ; Test that we can thread a simple known condition through switch statements.
diff --git a/llvm/test/Transforms/SimplifyCFG/trapping-load-unreachable.ll b/llvm/test/Transforms/SimplifyCFG/trapping-load-unreachable.ll
index 1596f0e0369..0c9cc8be925 100644
--- a/llvm/test/Transforms/SimplifyCFG/trapping-load-unreachable.ll
+++ b/llvm/test/Transforms/SimplifyCFG/trapping-load-unreachable.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | grep {volatile load}
+; RUN: opt < %s -simplifycfg -S | grep {volatile load}
 ; PR2967
 
 target datalayout =