Renamed `as' => `llvm-as', `dis' => `llvm-dis', `link' => `llvm-link'.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8558 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll b/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll
index f1458ce..fb44d94 100644
--- a/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll
+++ b/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll
@@ -2,7 +2,7 @@
 ; is performed.  It is not legal to delete the second load instruction because
 ; the value computed by the first load instruction is changed by the store.
 
-; RUN: as < %s | opt -load-vn -gcse -instcombine | dis | grep DONOTREMOVE
+; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE
 
 int %test() {
 	%A = alloca int
diff --git a/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll b/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll
index 0dd936a..1f48327 100644
--- a/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll
+++ b/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2
 void %test({[2 x int],[2 x int]}* %A, long %X, long %Y) {
 	%P1 = getelementptr {[2 x int],[2 x int]}* %A, long 0, ubyte 0, long %X
diff --git a/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll b/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll
index 27ec9ea..70f71c2 100644
--- a/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll
+++ b/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -load-vn -gcse -instcombine | dis | grep sub
+; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 ; BasicAA was incorrectly concluding that P1 and P2 didn't conflict!
 
diff --git a/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll b/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll
index 036e9d9..1401382 100644
--- a/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll
+++ b/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2
 void %test([17 x ushort]* %mask_bits) {
 	%P1 = getelementptr [17 x ushort]* %mask_bits, long 0, long 0
diff --git a/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll b/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
index fdb8c73..7322e63 100644
--- a/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
+++ b/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -licm -disable-output
+; RUN: llvm-as < %s | opt -licm -disable-output
 	%struct..apr_array_header_t = type { int*, int, int, int, sbyte* }
 	%struct..apr_table_t = type { %struct..apr_array_header_t, uint, [32 x int], [32 x int] }
 
diff --git a/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll b/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll
index 92cf5a9..2c2fbca 100644
--- a/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll
+++ b/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 
 int %MTConcat([3 x int]* %a.1) {
 	%tmp.961 = getelementptr [3 x int]* %a.1, long 0, long 4
diff --git a/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll b/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
index 785759d..916b523 100644
--- a/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
+++ b/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 
 	%struct..RefPoint = type { int, { uint, ushort, ushort } }
 	%struct..RefRect = type { %struct..RefPoint, %struct..RefPoint }
diff --git a/test/Analysis/BasicAA/featuretest.ll b/test/Analysis/BasicAA/featuretest.ll
index 0b798e2..7fc129d 100644
--- a/test/Analysis/BasicAA/featuretest.ll
+++ b/test/Analysis/BasicAA/featuretest.ll
@@ -1,7 +1,7 @@
 ; This testcase tests for various features the basicaa test should be able to 
 ; determine, as noted in the comments.
 
-; RUN: as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | dis | not grep REMOVE
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE
 
 %Global = external global { int }
 
diff --git a/test/Analysis/BasicAA/gcsetest.ll b/test/Analysis/BasicAA/gcsetest.ll
index 4287e7d..0cc0af2 100644
--- a/test/Analysis/BasicAA/gcsetest.ll
+++ b/test/Analysis/BasicAA/gcsetest.ll
@@ -2,7 +2,7 @@
 ; disambiguating some obvious cases.  All loads should be removable in 
 ; this testcase.
 
-; RUN: as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | dis | not grep load
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load
 
 %A = global int 7
 %B = global int 8
diff --git a/test/Analysis/BasicAA/licmtest.ll b/test/Analysis/BasicAA/licmtest.ll
index 414a538..56682c7 100644
--- a/test/Analysis/BasicAA/licmtest.ll
+++ b/test/Analysis/BasicAA/licmtest.ll
@@ -3,7 +3,7 @@
 ; two pointers, then the load should be hoisted, and the store sunk.  Thus
 ; the loop becomes empty and can be deleted by ADCE. 
 
-; RUN: as < %s | opt -basicaa -licm --adce | dis | not grep Loop
+; RUN: llvm-as < %s | opt -basicaa -licm --adce | llvm-dis | not grep Loop
 
 %A = global int 7
 %B = global int 8
diff --git a/test/Analysis/LoadVN/RLE-Eliminate.ll b/test/Analysis/LoadVN/RLE-Eliminate.ll
index fb79cfa..dba82b7 100644
--- a/test/Analysis/LoadVN/RLE-Eliminate.ll
+++ b/test/Analysis/LoadVN/RLE-Eliminate.ll
@@ -1,7 +1,7 @@
 ; This testcase ensures that redundant loads are eliminated when they should 
 ; be.  All RL variables (redundant loads) should be eliminated.
 ;
-; RUN: as < %s | opt -load-vn -gcse | dis | not grep %RL
+; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep %RL
 ;
 int "test1"(int* %P) {
 	%A = load int* %P
diff --git a/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll b/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll
index 1d760af..c320bc3 100644
--- a/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll
+++ b/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll
@@ -1,5 +1,5 @@
 
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | dis | grep sub
+; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 int %test(int* %P) {
 	%X = volatile load int* %P
diff --git a/test/Analysis/LoadVN/RLE-Preserve.ll b/test/Analysis/LoadVN/RLE-Preserve.ll
index 346eaf9..88a0c7f 100644
--- a/test/Analysis/LoadVN/RLE-Preserve.ll
+++ b/test/Analysis/LoadVN/RLE-Preserve.ll
@@ -1,6 +1,6 @@
 ; This testcase ensures that redundant loads are preserved when they are not 
 ; allowed to be eliminated.
-; RUN: as < %s | opt -load-vn -gcse | dis | grep sub
+; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | grep sub
 ;
 int %test1(int* %P) {
 	%A = load int* %P
diff --git a/test/Other/2002-02-24-InlineBrokePHINodes.ll b/test/Other/2002-02-24-InlineBrokePHINodes.ll
index 6de391a..1088205 100644
--- a/test/Other/2002-02-24-InlineBrokePHINodes.ll
+++ b/test/Other/2002-02-24-InlineBrokePHINodes.ll
@@ -1,7 +1,7 @@
 ; Inlining used to break PHI nodes.  This tests that they are correctly updated 
 ; when a node is split around the call instruction.  The verifier caught the error.
 ;
-; RUN: as < %s | opt -inline
+; RUN: llvm-as < %s | opt -inline
 ;
 implementation
 
diff --git a/test/Other/2002-03-11-ConstPropCrash.ll b/test/Other/2002-03-11-ConstPropCrash.ll
index 6eca639..6243574 100644
--- a/test/Other/2002-03-11-ConstPropCrash.ll
+++ b/test/Other/2002-03-11-ConstPropCrash.ll
@@ -5,7 +5,7 @@
 ;
 ; Fixed by adding new arguments to ConstantFoldTerminator
 ;
-; RUN: as < %s | opt -constprop
+; RUN: llvm-as < %s | opt -constprop
 
 implementation
 
diff --git a/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll b/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll
index 7f62270..162b050 100644
--- a/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll
+++ b/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 
 implementation
 
diff --git a/test/Transforms/ADCE/2002-05-22-PHITest.ll b/test/Transforms/ADCE/2002-05-22-PHITest.ll
index 79bcd81..e13536c 100644
--- a/test/Transforms/ADCE/2002-05-22-PHITest.ll
+++ b/test/Transforms/ADCE/2002-05-22-PHITest.ll
@@ -1,6 +1,6 @@
 ; It is illegal to remove BB1 because it will mess up the PHI node!
 ;
-; RUN: as < %s | opt -adce | dis | grep BB1
+; RUN: llvm-as < %s | opt -adce | llvm-dis | grep BB1
 
 
 int "test"(bool %C, int %A, int %B) {
diff --git a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
index 6862dad..d489596 100644
--- a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
+++ b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
@@ -4,7 +4,7 @@
 ; removed even though there were uses still around.  Now the uses are filled
 ; in with a dummy value before the PHI is deleted.
 ;
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 	
 %node_t = type { double*, %node_t*, %node_t**, double**, double*, int, int }
 
diff --git a/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll b/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
index 347559b..1fcf609 100644
--- a/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
+++ b/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
@@ -1,6 +1,6 @@
 ; This testcase is a distilled form of: 2002-05-28-Crash.ll
 
-; RUN: as < %s | opt -adce 
+; RUN: llvm-as < %s | opt -adce 
 
 float "test"(int %i) {
 	%F = cast int %i to float    ; This BB is not dead
diff --git a/test/Transforms/ADCE/2002-05-28-Crash.ll b/test/Transforms/ADCE/2002-05-28-Crash.ll
index ac81252..5b4acda 100644
--- a/test/Transforms/ADCE/2002-05-28-Crash.ll
+++ b/test/Transforms/ADCE/2002-05-28-Crash.ll
@@ -11,7 +11,7 @@
 ;  return !s;
 ;}
 ;
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll b/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
index edc658e..36db7fb 100644
--- a/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
+++ b/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
@@ -3,7 +3,7 @@
 ; block in this function, it would work fine, but that would be the part we 
 ; have to fix now, wouldn't it....
 ;
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 
 void %foo(sbyte* %reg5481) {
         %cast611 = cast sbyte* %reg5481 to sbyte**              ; <sbyte**> [#uses=1]
diff --git a/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll b/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
index 02125a5..bd88884 100644
--- a/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
+++ b/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
@@ -1,6 +1,6 @@
 ; This testcase was extracted from the gzip SPEC benchmark
 ;
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 
 %bk = external global uint		; <uint*> [#uses=2]
 %hufts = external global uint		; <uint*> [#uses=1]
diff --git a/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll b/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
index 2931db0..5023f94 100644
--- a/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
+++ b/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
@@ -1,5 +1,5 @@
 ; Testcase reduced from 197.parser by bugpoint
-; RUN: as < %s | opt -adce 
+; RUN: llvm-as < %s | opt -adce 
 implementation   ; Functions:
 
 void %conjunction_prune() {
diff --git a/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll b/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
index 994a63e..1a71ffe 100644
--- a/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
+++ b/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
@@ -2,7 +2,7 @@
 ; entries for it's postdominator.  But I think this can only happen when the 
 ; PHI node is dead, so we just avoid patching up dead PHI nodes.
 
-; RUN: as < %s | opt -adce
+; RUN: llvm-as < %s | opt -adce
 
 target endian = little
 target pointersize = 32
diff --git a/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll b/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
index 036b114..9f28fc1 100644
--- a/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
+++ b/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -disable-output
+; RUN: llvm-as < %s | opt -adce -disable-output
 %G = external global int*
 
 implementation   ; Functions:
diff --git a/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll b/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
index fb851e6..567aca7 100644
--- a/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
+++ b/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -disable-output
+; RUN: llvm-as < %s | opt -adce -disable-output
 
 target endian = little
 target pointersize = 32
diff --git a/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll b/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
index 7e4bf08..4591261 100644
--- a/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
+++ b/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -simplifycfg | dis | not grep then:
+; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | not grep then:
 
 void %dead_test8(int* %data.1, int %idx.1) {
 entry:		; No predecessors!
diff --git a/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll b/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
index 750e0b8..72b87bb 100644
--- a/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
+++ b/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -disable-output
+; RUN: llvm-as < %s | opt -adce -disable-output
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/ADCE/adcetest.ll b/test/Transforms/ADCE/adcetest.ll
index 2e9cd6c..28b5852 100644
--- a/test/Transforms/ADCE/adcetest.ll
+++ b/test/Transforms/ADCE/adcetest.ll
@@ -1,7 +1,7 @@
 ; This is the test case taken from Appel's book that illustrates a hard case
 ; that SCCP gets right, and when followed by ADCE, is completely eliminated
 ;
-; RUN: as < %s | opt -sccp -adce -simplifycfg | dis | not grep br
+; RUN: llvm-as < %s | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
 
 int "test function"(int %i0, int %j0) {
 BB1:
diff --git a/test/Transforms/ADCE/basictest.ll b/test/Transforms/ADCE/basictest.ll
index d58150d..737f775 100644
--- a/test/Transforms/ADCE/basictest.ll
+++ b/test/Transforms/ADCE/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -simplifycfg | dis
+; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis
 
 int "Test"(int %A, int %B) {
 BB1:
diff --git a/test/Transforms/ADCE/basictest1.ll b/test/Transforms/ADCE/basictest1.ll
index baacca5..f2db309 100644
--- a/test/Transforms/ADCE/basictest1.ll
+++ b/test/Transforms/ADCE/basictest1.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -simplifycfg | dis
+; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis
 	
 %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
 	%spec_fd_t = type { int, int, int, ubyte* }
diff --git a/test/Transforms/ADCE/basictest2.ll b/test/Transforms/ADCE/basictest2.ll
index 52693c4..6df243d 100644
--- a/test/Transforms/ADCE/basictest2.ll
+++ b/test/Transforms/ADCE/basictest2.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -adce -simplifycfg | dis	
+; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis	
 
 %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
 	%spec_fd_t = type { int, int, int, ubyte* }
diff --git a/test/Transforms/BasicAA/2003-02-26-AccessSizeTest.ll b/test/Transforms/BasicAA/2003-02-26-AccessSizeTest.ll
index f1458ce..fb44d94 100644
--- a/test/Transforms/BasicAA/2003-02-26-AccessSizeTest.ll
+++ b/test/Transforms/BasicAA/2003-02-26-AccessSizeTest.ll
@@ -2,7 +2,7 @@
 ; is performed.  It is not legal to delete the second load instruction because
 ; the value computed by the first load instruction is changed by the store.
 
-; RUN: as < %s | opt -load-vn -gcse -instcombine | dis | grep DONOTREMOVE
+; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE
 
 int %test() {
 	%A = alloca int
diff --git a/test/Transforms/BasicAA/2003-03-04-GEPCrash.ll b/test/Transforms/BasicAA/2003-03-04-GEPCrash.ll
index 0dd936a..1f48327 100644
--- a/test/Transforms/BasicAA/2003-03-04-GEPCrash.ll
+++ b/test/Transforms/BasicAA/2003-03-04-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2
 void %test({[2 x int],[2 x int]}* %A, long %X, long %Y) {
 	%P1 = getelementptr {[2 x int],[2 x int]}* %A, long 0, ubyte 0, long %X
diff --git a/test/Transforms/BasicAA/2003-04-22-GEPProblem.ll b/test/Transforms/BasicAA/2003-04-22-GEPProblem.ll
index 27ec9ea..70f71c2 100644
--- a/test/Transforms/BasicAA/2003-04-22-GEPProblem.ll
+++ b/test/Transforms/BasicAA/2003-04-22-GEPProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -load-vn -gcse -instcombine | dis | grep sub
+; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 ; BasicAA was incorrectly concluding that P1 and P2 didn't conflict!
 
diff --git a/test/Transforms/BasicAA/2003-04-25-GEPCrash.ll b/test/Transforms/BasicAA/2003-04-25-GEPCrash.ll
index 036e9d9..1401382 100644
--- a/test/Transforms/BasicAA/2003-04-25-GEPCrash.ll
+++ b/test/Transforms/BasicAA/2003-04-25-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2
 void %test([17 x ushort]* %mask_bits) {
 	%P1 = getelementptr [17 x ushort]* %mask_bits, long 0, long 0
diff --git a/test/Transforms/BasicAA/2003-05-21-GEP-Problem.ll b/test/Transforms/BasicAA/2003-05-21-GEP-Problem.ll
index fdb8c73..7322e63 100644
--- a/test/Transforms/BasicAA/2003-05-21-GEP-Problem.ll
+++ b/test/Transforms/BasicAA/2003-05-21-GEP-Problem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -licm -disable-output
+; RUN: llvm-as < %s | opt -licm -disable-output
 	%struct..apr_array_header_t = type { int*, int, int, int, sbyte* }
 	%struct..apr_table_t = type { %struct..apr_array_header_t, uint, [32 x int], [32 x int] }
 
diff --git a/test/Transforms/BasicAA/2003-06-01-AliasCrash.ll b/test/Transforms/BasicAA/2003-06-01-AliasCrash.ll
index 92cf5a9..2c2fbca 100644
--- a/test/Transforms/BasicAA/2003-06-01-AliasCrash.ll
+++ b/test/Transforms/BasicAA/2003-06-01-AliasCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 
 int %MTConcat([3 x int]* %a.1) {
 	%tmp.961 = getelementptr [3 x int]* %a.1, long 0, long 4
diff --git a/test/Transforms/BasicAA/2003-07-03-BasicAACrash.ll b/test/Transforms/BasicAA/2003-07-03-BasicAACrash.ll
index 785759d..916b523 100644
--- a/test/Transforms/BasicAA/2003-07-03-BasicAACrash.ll
+++ b/test/Transforms/BasicAA/2003-07-03-BasicAACrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
 
 	%struct..RefPoint = type { int, { uint, ushort, ushort } }
 	%struct..RefRect = type { %struct..RefPoint, %struct..RefPoint }
diff --git a/test/Transforms/BasicAA/featuretest.ll b/test/Transforms/BasicAA/featuretest.ll
index 0b798e2..7fc129d 100644
--- a/test/Transforms/BasicAA/featuretest.ll
+++ b/test/Transforms/BasicAA/featuretest.ll
@@ -1,7 +1,7 @@
 ; This testcase tests for various features the basicaa test should be able to 
 ; determine, as noted in the comments.
 
-; RUN: as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | dis | not grep REMOVE
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE
 
 %Global = external global { int }
 
diff --git a/test/Transforms/BasicAA/gcsetest.ll b/test/Transforms/BasicAA/gcsetest.ll
index 4287e7d..0cc0af2 100644
--- a/test/Transforms/BasicAA/gcsetest.ll
+++ b/test/Transforms/BasicAA/gcsetest.ll
@@ -2,7 +2,7 @@
 ; disambiguating some obvious cases.  All loads should be removable in 
 ; this testcase.
 
-; RUN: as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | dis | not grep load
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load
 
 %A = global int 7
 %B = global int 8
diff --git a/test/Transforms/BasicAA/licmtest.ll b/test/Transforms/BasicAA/licmtest.ll
index 414a538..56682c7 100644
--- a/test/Transforms/BasicAA/licmtest.ll
+++ b/test/Transforms/BasicAA/licmtest.ll
@@ -3,7 +3,7 @@
 ; two pointers, then the load should be hoisted, and the store sunk.  Thus
 ; the loop becomes empty and can be deleted by ADCE. 
 
-; RUN: as < %s | opt -basicaa -licm --adce | dis | not grep Loop
+; RUN: llvm-as < %s | opt -basicaa -licm --adce | llvm-dis | not grep Loop
 
 %A = global int 7
 %B = global int 8
diff --git a/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
index ddfd7d1..85bac18 100644
--- a/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
+++ b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
@@ -1,6 +1,6 @@
 ; Make sure that the constant propogator doesn't divide by zero!
 ;
-; RUN: as < %s | opt -constprop
+; RUN: llvm-as < %s | opt -constprop
 ;
 
 int "test"() {
diff --git a/test/Transforms/ConstProp/2002-05-03-NotOperator.ll b/test/Transforms/ConstProp/2002-05-03-NotOperator.ll
index d184c08..91e495d 100644
--- a/test/Transforms/ConstProp/2002-05-03-NotOperator.ll
+++ b/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: as < %s | opt -constprop | dis | not grep 'int 0'
+; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep 'int 0'
 
 int "test1"() {
 	%R = xor int 123, -1
diff --git a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
index ec73c05..1d08e6f 100644
--- a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
+++ b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
@@ -1,6 +1,6 @@
 ; SetCC on boolean values was not implemented!
 
-; RUN: as < %s | opt -constprop -die | dis | not grep 'set'
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep 'set'
 
 bool "test1"() {
 	%A = setle bool true, false
diff --git a/test/Transforms/ConstProp/2003-05-12-DivideError.ll b/test/Transforms/ConstProp/2003-05-12-DivideError.ll
index b634812..d926a43 100644
--- a/test/Transforms/ConstProp/2003-05-12-DivideError.ll
+++ b/test/Transforms/ConstProp/2003-05-12-DivideError.ll
@@ -1,6 +1,6 @@
 ; Make sure that the constant propagator doesn't cause a sigfpe
 ;
-; RUN: as < %s | opt -constprop
+; RUN: llvm-as < %s | opt -constprop
 ;
 
 int "test"() {
diff --git a/test/Transforms/ConstProp/basictest.ll b/test/Transforms/ConstProp/basictest.ll
index 8fe5ebb..c75cc51 100644
--- a/test/Transforms/ConstProp/basictest.ll
+++ b/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: as < %s | opt -constprop -die | dis | not grep add
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep add
 
 int %test(bool %B) {
 	br bool %B, label %BB1, label %BB2
diff --git a/test/Transforms/ConstProp/logicaltest.ll b/test/Transforms/ConstProp/logicaltest.ll
index 8e9d416..9af9142 100644
--- a/test/Transforms/ConstProp/logicaltest.ll
+++ b/test/Transforms/ConstProp/logicaltest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of logical instructions is working correctly.
 
-; RUN: as < %s | opt -constprop -die | dis | not ggrep -E 'and|or|xor'
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not ggrep -E 'and|or|xor'
 
 
 int  "test1"() { %R = and int 4,1234          ret int  %R }
diff --git a/test/Transforms/ConstProp/nottest.ll b/test/Transforms/ConstProp/nottest.ll
index 11dc63e..fe9b094 100644
--- a/test/Transforms/ConstProp/nottest.ll
+++ b/test/Transforms/ConstProp/nottest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of 'not' instructions is working correctly.
 
-; RUN: as < %s | opt -constprop -die | dis | not grep xor
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep xor
 
 int "test1"() {
 	%R = xor int 4, -1
diff --git a/test/Transforms/ConstProp/phi.ll b/test/Transforms/ConstProp/phi.ll
index c80c5e4..e2c7d5b 100644
--- a/test/Transforms/ConstProp/phi.ll
+++ b/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: as < %s | opt -constprop -die | dis | not grep phi
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep phi
 
 int %test(bool %B) {
 BB0:
diff --git a/test/Transforms/ConstProp/remtest.ll b/test/Transforms/ConstProp/remtest.ll
index 7ff3108..e278386 100644
--- a/test/Transforms/ConstProp/remtest.ll
+++ b/test/Transforms/ConstProp/remtest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propagation of remainder instructions is working correctly.
 
-; RUN: as < %s | opt -constprop -die | dis | not grep rem
+; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep rem
 
 int %test1() {
 	%R = rem int 4, 3
diff --git a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
index aa497c6..85d0436 100644
--- a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
+++ b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -constmerge > /dev/null
+; RUN: llvm-as < %s | opt -constmerge > /dev/null
 
 %foo = internal constant {int} {int 7} 
 %bar = internal constant {int} {int 7} 
diff --git a/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll b/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
index 0bc98ca..93cdecc 100644
--- a/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
+++ b/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 
 implementation
 
diff --git a/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll b/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
index d1bb430..2496805 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
@@ -12,7 +12,7 @@
 ;   }
 ; }
 ;
-; RUN: as < %s | opt -cee -simplifycfg | dis | not grep bb3
+; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep bb3
 
 implementation
 declare void %bar()
diff --git a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
index c76c8fd..c36e869 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
@@ -1,6 +1,6 @@
 ; Testcase distilled from bisort where we tried to perform branch target 
 ; forwarding where it was not safe.
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 ;
 	%HANDLE = type { int, %HANDLE*, %HANDLE* }
 	%struct.node = type { int, %HANDLE*, %HANDLE* }
diff --git a/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll b/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
index 70f879b..0267f2b 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 ;
 ; The 'cee' pass is breaking SSA form when it blindly forwards the branch from 
 ; Eq to branch to "Forwarded" instead.
diff --git a/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll b/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
index ebf094e..9d40953 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 ;
 ; This testcase causes an assertion error.
 ;
diff --git a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
index 8ae3454..ee8a619 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
@@ -1,5 +1,5 @@
 ; Test to make sure that SSA is correctly updated
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 ;
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
index 732eb56..de37831 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
@@ -1,5 +1,5 @@
 ; Simple test to make sure dominators are updated properly
-; RUN: as < %s | opt -cee
+; RUN: llvm-as < %s | opt -cee
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/basictest.ll b/test/Transforms/CorrelatedExprs/basictest.ll
index d5b2609..2f57c6e 100644
--- a/test/Transforms/CorrelatedExprs/basictest.ll
+++ b/test/Transforms/CorrelatedExprs/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -cee -constprop -instcombine -dce | dis | not grep 'REMOVE'
+; RUN: llvm-as < %s | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
 
 int %test1(int %A) {
 	%cond = seteq int %A, 40
diff --git a/test/Transforms/CorrelatedExprs/branchtest.ll b/test/Transforms/CorrelatedExprs/branchtest.ll
index c431cb4..cfc4517 100644
--- a/test/Transforms/CorrelatedExprs/branchtest.ll
+++ b/test/Transforms/CorrelatedExprs/branchtest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -cee -simplifycfg | dis | not grep 'REMOVE'
+; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep 'REMOVE'
 
 implementation
 
diff --git a/test/Transforms/CorrelatedExprs/looptest.ll b/test/Transforms/CorrelatedExprs/looptest.ll
index 6763443..62a983a 100644
--- a/test/Transforms/CorrelatedExprs/looptest.ll
+++ b/test/Transforms/CorrelatedExprs/looptest.ll
@@ -11,7 +11,7 @@
 ;
 ; Note that this is a "feature" test, not a correctness test.
 ;
-; RUN: as < %s | opt -cee -simplifycfg | dis | not grep cond213
+; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep cond213
 ;
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/nullpointer.ll b/test/Transforms/CorrelatedExprs/nullpointer.ll
index ff4a3bd..8f3402b 100644
--- a/test/Transforms/CorrelatedExprs/nullpointer.ll
+++ b/test/Transforms/CorrelatedExprs/nullpointer.ll
@@ -1,7 +1,7 @@
 ; a load or store of a pointer indicates that the pointer is not null.
 ; Any succeeding uses of the pointer should get this info
 
-; RUN: as < %s | opt -cee -instcombine -simplifycfg | dis | not grep br
+; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/whet.ll b/test/Transforms/CorrelatedExprs/whet.ll
index b2ce091..8a5339b 100644
--- a/test/Transforms/CorrelatedExprs/whet.ll
+++ b/test/Transforms/CorrelatedExprs/whet.ll
@@ -11,7 +11,7 @@
 ;
 ; This should eliminate all BB's except BB0, BB9, BB10
 ;
-; RUN: as < %s | opt -cee -instcombine -simplifycfg | dis | not grep 'bb[2-8]'
+; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]'
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/DeadArgElim/basictest.ll b/test/Transforms/DeadArgElim/basictest.ll
index d43d577..424f8e5 100644
--- a/test/Transforms/DeadArgElim/basictest.ll
+++ b/test/Transforms/DeadArgElim/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -deadargelim | dis | not grep DEADARG
+; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep DEADARG
 
 implementation
 
diff --git a/test/Transforms/DecomposeMultiDimRefs/multidim.ll b/test/Transforms/DecomposeMultiDimRefs/multidim.ll
index 2419871..63bf316 100644
--- a/test/Transforms/DecomposeMultiDimRefs/multidim.ll
+++ b/test/Transforms/DecomposeMultiDimRefs/multidim.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -f -lowerrefs -o Output/%s.bc
+; RUN: llvm-as < %s | opt -f -lowerrefs -o Output/%s.bc
 ; 
 	%Flat_struct = type { sbyte, float }
 	%Flat_t = type { sbyte, float }
diff --git a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
index 54bc688..129138a 100644
--- a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
+++ b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
@@ -1,7 +1,7 @@
 ; Test that: extern int X[]  and int X[] = { 1, 2, 3, 4 } are resolved 
 ; correctly.
 ;
-; RUN: as < %s | opt -funcresolve | dis | not grep external
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
 
 %X = external global [0 x int]
 %X = global [4 x int] [ int 1, int 2, int 3, int 4 ]
diff --git a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
index 993fd88..cdd6349 100644
--- a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
+++ b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
@@ -1,7 +1,7 @@
 ; Test that: extern int X[]  and int X[] = { 1, 2, 3, 4 } are resolved 
 ; correctly.  This doesn't have constantexprs
 ;
-; RUN: as < %s | opt -funcresolve | dis | not grep external
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
 ;
 
 %X = external global [0 x int]
diff --git a/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll b/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
index 15a09ab..8be0681 100644
--- a/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
+++ b/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve -funcresolve | dis | not grep declare
+; RUN: llvm-as < %s | opt -funcresolve -funcresolve | llvm-dis | not grep declare
 
 declare void %qsortg(sbyte*, int, int)
 
diff --git a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
index 6909219..be7fd30 100644
--- a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
+++ b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
@@ -1,5 +1,5 @@
 ;
-; RUN: as < %s | opt -funcresolve -instcombine | dis | not grep '\.\.\.'
+; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | not grep '\.\.\.'
 
 declare int %foo(...)
 declare int %foo(int)
diff --git a/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll b/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
index a9c4117..1434bb9 100644
--- a/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
+++ b/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
+; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
 
 %__popcount_tab = external constant [0 x ubyte]
 %__popcount_tab = constant [4 x ubyte] c"\00\01\01\02"
diff --git a/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll b/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
index cfbc76c..48b5d46 100644
--- a/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
+++ b/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve -disable-output
+; RUN: llvm-as < %s | opt -funcresolve -disable-output
 
 void %foo(int, int) {
   ret void
diff --git a/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll b/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
index 01da6dc..d65e89f 100644
--- a/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
+++ b/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve | dis | not grep declare
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep declare
 
 %Table = constant int(...)* %foo
 
diff --git a/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll b/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
index 41cad05..a45a3e5 100644
--- a/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
+++ b/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve | dis | not grep declare
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep declare
 
 declare void %test(...)
 
diff --git a/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll b/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
index b9d561a..353b74f 100644
--- a/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
+++ b/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve | dis | not grep foo
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep foo
 
 ; The funcresolve pass was resolving the two foo's together in this test,
 ; adding a ConstantPointerRef to one of them.  Then because of this
diff --git a/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll b/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
index 9f6bc2c..8d89c7d 100644
--- a/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
+++ b/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
+; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
 
 declare int %foo(int *%X)
 declare int %foo(float *%X)
diff --git a/test/Transforms/FunctionResolve/basictest.ll b/test/Transforms/FunctionResolve/basictest.ll
index fa53724..7e94687 100644
--- a/test/Transforms/FunctionResolve/basictest.ll
+++ b/test/Transforms/FunctionResolve/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | not grep call
+; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare int %foo(...)
 
diff --git a/test/Transforms/FunctionResolve/retmismatch1.ll b/test/Transforms/FunctionResolve/retmismatch1.ll
index adbce73..6895fb5 100644
--- a/test/Transforms/FunctionResolve/retmismatch1.ll
+++ b/test/Transforms/FunctionResolve/retmismatch1.ll
@@ -1,6 +1,6 @@
 ; This shows where the function is called with the prototype indicating a
 ; return type exists, but it really doesn't.
-; RUN: as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | not grep call
+; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare int %foo(...)
 
diff --git a/test/Transforms/FunctionResolve/retmismatch2.ll b/test/Transforms/FunctionResolve/retmismatch2.ll
index 36a062e..433f5bb 100644
--- a/test/Transforms/FunctionResolve/retmismatch2.ll
+++ b/test/Transforms/FunctionResolve/retmismatch2.ll
@@ -1,7 +1,7 @@
 ; This shows where the function is called with the prototype indicating a
 ; return type doesn't exists, but it really does.
 ;
-; RUN: as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | not grep call
+; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare void %foo(...)
 
diff --git a/test/Transforms/FunctionResolve/retmismatch3.ll b/test/Transforms/FunctionResolve/retmismatch3.ll
index 2f4afab..d85da64 100644
--- a/test/Transforms/FunctionResolve/retmismatch3.ll
+++ b/test/Transforms/FunctionResolve/retmismatch3.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -funcresolve
+; RUN: llvm-as < %s | opt -funcresolve
 
 declare int %read(...)
 
diff --git a/test/Transforms/GCSE/2002-05-14-OperandSwap.ll b/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
index 57ac538..5e893bf 100644
--- a/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
+++ b/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
@@ -1,7 +1,7 @@
 ; This entire chain of computation should be optimized away, but
 ; wasn't because the two multiplies were not detected as being identical.
 ;
-; RUN: as < %s  | opt -gcse -instcombine -dce | dis | not grep sub
+; RUN: llvm-as < %s  | opt -gcse -instcombine -dce | llvm-dis | not grep sub
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll b/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll
index 1f4ec5b..9d09911 100644
--- a/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll
+++ b/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll
@@ -1,7 +1,7 @@
 ; This testcase shows a bug where an common subexpression exists, but there
 ; is no shared dominator block that the expression can be hoisted out to.
 ;
-; RUN: as < %s | opt -gcse | dis
+; RUN: llvm-as < %s | opt -gcse | llvm-dis
 
 int "test"(int %X, int %Y) {
 	%Z = add int %X, %Y
diff --git a/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll b/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll
index fa83e2d..3c3b17d 100644
--- a/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll
+++ b/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll
@@ -1,7 +1,7 @@
 ; This testcase shows a bug where an common subexpression exists, but there
 ; is no shared dominator block that the expression can be hoisted out to.
 ;
-; RUN: as < %s | opt -load-vn -gcse | dis | not grep load
+; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep load
 
 int %test(int* %P) {
 	store int 5, int* %P
diff --git a/test/Transforms/GCSE/gcsetests.ll b/test/Transforms/GCSE/gcsetests.ll
index 26a5382..8ae62d6 100644
--- a/test/Transforms/GCSE/gcsetests.ll
+++ b/test/Transforms/GCSE/gcsetests.ll
@@ -1,6 +1,6 @@
 ; Various test cases to ensure basic functionality is working for GCSE
 
-; RUN: as < %s | opt -gcse
+; RUN: llvm-as < %s | opt -gcse
 
 implementation
 
diff --git a/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll b/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
index d68d393..56d9494 100644
--- a/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
+++ b/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -globaldce
+; RUN: llvm-as < %s | opt -globaldce
 ;
 implementation
 
diff --git a/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll b/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
index e7830f5..47a8a54 100644
--- a/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
+++ b/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -globaldce
+; RUN: llvm-as < %s | opt -globaldce
 ;
 %X = global void() * %func
 implementation
diff --git a/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll b/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
index a923eb3..cf22be0 100644
--- a/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
+++ b/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
@@ -1,7 +1,7 @@
 ; Make sure that functions are removed successfully if they are referred to by
 ; a global that is dead.  Make sure any globals they refer to die as well.
 
-; RUN: as < %s | opt -globaldce | dis | not grep foo
+; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep foo
 
 %b = internal global int ()* %foo   ;; Unused, kills %foo
 
diff --git a/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll b/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
index 039d597..cbc783e 100644
--- a/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
+++ b/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
@@ -1,7 +1,7 @@
 ; This testcase tests that a worklist is being used, and that globals can be 
 ; removed if they are the subject of a constexpr and ConstantPointerRef
 
-; RUN: as < %s | opt -globaldce | dis | not grep global
+; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep global
 
 %t0 = internal global [4 x sbyte] c"foo\00"
 %t1 = internal global [4 x sbyte] c"bar\00"
diff --git a/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll b/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
index b6e9b69..0f7f075 100644
--- a/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
+++ b/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -globaldce
+; RUN: llvm-as < %s | opt -globaldce
 
 %foo = internal global int 7         ;; Should die when function %foo is killed
 
diff --git a/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll b/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
index d9f6db2..e306d9a 100644
--- a/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
+++ b/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
@@ -1,5 +1,5 @@
 ; distilled from 255.vortex
-; RUN: as < %s | opt -globaldce | dis | not grep testfunc
+; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep testfunc
 
 implementation
 
diff --git a/test/Transforms/GlobalDCE/basicvariabletest.ll b/test/Transforms/GlobalDCE/basicvariabletest.ll
index 1f5c61b..8990ba3 100644
--- a/test/Transforms/GlobalDCE/basicvariabletest.ll
+++ b/test/Transforms/GlobalDCE/basicvariabletest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -globaldce | dis | not grep global
+; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep global
 
 %X = uninitialized global int
 %Y = internal global int 7
diff --git a/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll b/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll
index 678b062..81a0277 100644
--- a/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll
+++ b/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll
@@ -1,7 +1,7 @@
 ; Induction variable pass is doing bad things with pointer induction vars, 
 ; trying to do arithmetic on them directly.
 ;
-; RUN: as < %s | opt -indvars
+; RUN: llvm-as < %s | opt -indvars
 ;
 void %test(int %A, uint %S, sbyte* %S) {
 
diff --git a/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll b/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll
index 450c6c2..b21e3bb 100644
--- a/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll
+++ b/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll
@@ -1,7 +1,7 @@
 ; This is a test case for the expression analysis code, not really indvars.
 ; It was assuming any constant of int type was a ConstantInteger.
 ;
-; RUN: as < %s | opt -indvars
+; RUN: llvm-as < %s | opt -indvars
 
 %X = global int 7
 
diff --git a/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll b/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
index fc807ef..71f02ae 100644
--- a/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
+++ b/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | dis | grep indvar
+; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar
 
 int %test() {
 	br bool true, label %LoopHead, label %LoopHead
diff --git a/test/Transforms/Inline/alloca_test.ll b/test/Transforms/Inline/alloca_test.ll
index 8bd9575..418dc3e 100644
--- a/test/Transforms/Inline/alloca_test.ll
+++ b/test/Transforms/Inline/alloca_test.ll
@@ -1,7 +1,7 @@
 ; This test ensures that alloca instructions in the entry block for an inlined
 ; function are moved to the top of the function they are inlined into.
 ;
-; RUN: as < %s | opt -inline | dis | grep -C 1 alloca | grep Entry:
+; RUN: llvm-as < %s | opt -inline | llvm-dis | grep -C 1 alloca | grep Entry:
 
 int %func(int %i) {
 	%X = alloca int 
diff --git a/test/Transforms/Inline/basictest.ll b/test/Transforms/Inline/basictest.ll
index f12d00c..e320078 100644
--- a/test/Transforms/Inline/basictest.ll
+++ b/test/Transforms/Inline/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -inline -disable-output -print
+; RUN: llvm-as < %s | opt -inline -disable-output -print
 
 int %func(int %i) {
 	ret int %i
diff --git a/test/Transforms/Inline/cfg_preserve_test.ll b/test/Transforms/Inline/cfg_preserve_test.ll
index 83179a0..7548b52 100644
--- a/test/Transforms/Inline/cfg_preserve_test.ll
+++ b/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: as < %s | opt -inline | dis | not grep br
+; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep br
 
 int %func(int %i) {
 	ret int %i
diff --git a/test/Transforms/Inline/inline_dce.ll b/test/Transforms/Inline/inline_dce.ll
index 7299d36..bcad01c 100644
--- a/test/Transforms/Inline/inline_dce.ll
+++ b/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: as < %s | opt -inline | dis | not grep %reallysmall
+; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep %reallysmall
 
 implementation
 
diff --git a/test/Transforms/Inline/invoke_test-1.ll b/test/Transforms/Inline/invoke_test-1.ll
index 2aa47f7..023563a 100644
--- a/test/Transforms/Inline/invoke_test-1.ll
+++ b/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: as < %s | opt -inline | dis | not grep 'call[^e]'
+; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'call[^e]'
 
 declare void %might_throw()
 
diff --git a/test/Transforms/Inline/invoke_test-2.ll b/test/Transforms/Inline/invoke_test-2.ll
index 95c8e66..9c2a854 100644
--- a/test/Transforms/Inline/invoke_test-2.ll
+++ b/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: as < %s | opt -inline -simplifycfg | dis | not grep UnreachableExceptionHandler
+; RUN: llvm-as < %s | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler
 
 declare void %might_throw()
 
diff --git a/test/Transforms/Inline/invoke_test-3.ll b/test/Transforms/Inline/invoke_test-3.ll
index 414d058..7ca3f6a 100644
--- a/test/Transforms/Inline/invoke_test-3.ll
+++ b/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: as < %s | opt -inline | dis | not grep 'call void %llvm.unwind'
+; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'call void %llvm.unwind'
 
 declare void %might_throw()
 declare void %llvm.unwind()
diff --git a/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll b/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
index 86dacf7..3bf8648 100644
--- a/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
+++ b/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
@@ -1,6 +1,6 @@
 ; This testcase causes instcombine to hang.
 ;
-; RUN: as < %s | opt -instcombine
+; RUN: llvm-as < %s | opt -instcombine
 
 implementation
 
diff --git a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
index 101351e..6f832f2 100644
--- a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
+++ b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
@@ -1,7 +1,7 @@
 ; Instcombine was missing a test that caused it to make illegal transformations
 ; sometimes.  In this case, it transforms the sub into an add:
 ; RUN: echo foo
-; RUN: as < %s | opt -instcombine | dis | not grep add
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep add
 ;
 
 
diff --git a/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll b/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll
index 62b1229..1ebe6c8 100644
--- a/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll
+++ b/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll
@@ -4,7 +4,7 @@
 ; stayed on the worklist, as soon as it came back up to be processed, bad things
 ; happened, and opt asserted.
 ;
-; RUN: as < %s | opt -instcombine
+; RUN: llvm-as < %s | opt -instcombine
 ;
 
 %.LC0 = internal global [21 x sbyte] c"hbMakeCodeLengths(1)\00"		; <[21 x sbyte]*> [#uses=1]
diff --git a/test/Transforms/InstCombine/2002-08-02-CastTest.ll b/test/Transforms/InstCombine/2002-08-02-CastTest.ll
index 2e76283..4dce242 100644
--- a/test/Transforms/InstCombine/2002-08-02-CastTest.ll
+++ b/test/Transforms/InstCombine/2002-08-02-CastTest.ll
@@ -1,7 +1,7 @@
 ; This testcase is incorrectly getting completely eliminated.  There should be
 ; SOME instruction named %c here, even if it's a bitwise and.
 ;
-; RUN: as < %s | opt -instcombine -die | dis | grep '%c'
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep '%c'
 ;
 ulong %test3(ulong %A) {
         %c1 = cast ulong %A to ubyte
diff --git a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
index 18496f2..c632ac1 100644
--- a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
+++ b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine
+; RUN: llvm-as < %s | opt -instcombine
 
 %bob = type { int }
 
diff --git a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
index 6fa77b6..ec29e6b 100644
--- a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
+++ b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine | dis | not grep add
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep add
 
 int %test(int %A) {
   %A.neg = sub int 0, %A
diff --git a/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll b/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
index e285120..218a536 100644
--- a/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
+++ b/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine | dis | grep 4294967295
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 4294967295
 
 ulong %test(ulong %Val) {
         %tmp.3 = cast ulong %Val to uint              ; <uint> [#uses=1]
diff --git a/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll b/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
index 353a036..309191c 100644
--- a/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
+++ b/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine -disable-output
+; RUN: llvm-as < %s | opt -instcombine -disable-output
 
 %X = global int 5
 long %test() {
diff --git a/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll b/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll
index a297230..3d26024 100644
--- a/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll
+++ b/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll
@@ -2,7 +2,7 @@
 ; because it things that the constant value is a not expression... and 
 ; constantly inverts the branch back and forth.
 ;
-; RUN: as < %s | opt -instcombine -disable-output
+; RUN: llvm-as < %s | opt -instcombine -disable-output
 
 ubyte %test19(bool %c) {
         br bool true, label %True, label %False
diff --git a/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll b/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll
index 9539fa8..917c86c 100644
--- a/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll
+++ b/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll
@@ -1,7 +1,7 @@
 ; This is a bug in the VMcode library, not instcombine, it's just convenient 
 ; to expose it here.
 
-; RUN: as < %s | opt -instcombine -disable-output
+; RUN: llvm-as < %s | opt -instcombine -disable-output
 
 %A = global int 1
 %B = global int 2
diff --git a/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll b/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
index a98a68e..2fc1b20 100644
--- a/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
+++ b/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
@@ -10,7 +10,7 @@
 ;	should pass through the optimizer without failure.
 ;
 ; Extra code:
-; RUN: as < %s | opt -instcombine
+; RUN: llvm-as < %s | opt -instcombine
 ;
 
 target endian = little
diff --git a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
index 335b884..e2b2afd 100644
--- a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
+++ b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
@@ -1,6 +1,6 @@
 ; This testcase can be simplified by "realizing" that alloca can never return 
 ; null.
-; RUN: as < %s | opt -instcombine -simplifycfg | dis | not grep 'br '
+; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep 'br '
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll b/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
index 890d61e..355087a 100644
--- a/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
+++ b/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine | dis | grep load
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep load
 void %test(int* %P) {
 	%X = volatile load int* %P  ; Dead but not deletable!
 	ret void
diff --git a/test/Transforms/InstCombine/add.ll b/test/Transforms/InstCombine/add.ll
index a70d490..afcef78 100644
--- a/test/Transforms/InstCombine/add.ll
+++ b/test/Transforms/InstCombine/add.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 
-; RUN: as < %s | opt -instcombine -die | dis | grep -v OK | not grep add
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep -v OK | not grep add
 
 implementation
 
diff --git a/test/Transforms/InstCombine/and.ll b/test/Transforms/InstCombine/and.ll
index 59fb823..5030a66 100644
--- a/test/Transforms/InstCombine/and.ll
+++ b/test/Transforms/InstCombine/and.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep and
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and
 
 implementation
 
diff --git a/test/Transforms/InstCombine/call.ll b/test/Transforms/InstCombine/call.ll
index cf06244..a1da2c6 100644
--- a/test/Transforms/InstCombine/call.ll
+++ b/test/Transforms/InstCombine/call.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine -die | dis | grep call | not grep cast
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep call | not grep cast
 
 implementation
 
diff --git a/test/Transforms/InstCombine/cast-set.ll b/test/Transforms/InstCombine/cast-set.ll
index 9cc3225..721faef 100644
--- a/test/Transforms/InstCombine/cast-set.ll
+++ b/test/Transforms/InstCombine/cast-set.ll
@@ -3,7 +3,7 @@
 ; slow.  Might it be better to make there be an instcombine prepass before
 ; level raise that takes care of the obvious stuff?
 
-; RUN: as < %s | opt -instcombine | dis | not grep cast
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep cast
 
 bool %test1(int %X) {
 	%A = cast int %X to uint
diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll
index d16ed4f..b6a47b8 100644
--- a/test/Transforms/InstCombine/cast.ll
+++ b/test/Transforms/InstCombine/cast.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 
-; RUN: as < %s | opt -instcombine -die | dis | grep '%c' | not grep cast
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep '%c' | not grep cast
 
 implementation
 
diff --git a/test/Transforms/InstCombine/div.ll b/test/Transforms/InstCombine/div.ll
index 543bd21..01fcf7f 100644
--- a/test/Transforms/InstCombine/div.ll
+++ b/test/Transforms/InstCombine/div.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep div
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep div
 
 implementation
 
diff --git a/test/Transforms/InstCombine/getelementptr.ll b/test/Transforms/InstCombine/getelementptr.ll
index 09642cd..4c8bbd2 100644
--- a/test/Transforms/InstCombine/getelementptr.ll
+++ b/test/Transforms/InstCombine/getelementptr.ll
@@ -1,6 +1,6 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: as < %s | opt -instcombine -die | dis | grep getelementptr | not grep '%A '
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep getelementptr | not grep '%A '
 
 %Global = constant [10 x sbyte] c"helloworld"
 
diff --git a/test/Transforms/InstCombine/load.ll b/test/Transforms/InstCombine/load.ll
index f085346..fa40284 100644
--- a/test/Transforms/InstCombine/load.ll
+++ b/test/Transforms/InstCombine/load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep load
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep load
 
 %X = constant int 42
 %Y = constant [2 x { int, float }] [ { int, float } { int 12, float 1.0 }, 
diff --git a/test/Transforms/InstCombine/malloc.ll b/test/Transforms/InstCombine/malloc.ll
index 3545f30..3231acf 100644
--- a/test/Transforms/InstCombine/malloc.ll
+++ b/test/Transforms/InstCombine/malloc.ll
@@ -1,5 +1,5 @@
 ; test that malloc's with a constant argument are promoted to array allocations
-; RUN: as < %s | opt -instcombine -die | dis | grep getelementptr
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep getelementptr
 
 int* %test() {
 	%X = malloc int, uint 4
diff --git a/test/Transforms/InstCombine/mul.ll b/test/Transforms/InstCombine/mul.ll
index d7ad546..2cafce0 100644
--- a/test/Transforms/InstCombine/mul.ll
+++ b/test/Transforms/InstCombine/mul.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that mul instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep mul
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep mul
 
 implementation
 
diff --git a/test/Transforms/InstCombine/not.ll b/test/Transforms/InstCombine/not.ll
index 92ddffd..f87e4be 100644
--- a/test/Transforms/InstCombine/not.ll
+++ b/test/Transforms/InstCombine/not.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | not grep xor
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | not grep xor
 
 implementation
 
diff --git a/test/Transforms/InstCombine/or.ll b/test/Transforms/InstCombine/or.ll
index 4165c52..e4d5bb7 100644
--- a/test/Transforms/InstCombine/or.ll
+++ b/test/Transforms/InstCombine/or.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep -v xor | not grep 'or '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v xor | not grep 'or '
 
 implementation
 
diff --git a/test/Transforms/InstCombine/phi.ll b/test/Transforms/InstCombine/phi.ll
index 2c16f72..e8eea8f 100644
--- a/test/Transforms/InstCombine/phi.ll
+++ b/test/Transforms/InstCombine/phi.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | not grep phi
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | not grep phi
 
 implementation
 
diff --git a/test/Transforms/InstCombine/pow.ll b/test/Transforms/InstCombine/pow.ll
index ee84ac6..308bf5a 100644
--- a/test/Transforms/InstCombine/pow.ll
+++ b/test/Transforms/InstCombine/pow.ll
@@ -2,7 +2,7 @@
 ;
 ; Equivalent to: http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01786.html
 
-; RUN: as < %s | opt -instcombine | dis | not grep 'call double %pow'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call double %pow'
 
 declare double %pow(double, double)
 
diff --git a/test/Transforms/InstCombine/rem.ll b/test/Transforms/InstCombine/rem.ll
index 3c94145..b7a9a0a 100644
--- a/test/Transforms/InstCombine/rem.ll
+++ b/test/Transforms/InstCombine/rem.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep rem
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
 implementation
 
diff --git a/test/Transforms/InstCombine/set.ll b/test/Transforms/InstCombine/set.ll
index 12e73e9..762ca6c 100644
--- a/test/Transforms/InstCombine/set.ll
+++ b/test/Transforms/InstCombine/set.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep set
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep set
 
 %X = uninitialized global int
 
diff --git a/test/Transforms/InstCombine/setcc-strength-reduce.ll b/test/Transforms/InstCombine/setcc-strength-reduce.ll
index 36114ca..0c6683c 100644
--- a/test/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/test/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -3,7 +3,7 @@
 ; into equivalent setne,eq instructions.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep -v seteq | grep -v setne | not grep set
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v seteq | grep -v setne | not grep set
 
 bool %test1(uint %A) {
 	%B = setge uint %A, 1   ; setne %A, 0
diff --git a/test/Transforms/InstCombine/shift.ll b/test/Transforms/InstCombine/shift.ll
index b11d6dc..016d00f 100644
--- a/test/Transforms/InstCombine/shift.ll
+++ b/test/Transforms/InstCombine/shift.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep sh
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep sh
 
 implementation
 
diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll
index b17e97d..4f2a1c9 100644
--- a/test/Transforms/InstCombine/sub.ll
+++ b/test/Transforms/InstCombine/sub.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | grep sub | not grep -v 'sub int %Cok, %Bok'
+; RUN: llvm-as < %s | opt -instcombine -die | llvm-dis | grep sub | not grep -v 'sub int %Cok, %Bok'
 
 implementation
 
diff --git a/test/Transforms/InstCombine/xor.ll b/test/Transforms/InstCombine/xor.ll
index 0a33a12..6082e0c 100644
--- a/test/Transforms/InstCombine/xor.ll
+++ b/test/Transforms/InstCombine/xor.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
 
 implementation
 
diff --git a/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll b/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
index 6bb8e00..43430d8 100644
--- a/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
+++ b/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -basicaa -licm -disable-output
+; RUN: llvm-as < %s | opt -basicaa -licm -disable-output
 
 ;%MoveArray = external global [64 x ulong]
 
diff --git a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
index 0eb922d..23c92b6 100644
--- a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
+++ b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
@@ -1,6 +1,6 @@
 ; Exit blocks need to be updated for all nested loops...
 
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll b/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
index 85ec34e..c082a59 100644
--- a/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
+++ b/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
@@ -1,7 +1,7 @@
 ; This testcase fails because preheader insertion is not updating exit node 
 ; information for loops.
 
-; RUN: as < %s | opt -licm
+; RUN: llvm-as < %s | opt -licm
 
 int %main(int %argc, sbyte** %argv) {
 bb0:            ; No predecessors!
diff --git a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
index d7290e6..d1a15c7 100644
--- a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
+++ b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
@@ -3,7 +3,7 @@
 ; happens because preheader insertion doesn't insert a preheader for this
 ; case... bad.
 
-; RUN: as < %s | opt -licm -adce -simplifycfg | dis | not grep 'br '
+; RUN: llvm-as < %s | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br '
 
 int %main(int %argc) {
         br label %bb5
diff --git a/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll b/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
index 18193e1..d0ec438 100644
--- a/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
+++ b/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
@@ -1,6 +1,6 @@
 ; LICM is adding stores before phi nodes.  bad.
 
-; RUN: as < %s | opt -licm
+; RUN: llvm-as < %s | opt -licm
 
 bool %test(bool %c) {
 	br bool %c, label %Loop, label %Out
diff --git a/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll b/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
index 9a133e4..4f7cbea 100644
--- a/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
+++ b/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
@@ -1,6 +1,6 @@
 ; Test that hoisting is disabled for pointers of different types...
 ;
-; RUN: as < %s | opt -licm
+; RUN: llvm-as < %s | opt -licm
 
 void %test(int* %P) {
 	br label %Loop
diff --git a/test/Transforms/LICM/2003-05-02-LoadHoist.ll b/test/Transforms/LICM/2003-05-02-LoadHoist.ll
index e6242f6..90a64e8 100644
--- a/test/Transforms/LICM/2003-05-02-LoadHoist.ll
+++ b/test/Transforms/LICM/2003-05-02-LoadHoist.ll
@@ -3,7 +3,7 @@
 ; loaded from.  Basically if the load gets hoisted, the subtract gets turned
 ; into a constant zero.
 ;
-; RUN: as < %s | opt -licm -load-vn -gcse -instcombine | dis | grep load
+; RUN: llvm-as < %s | opt -licm -load-vn -gcse -instcombine | llvm-dis | grep load
 
 %X = global int 7
 declare void %foo()
diff --git a/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll b/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll
index 67c7d82..952078c 100644
--- a/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll
+++ b/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll
@@ -1,7 +1,7 @@
 ; This testcase tests for a problem where LICM hoists 
 ; potentially trapping instructions when they are not guaranteed to execute.
 ;
-; RUN: as < %s | opt -licm | dis | grep -C 2 "IfUnEqual" | grep div 
+; RUN: llvm-as < %s | opt -licm | llvm-dis | grep -C 2 "IfUnEqual" | grep div 
 
 %X = global int 0
 declare void %foo()
diff --git a/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll b/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll
index 749024b..65d1808 100644
--- a/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll
+++ b/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll
@@ -1,7 +1,7 @@
 ; This testcase tests to make sure a trapping instruction is hoisted when
 ; it is guaranteed to execute.
 ;
-; RUN: as < %s | opt -licm | dis | grep -C 2 "test" | grep div
+; RUN: llvm-as < %s | opt -licm | llvm-dis | grep -C 2 "test" | grep div
 
 %X = global int 0
 declare void %foo()
diff --git a/test/Transforms/LICM/basictest.ll b/test/Transforms/LICM/basictest.ll
index f526987..328687d 100644
--- a/test/Transforms/LICM/basictest.ll
+++ b/test/Transforms/LICM/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -licm | dis
+; RUN: llvm-as < %s | opt -licm | llvm-dis
 
 void "testfunc"(int %i) {
 
diff --git a/test/Transforms/LICM/no-preheader-test.ll b/test/Transforms/LICM/no-preheader-test.ll
index eb0773f..8d2eef9 100644
--- a/test/Transforms/LICM/no-preheader-test.ll
+++ b/test/Transforms/LICM/no-preheader-test.ll
@@ -1,5 +1,5 @@
 ; Test that LICM works when there is not a loop-preheader
-; RUN: as < %s | opt -licm | dis
+; RUN: llvm-as < %s | opt -licm | llvm-dis
 
 void "testfunc"(int %i, bool %ifcond) {
 	br bool %ifcond, label %Then, label %Else
diff --git a/test/Transforms/LICM/scalar_promote.ll b/test/Transforms/LICM/scalar_promote.ll
index 01c25c8..02fa57d 100644
--- a/test/Transforms/LICM/scalar_promote.ll
+++ b/test/Transforms/LICM/scalar_promote.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt  -licm -stats 2>&1 | grep "memory locations promoted to register"
+; RUN: llvm-as < %s | opt  -licm -stats 2>&1 | grep "memory locations promoted to register"
 
 %X = global int 7
 
diff --git a/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll b/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
index ef9a7ae..a88c513 100644
--- a/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
+++ b/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
@@ -17,7 +17,7 @@
 ; The fix is to have the -raise pass correctly convert it to the second
 ; equivelent form.
 ;
-; RUN: as < %s | opt -q -raise > Output/%s.raised.bc
+; RUN: llvm-as < %s | opt -q -raise > Output/%s.raised.bc
 ; RUN: lli -force-interpreter -array-checks -abort-on-exception < Output/%s.raised.bc
 ;
 
diff --git a/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll b/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
index 7fcc83e..44ccfcc 100644
--- a/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
+++ b/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
@@ -1,6 +1,6 @@
 ; An invalid assertion killed the level raiser.  Fixed.
 ;
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-03-11-Calls.ll b/test/Transforms/LevelRaise/2002-03-11-Calls.ll
index 1232b1a..26fedff 100644
--- a/test/Transforms/LevelRaise/2002-03-11-Calls.ll
+++ b/test/Transforms/LevelRaise/2002-03-11-Calls.ll
@@ -2,7 +2,7 @@
 ; method pointer type into a call.  In doing so, it would have to change the
 ; types of the arguments to the call, but broke doing so.
 ;
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll b/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll
index 59c9122..c740f4b 100644
--- a/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll
+++ b/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll
@@ -2,7 +2,7 @@
 ; Note that this code is actually miscompiled from the input source, but despite 
 ; that, level raise should not hang!
 ;
-; RUN: as < %s | opt -raise	
+; RUN: llvm-as < %s | opt -raise	
 	
 	%Disjunct = type { \2 *, short, sbyte, sbyte *, { short, short, sbyte, sbyte, \2, sbyte * } *, { short, short, sbyte, sbyte, \2, sbyte * } * }
 %chosen_disjuncts = uninitialized global %Disjunct * *		; <%Disjunct * * *> [#uses=1]
diff --git a/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll b/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll
index b14bc2d..38ec993 100644
--- a/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll
+++ b/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll
@@ -2,7 +2,7 @@
 ; getelementptr instruction... with a bad level raise pass, this code
 ; will segfault on execution.
 ;
-; RUN: as < %s | opt -raise  |lli -abort-on-exception  
+; RUN: llvm-as < %s | opt -raise  |lli -abort-on-exception  
  
  %Village = type { [4 x \3 *], \2 *, { \2 *, { int, int, int, \5 * } *, \2 * }, { int, int, int, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int,
   int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * } }, int, int }
diff --git a/test/Transforms/LevelRaise/2002-03-20-Crash.ll b/test/Transforms/LevelRaise/2002-03-20-Crash.ll
index bd1ec5b..d23b22a 100644
--- a/test/Transforms/LevelRaise/2002-03-20-Crash.ll
+++ b/test/Transforms/LevelRaise/2002-03-20-Crash.ll
@@ -1,7 +1,7 @@
 ; Level raise is making an incorrect transformation, which causes incorrect 
 ; bytecode to be generated.
 ;
-; RUN: as < %s | opt -raise | dis
+; RUN: llvm-as < %s | opt -raise | llvm-dis
 ;
 
 	%Village = type { [4 x \3 *], \2 *, { \2 *, { int, int, int, \5 * } *, \2 * }, { int, int, int, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * } }, int, int }
diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
index 62ac990..969fdfc 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
@@ -2,7 +2,7 @@
 ; successful, all cast instructions should be eliminated from this testcase.
 ;
 
-; RUN: as < %s | opt -raise | dis | not grep cast 
+; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep cast 
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int }
diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
index 36cdc4e..bae5a28 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
@@ -3,7 +3,7 @@
 ; prevented reg115 from being able to change.
 ;
 
-; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep '= cast' | not grep \*
 	
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
index 52cf268..e1350cb 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep '= cast' | not grep \*
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
diff --git a/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll b/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
index e04c397..7b7775d 100644
--- a/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
@@ -8,7 +8,7 @@
 ;     x[j*i-12] = j;
 ; }
 
-; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep ' cast ' | not grep '*'
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
index a856fe2..f89551d 100644
--- a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
@@ -5,7 +5,7 @@
 ;   return (int*)malloc(i+j);
 ; }
 
-; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep ' cast ' | not grep '*'
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll b/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll
index d78a946..be6f3f5 100644
--- a/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll
+++ b/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll
@@ -3,7 +3,7 @@
 ; to a 32 bit version of the number with all upper 16 bits clear (ushort->uint
 ; involves no sign extension).  Optimizing this to a single cast is invalid!
 ;
-; RUN: as < %s | opt -raise -q | lli -abort-on-exception
+; RUN: llvm-as < %s | opt -raise -q | lli -abort-on-exception
 ;
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
index d23ffd3..322e324 100644
--- a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
@@ -1,6 +1,6 @@
 ; This testcase is not level raised properly...
 ;
-; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep ' cast ' | not grep '*'
 
 	%List = type { int, %List* }
 
diff --git a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
index dafd4e0..1e2ca0e 100644
--- a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
+++ b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
@@ -1,7 +1,7 @@
 ; This testcase should have the cast propogated through the load
 ; just like a store does...
 ;
-; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep ' cast ' | not grep '*'
 
 int "test"(uint * %Ptr) {
 	%P2 = cast uint *%Ptr to int *
diff --git a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
index 50176e2..97549f4 100644
--- a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep '= cast' | not grep \*
 
 %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
 
diff --git a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
index 11a3967..5d49248 100644
--- a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
@@ -5,7 +5,7 @@
 ; This could be fixed by making all stores add themselves to a list, and check
 ; their arguments are consistent AFTER all other values are propogated.
 
-; RUN: as < %s | opt -raise | dis | not grep '= cast' 
+; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep '= cast' 
 
         %Tree = type %struct.tree*
         %struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree }
diff --git a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
index faae968..5f528a0 100644
--- a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
+++ b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 	
 	%Tree = type %struct.tree*
 	%struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree }
diff --git a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
index 6a7faf4..6ca0b13 100644
--- a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
+++ b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
@@ -1,6 +1,6 @@
 ; This crashes raise, with an cast<> failure
 
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 implementation
 sbyte* %test(int* %ptr) {
diff --git a/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll b/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll
index 296e9e1..792a035 100644
--- a/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll
+++ b/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll
@@ -2,7 +2,7 @@
 ; because both the source and the destination of the %Y cast are converted
 ; to a new type, which causes massive problems.
 
-; RUN: as < %s | opt -raise -raise-start-inst=W
+; RUN: llvm-as < %s | opt -raise -raise-start-inst=W
 
 int **%test(sbyte **%S) {
 BB0:
diff --git a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
index 8653e26..e8a71be 100644
--- a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
+++ b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
@@ -1,6 +1,6 @@
 ; Looks like we don't raise alloca's like we do mallocs
 ;
-; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep '= cast' | not grep \*
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll b/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
index 6e76d54..e165cf6 100644
--- a/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
+++ b/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise -raise-start-inst=cast271
+; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast271
 
 	%CON_list = type { %CON_list*, %CON_node* }
 	%CON_node = type { %DIS_list*, %DIS_list*, int }
diff --git a/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll b/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
index 493b88f..64c08a2 100644
--- a/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
+++ b/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 int* %test(int* %P, int* %Q) {
 	%P = cast int* %P to ulong
diff --git a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
index 7cfd02e..0e35058 100644
--- a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
+++ b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise | dis | grep -v uint | not grep 4294967295
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep -v uint | not grep 4294967295
 
 %length_code = uninitialized global [256 x ubyte]
 
diff --git a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
index 8c0fcf4..94ad671 100644
--- a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
+++ b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise | dis | grep call | not grep '\.\.\.'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | grep call | not grep '\.\.\.'
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll b/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll
index 111cddc..b9ebe63 100644
--- a/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll
+++ b/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll
@@ -1,6 +1,6 @@
 ; Due to a recent change, this testcase now sends the raise pass into an infinite loop
 ;
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
index 33556fe..4d5f081 100644
--- a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
+++ b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
@@ -1,6 +1,6 @@
 ; This testcase should be able to eliminate at least one of the casts.
 ;
-; RUN: as < %s | opt -raise | dis | not grep 'REMOVE'
+; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 'REMOVE'
 
 int %foo(sbyte * %PF) {
 	%UPF = cast sbyte* %PF to uint()*
diff --git a/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll b/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
index e865e04..2dfe07c 100644
--- a/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
+++ b/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
@@ -1,5 +1,5 @@
 ; Testcase reduced from 197.parser by bugpoint
-; RUN: as < %s | opt -raise -raise-start-inst=cast455 > /dev/null
+; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast455 > /dev/null
 
 void %conjunction_prune() {
 ; <label>:0             ; No predecessors!
diff --git a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
index b88cbe2..d1e6ca1 100644
--- a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
+++ b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise -debug -raise-start-inst=cast459
+; RUN: llvm-as < %s | opt -raise -debug -raise-start-inst=cast459
 
 int %deflateInit2_({ ubyte*, uint, ulong, ubyte*, uint, ulong, sbyte*, { \4, int, ubyte*, ulong, ubyte*, int, int, ubyte, ubyte, int, uint, uint, uint, ubyte*, ulong, ushort*, ushort*, uint, uint, uint, uint, uint, long, uint, uint, int, uint, uint, uint, uint, uint, uint, int, int, uint, int, [573 x { { ushort }, { ushort } }], [61 x { { ushort }, { ushort } }], [39 x { { ushort }, { ushort } }], { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, [16 x ushort], [573 x int], int, int, [573 x ubyte], ubyte*, uint, uint, ushort*, ulong, ulong, uint, int, ushort, int }*, sbyte* (sbyte*, uint, uint)*, void (sbyte*, sbyte*)*, sbyte*, int, ulong, ulong }* %strm, int %level, int %method, int %windowBits, int %memLevel, int %strategy, sbyte* %version, int %stream_size) {
 bb0:            ; No predecessors!
diff --git a/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll b/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll
index 432c668..b752b0f 100644
--- a/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll
+++ b/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise
+; RUN: llvm-as < %s | opt -raise
 
 declare void %foo()
 
diff --git a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
index 55557de..a313249 100644
--- a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
+++ b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise | dis | not grep cast
+; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep cast
 
 void %test(...) { ret void }
 
diff --git a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
index 07f838a..0e9785e 100644
--- a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
+++ b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -raise -disable-output
+; RUN: llvm-as < %s | opt -raise -disable-output
 
 %T = type { [0 x ubyte] }
 
diff --git a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
index f4edb6f..998f497 100644
--- a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
+++ b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
@@ -1,6 +1,6 @@
 ; The expr analysis routines were being too aggressive across cast instructions!
 
-; RUN: as < %s | opt -raise | dis | not grep 4294967295
+; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 4294967295
 
 target endian = big
 target pointersize = 64
diff --git a/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll b/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
index 1acc470..a4c7330 100644
--- a/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
+++ b/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
@@ -1,7 +1,7 @@
 ; This testcase exposed a problem with the loop identification pass (LoopInfo).
 ; Basically, it was incorrectly calculating the loop nesting information.
 ;
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll b/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
index 7f709df..2382429 100644
--- a/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
+++ b/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
@@ -2,7 +2,7 @@
 ; inserted for the "fail" loop, but the exit block of a loop is not updated
 ; to be the preheader instead of the exit loop itself.
 
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 int %re_match_2() {
 	br label %loopentry.1
diff --git a/test/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll b/test/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
index caf886b..f7bb283 100644
--- a/test/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
+++ b/test/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
 
 target endian = little
 target pointersize = 32
diff --git a/test/Transforms/LoopPreheaders/basictest.ll b/test/Transforms/LoopPreheaders/basictest.ll
index 1540219..294140b 100644
--- a/test/Transforms/LoopPreheaders/basictest.ll
+++ b/test/Transforms/LoopPreheaders/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 implementation
 
diff --git a/test/Transforms/LoopPreheaders/hardertest.ll b/test/Transforms/LoopPreheaders/hardertest.ll
index 7c11fba..9179c49 100644
--- a/test/Transforms/LoopPreheaders/hardertest.ll
+++ b/test/Transforms/LoopPreheaders/hardertest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 void %foo(bool %C) {
 	br bool %C, label %T, label %F
diff --git a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
index 1acc470..a4c7330 100644
--- a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
+++ b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
@@ -1,7 +1,7 @@
 ; This testcase exposed a problem with the loop identification pass (LoopInfo).
 ; Basically, it was incorrectly calculating the loop nesting information.
 ;
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
index 7f709df..2382429 100644
--- a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
+++ b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
@@ -2,7 +2,7 @@
 ; inserted for the "fail" loop, but the exit block of a loop is not updated
 ; to be the preheader instead of the exit loop itself.
 
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 int %re_match_2() {
 	br label %loopentry.1
diff --git a/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll b/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
index caf886b..f7bb283 100644
--- a/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
+++ b/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
 
 target endian = little
 target pointersize = 32
diff --git a/test/Transforms/LoopSimplify/basictest.ll b/test/Transforms/LoopSimplify/basictest.ll
index 1540219..294140b 100644
--- a/test/Transforms/LoopSimplify/basictest.ll
+++ b/test/Transforms/LoopSimplify/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 implementation
 
diff --git a/test/Transforms/LoopSimplify/hardertest.ll b/test/Transforms/LoopSimplify/hardertest.ll
index 7c11fba..9179c49 100644
--- a/test/Transforms/LoopSimplify/hardertest.ll
+++ b/test/Transforms/LoopSimplify/hardertest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -preheaders
 
 void %foo(bool %C) {
 	br bool %C, label %T, label %F
diff --git a/test/Transforms/LowerSetJmp/simpletest.ll b/test/Transforms/LowerSetJmp/simpletest.ll
index b5adbbe..f7bef72 100644
--- a/test/Transforms/LowerSetJmp/simpletest.ll
+++ b/test/Transforms/LowerSetJmp/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -lowersetjmp | dis | grep invoke
+; RUN: llvm-as < %s | opt -lowersetjmp | llvm-dis | grep invoke
 
 %JmpBuf = type int
 %.str_1 = internal constant [13 x sbyte] c"returned %d\0A\00"
diff --git a/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll b/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
index 914df25..c17f8ce 100644
--- a/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
+++ b/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -lowerswitch
+; RUN: llvm-as < %s | opt -lowerswitch
 
 void %child(int %ct.1) {
 entry:          ; No predecessors!
diff --git a/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll b/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
index 8b67c23..e858f34 100644
--- a/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
+++ b/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -lowerswitch
+; RUN: llvm-as < %s | opt -lowerswitch
 
 void %test() {
 	switch uint 0, label %Next []
diff --git a/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll b/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
index 0eded43..9f401b3 100644
--- a/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
+++ b/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
@@ -1,6 +1,6 @@
 ; Uninitialized values are not handled correctly.
 ;
-; RUN: as < %s | opt -mem2reg
+; RUN: llvm-as < %s | opt -mem2reg
 ;
 
 implementation
diff --git a/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll b/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll
index 1c107ac..c51d095 100644
--- a/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll
+++ b/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll
@@ -1,7 +1,7 @@
 ; This input caused the mem2reg pass to die because it was trying to promote
 ; the %r alloca, even though it is invalid to do so in this case!
 ;
-; RUN: as < %s | opt -mem2reg
+; RUN: llvm-as < %s | opt -mem2reg
 
 
 implementation
diff --git a/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll b/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
index 286252a..05990b1 100644
--- a/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
+++ b/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -mem2reg
+; RUN: llvm-as < %s | opt -mem2reg
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll b/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
index 8a3dc1e..bdf155a 100644
--- a/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
+++ b/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
@@ -1,5 +1,5 @@
 ; This testcases makes sure that mem2reg can handle unreachable blocks.
-; RUN: as < %s | opt -mem2reg
+; RUN: llvm-as < %s | opt -mem2reg
 
 int %test() {
 	%X = alloca int
diff --git a/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll b/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll
index 16507e3..9e23466 100644
--- a/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll
+++ b/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll
@@ -1,7 +1,7 @@
 ; Mem2reg used to only add one incoming value to a PHI node, even if it had
 ; multiple incoming edges from a block.
 ;
-; RUN: as < %s | opt -mem2reg -disable-output
+; RUN: llvm-as < %s | opt -mem2reg -disable-output
 
 int %test(bool %c1, bool %c2) {
 	%X = alloca int
diff --git a/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll b/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
index f895150..3b63efa 100644
--- a/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
+++ b/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
@@ -1,5 +1,5 @@
 ; Promoting some values allows promotion of other values.
-; RUN: as < %s | opt -mem2reg | dis | not grep alloca
+; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep alloca
 
 int %test2() {
         %result = alloca int             ; ty=int*
diff --git a/test/Transforms/Mem2Reg/DifferingTypes.ll b/test/Transforms/Mem2Reg/DifferingTypes.ll
index e1069a4..91e33e0 100644
--- a/test/Transforms/Mem2Reg/DifferingTypes.ll
+++ b/test/Transforms/Mem2Reg/DifferingTypes.ll
@@ -2,7 +2,7 @@
 ; generated code should perform the appropriate masking operations required 
 ; depending on the endianness of the target...
 
-; RUN: as < %s | opt -mem2reg | dis | not grep 'alloca'
+; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca'
 
 implementation
 
diff --git a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
index ea30cdb..b540a29 100644
--- a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
+++ b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
@@ -1,5 +1,5 @@
 ; Simple sanity check testcase.  Both alloca's should be eliminated.
-; RUN: as < %s | opt -mem2reg | dis | not grep 'alloca'
+; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca'
 
 implementation
 
diff --git a/test/Transforms/PRE/basictest.ll b/test/Transforms/PRE/basictest.ll
index 2a999b5..abf5fe6 100644
--- a/test/Transforms/PRE/basictest.ll
+++ b/test/Transforms/PRE/basictest.ll
@@ -1,7 +1,7 @@
 ; Basic testcases - these are only tested by inspection, but illustrate the 
 ; basic cases PRE can handle.
 ;
-; RUN: as < %s | opt -pre -disable-output
+; RUN: llvm-as < %s | opt -pre -disable-output
 
 declare void %use(int)
 declare int %get()
diff --git a/test/Transforms/PiNodeInserter/substitutetest.ll b/test/Transforms/PiNodeInserter/substitutetest.ll
index a08a968..9c9fa56 100644
--- a/test/Transforms/PiNodeInserter/substitutetest.ll
+++ b/test/Transforms/PiNodeInserter/substitutetest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -pinodes -instcombine -die | dis | not grep add
+; RUN: llvm-as < %s | opt -pinodes -instcombine -die | llvm-dis | not grep add
 
 int "test"(int %i, int %j) {
 	%c = seteq int %i, 0
diff --git a/test/Transforms/ProfilePaths/2002-05-22-CastCrash.ll b/test/Transforms/ProfilePaths/2002-05-22-CastCrash.ll
index a674a4d..05c62b3 100644
--- a/test/Transforms/ProfilePaths/2002-05-22-CastCrash.ll
+++ b/test/Transforms/ProfilePaths/2002-05-22-CastCrash.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -paths
+; RUN: llvm-as < %s | opt -paths
 ;
 %globalCrc = uninitialized global uint         ; <uint*> [#uses=1]
 
diff --git a/test/Transforms/PruneEH/recursivetest.llx b/test/Transforms/PruneEH/recursivetest.llx
index 8a966bb..fc2b952 100644
--- a/test/Transforms/PruneEH/recursivetest.llx
+++ b/test/Transforms/PruneEH/recursivetest.llx
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -prune-eh | dis | not grep invoke
+; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke
 
 implementation
 
diff --git a/test/Transforms/PruneEH/simpletest.llx b/test/Transforms/PruneEH/simpletest.llx
index 619ca48..4c6f8ba 100644
--- a/test/Transforms/PruneEH/simpletest.llx
+++ b/test/Transforms/PruneEH/simpletest.llx
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -prune-eh | dis | not grep invoke
+; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke
 
 implementation
 
diff --git a/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll b/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
index 94785f3..0a176be 100644
--- a/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
+++ b/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -reassociate -instcombine -constprop -dce | dis | not grep add
+; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -dce | llvm-dis | not grep add
 
 int %test(int %A) {
 	%X = add int %A, 1
diff --git a/test/Transforms/Reassociate/2002-05-15-MissedTree.ll b/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
index 4f36c96..fce2cde 100644
--- a/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
+++ b/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -reassociate -instcombine -constprop -die | dis | not grep 5
+; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -die | llvm-dis | not grep 5
 
 int %test(int %A, int %B) {
         %W = add int %B, -5
diff --git a/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll b/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
index 2136e09..f3e6bfa 100644
--- a/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
+++ b/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate all of the constants.
 ;
-; RUN: as < %s | opt -reassociate -constprop -instcombine -dce | dis | not grep add
+; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -dce | llvm-dis | not grep add
 
 int %test(int %A, int %B) {
 	%W = add int 5, %B
diff --git a/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll b/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
index 05f9bd4..85e746b 100644
--- a/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
+++ b/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate the two 12 constants.
 ;
-; RUN: as < %s | opt -reassociate -constprop -dce | dis | not grep 12
+; RUN: llvm-as < %s | opt -reassociate -constprop -dce | llvm-dis | not grep 12
 
 int "test"(int %A, int %B, int %C, int %D) {
 	%M = add int %A, 12
diff --git a/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll b/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
index f2d2a62..3829148 100644
--- a/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
+++ b/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
@@ -1,6 +1,6 @@
 ; The reassociate pass is not preserving dominance properties correctly
 ;
-; RUN: as < %s | opt -reassociate
+; RUN: llvm-as < %s | opt -reassociate
 
 int %compute_dist(int %i, int %j) {
         %reg119 = sub int %j, %i
diff --git a/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll b/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
index 7919bad..59e482d 100644
--- a/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
+++ b/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -reassociate -disable-output
+; RUN: llvm-as < %s | opt -reassociate -disable-output
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/Reassociate/basictest.ll b/test/Transforms/Reassociate/basictest.ll
index cad7a5a..6372d98 100644
--- a/test/Transforms/Reassociate/basictest.ll
+++ b/test/Transforms/Reassociate/basictest.ll
@@ -1,6 +1,6 @@
 ; With reassociation, constant folding can eliminate the 12 and -12 constants.
 ;
-; RUN: as < %s | opt -reassociate -constprop -instcombine -die | dis | not grep add
+; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep add
 
 int %test(int %arg) {
 	%tmp1 = sub int -12, %arg
diff --git a/test/Transforms/Reassociate/basictest2.ll b/test/Transforms/Reassociate/basictest2.ll
index 31c3be0..c7a3687 100644
--- a/test/Transforms/Reassociate/basictest2.ll
+++ b/test/Transforms/Reassociate/basictest2.ll
@@ -1,6 +1,6 @@
 ; With reassociation, constant folding can eliminate the +/- 30 constants.
 ;
-; RUN: as < %s | opt -reassociate -constprop -instcombine -die | dis | not grep 30
+; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 30
 
 int "test"(int %reg109, int %reg1111) {
         %reg115 = add int %reg109, -30           ; <int> [#uses=1]
diff --git a/test/Transforms/Reassociate/looptest.ll b/test/Transforms/Reassociate/looptest.ll
index 06dea0b..aa7000f 100644
--- a/test/Transforms/Reassociate/looptest.ll
+++ b/test/Transforms/Reassociate/looptest.ll
@@ -12,7 +12,7 @@
 ; In this case, we want to reassociate the specified expr so that i+j can be
 ; hoisted out of the inner most loop.
 ;
-; RUN: as < %s | opt -reassociate | dis | grep 115 | not grep 117
+; RUN: llvm-as < %s | opt -reassociate | llvm-dis | grep 115 | not grep 117
 
 %.LC0 = internal global [4 x sbyte] c"%d\0A\00"		; <[4 x sbyte]*> [#uses=1]
 
diff --git a/test/Transforms/Reassociate/otherops.ll b/test/Transforms/Reassociate/otherops.ll
index 6960b1d..0a205e3 100644
--- a/test/Transforms/Reassociate/otherops.ll
+++ b/test/Transforms/Reassociate/otherops.ll
@@ -1,6 +1,6 @@
 ; Reassociation should apply to Add, Mul, And, Or, & Xor
 ;
-; RUN: as < %s | opt -reassociate -constprop -instcombine -die | dis | not grep 12
+; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
 
 int "test_mul"(int %arg) {
         %tmp1 = mul int 12, %arg
diff --git a/test/Transforms/Reassociate/subtest.ll b/test/Transforms/Reassociate/subtest.ll
index 38a887b..fe2d46f 100644
--- a/test/Transforms/Reassociate/subtest.ll
+++ b/test/Transforms/Reassociate/subtest.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate the 12 and -12 constants.
 ;
-; RUN: as < %s | opt -reassociate -constprop -instcombine -die | dis | not grep 12
+; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
 
 int "test"(int %A, int %B) {
 	%X = add int -12, %A
diff --git a/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll b/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll
index be8bbfd..9eeca70 100644
--- a/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll
+++ b/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: as < %s | opt -sccp | dis | not grep loop
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep loop
 
 int* %test() {
 bb1:
diff --git a/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll b/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
index 101ced7..183e5bc 100644
--- a/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
+++ b/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -sccp | dis | not grep sub
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep sub
 
 void %test3(int, int) {
 	add int 0, 0
diff --git a/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll b/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
index ec30c67..448d1b5 100644
--- a/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
+++ b/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: as < %s | opt -sccp | dis | grep phi
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
 
 int "test"(int %A, bool %c) {
 bb1:
diff --git a/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll b/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
index b8c03b2..6b0f369 100644
--- a/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
+++ b/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: as < %s | opt -sccp -simplifycfg | dis | grep ret
+; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | grep ret
 
 
 void "old_main"() {
diff --git a/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
index a957a90..1d1b1f7 100644
--- a/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
+++ b/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -sccp | dis | not grep '%X'
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep '%X'
 
 %G = uninitialized global [40x int]
 
diff --git a/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll b/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
index 85ea1a7..f554b00 100644
--- a/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
+++ b/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -sccp -simplifycfg | dis | not grep then:
+; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | not grep then:
 
 void %cprop_test11(int* %data.1) {
 entry:		; No predecessors!
diff --git a/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll b/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
index 525f152..14c41d7 100644
--- a/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
+++ b/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: as < %s | opt -sccp | dis | grep phi
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
 
 declare void %foo()
 int %test(bool %cond) {
diff --git a/test/Transforms/SCCP/basictest.ll b/test/Transforms/SCCP/basictest.ll
index 2ed9d5e..0825d0d 100644
--- a/test/Transforms/SCCP/basictest.ll
+++ b/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: as < %s | opt -sccp | dis | not grep add
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
 
 int %test(bool %B) {
 	br bool %B, label %BB1, label %BB2
diff --git a/test/Transforms/SCCP/sccptest.ll b/test/Transforms/SCCP/sccptest.ll
index 37f4bc2..94a3364 100644
--- a/test/Transforms/SCCP/sccptest.ll
+++ b/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: as < %s | opt -sccp -constprop -dce -cfgsimplify | dis | not grep BB3
+; RUN: llvm-as < %s | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3
 
 int %test function(int %i0, int %j0) {
 BB1:
diff --git a/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll b/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
index 0f8d480..e964dc8 100644
--- a/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
+++ b/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl | dis | grep alloca | grep '4 x'
+; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep alloca | grep '4 x'
 
 ; Test that an array is not incorrectly deconstructed...
 
diff --git a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
index 42f6f8b..6ec9adb 100644
--- a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
+++ b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl
+; RUN: llvm-as < %s | opt -scalarrepl
 
 void %main() {
 	%E = alloca { { int, float, double, long }, { int, float, double, long } }		; <{ { int, float, double, long }, { int, float, double, long } }*> [#uses=1]
diff --git a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
index d6f437e..958f33a 100644
--- a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
+++ b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl
+; RUN: llvm-as < %s | opt -scalarrepl
 
 int %test() {
   %X = alloca { [ 4 x int] }
diff --git a/test/Transforms/ScalarRepl/arraytest.ll b/test/Transforms/ScalarRepl/arraytest.ll
index 076659b..b923e19 100644
--- a/test/Transforms/ScalarRepl/arraytest.ll
+++ b/test/Transforms/ScalarRepl/arraytest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl -mem2reg | dis | not grep alloca
+; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
 
 int %test() {
   %X = alloca [ 4 x int ]
diff --git a/test/Transforms/ScalarRepl/badarray.ll b/test/Transforms/ScalarRepl/badarray.ll
index 22e84f8..fa3156b 100644
--- a/test/Transforms/ScalarRepl/badarray.ll
+++ b/test/Transforms/ScalarRepl/badarray.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl -mem2reg | dis | grep alloca
+; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | grep alloca
 
 int %test() {
   %X = alloca [ 4 x int ]
diff --git a/test/Transforms/ScalarRepl/basictest.ll b/test/Transforms/ScalarRepl/basictest.ll
index a576fd6..df27b09 100644
--- a/test/Transforms/ScalarRepl/basictest.ll
+++ b/test/Transforms/ScalarRepl/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -scalarrepl -mem2reg | dis | not grep alloca
+; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
 
 int %test() {
   %X = alloca { int, float }
diff --git a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
index c1257cd..3539bcc 100644
--- a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
-; RUN: as < %s | opt -simplifycfg | dis | grep 'br label'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep 'br label'
 ;
 void "cprop_test12"(int* %data) {
 bb0:
diff --git a/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll b/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
index d5f5077..7baea2e 100644
--- a/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
+++ b/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
@@ -4,7 +4,7 @@
 ;
 ; Which is not valid SSA
 ;
-; RUN: as < %s | opt -simplifycfg | dis
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis
 
 void "test"() {
 	br bool true, label %end, label %Loop
diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index 1587e7e..4c0cbbc 100644
--- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
@@ -1,7 +1,7 @@
 ; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
 ; should be fixed eventually
 
-; RUN: as < %s | opt -simplifycfg | dis | not grep br
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
 
 int %main(int %argc) {
         br label %InlinedFunctionReturnNode
diff --git a/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll b/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
index 94d632f..b3c9485 100644
--- a/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
+++ b/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -simplifycfg
+; RUN: llvm-as < %s | opt -simplifycfg
 
 int %test(int %A, int %B, bool %cond) {
 J:
diff --git a/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll b/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
index 6133457..6b75c5f 100644
--- a/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
+++ b/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-as < %s | opt -simplifycfg -disable-output
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
index 0dafdd9..b6638ee 100644
--- a/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
+++ b/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-as < %s | opt -simplifycfg -disable-output
 
 int %test() {
 	%A = invoke int %test() to label %Ret except label %Ret
diff --git a/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll b/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
index 25deb3b..179ef72 100644
--- a/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
+++ b/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: as < %s | opt -simplifycfg | dis | grep invoke
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep invoke
 
 int %test() {
 	invoke int %test() to label %Ret except label %Ret
diff --git a/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
index da15180..55199ab 100644
--- a/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
+++ b/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: as < %s | opt -simplifycfg | dis | not grep 'br bool %c2'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
 
 declare void %noop()
 
diff --git a/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
index 25a4d56..b96a4a6 100644
--- a/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
+++ b/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: as < %s | opt -simplifycfg | dis | not grep 'br bool %c2'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
 
 declare void %noop()
 
diff --git a/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll b/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
index 71269ec..c5b0058 100644
--- a/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
+++ b/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -simplifycfg | dis | not grep switch
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep switch
 
 int %test1() {   ; Test normal folding
 	switch uint 5, label %Default [
diff --git a/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
index 1a31ee4..09e7024 100644
--- a/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks with phi nodes.
 ;
-; RUN: as < %s | opt -simplifycfg | dis | not grep 'N:'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a) {
diff --git a/test/Transforms/SimplifyCFG/InvokeEliminate.ll b/test/Transforms/SimplifyCFG/InvokeEliminate.ll
index 7a2c4a6..0f14ec8 100644
--- a/test/Transforms/SimplifyCFG/InvokeEliminate.ll
+++ b/test/Transforms/SimplifyCFG/InvokeEliminate.ll
@@ -3,7 +3,7 @@
 
 ; If this test is successful, the function should be reduced to 'call; ret'
 
-; RUN: as < %s | opt -simplifycfg | dis | not egrep 'invoke|br'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not egrep 'invoke|br'
 
 declare void %bar()
 declare void %llvm.unwind()
diff --git a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
index 21e4f59..0537722 100644
--- a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: as < %s | opt -simplifycfg | dis | not grep 'N:'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
index 94cd593..083e45e 100644
--- a/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
+++ b/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: as < %s | opt -simplifycfg | dis | not grep 'N:'
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/test/Transforms/SimplifyCFG/basictest.ll b/test/Transforms/SimplifyCFG/basictest.ll
index c16b1cd..9dac7c0 100644
--- a/test/Transforms/SimplifyCFG/basictest.ll
+++ b/test/Transforms/SimplifyCFG/basictest.ll
@@ -1,6 +1,6 @@
 ; Test CFG simplify removal of branch instructions...
 ;
-; RUN: as < %s | opt -simplifycfg | dis | not grep br
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
 
 
 void "test1"() {
diff --git a/test/Transforms/SimplifyCFG/branch-fold-test.ll b/test/Transforms/SimplifyCFG/branch-fold-test.ll
index 3f1a8e4..bb6c5fe 100644
--- a/test/Transforms/SimplifyCFG/branch-fold-test.ll
+++ b/test/Transforms/SimplifyCFG/branch-fold-test.ll
@@ -1,7 +1,7 @@
 ; This test ensures that the simplifycfg pass continues to constant fold
 ; terminator instructions.
 
-; RUN: as < %s | opt -simplifycfg | not grep br
+; RUN: llvm-as < %s | opt -simplifycfg | not grep br
 
 int %test(int %A, int %B) {
 J:
diff --git a/test/Transforms/TailDup/2003-06-24-Simpleloop.ll b/test/Transforms/TailDup/2003-06-24-Simpleloop.ll
index e6e1b22..3047fe6 100644
--- a/test/Transforms/TailDup/2003-06-24-Simpleloop.ll
+++ b/test/Transforms/TailDup/2003-06-24-Simpleloop.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -disable-output
 
 void %motion_result7() {
 entry:
diff --git a/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll b/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
index 3e6ca09..c723339 100644
--- a/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
+++ b/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -disable-output
 
 implementation
 
diff --git a/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll b/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
index 35c8264..4b98675 100644
--- a/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
+++ b/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -disable-output
 
 implementation
 
diff --git a/test/Transforms/TailDup/PHIUpdateTest.ll b/test/Transforms/TailDup/PHIUpdateTest.ll
index 08112b4..433b078 100644
--- a/test/Transforms/TailDup/PHIUpdateTest.ll
+++ b/test/Transforms/TailDup/PHIUpdateTest.ll
@@ -1,6 +1,6 @@
 ; This test checks to make sure phi nodes are updated properly
 ;
-; RUN: as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -disable-output
 
 
 
diff --git a/test/Transforms/TailDup/basictest.ll b/test/Transforms/TailDup/basictest.ll
index 66dcf63..f20896d 100644
--- a/test/Transforms/TailDup/basictest.ll
+++ b/test/Transforms/TailDup/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-as < %s | opt -tailduplicate -disable-output
 
 declare void %__main()