Change these tests to feed the assembly files to opt directly, instead

of using llvm-as, now that opt supports this.

llvm-svn: 81226

37 files changed, 45 insertions, 45 deletions

diff --git a/llvm/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll b/llvm/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll
index 13b45f59a94..2d61c6aca76 100644
--- a/llvm/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll
@@ -5,7 +5,7 @@
 ; real benchmark (mst from Olden benchmark, MakeGraph function).  When SCCP is
 ; fixed, this should be eliminated by a single SCCP application.
 ;
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep loop
+; RUN: opt %s -sccp | llvm-dis | not grep loop
 
 define i32* @test() {
 bb1:
diff --git a/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll b/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
index fd4083d1374..289cafb9dbe 100644
--- a/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep sub
+; RUN: opt %s -sccp | llvm-dis | not grep sub
 
 define void @test3(i32, i32) {
 	add i32 0, 0		; <i32>:3 [#uses=0]
diff --git a/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll b/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
index 61bf5db4444..b5dc2bc8e59 100644
--- a/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
@@ -1,7 +1,7 @@
 ; This test shows a case where SCCP is incorrectly eliminating the PHI node
 ; because it thinks it has a constant 0 value, when it really doesn't.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
+; RUN: opt %s -sccp | llvm-dis | grep phi
 
 define i32 @test(i32 %A, i1 %c) {
 bb1:
diff --git a/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll b/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
index b46d23a9dcf..b81f6255579 100644
--- a/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
@@ -2,7 +2,7 @@
 ; this is in fact NOT the case, so the return should still be alive in the code
 ; after sccp and CFG simplification have been performed.
 ;
-; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | \
+; RUN: opt %s -sccp -simplifycfg | llvm-dis | \
 ; RUN:   grep ret
 
 define void @old_main() {
diff --git a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
index c5a7c790bd2..32fa36ca98a 100644
--- a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
+++ b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep %X
+; RUN: opt %s -sccp | llvm-dis | not grep %X
 
 @G = external global [40 x i32]		; <[40 x i32]*> [#uses=1]
 
diff --git a/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll b/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
index 03ff4dde8a1..6dbe97d05a2 100644
--- a/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
+++ b/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | \
+; RUN: opt %s -sccp -simplifycfg | llvm-dis | \
 ; RUN:   not grep then:
 
 define void @cprop_test11(i32* %data.1) {
diff --git a/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll b/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
index 020af7d16c7..57f0cf059ce 100644
--- a/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
+++ b/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
@@ -1,5 +1,5 @@
 ; The PHI cannot be eliminated from this testcase, SCCP is mishandling invoke's!
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
+; RUN: opt %s -sccp | llvm-dis | grep phi
 
 declare void @foo()
 
diff --git a/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll b/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
index cf64677334a..98cced0fce9 100644
--- a/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
+++ b/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output
+; RUN: opt %s -sccp -disable-output
 
 declare i32 @foo()
 
diff --git a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
index 6592e8b0892..983297f8ee7 100644
--- a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
+++ b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i32 1}
+; RUN: opt %s -sccp | llvm-dis | grep {ret i32 1}
 
 ; This function definitely returns 1, even if we don't know the direction
 ; of the branch.
diff --git a/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll b/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
index 299b79f53e2..9cec1e6e1e1 100644
--- a/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
+++ b/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output
+; RUN: opt %s -sccp -disable-output
 ; END.
 target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin8.7.0"
diff --git a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
index 0e268c2db83..afdf9dab2b0 100644
--- a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
@@ -1,7 +1,7 @@
 ; Test VectorType handling by SCCP.
 ; SCCP ignores VectorTypes until PR 1034 is fixed
 ;
-; RUN: llvm-as < %s | opt -sccp
+; RUN: opt %s -sccp
 ; END.
 
 target datalayout = "E-p:32:32"
diff --git a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
index 4d686690b98..1b1c249648f 100644
--- a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | \
+; RUN: opt %s -sccp | llvm-dis | \
 ; RUN:   grep {ret i1 false}
 
 define i1 @foo() {
diff --git a/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll b/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
index 18ab5e8cdc5..4bcad3a5974 100644
--- a/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
+++ b/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep undef | count 1
+; RUN: opt %s -sccp | llvm-dis | grep undef | count 1
 ; PR1938
 
 define i32 @main() {
diff --git a/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll b/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
index f85a36260e0..9abe1038c19 100644
--- a/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
+++ b/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep {ret i32 undef}
+; RUN: opt %s -sccp | llvm-dis | not grep {ret i32 undef}
 ; PR2358
 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"
diff --git a/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
index 20f7c21b7c1..9f0b95db9ee 100644
--- a/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
+++ b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 42}
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 undef}
+; RUN: opt %s -ipsccp | llvm-dis | grep {ret i32 42}
+; RUN: opt %s -ipsccp | llvm-dis | grep {ret i32 undef}
 ; PR3325
 
 define i32 @main() {
diff --git a/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll b/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
index 480aca0d1ac..3d1b2945022 100644
--- a/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
+++ b/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output
+; RUN: opt %s -sccp -disable-output
 ; PR4277
 
 define i32 @main() nounwind {
diff --git a/llvm/test/Transforms/SCCP/apint-array.ll b/llvm/test/Transforms/SCCP/apint-array.ll
index ead3f6ab9a6..15d0f3203f7 100644
--- a/llvm/test/Transforms/SCCP/apint-array.ll
+++ b/llvm/test/Transforms/SCCP/apint-array.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i101 12}
+; RUN: opt %s -sccp | llvm-dis | grep {ret i101 12}
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,i101 
 -123456789000000, i101 0,i101 9123456789000000]
diff --git a/llvm/test/Transforms/SCCP/apint-basictest.ll b/llvm/test/Transforms/SCCP/apint-basictest.ll
index 12f8326a737..9796ad9b333 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
+; RUN: opt %s -sccp | llvm-dis | not grep add
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/SCCP/apint-basictest2.ll b/llvm/test/Transforms/SCCP/apint-basictest2.ll
index 7db4e362eb4..4a173549b9a 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest2.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest2.ll
@@ -1,8 +1,8 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; and phi instruction should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep phi
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
+; RUN: opt %s -sccp | llvm-dis | not grep phi
+; RUN: opt %s -sccp | llvm-dis | not grep add
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/SCCP/apint-basictest3.ll b/llvm/test/Transforms/SCCP/apint-basictest3.ll
index 6e86764bf2c..cc3d07389bd 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest3.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest3.ll
@@ -2,8 +2,8 @@
 ; arithmatic operations.
 
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep mul
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep umod
+; RUN: opt %s -sccp | llvm-dis | not grep mul
+; RUN: opt %s -sccp | llvm-dis | not grep umod
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/SCCP/apint-basictest4.ll b/llvm/test/Transforms/SCCP/apint-basictest4.ll
index a90bd7d7315..541412bf86b 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest4.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest4.ll
@@ -2,9 +2,9 @@
 ; logic operations.
 
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep and
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep trunc
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i100 -1}
+; RUN: opt %s -sccp | llvm-dis | not grep and
+; RUN: opt %s -sccp | llvm-dis | not grep trunc
+; RUN: opt %s -sccp | llvm-dis | grep {ret i100 -1}
 
 define i100 @test(i133 %A) {
         %B = and i133 0, %A
diff --git a/llvm/test/Transforms/SCCP/apint-bigarray.ll b/llvm/test/Transforms/SCCP/apint-bigarray.ll
index 5cd1107a7a4..91886ffe60b 100644
--- a/llvm/test/Transforms/SCCP/apint-bigarray.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigarray.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep %X
+; RUN: opt %s -sccp | llvm-dis | not grep %X
 
 @G =  global [1000000 x i10000] zeroinitializer
 
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
index 59cfa3f7a2f..eb374ff98dd 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v {ret i512 undef} | \
+; RUN: opt %s -ipsccp | llvm-dis | grep -v {ret i512 undef} | \
 ; RUN:   grep {ret i8 2}
 
 define internal i512 @test(i1 %B) {
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
index 65e5ee7e89e..e6a971d9d3f 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v {ret i101 0} | \
+; RUN: opt %s -ipsccp | llvm-dis | grep -v {ret i101 0} | \
 ; RUN:    grep -v {ret i101 undef} | not grep ret
 
 
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
index a0656b75c13..59775471059 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly constant propagated.
 
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep load
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep add
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep phi
+; RUN: opt %s -ipsccp | llvm-dis | not grep load
+; RUN: opt %s -ipsccp | llvm-dis | not grep add
+; RUN: opt %s -ipsccp | llvm-dis | not grep phi
 
 
 @Y = constant [2 x { i212, float }] [ { i212, float } { i212 12, float 1.0 }, 
diff --git a/llvm/test/Transforms/SCCP/apint-load.ll b/llvm/test/Transforms/SCCP/apint-load.ll
index 96509714bb0..66629d75eca 100644
--- a/llvm/test/Transforms/SCCP/apint-load.ll
+++ b/llvm/test/Transforms/SCCP/apint-load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly constant propagated.
 
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep load
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep fdiv
+; RUN: opt %s -ipsccp | llvm-dis | not grep load
+; RUN: opt %s -ipsccp | llvm-dis | not grep fdiv
 
 @X = constant i212 42
 @Y = constant [2 x { i212, float }] [ { i212, float } { i212 12, float 1.0 }, 
diff --git a/llvm/test/Transforms/SCCP/apint-phi.ll b/llvm/test/Transforms/SCCP/apint-phi.ll
index 77f6bc86926..21c998b4704 100644
--- a/llvm/test/Transforms/SCCP/apint-phi.ll
+++ b/llvm/test/Transforms/SCCP/apint-phi.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep phi
+; RUN: opt %s -sccp | llvm-dis | not grep phi
 
 define i999 @test(i999%A, i1 %c) {
 bb1:
diff --git a/llvm/test/Transforms/SCCP/basictest.ll b/llvm/test/Transforms/SCCP/basictest.ll
index 08640a9a239..a0cc398dab2 100644
--- a/llvm/test/Transforms/SCCP/basictest.ll
+++ b/llvm/test/Transforms/SCCP/basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
+; RUN: opt %s -sccp | llvm-dis | not grep add
 
 define i32 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/SCCP/calltest.ll b/llvm/test/Transforms/SCCP/calltest.ll
index ee6eb8e4a80..3e42432548e 100644
--- a/llvm/test/Transforms/SCCP/calltest.ll
+++ b/llvm/test/Transforms/SCCP/calltest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -loop-deletion -simplifycfg | llvm-dis | \
+; RUN: opt %s -sccp -loop-deletion -simplifycfg | llvm-dis | \
 ; RUN:   not grep br
 
 ; No matter how hard you try, sqrt(1.0) is always 1.0.  This allows the
diff --git a/llvm/test/Transforms/SCCP/ipsccp-basic.ll b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
index 1449ea70c39..525747ff6ee 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | \
+; RUN: opt %s -ipsccp | llvm-dis | \
 ; RUN:   grep -v {ret i32 17} | grep -v {ret i32 undef} | not grep ret
 
 define internal i32 @bar(i32 %A) {
diff --git a/llvm/test/Transforms/SCCP/ipsccp-conditional.ll b/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
index b98bbf44be6..cbeee601db9 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | \
+; RUN: opt %s -ipsccp | llvm-dis | \
 ; RUN:   grep -v {ret i32 0} | grep -v {ret i32 undef} | not grep ret
 
 define internal i32 @bar(i32 %A) {
diff --git a/llvm/test/Transforms/SCCP/ipsccp-gvar.ll b/llvm/test/Transforms/SCCP/ipsccp-gvar.ll
index 6f2ee1f4d8a..7dbb86a863e 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-gvar.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-gvar.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep global
+; RUN: opt %s -ipsccp | llvm-dis | not grep global
 
 @G = internal global i32 undef		; <i32*> [#uses=5]
 
diff --git a/llvm/test/Transforms/SCCP/loadtest.ll b/llvm/test/Transforms/SCCP/loadtest.ll
index 0cbbdf60366..172f3d25349 100644
--- a/llvm/test/Transforms/SCCP/loadtest.ll
+++ b/llvm/test/Transforms/SCCP/loadtest.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly constant propagated.
 ;
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep load
+; RUN: opt %s -sccp | llvm-dis | not grep load
 
 
 @X = constant i32 42		; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/SCCP/logical-nuke.ll b/llvm/test/Transforms/SCCP/logical-nuke.ll
index 87454e4dcea..15eb1954794 100644
--- a/llvm/test/Transforms/SCCP/logical-nuke.ll
+++ b/llvm/test/Transforms/SCCP/logical-nuke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i32 0}
+; RUN: opt %s -sccp | llvm-dis | grep {ret i32 0}
 
 ; Test that SCCP has basic knowledge of when and/or nuke overdefined values.
 
diff --git a/llvm/test/Transforms/SCCP/phitest.ll b/llvm/test/Transforms/SCCP/phitest.ll
index c75de5dde8f..9946a88eeee 100644
--- a/llvm/test/Transforms/SCCP/phitest.ll
+++ b/llvm/test/Transforms/SCCP/phitest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -dce -simplifycfg | llvm-dis | \
+; RUN: opt %s -sccp -dce -simplifycfg | llvm-dis | \
 ; RUN:   not grep br
 
 define i32 @test(i32 %param) {
diff --git a/llvm/test/Transforms/SCCP/sccptest.ll b/llvm/test/Transforms/SCCP/sccptest.ll
index 84ba2d43cde..7606d85635f 100644
--- a/llvm/test/Transforms/SCCP/sccptest.ll
+++ b/llvm/test/Transforms/SCCP/sccptest.ll
@@ -1,7 +1,7 @@
 ; This is the test case taken from appel's book that illustrates a hard case
 ; that SCCP gets right. BB3 should be completely eliminated.
 ;
-; RUN: llvm-as < %s | opt -sccp -constprop -dce -simplifycfg | \
+; RUN: opt %s -sccp -constprop -dce -simplifycfg | \
 ; RUN:   llvm-dis | not grep BB3
 
 define i32 @testfunction(i32 %i0, i32 %j0) {
diff --git a/llvm/test/Transforms/SCCP/select.ll b/llvm/test/Transforms/SCCP/select.ll
index 74b20d09c14..1e0fc484016 100644
--- a/llvm/test/Transforms/SCCP/select.ll
+++ b/llvm/test/Transforms/SCCP/select.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep select
+; RUN: opt %s -sccp | llvm-dis | not grep select
 
 define i32 @test1(i1 %C) {
 	%X = select i1 %C, i32 0, i32 0		; <i32> [#uses=1]