diff --git a/llvm/test/Feature/alignment.ll b/llvm/test/Feature/alignment.ll
index 6ea7d8d7ff464b027d724256163fca9034336196..871592b2ff32fe0835a9dfe7efd7cf20dec16d39 100644
--- a/llvm/test/Feature/alignment.ll
+++ b/llvm/test/Feature/alignment.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/basictest.ll b/llvm/test/Feature/basictest.ll
index cabf6036dc3a26dd5a032da95a16386865655f87..cf040ec250836b679d052400d5402f0696dbbeee 100644
--- a/llvm/test/Feature/basictest.ll
+++ b/llvm/test/Feature/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
@@ -30,4 +30,3 @@ begin
 Startup:
 	ret int 0
 end
-
diff --git a/llvm/test/Feature/callingconventions.ll b/llvm/test/Feature/callingconventions.ll
index ea50b0a86ab488a33bada69271cf78a5bcf4b44e..5617f9f26f989ab5883226cc3fcd750381bfb71f 100644
--- a/llvm/test/Feature/callingconventions.ll
+++ b/llvm/test/Feature/callingconventions.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/calltest.ll b/llvm/test/Feature/calltest.ll
index 861d7632d41ab3a9afe9a317d14f8f0190880d4c..090e840007e37395de37bc3fec31582990dce3d4 100644
--- a/llvm/test/Feature/calltest.ll
+++ b/llvm/test/Feature/calltest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/casttest.ll b/llvm/test/Feature/casttest.ll
index e7d8756791b6bb7adafd4924a8158cbd4fbc920b..96f971a0e8fdc2942cd67c085338065c3646f5df 100644
--- a/llvm/test/Feature/casttest.ll
+++ b/llvm/test/Feature/casttest.ll
@@ -1,23 +1,7 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-void "NewCasts" (short %x) {
-  %a = zext short %x to int
-  %b = sext short %x to uint
-  %c = trunc short %x to ubyte
-  %d = uitofp short %x to float
-  %e = sitofp short %x to double
-  %f = fptoui float %d to short
-  %g = fptosi double %e to short
-  %i = fpext float %d to double
-  %j = fptrunc double %i to float
-  %k = bitcast int %a to float
-  %l = inttoptr short %x to int*
-  %m = ptrtoint int* %l to long
-  ret void
-}
-
 short "FunFunc"(long %x, sbyte %z)
 begin
 bb0:            ;;<label>
diff --git a/llvm/test/Feature/cfgstructures.ll b/llvm/test/Feature/cfgstructures.ll
index b044b5cf52e804dd0c58687e0663a1446f8770a4..b16af47af1c427989a51bb2aa7b523a193e8bf15 100644
--- a/llvm/test/Feature/cfgstructures.ll
+++ b/llvm/test/Feature/cfgstructures.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/constexpr.ll b/llvm/test/Feature/constexpr.ll
index fe20b9c11b1e874e3aac7ea411169b2d0d2e1d07..afbe0cd1f88d129176ec53177be31a59600dcb5f 100644
--- a/llvm/test/Feature/constexpr.ll
+++ b/llvm/test/Feature/constexpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/constpointer.ll b/llvm/test/Feature/constpointer.ll
index 9a876d2cedb0a96f1149ea9b5f5a4dac83f6c5fc..d1dddaadb3b2026be1663413ad3bd111746e0077 100644
--- a/llvm/test/Feature/constpointer.ll
+++ b/llvm/test/Feature/constpointer.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/escaped_label.ll b/llvm/test/Feature/escaped_label.ll
index 81011cdc94080abdd58b47bf1e05d487e4b33aeb..4532fe99bc80a9a2f3a760c012239a5243168d3c 100644
--- a/llvm/test/Feature/escaped_label.ll
+++ b/llvm/test/Feature/escaped_label.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/float.ll b/llvm/test/Feature/float.ll
index e16f092e4cdd7b74d92d0d4c3a9a7581bf33f270..5a53c2c0a3b618932f79ac96b57ee33c37f47878 100644
--- a/llvm/test/Feature/float.ll
+++ b/llvm/test/Feature/float.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > Output/t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll
 ; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll
 ; RUN: diff Output/t1.ll Output/t2.ll
 
diff --git a/llvm/test/Feature/forwardreftest.ll b/llvm/test/Feature/forwardreftest.ll
index 4569ee2b30b76d8306508d7ddc21aefc41b64c3b..edb1f281ebab91f97a701278d9e12225b2433988 100644
--- a/llvm/test/Feature/forwardreftest.ll
+++ b/llvm/test/Feature/forwardreftest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/global_section.ll b/llvm/test/Feature/global_section.ll
index 179d99bba865b9b756eb9c239995b855244df7ec..08a2c323dd9566b3b44762d66fee065263fe63ec 100644
--- a/llvm/test/Feature/global_section.ll
+++ b/llvm/test/Feature/global_section.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/globalredefinition.ll b/llvm/test/Feature/globalredefinition.ll
index 8e5bbe24ba4059da9e57abc53b4dd8fb3a3971ea..e7b37eedc6d8cdaaac849f606dafc7f1779b0eec 100644
--- a/llvm/test/Feature/globalredefinition.ll
+++ b/llvm/test/Feature/globalredefinition.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/globalvars.ll b/llvm/test/Feature/globalvars.ll
index b5001627c6bc4878dc9df510078a27fc0039faa1..26259dad4c650408949a3bebc79ed0a0e75b1757 100644
--- a/llvm/test/Feature/globalvars.ll
+++ b/llvm/test/Feature/globalvars.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/indirectcall.ll b/llvm/test/Feature/indirectcall.ll
index cdc2651e7085e89375f0f5dcf455b7e25f6f9cf8..2d1855b9033e00252696ce68c21241fe136c8e22 100644
--- a/llvm/test/Feature/indirectcall.ll
+++ b/llvm/test/Feature/indirectcall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/indirectcall2.ll b/llvm/test/Feature/indirectcall2.ll
index 08e49ecd5e2f9103d6d5362828cddfb8dc6b1d41..d16c737374d02ed73cd141d8dec995f284be5f42 100644
--- a/llvm/test/Feature/indirectcall2.ll
+++ b/llvm/test/Feature/indirectcall2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/inlineasm.ll b/llvm/test/Feature/inlineasm.ll
index 9043b494ea6bac4c4b2e0b04293197ed890e4afd..c34324a3eed3db19743e0b4604764fae1a4155e6 100644
--- a/llvm/test/Feature/inlineasm.ll
+++ b/llvm/test/Feature/inlineasm.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as %s -o /dev/null -f &&
-; RUN: llvm-as %s -o - | llvm-dis > Output/t1.ll &&
+; RUN: llvm-upgrade %s -o - | llvm-as -o /dev/null -f &&
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll &&
 ; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll &&
 ; RUN: diff Output/t1.ll Output/t2.ll
 
diff --git a/llvm/test/Feature/instructions.ll b/llvm/test/Feature/instructions.ll
index 99cec7699c90b32cdb5223ceb529e9717edd37f0..281dafb5a20663e0ae0711d9ec6224f59af84fe2 100644
--- a/llvm/test/Feature/instructions.ll
+++ b/llvm/test/Feature/instructions.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/intrinsics.ll b/llvm/test/Feature/intrinsics.ll
index 6733e3711948e505411b022accf48470c209906b..3cb8728c2dd63b543ca14dad5cbffc21f8ad47f1 100644
--- a/llvm/test/Feature/intrinsics.ll
+++ b/llvm/test/Feature/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/newcasts.ll b/llvm/test/Feature/newcasts.ll
new file mode 100644
index 0000000000000000000000000000000000000000..6b297961aa7f5c2075fdd70c485b0a2dd86a74da
--- /dev/null
+++ b/llvm/test/Feature/newcasts.ll
@@ -0,0 +1,21 @@
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
+; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
+; RUN: diff %t1.ll %t2.ll
+
+void "NewCasts" (short %x) {
+  %a = zext short %x to int
+  %b = sext short %x to uint
+  %c = trunc short %x to ubyte
+  %d = uitofp short %x to float
+  %e = sitofp short %x to double
+  %f = fptoui float %d to short
+  %g = fptosi double %e to short
+  %i = fpext float %d to double
+  %j = fptrunc double %i to float
+  %k = bitcast int %a to float
+  %l = inttoptr short %x to int*
+  %m = ptrtoint int* %l to long
+  ret void
+}
+
+
diff --git a/llvm/test/Feature/opaquetypes.ll b/llvm/test/Feature/opaquetypes.ll
index 1873a00af9e82b38507efb0374d3bb224ce8aa65..92efaebfd0a51bfe034f1b2d8074508dfaed25bd 100644
--- a/llvm/test/Feature/opaquetypes.ll
+++ b/llvm/test/Feature/opaquetypes.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/packed.ll b/llvm/test/Feature/packed.ll
index bc50d26015fda19174f14623d046d3f165a321ae..a3591dffe8315b9099c9817888d49d8dae204556 100755
--- a/llvm/test/Feature/packed.ll
+++ b/llvm/test/Feature/packed.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/properties.ll b/llvm/test/Feature/properties.ll
index fc88f239dc24be8b5719ca13796fda9f9c2d2826..e906f22b18e7b5b4993e3003a55c5e4b176fcf9f 100644
--- a/llvm/test/Feature/properties.ll
+++ b/llvm/test/Feature/properties.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/prototype.ll b/llvm/test/Feature/prototype.ll
index a97f8129b138c063454d634d2df5fefa8c7bba0d..9bab73f7fb7e2896e330ae129acfa66c4f0f6493 100644
--- a/llvm/test/Feature/prototype.ll
+++ b/llvm/test/Feature/prototype.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/recursivetype.ll b/llvm/test/Feature/recursivetype.ll
index e91d49e81513698a381e0eb815f9af8b8a051353..9ea34848422ed9e0aaaf381f4e2f89ad59a10d05 100644
--- a/llvm/test/Feature/recursivetype.ll
+++ b/llvm/test/Feature/recursivetype.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/simplecalltest.ll b/llvm/test/Feature/simplecalltest.ll
index 37fa6c62ab2fbfe22cf3574d6a54dbdc7c450207..6f0b72e9012521358638c608c9a7eee69a9b4da4 100644
--- a/llvm/test/Feature/simplecalltest.ll
+++ b/llvm/test/Feature/simplecalltest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/small.ll b/llvm/test/Feature/small.ll
index 5d80e2003a72ae9afe3bdc12cf0b0bbefcd70848..6ef37c7083a08eecddb1928a55e533b2077243cc 100644
--- a/llvm/test/Feature/small.ll
+++ b/llvm/test/Feature/small.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/smallest.ll b/llvm/test/Feature/smallest.ll
index a7ad71c3849c65407e6b80dc3e5f65e7a236d316..910af3c88f346fb070b28a7bc26b4f89e1efab48 100644
--- a/llvm/test/Feature/smallest.ll
+++ b/llvm/test/Feature/smallest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testalloca.ll b/llvm/test/Feature/testalloca.ll
index 5a13bada7281d5727cf76a7ae2b5fe61a9798be2..d05b70d0c30be904b5f86a2a930a232c7728a03d 100644
--- a/llvm/test/Feature/testalloca.ll
+++ b/llvm/test/Feature/testalloca.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testconstants.ll b/llvm/test/Feature/testconstants.ll
index 49d2d152ae197f65b42224e2593e0d020d9c4324..3df2a2971e80d1ba526c3e25eb31b414afa0f1b3 100644
--- a/llvm/test/Feature/testconstants.ll
+++ b/llvm/test/Feature/testconstants.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testlogical.ll b/llvm/test/Feature/testlogical.ll
index 97452b4557ec761e0481d35deb0674271fd8f207..887699ab5f2214fb58aff1ac055602bc70a47112 100644
--- a/llvm/test/Feature/testlogical.ll
+++ b/llvm/test/Feature/testlogical.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testmemory.ll b/llvm/test/Feature/testmemory.ll
index 573ee982d71e4890c80e719ccea88d14dcd926cb..ce48e576060bf60c3379b57419fbfbed66340e88 100644
--- a/llvm/test/Feature/testmemory.ll
+++ b/llvm/test/Feature/testmemory.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testswitch.ll b/llvm/test/Feature/testswitch.ll
index 484ff2abc16512cd49c7c76a8d3c53a116132f9d..8664ace55acdd9b1817b678ffd809fb3bcedde83 100644
--- a/llvm/test/Feature/testswitch.ll
+++ b/llvm/test/Feature/testswitch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/testvarargs.ll b/llvm/test/Feature/testvarargs.ll
index 5806f2899acff5e538c6db20067a2f7eb4bf63cc..196ab01e40eb9357e0c2b5879583fb5b03608f6c 100644
--- a/llvm/test/Feature/testvarargs.ll
+++ b/llvm/test/Feature/testvarargs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/undefined.ll b/llvm/test/Feature/undefined.ll
index cdbec03d398a285c55bab764dd9edb47d6491f00..dc1b7c547a74a114c8b8ffa05f3e5a75cbb7fd4e 100644
--- a/llvm/test/Feature/undefined.ll
+++ b/llvm/test/Feature/undefined.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/unreachable.ll b/llvm/test/Feature/unreachable.ll
index de7beb93aeb52caed9e80beca3065bb3b403e3c6..48558dded0ae4d8759a0b313b32e2180302088bb 100644
--- a/llvm/test/Feature/unreachable.ll
+++ b/llvm/test/Feature/unreachable.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/varargs.ll b/llvm/test/Feature/varargs.ll
index d75a49d8edf4499250596793eff4adae89b6877a..672d96a4288fa03653715c5c2015c23c4d140ab9 100644
--- a/llvm/test/Feature/varargs.ll
+++ b/llvm/test/Feature/varargs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
@@ -6,18 +6,19 @@
 ; the va_arg instruction.
 
 implementation
-declare sbyte* %llvm.va_start()
-declare sbyte* %llvm.va_copy(sbyte*)
-declare void %llvm.va_end(sbyte*)
+declare void %llvm.va_start(sbyte** %ap)
+declare void %llvm.va_copy(sbyte** %aq, sbyte** %ap)
+declare void %llvm.va_end(sbyte** %ap)
 
 int %test(int %X, ...) {
-	%ap = call sbyte* %llvm.va_start()
-	%aq = call sbyte* %llvm.va_copy(sbyte* %ap)
-	call void %llvm.va_end(sbyte* %aq)
-	
-	%tmp = vaarg sbyte* %ap, int 
-	%ap2 = vanext sbyte* %ap, int
+        %ap = alloca sbyte*
+	call void %llvm.va_start(sbyte** %ap)
+	%tmp = va_arg sbyte** %ap, int 
 
-	call void %llvm.va_end(sbyte* %ap2)
+        %aq = alloca sbyte*
+	call void %llvm.va_copy(sbyte** %aq, sbyte** %ap)
+	call void %llvm.va_end(sbyte** %aq)
+	
+	call void %llvm.va_end(sbyte** %ap)
 	ret int %tmp
 }
diff --git a/llvm/test/Feature/varargs_new.ll b/llvm/test/Feature/varargs_new.ll
index 995076e1a0750b11adcefb5aed3ddcdb0591d37e..a0e8c46af63bd7aa9b0420a25cb1236294768704 100644
--- a/llvm/test/Feature/varargs_new.ll
+++ b/llvm/test/Feature/varargs_new.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Feature/weirdnames.ll b/llvm/test/Feature/weirdnames.ll
index c8a45c34a6d87e356708b662c08b1ba09821d696..54046480aea3e7ca7aabcea10c2acb8acd442a67 100644
--- a/llvm/test/Feature/weirdnames.ll
+++ b/llvm/test/Feature/weirdnames.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
diff --git a/llvm/test/Regression/Analysis/Andersens/arg-must-alias.ll b/llvm/test/Regression/Analysis/Andersens/arg-must-alias.ll
index 5aef808b84ada42eddd3010188ca8c5c9c7eab5a..d19b381e4a14ca75e17c32c6b27ae912b530071d 100644
--- a/llvm/test/Regression/Analysis/Andersens/arg-must-alias.ll
+++ b/llvm/test/Regression/Analysis/Andersens/arg-must-alias.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG
+; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG
 
 %G = internal constant int* null
 
diff --git a/llvm/test/Regression/Analysis/Andersens/basictest.ll b/llvm/test/Regression/Analysis/Andersens/basictest.ll
index 220e3bca7414e5684059eff3bf2454bf22f3575f..5730f75b5b07cfda8ea3a118b24df14f077f5565 100644
--- a/llvm/test/Regression/Analysis/Andersens/basictest.ll
+++ b/llvm/test/Regression/Analysis/Andersens/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -anders-aa -aa-eval
+; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -aa-eval
 
 implementation
 
diff --git a/llvm/test/Regression/Analysis/Andersens/external.ll b/llvm/test/Regression/Analysis/Andersens/external.ll
index 117a690ab022baad03068c7ac35b5682143210f8..a829999f446346c06ca7327f86d6f89add2594cc 100644
--- a/llvm/test/Regression/Analysis/Andersens/external.ll
+++ b/llvm/test/Regression/Analysis/Andersens/external.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null
+; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null
 
 ; Because the 'internal' function is passed to an external function, we don't
 ; know what the incoming values will alias.  As such, we cannot do the 
diff --git a/llvm/test/Regression/Analysis/Andersens/modreftest.ll b/llvm/test/Regression/Analysis/Andersens/modreftest.ll
index 979aa037380c41e3eccec654dba8c3250eb856b8..488c6f54733fe89492b45b7fcc32269f0659ec11 100644
--- a/llvm/test/Regression/Analysis/Andersens/modreftest.ll
+++ b/llvm/test/Regression/Analysis/Andersens/modreftest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret bool true'
 
 %G = internal global int* null
 declare int *%ext()
diff --git a/llvm/test/Regression/Analysis/Andersens/trivialtest.ll b/llvm/test/Regression/Analysis/Andersens/trivialtest.ll
index 5cebe0065ee7a1b4ccafea6677ac2b1ba0851209..9e447d6d6b5df4bd8c7e19ac14cb6e93ea869a18 100644
--- a/llvm/test/Regression/Analysis/Andersens/trivialtest.ll
+++ b/llvm/test/Regression/Analysis/Andersens/trivialtest.ll
@@ -1,3 +1,3 @@
-; RUN: llvm-as < %s | opt -anders-aa -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -disable-output
 
 void %foo() { ret void }
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll b/llvm/test/Regression/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll
index fb44d94a578d726ca9d440cd393bbe6b88ca4cb7..cb2b27eeb2243fd82ff7893f4540eca43fe8f016 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE
 
 int %test() {
 	%A = alloca int
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-03-04-GEPCrash.ll b/llvm/test/Regression/Analysis/BasicAA/2003-03-04-GEPCrash.ll
index 8a25031d7b4e0e923c8228aefd4bc31fbed7e471..ee008a8df0f9f5517159150168ed6fba4ea269e0 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-03-04-GEPCrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-03-04-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | 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, uint 0, long %X
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-04-22-GEPProblem.ll b/llvm/test/Regression/Analysis/BasicAA/2003-04-22-GEPProblem.ll
index 70f71c22fb8d23c2ee4d76f08f3b5340ba0b8d43..ddadc8eea2dbe6434078b0672f542c48d8367aab 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-04-22-GEPProblem.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-04-22-GEPProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 ; BasicAA was incorrectly concluding that P1 and P2 didn't conflict!
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-04-25-GEPCrash.ll b/llvm/test/Regression/Analysis/BasicAA/2003-04-25-GEPCrash.ll
index 14013822f97d03c99142168d0c9867879372cf5a..7e39f1398bb782484ad7fbb690be360244b8832e 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-04-25-GEPCrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-04-25-GEPCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Analysis/BasicAA/2003-05-21-GEP-Problem.ll b/llvm/test/Regression/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
index 2e95261b5dbc8cd3efa335a4f02d9467758626a4..146fc54f4d27ff6a740f5ddad37c10ae53d1bdac 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-05-21-GEP-Problem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Analysis/BasicAA/2003-06-01-AliasCrash.ll b/llvm/test/Regression/Analysis/BasicAA/2003-06-01-AliasCrash.ll
index 2c2fbca550507d284c4698e31be82d3f7995b10e..772bca906e85a2f233af6caa692b09195f392b9a 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-06-01-AliasCrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-06-01-AliasCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Analysis/BasicAA/2003-07-03-BasicAACrash.ll b/llvm/test/Regression/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
index 942fe9f147951488936dc9025c59d6a885ae6c38..61f39579b40f2f02a2d3751b31c4d2b2cc27dbcd 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-07-03-BasicAACrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -aa-eval -disable-output
 
 	%struct..RefPoint = type { int, { uint, ushort, ushort } }
 	%struct..RefRect = type { %struct..RefPoint, %struct..RefPoint }
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-09-19-LocalArgument.ll b/llvm/test/Regression/Analysis/BasicAA/2003-09-19-LocalArgument.ll
index 90f7172e4abba4647fdd9d2ce2b3ba3aba5f7ea3..ee6ac9c65a224e6a2a3343a05eabad97950f8e22 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-09-19-LocalArgument.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-09-19-LocalArgument.ll
@@ -1,6 +1,6 @@
 ; In this test, a local alloca cannot alias an incoming argument.
 
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | not grep sub
 
 int %test(int* %P) {
 	%X = alloca int
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-11-04-SimpleCases.ll b/llvm/test/Regression/Analysis/BasicAA/2003-11-04-SimpleCases.ll
index c030c06adead60cf5d243e979337ce143e2f57b0..fe6ed0804a988cc65eff13905e4236a30fae8e00 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-11-04-SimpleCases.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-11-04-SimpleCases.ll
@@ -1,7 +1,7 @@
 ; This testcase consists of alias relations which should be completely
 ; resolvable by basicaa.
 
-; RUN: llvm-as < %s | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May:
+; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May:
 
 %T = type { uint, [10 x ubyte] }
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll b/llvm/test/Regression/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
index f751928c064d25a20ec899776e032459a658d8df..f74bdba2c1789858d9117697071d3c5696f60980 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
@@ -1,7 +1,7 @@
 ; This testcase consists of alias relations which should be completely
 ; resolvable by basicaa, but require analysis of getelementptr constant exprs.
 
-; RUN: llvm-as < %s | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May:
+; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May:
 
 %T = type { uint, [10 x ubyte] }
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash.ll b/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash.ll
index 49218249981afe073aad8d2747f113fcfd7e63a6..2539c453efa6ef9a9e9f2621a8ed108fb4c005d9 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm
 
 "java/lang/Object" = type { %struct.llvm_java_object_base }
 	"java/lang/StringBuffer" = type { "java/lang/Object", int, { "java/lang/Object", uint, [0 x ushort] }*, bool }
diff --git a/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll b/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll
index d856260baed77ac77f42a6ec27d97184eb3410e5..d5d16d872f91225d24d825913f41ba552e1dc3dc 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse
 
 "java/lang/Object" = type { %struct.llvm_java_object_base }
 	"java/lang/StringBuffer" = type { "java/lang/Object", int, { "java/lang/Object", uint, [0 x ushort] }*, bool }
diff --git a/llvm/test/Regression/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll b/llvm/test/Regression/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
index 7560143207107f6f83aeb7af5f2efe4785670906..e8289109ddec6c7ddc12f785185de20466768c28 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load int\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load int\* %A'
 
 declare double* %useit(int*)
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/llvm/test/Regression/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
index 767df3460bb43ae23434674dffd246d519b4cb3e..6c822172392f1a510474b91372d481b136b65045 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -aa-eval -disable-output 2>&1 | grep '2 no alias respon'
+; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -disable-output 2>&1 | grep '2 no alias respon'
 
 ;; TEST that A[1][0] may alias A[0][i].
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll b/llvm/test/Regression/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll
index 9279825a4ef211642c57e9e36fdadaf53bb22003..0503faca916d9f7625b84799721459f93c24f356 100644
--- a/llvm/test/Regression/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output
 target endian = big
 target pointersize = 32
 target triple = "powerpc-apple-darwin8.7.0"
diff --git a/llvm/test/Regression/Analysis/BasicAA/featuretest.ll b/llvm/test/Regression/Analysis/BasicAA/featuretest.ll
index d7bec224471edbf97c4c3b34c4b55205d500d09e..52e0a5267005a19827c8357853a5bd1e94f470d7 100644
--- a/llvm/test/Regression/Analysis/BasicAA/featuretest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE
 
 %Global = external global { int }
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/gcsetest.ll b/llvm/test/Regression/Analysis/BasicAA/gcsetest.ll
index 4af5cc16db88be97720ba62a97a2c2c69bcd3081..cd1286f60b484b06392bf0e19e3f2cdf8f8c2c83 100644
--- a/llvm/test/Regression/Analysis/BasicAA/gcsetest.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/gcsetest.ll
@@ -2,7 +2,7 @@
 ; disambiguating some obvious cases.  All loads should be removable in 
 ; this testcase.
 
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load
 
 %A = global int 7
 %B = global int 8
diff --git a/llvm/test/Regression/Analysis/BasicAA/global-size.ll b/llvm/test/Regression/Analysis/BasicAA/global-size.ll
index 52ea7bc7b0ecbf4723b01fe5bdc6a13cbe127039..5e752494a54dd43cf2965042235a5656255d1075 100644
--- a/llvm/test/Regression/Analysis/BasicAA/global-size.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/global-size.ll
@@ -1,7 +1,7 @@
 ; A store or load cannot alias a global if the accessed amount is larger then
 ; the global.
 
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep load
 
 %B = global short 8
 
diff --git a/llvm/test/Regression/Analysis/BasicAA/licmtest.ll b/llvm/test/Regression/Analysis/BasicAA/licmtest.ll
index 56682c7cabf3bc62b9614a83a90b3c819c34aa6a..0b1394394e9dd67743baf687aa631cc500b2f3ce 100644
--- a/llvm/test/Regression/Analysis/BasicAA/licmtest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -basicaa -licm --adce | llvm-dis | not grep Loop
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm --adce | llvm-dis | not grep Loop
 
 %A = global int 7
 %B = global int 8
diff --git a/llvm/test/Regression/Analysis/BasicAA/modref.ll b/llvm/test/Regression/Analysis/BasicAA/modref.ll
index 1cb478c8e1e58177f2cf603b19e483bfabdea2d0..be2506c801d05b978617e8503b65f6ee365bde40 100644
--- a/llvm/test/Regression/Analysis/BasicAA/modref.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/modref.ll
@@ -1,6 +1,6 @@
 ; A very rudimentary test on AliasAnalysis::getModRefInfo.
-; RUN: llvm-as < %s | opt -print-all-alias-modref-info -aa-eval -disable-output &&
-; RUN: llvm-as < %s | opt -print-all-alias-modref-info -aa-eval -disable-output 2>&1 | not grep NoModRef
+; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output 2>&1 | not grep NoModRef
 
 int %callee() {
   %X = alloca { int, int }
diff --git a/llvm/test/Regression/Analysis/BasicAA/tailcall-modref.ll b/llvm/test/Regression/Analysis/BasicAA/tailcall-modref.ll
index c58ad7ffcd4c320cb52c0d05f1ec5dfed38ef5bc..7fbddd769f512fa19b7234c0e48d54f4b7aa8c53 100644
--- a/llvm/test/Regression/Analysis/BasicAA/tailcall-modref.ll
+++ b/llvm/test/Regression/Analysis/BasicAA/tailcall-modref.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
 declare void %foo(int*)
 declare void %bar()
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll
index 713a876536dc81b1c24d56e06941658240b77ffc..9afd1daa8a1148674078e3e1b15fff2aa96a97cb 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=Ptr:HR
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=Ptr:HR
 
 
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll
index db956231f8f11e6667420930c4ab9176fc7f45b8..9ecf0f17416757f5533ae52700558ed4cacdb27e 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
 %T = type { int*, int* }
 
 int %main() {
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll
index 93260e821e4a8d6e582cfe32d074b4fb4252ed3f..d9ded6019e26283cf9907522edda29cf7baa4941 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll
@@ -1,7 +1,7 @@
 ; This is the same testcase as 2003-06-29-NodeCollapsing2.ll, but it uses the 
 ; graph checker.
 ;
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
 ;
 %T = type { int}
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-06-30-TopDownResolve.ll b/llvm/test/Regression/Analysis/DSGraph/2003-06-30-TopDownResolve.ll
index 631eb9f078e6cf7383b9bb962d1a49de8ec352d3..143289ceee138b063e6ce63486015e3abaacb7ed 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-06-30-TopDownResolve.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-06-30-TopDownResolve.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=X:GM
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=X:GM
 
 %G = internal global int 5
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-07-01-FieldCollapse.ll b/llvm/test/Regression/Analysis/DSGraph/2003-07-01-FieldCollapse.ll
index a0ab49244388e293e91b708ea311aa466a85d074..3ae36fef8b89ae1508a8031a5ec05e7fd30f26bf 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-07-01-FieldCollapse.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-07-01-FieldCollapse.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
 
 %X = internal global { int, short, short } { int 1, short 2, short 3 }
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll b/llvm/test/Regression/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll
index cd8919df0fae865796c6f945daa340c60f725cb2..0fd930f06dc8a54f5058fc003f9d25f84874edde 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll
@@ -1,6 +1,6 @@
 ; This should cause the global node to collapse!!
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-check-flags=test:GAU
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-check-flags=test:GAU
 
 %Tree = type { int, %Tree*, %Tree* }
 %T5 = external global %Tree
diff --git a/llvm/test/Regression/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll b/llvm/test/Regression/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll
index 416fc25bbb8524fb30b1cc1ad352d2fbbf51904e..c082b61ea4521303e3bff4dd940042a259bee79a 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll
@@ -1,7 +1,7 @@
 ; This is the same testcase as 2003-06-29-NodeCollapsing2.ll, but it uses the 
 ; graph checker.
 ;
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
 ;
 
 %S = type { double, int }
diff --git a/llvm/test/Regression/Analysis/DSGraph/2004-02-13-memcpy.ll b/llvm/test/Regression/Analysis/DSGraph/2004-02-13-memcpy.ll
index 835b42cbe43f08ef4a50212869056389d657b19e..d580097e92733fe62e85c00835254074d7964a02 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2004-02-13-memcpy.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2004-02-13-memcpy.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=Xn:SMR &&
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=X:SMR
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=Xn:SMR &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=X:SMR
 
 declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint, uint)
 declare void %llvm.memmove.i32(sbyte*, sbyte*, uint, uint)
diff --git a/llvm/test/Regression/Analysis/DSGraph/2004-03-10-ElimLoad.ll b/llvm/test/Regression/Analysis/DSGraph/2004-03-10-ElimLoad.ll
index 1ae0a48a84385f1eda3b261fd2dfaf46a2c71bd8..09ebb2b4a4b3318fb86561425ede8efc202ebbc0 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2004-03-10-ElimLoad.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2004-03-10-ElimLoad.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub
 
 void %bar(int* %p) {
   ret void
diff --git a/llvm/test/Regression/Analysis/DSGraph/2004-03-10-NoElimLoad.ll b/llvm/test/Regression/Analysis/DSGraph/2004-03-10-NoElimLoad.ll
index 3a8e540ef16fd863486290475cfb9b33a9d86df4..fdd16de047ab4ff6af303516fb92732332511154 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2004-03-10-NoElimLoad.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2004-03-10-NoElimLoad.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 void %bar(int* %p) {
   store int 15, int* %p
diff --git a/llvm/test/Regression/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll b/llvm/test/Regression/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll
index 86b053367d6b63c916eee52c4df8b9525e9d946f..b8abe2e41b5c0cd8c0b21c2b8d815933b26f8402 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc  -dsgc-check-flags=G:GIM -dsgc-dspass=bu &&\
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc  -dsgc-check-flags=G:GIM -dsgc-dspass=td
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc  -dsgc-check-flags=G:GIM -dsgc-dspass=bu &&\
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc  -dsgc-check-flags=G:GIM -dsgc-dspass=td
 
 %S = type { double, int }
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll b/llvm/test/Regression/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll
index 510997de22fcc7213e07762e6725d6fd430fddc9..e79acd777b47fa2843a536e38d889205151ffd29 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse | llvm-dis | grep 'load int\* %L'
+; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse | llvm-dis | grep 'load int\* %L'
 
 %G = internal global int* null
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll b/llvm/test/Regression/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll
index ce1ebb920270f4d25931b8048b184108904a9e25..1c5ed693a2296e339d6a283d8ea7ce260ce73db7 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll b/llvm/test/Regression/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll
index 0fa6ba8d8f3c0020e74bfd2fc72706e346368dcf..14ef03319b6be7de71935e6e88d36e1401b6f8f6 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure
 
 ; ModuleID = 'bug3.bc'
 target endian = little
diff --git a/llvm/test/Regression/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll b/llvm/test/Regression/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll
index db072d906d93a8acf8b127481dece6677b4fa11c..5598c2035ba4592cf5cf4d3b57d91031b3dc796f 100644
--- a/llvm/test/Regression/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=x:IA
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=x:IA
 
 ; ModuleID = 'bug3.bc'
 target endian = little
diff --git a/llvm/test/Regression/Analysis/DSGraph/FunctionPointerTable-const.ll b/llvm/test/Regression/Analysis/DSGraph/FunctionPointerTable-const.ll
index 9c904fa0e07e115d0f37684645ed7011c6bd00e7..6ac224721dd303043960ee79e521833994db06c0 100644
--- a/llvm/test/Regression/Analysis/DSGraph/FunctionPointerTable-const.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/FunctionPointerTable-const.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=Y:SHM && \
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=P1:SHM,P2:SHM
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=Y:SHM && \
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=P1:SHM,P2:SHM
 
 %G = internal constant [2 x int*(int*)*] [ 
   int*(int*)* %callee1, int*(int*)* %callee2
diff --git a/llvm/test/Regression/Analysis/DSGraph/GlobalsGraphFuncPtr.ll b/llvm/test/Regression/Analysis/DSGraph/GlobalsGraphFuncPtr.ll
index 6cc06c4b01ec69b534e1a7292685c06a326ea8c9..a44488d8855376bc9746d4bcbe4b12d7932c8409 100644
--- a/llvm/test/Regression/Analysis/DSGraph/GlobalsGraphFuncPtr.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/GlobalsGraphFuncPtr.ll
@@ -4,7 +4,7 @@
 ; -- latter should remain unresolved in main() and copied to GG
 ; -- globals in GG pointed to by latter should be marked I, but not other nodes
 ;
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=KnownPtr:S,UnknownPtr:SI -dsgc-dspass=bu
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=KnownPtr:S,UnknownPtr:SI -dsgc-dspass=bu
 
 %Z = internal global int 0
 %X = internal global int 0
diff --git a/llvm/test/Regression/Analysis/DSGraph/HardBUCase.ll b/llvm/test/Regression/Analysis/DSGraph/HardBUCase.ll
index 63ec3faca063b0f406d1890723f1416a381f3cc6..838a33ac82e3a413d70e6cbf7530255c7b753efd 100644
--- a/llvm/test/Regression/Analysis/DSGraph/HardBUCase.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/HardBUCase.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -budatastructure -dont-print-ds
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -budatastructure -dont-print-ds
 
 %MidFnTy = type void (\2*)
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/PhysicalSubtyping.ll b/llvm/test/Regression/Analysis/DSGraph/PhysicalSubtyping.ll
index 6e9676ea1251d88240f915db590f48f8ec872f0d..025ead093f96a897ed4700c09910076fccff3a8d 100644
--- a/llvm/test/Regression/Analysis/DSGraph/PhysicalSubtyping.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/PhysicalSubtyping.ll
@@ -1,6 +1,6 @@
 ; Test to check for support for "physical subtyping"
 ;
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed
 ;
 %S = type { int }
 %T = type { int, float, double }
diff --git a/llvm/test/Regression/Analysis/DSGraph/SCCSimpleExample.ll b/llvm/test/Regression/Analysis/DSGraph/SCCSimpleExample.ll
index c742afa25f6fbe9bc37ee1f503a7a8f2081cb0c0..d55e5415674e2aac204f8ad1d8cc5a3629716fcd 100644
--- a/llvm/test/Regression/Analysis/DSGraph/SCCSimpleExample.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/SCCSimpleExample.ll
@@ -1,5 +1,5 @@
 
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-abort-if-merged=Y,BVal
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-abort-if-merged=Y,BVal
 
 implementation
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/buglobals.ll b/llvm/test/Regression/Analysis/DSGraph/buglobals.ll
index c3bc745686ad56a133589e156c6ed7283307ec6f..2f7c8f6449d46024d0e12f4a304429ecaa0791a4 100644
--- a/llvm/test/Regression/Analysis/DSGraph/buglobals.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/buglobals.ll
@@ -1,7 +1,7 @@
 ; This tests to make sure that G ends up in the globals graph of the BU pass.
 ; If it is not, then %G will get converted to a 'constant' from a 'global'
 ;
-; RUN: llvm-as < %s | opt -ds-opt -globaldce | llvm-dis | grep %G
+; RUN: llvm-upgrade < %s | llvm-as | opt -ds-opt -globaldce | llvm-dis | grep %G
 
 
 %G = internal global int 0		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/Analysis/DSGraph/constant_globals.ll b/llvm/test/Regression/Analysis/DSGraph/constant_globals.ll
index 1ee6530883784bdc09af7a6e36932da11e8873be..67de589de39e013f48f7a71de8da425c814389c5 100644
--- a/llvm/test/Regression/Analysis/DSGraph/constant_globals.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/constant_globals.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=A:SM
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=A:SM
 ; Constant globals should not mark stuff incomplete.  This should allow the 
 ; bu pass to resolve the indirect call immediately in "test", allowing %A to
 ; be marked complete and the store to happen.
diff --git a/llvm/test/Regression/Analysis/DSGraph/constantize.ll b/llvm/test/Regression/Analysis/DSGraph/constantize.ll
index fa7c12f5d8595536af3ca3993e59a76799609439..c8d0ad8fc569a31686d8d41223c1933d62e02d43 100644
--- a/llvm/test/Regression/Analysis/DSGraph/constantize.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/constantize.ll
@@ -1,6 +1,6 @@
 ; Make sure that the ds-opt pass is constantizing globals
 ;
-; RUN: llvm-as < %s | opt -ds-opt | llvm-dis | grep %G | grep constant
+; RUN: llvm-upgrade < %s | llvm-as | opt -ds-opt | llvm-dis | grep %G | grep constant
 
 
 %G = internal global int 0		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/Analysis/DSGraph/field-sensitive.ll b/llvm/test/Regression/Analysis/DSGraph/field-sensitive.ll
index dc3fc22dfb822695f2990d5be06231aec365e252..49aeaba7dfe9bc45f9837f46519f82ba8c30fa5c 100644
--- a/llvm/test/Regression/Analysis/DSGraph/field-sensitive.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/field-sensitive.ll
@@ -1,5 +1,5 @@
 ; Test that ds-aa can be used for queries that require field sensitive AA.
-; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
 
 %Pair = type { int, int }
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/gcsetest.ll b/llvm/test/Regression/Analysis/DSGraph/gcsetest.ll
index b9b28c4f8c5a207edfb50e81d95aa631786377d9..bb7af1249c4e730b27593bcef441c8fc57cc042f 100644
--- a/llvm/test/Regression/Analysis/DSGraph/gcsetest.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/gcsetest.ll
@@ -1,7 +1,7 @@
 ; Test that GCSE uses ds-aa to do alias analysis, which is capable of 
 ; disambiguating some cases.
 
-; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse -instcombine -dce | llvm-dis | not grep ELIM
+; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse -instcombine -dce | llvm-dis | not grep ELIM
 
 %intpair = type {int*, int*}
 implementation
diff --git a/llvm/test/Regression/Analysis/DSGraph/incompletenode.ll b/llvm/test/Regression/Analysis/DSGraph/incompletenode.ll
index b9940db157f75bfec7a7eb98cb214a38f6c0ecf1..c94faf08946742fe908ce3378d027d685cd896f6 100644
--- a/llvm/test/Regression/Analysis/DSGraph/incompletenode.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/incompletenode.ll
@@ -1,7 +1,7 @@
 ; This test was failing because the globals X and Y are marked incomplete
 ; in the TD graph for %test
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep seteq
+; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep seteq
 
 %X = internal global int 20
 %Y = internal global int* null
diff --git a/llvm/test/Regression/Analysis/DSGraph/mustalias.ll b/llvm/test/Regression/Analysis/DSGraph/mustalias.ll
index 4425157f0881cfbd51eecc60a4e6852efc403fd4..111b7addcede67e767c8e5fe1f7690b25c111cfb 100644
--- a/llvm/test/Regression/Analysis/DSGraph/mustalias.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/mustalias.ll
@@ -1,6 +1,6 @@
 ; Test that ds-aa is returning must-alias information when it can.
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load
 
 %X = internal global int 20
 
diff --git a/llvm/test/Regression/Analysis/DSGraph/strcpy.ll b/llvm/test/Regression/Analysis/DSGraph/strcpy.ll
index 7697c7ffa727c5ee11333f46f0d2850249a6fa5f..20c2da802d8174e04bdb5437d1524f93fc434b7d 100644
--- a/llvm/test/Regression/Analysis/DSGraph/strcpy.ll
+++ b/llvm/test/Regression/Analysis/DSGraph/strcpy.ll
@@ -3,7 +3,7 @@
 ; has no defined way to check for this, so DSA can know that strcpy doesn't
 ; require merging the input arguments.
 
-; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-abort-if-merged=A,B --dsgc-check-flags=A:ASM,B:ASR --dsgc-dspass=bu
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-abort-if-merged=A,B --dsgc-check-flags=A:ASM,B:ASR --dsgc-dspass=bu
 
 implementation
 
diff --git a/llvm/test/Regression/Analysis/Dominators/2003-05-12-UnreachableCode.ll b/llvm/test/Regression/Analysis/Dominators/2003-05-12-UnreachableCode.ll
index 1df4f785fdb2e4d3d312ea7a33a3e77ada914a7e..256cb54e56dc9c0c5e50707b0bbb6bb03be1f71e 100644
--- a/llvm/test/Regression/Analysis/Dominators/2003-05-12-UnreachableCode.ll
+++ b/llvm/test/Regression/Analysis/Dominators/2003-05-12-UnreachableCode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -domset -disable-verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -domset -disable-verify
 ;
 int %re_match_2() {
 ENTRY:
diff --git a/llvm/test/Regression/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll b/llvm/test/Regression/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
index 3ff1184bfaa7be9f881c371e231d7eaa773abf47..36385e2b207bf0ca7e4273404da0dfb19a3a5050 100644
--- a/llvm/test/Regression/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
+++ b/llvm/test/Regression/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -postdomfrontier -disable-verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier -disable-verify
 ;
 ; ModuleID = '2006-09-26-PostDominanceFrontier.bc'
 target endian = little
diff --git a/llvm/test/Regression/Analysis/Dominators/2006-10-02-BreakCritEdges.ll b/llvm/test/Regression/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
index cce885beec6ef3e1ebd518c38238eef85ee0120f..e7bb43e97f434634c607b9de33f0190ed83c7e22 100644
--- a/llvm/test/Regression/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
+++ b/llvm/test/Regression/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$'
+; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$'
 ; PR932
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Analysis/GlobalsModRef/aliastest.ll b/llvm/test/Regression/Analysis/GlobalsModRef/aliastest.ll
index 19def38595329e0775fb14b825b8d733ed671c29..4363d3b30fd76744e4fd2adccc653efece0a8f5b 100644
--- a/llvm/test/Regression/Analysis/GlobalsModRef/aliastest.ll
+++ b/llvm/test/Regression/Analysis/GlobalsModRef/aliastest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
 %X = internal global int 4
 
 int %test(int *%P) {
diff --git a/llvm/test/Regression/Analysis/GlobalsModRef/chaining-analysis.ll b/llvm/test/Regression/Analysis/GlobalsModRef/chaining-analysis.ll
index 5caa0a8eb930011e0f0fc7fef0f0cc83fd763ac2..49244563c0c9e6ee106390ae40f84861850595e7 100644
--- a/llvm/test/Regression/Analysis/GlobalsModRef/chaining-analysis.ll
+++ b/llvm/test/Regression/Analysis/GlobalsModRef/chaining-analysis.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
 
 ; This test requires the use of previous analyses to determine that 
 ; doesnotmodX does not modify X (because 'sin' doesn't).
diff --git a/llvm/test/Regression/Analysis/GlobalsModRef/indirect-global.ll b/llvm/test/Regression/Analysis/GlobalsModRef/indirect-global.ll
index 206955eba75210390185ebf70e2d08a1e0c58b7e..d0f79c12ea8f7cedee4169551d120c2a6f6d442c 100644
--- a/llvm/test/Regression/Analysis/GlobalsModRef/indirect-global.ll
+++ b/llvm/test/Regression/Analysis/GlobalsModRef/indirect-global.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
 %G = internal global int* null
 
 implementation
diff --git a/llvm/test/Regression/Analysis/GlobalsModRef/modreftest.ll b/llvm/test/Regression/Analysis/GlobalsModRef/modreftest.ll
index a08eef1b6661c5cb231120bb6e93461b9d5653e1..fadc7471f8d476bcccbb7b5b249e8bba797dfc58 100644
--- a/llvm/test/Regression/Analysis/GlobalsModRef/modreftest.ll
+++ b/llvm/test/Regression/Analysis/GlobalsModRef/modreftest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
 %X = internal global int 4
 
 int %test(int *%P) {
diff --git a/llvm/test/Regression/Analysis/GlobalsModRef/purecse.ll b/llvm/test/Regression/Analysis/GlobalsModRef/purecse.ll
index bed282338d6f87200fe543dd84908155c7531aaa..0c95182d46d7616434dc87c13d8425fe34902981 100644
--- a/llvm/test/Regression/Analysis/GlobalsModRef/purecse.ll
+++ b/llvm/test/Regression/Analysis/GlobalsModRef/purecse.ll
@@ -1,6 +1,6 @@
 ; Test that pure functions are cse'd away
 
-; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub
 
 int %pure(int %X) {
 	%Y = add int %X, 1
diff --git a/llvm/test/Regression/Analysis/LoadVN/RLE-Eliminate.ll b/llvm/test/Regression/Analysis/LoadVN/RLE-Eliminate.ll
index dba82b7e758e0d6284f5a35b6be3ce783e6512ce..4c3a668bc9b9302343b8bace953efdcaf978ef54 100644
--- a/llvm/test/Regression/Analysis/LoadVN/RLE-Eliminate.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep %RL
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep %RL
 ;
 int "test1"(int* %P) {
 	%A = load int* %P
diff --git a/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve-Volatile.ll b/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve-Volatile.ll
index c320bc3eeaca08656292f3385f37634bcce03a93..99660168fb2dd45d28f1e488a6dfbac4c5f3a624 100644
--- a/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve-Volatile.ll
+++ b/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve-Volatile.ll
@@ -1,5 +1,5 @@
 
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep sub
 
 int %test(int* %P) {
 	%X = volatile load int* %P
diff --git a/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve.ll b/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve.ll
index 88a0c7f2987fb120058d66fe5ea5d133cfa48fd0..e08c41ceeb8b2b22b029ce56706cae54aa20e711 100644
--- a/llvm/test/Regression/Analysis/LoadVN/RLE-Preserve.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -load-vn -gcse | llvm-dis | grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | grep sub
 ;
 int %test1(int* %P) {
 	%A = load int* %P
diff --git a/llvm/test/Regression/Analysis/LoadVN/call_cse.ll b/llvm/test/Regression/Analysis/LoadVN/call_cse.ll
index 311f38aa1578baaa6d21b4e5505d2a3502633284..78cdd43051feff3c032d2af84fca993d065611da 100644
--- a/llvm/test/Regression/Analysis/LoadVN/call_cse.ll
+++ b/llvm/test/Regression/Analysis/LoadVN/call_cse.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
 declare int %strlen(sbyte*)
 
 int %test(sbyte* %P) {
diff --git a/llvm/test/Regression/Analysis/LoadVN/call_pure_function.ll b/llvm/test/Regression/Analysis/LoadVN/call_pure_function.ll
index c9de486c066ec1be73f14d6b6b90889974b1ce4a..302ae604663d1e4dd6d934019f9375dc1b83ae76 100644
--- a/llvm/test/Regression/Analysis/LoadVN/call_pure_function.ll
+++ b/llvm/test/Regression/Analysis/LoadVN/call_pure_function.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
 declare int %strlen(sbyte*)
 declare void %use(int %X)
 
diff --git a/llvm/test/Regression/Analysis/LoadVN/dependent_loads.ll b/llvm/test/Regression/Analysis/LoadVN/dependent_loads.ll
index 331ba2110e84c0c336f8e886e323ff60fab05ae6..168b640c9e759b95085d26a2c7f5d0a6a96e5fe2 100644
--- a/llvm/test/Regression/Analysis/LoadVN/dependent_loads.ll
+++ b/llvm/test/Regression/Analysis/LoadVN/dependent_loads.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub
 
 %S = type { int, sbyte }
 
diff --git a/llvm/test/Regression/Analysis/LoadVN/undefined_load.ll b/llvm/test/Regression/Analysis/LoadVN/undefined_load.ll
index 9f01d24806da534257ed65690994cfd31bf18be8..8e4660c045d8e117f601c0f6bb0b7c0058b85537 100644
--- a/llvm/test/Regression/Analysis/LoadVN/undefined_load.ll
+++ b/llvm/test/Regression/Analysis/LoadVN/undefined_load.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep load
 ; Test that loads of undefined memory are eliminated.
 
 int %test1() {
diff --git a/llvm/test/Regression/Analysis/LoopInfo/2003-05-15-NestingProblem.ll b/llvm/test/Regression/Analysis/LoopInfo/2003-05-15-NestingProblem.ll
index 6c5bb689b49d23fc6504dd08538ad7ca927e601d..3eeecae0534c142bca3b3e666e1afb0ea54c7b2c 100644
--- a/llvm/test/Regression/Analysis/LoopInfo/2003-05-15-NestingProblem.ll
+++ b/llvm/test/Regression/Analysis/LoopInfo/2003-05-15-NestingProblem.ll
@@ -1,7 +1,7 @@
 ; This testcase was incorrectly computing that the loopentry.7 loop was
 ; not a child of the loopentry.6 loop.
 ;
-; RUN: llvm-as < %s | opt -analyze -loops | grep "^            Loop Containing:  %loopentry.7"
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | grep "^            Loop Containing:  %loopentry.7"
 
 void %getAndMoveToFrontDecode() {		; No predecessors!
 	br label %endif.2
diff --git a/llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx b/llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx
index 04a1b463c4d45657195656fd1ae81a31b61debc7..d0f413ae9e954db33564ca6a4506dceb0a438e43 100644
--- a/llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx
+++ b/llvm/test/Regression/Assembler/2002-04-07-HexFloatConstants.llx
@@ -5,8 +5,8 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: llvm-as < %s | opt -constprop | llvm-dis > %t.1 && \
-; RUN: llvm-as < %s | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1 && \
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \
 ; RUN: diff %t.1 %t.2
 
 implementation
diff --git a/llvm/test/Regression/Assembler/2002-04-07-InfConstant.llx b/llvm/test/Regression/Assembler/2002-04-07-InfConstant.llx
index 8ca7450bf74193adb675adcd25e9ab1b882f5250..f1479eb4df2d64d97192c18ae3327006f29ee52a 100644
--- a/llvm/test/Regression/Assembler/2002-04-07-InfConstant.llx
+++ b/llvm/test/Regression/Assembler/2002-04-07-InfConstant.llx
@@ -1,6 +1,6 @@
 ; The output formater prints out 1.0e100 as Inf!
 ;
-; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
 
 implementation
 
diff --git a/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx b/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
index 88ad4936067d8c64613eea417376288c13cc0403..ad994f0386c750f4919bfbad0708949e5df727df 100644
--- a/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
+++ b/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
@@ -4,7 +4,7 @@
 ; Check by running globaldce, which will remove the constant if there are
 ; no references to it!
 ; 
-; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep constant
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep constant
 ;
 	
 %v1 = internal constant int 5
diff --git a/llvm/test/Regression/Assembler/2002-07-14-InternalLossage.llx b/llvm/test/Regression/Assembler/2002-07-14-InternalLossage.llx
index 31469649c2cf93e70ed0a402e251c9a147fc6abc..51f88e4d616fa244d61047c83cd4e22c470e2159 100644
--- a/llvm/test/Regression/Assembler/2002-07-14-InternalLossage.llx
+++ b/llvm/test/Regression/Assembler/2002-07-14-InternalLossage.llx
@@ -1,6 +1,6 @@
 ; Test to make sure that the 'internal' tag is not lost!
 ;
-; RUN: llvm-as < %s | llvm-dis | grep internal
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep internal
 
 declare void %foo()
 implementation
diff --git a/llvm/test/Regression/Assembler/2002-07-14-OpaqueType.llx b/llvm/test/Regression/Assembler/2002-07-14-OpaqueType.llx
index b4de7e720f7ee97c341896f94380a4227a4ff54c..dce13fe6b81a2e9ce0b52d0a8dd3d18d567106ff 100644
--- a/llvm/test/Regression/Assembler/2002-07-14-OpaqueType.llx
+++ b/llvm/test/Regression/Assembler/2002-07-14-OpaqueType.llx
@@ -1,5 +1,5 @@
 ; Test that opaque types are preserved correctly
-; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
 ;
 
 %Ty = type opaque
diff --git a/llvm/test/Regression/Assembler/2002-07-25-QuoteInString.llx b/llvm/test/Regression/Assembler/2002-07-25-QuoteInString.llx
index 156f97963b978ab6ae542d08c2f7b0b492538842..59a664e0546e96cc72b1ba6a649ac5d4b1a79d30 100644
--- a/llvm/test/Regression/Assembler/2002-07-25-QuoteInString.llx
+++ b/llvm/test/Regression/Assembler/2002-07-25-QuoteInString.llx
@@ -1,5 +1,5 @@
 ; Test double quotes in strings work correctly!
-; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
 ;
 
 %str = internal global [6 x sbyte] c"\22foo\22\00"
diff --git a/llvm/test/Regression/Assembler/2002-07-25-ReturnPtrFunction.llx b/llvm/test/Regression/Assembler/2002-07-25-ReturnPtrFunction.llx
index 354fa54be986e552a5d6bec590484b86ec8c5260..c5c4aa8a8b74668991a50873ff59574c90b60eac 100644
--- a/llvm/test/Regression/Assembler/2002-07-25-ReturnPtrFunction.llx
+++ b/llvm/test/Regression/Assembler/2002-07-25-ReturnPtrFunction.llx
@@ -1,7 +1,7 @@
 ; Test that returning a pointer to a function causes the disassembler to print 
 ; the right thing.
 ;
-; RUN: llvm-as < %s | llvm-dis | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as
 
 %ty = type void (int)
 
diff --git a/llvm/test/Regression/Assembler/2002-07-31-SlashInString.llx b/llvm/test/Regression/Assembler/2002-07-31-SlashInString.llx
index 4408f0a8bb45a70f9b2d41e8c1ea65eb9dbb61e8..9fae11aa33c977e480abedb8bd17bafa2d9cdcf6 100644
--- a/llvm/test/Regression/Assembler/2002-07-31-SlashInString.llx
+++ b/llvm/test/Regression/Assembler/2002-07-31-SlashInString.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | llvm-as 
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as 
 
 ; Make sure that \\ works in a string initializer
 %Slashtest = internal global [8 x sbyte] c"\5Cbegin{\00"
diff --git a/llvm/test/Regression/Assembler/2002-08-16-ConstExprInlined.llx b/llvm/test/Regression/Assembler/2002-08-16-ConstExprInlined.llx
index a88dc6ad88b75dcbbfce99738ffcbc1a3d360d1e..b344d9faccd6267dbf189f14661e2c07da3c0aa3 100644
--- a/llvm/test/Regression/Assembler/2002-08-16-ConstExprInlined.llx
+++ b/llvm/test/Regression/Assembler/2002-08-16-ConstExprInlined.llx
@@ -8,7 +8,7 @@
 ; reader should NEVER produce a program "successfully" with placeholders still
 ; around!
 
-; RUN: llvm-as < %s | llvm-dis | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as
 
 %.LC0 = internal global [4 x sbyte] c"foo\00"		; <[4 x sbyte]*> [#uses=1]
 
diff --git a/llvm/test/Regression/Assembler/2002-08-19-BytecodeReader.llx b/llvm/test/Regression/Assembler/2002-08-19-BytecodeReader.llx
index 3e497618015cfdb7cdca8a1c3d2ee11765fba756..01301b7ab05028aa4083e85ed02d8ab08077a9fe 100644
--- a/llvm/test/Regression/Assembler/2002-08-19-BytecodeReader.llx
+++ b/llvm/test/Regression/Assembler/2002-08-19-BytecodeReader.llx
@@ -1,7 +1,7 @@
 ; Testcase that seems to break the bytecode reader.  This comes from the 
 ; "crafty" spec benchmark.
 ;
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | llvm-as
 
 %CHESS_POSITION = type { uint, int }
 
diff --git a/llvm/test/Regression/Assembler/2002-10-13-ConstantEncodingProblem.llx b/llvm/test/Regression/Assembler/2002-10-13-ConstantEncodingProblem.llx
index 0634b9f43044f86117479768755c5547e4957cdc..2c3f41b8ce0355e054eff7de87af0d08d688629e 100644
--- a/llvm/test/Regression/Assembler/2002-10-13-ConstantEncodingProblem.llx
+++ b/llvm/test/Regression/Assembler/2002-10-13-ConstantEncodingProblem.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 %Domain = type { %Domain**, %Domain* }
 
diff --git a/llvm/test/Regression/Assembler/2003-05-03-BytecodeReaderProblem.llx b/llvm/test/Regression/Assembler/2003-05-03-BytecodeReaderProblem.llx
index b8b82d94d1fdf51ebab6366ce9babfecaaf93a55..f45d9a9a399f5b2bdfc3d5289c73dd97fca354d7 100644
--- a/llvm/test/Regression/Assembler/2003-05-03-BytecodeReaderProblem.llx
+++ b/llvm/test/Regression/Assembler/2003-05-03-BytecodeReaderProblem.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 void %test() {
 	%tmp.123 = cast long cast ([5 x { ubyte, sbyte }]* getelementptr ([30 x [5 x { ubyte, sbyte }]]* null, long 0, long 0) to long) to int
diff --git a/llvm/test/Regression/Assembler/2003-05-12-MinIntProblem.llx b/llvm/test/Regression/Assembler/2003-05-12-MinIntProblem.llx
index 515ad0f9fe185034d2ee55ecca14880a7eb0212f..88d83c536d8902cdff035bfa8583f38edd023263 100644
--- a/llvm/test/Regression/Assembler/2003-05-12-MinIntProblem.llx
+++ b/llvm/test/Regression/Assembler/2003-05-12-MinIntProblem.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep -- -2147483648
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep -- -2147483648
 
 int %foo() {
 	ret int -2147483648
diff --git a/llvm/test/Regression/Assembler/2003-06-17-InvokeDisassemble.llx b/llvm/test/Regression/Assembler/2003-06-17-InvokeDisassemble.llx
index a444dc9b81b9854dc38b2f5be7579629e8e656a5..ceb1d2e7fe677947f0136f7744c12db59d83a839 100644
--- a/llvm/test/Regression/Assembler/2003-06-17-InvokeDisassemble.llx
+++ b/llvm/test/Regression/Assembler/2003-06-17-InvokeDisassemble.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 void %test() {
    invoke void %test() to label %Next except label %Next
 Next:
diff --git a/llvm/test/Regression/Assembler/2003-08-20-ConstantExprGEP-Fold.llx b/llvm/test/Regression/Assembler/2003-08-20-ConstantExprGEP-Fold.llx
index d93cf19e49e8dbe0b5158d4d0b2694f31b9c943f..27e3169337347977a0f825953c2f8388868c09e6 100644
--- a/llvm/test/Regression/Assembler/2003-08-20-ConstantExprGEP-Fold.llx
+++ b/llvm/test/Regression/Assembler/2003-08-20-ConstantExprGEP-Fold.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep br
 
 %.str_1 = internal constant [6 x sbyte] c"_Bool\00"             ; <[6 x sbyte]*> [#uses=1]
 
diff --git a/llvm/test/Regression/Assembler/2003-08-21-ConstantExprCast-Fold.llx b/llvm/test/Regression/Assembler/2003-08-21-ConstantExprCast-Fold.llx
index 453be5ec0f78c6029f922209f44b14ee9469583b..37b0363e191f22d96a6887750a2c241a775df54d 100644
--- a/llvm/test/Regression/Assembler/2003-08-21-ConstantExprCast-Fold.llx
+++ b/llvm/test/Regression/Assembler/2003-08-21-ConstantExprCast-Fold.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep getelementptr
 
 %A = external global { float }          ; <{ float }*> [#uses=1]
 global int* cast (float* getelementptr ({ float }* %A, long 0, ubyte 0) to int*)
diff --git a/llvm/test/Regression/Assembler/2003-11-05-ConstantExprShift.llx b/llvm/test/Regression/Assembler/2003-11-05-ConstantExprShift.llx
index 8e79abe33aa3fb3c5b5a7ce1711b53247e7b0e0c..e78af237f90a0e648edec29dabf44878b30aac17 100644
--- a/llvm/test/Regression/Assembler/2003-11-05-ConstantExprShift.llx
+++ b/llvm/test/Regression/Assembler/2003-11-05-ConstantExprShift.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 int %test() {
   ret int shr (int cast (int()* %test to int), ubyte 2)
diff --git a/llvm/test/Regression/Assembler/2003-11-12-ConstantExprCast.llx b/llvm/test/Regression/Assembler/2003-11-12-ConstantExprCast.llx
index 8b3f05128bb250c7d80515424596815bde1538ce..d243df45bae44cdccfc6ee5202bfa650352f0d04 100644
--- a/llvm/test/Regression/Assembler/2003-11-12-ConstantExprCast.llx
+++ b/llvm/test/Regression/Assembler/2003-11-12-ConstantExprCast.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep ' bitcast ('
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep ' bitcast ('
 
 %.Base64_1 = external constant [4 x sbyte] 
 
diff --git a/llvm/test/Regression/Assembler/2004-01-11-getelementptrfolding.llx b/llvm/test/Regression/Assembler/2004-01-11-getelementptrfolding.llx
index 6f7f06a9b2481c36ea7e94a49f71381d52442073..6ab1a5577b08aef32095aaf3906b151c181b2dfb 100644
--- a/llvm/test/Regression/Assembler/2004-01-11-getelementptrfolding.llx
+++ b/llvm/test/Regression/Assembler/2004-01-11-getelementptrfolding.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | not grep 'getelementptr.*getelementptr'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep 'getelementptr.*getelementptr'
 
         %struct.TUVVertex = type { short, short, short, short }
         %struct.TTriangleItem = type { sbyte*, sbyte*, [3 x %struct.TUVVertex] }
diff --git a/llvm/test/Regression/Assembler/2004-01-20-MaxLongLong.llx b/llvm/test/Regression/Assembler/2004-01-20-MaxLongLong.llx
index a55fcd6e8c0d2c4341bd2eafa1b85265f5c93f6f..cb75284e7416a627467949c38bbc1d83204c348a 100644
--- a/llvm/test/Regression/Assembler/2004-01-20-MaxLongLong.llx
+++ b/llvm/test/Regression/Assembler/2004-01-20-MaxLongLong.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep 9223372036854775808
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 9223372036854775808
 
 global long -9223372036854775808
 
diff --git a/llvm/test/Regression/Assembler/2004-02-01-NegativeZero.llx b/llvm/test/Regression/Assembler/2004-02-01-NegativeZero.llx
index b999672b8d7e63eb90f69b4566b6a0e8cd01e5fd..b8c02f945240de9b71d31a4e44c062ce89807383 100644
--- a/llvm/test/Regression/Assembler/2004-02-01-NegativeZero.llx
+++ b/llvm/test/Regression/Assembler/2004-02-01-NegativeZero.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep -- -0.0
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep -- -0.0
 
 
 global double 0x8000000000000000
diff --git a/llvm/test/Regression/Assembler/2004-03-07-FunctionAddressAlignment.llx b/llvm/test/Regression/Assembler/2004-03-07-FunctionAddressAlignment.llx
index 13f7392c9f362c61fe20b71a5cfe2c818dc3503a..909585cddf159bd0e722637e8b3049e27f1dcef3 100644
--- a/llvm/test/Regression/Assembler/2004-03-07-FunctionAddressAlignment.llx
+++ b/llvm/test/Regression/Assembler/2004-03-07-FunctionAddressAlignment.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | not grep cast
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep cast
 ; All of these should be eliminable
 
 
diff --git a/llvm/test/Regression/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll b/llvm/test/Regression/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
index 66e7d121a9efe0dab4caaea1a52512ae70688920..5743e42f9d2aaa2ea8e1aa6a594d6e0b713d2a7e 100644
--- a/llvm/test/Regression/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
+++ b/llvm/test/Regression/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep '%G = alloca int'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep '%G = alloca int'
 
 ; In this testcase, %bar stores to the global G.  Make sure that inlining does
 ; not cause it to store to the G in main instead.
diff --git a/llvm/test/Regression/Assembler/2005-01-03-FPConstantDisassembly.ll b/llvm/test/Regression/Assembler/2005-01-03-FPConstantDisassembly.ll
index bd0d389ff7c2c37ca6b225d849067c7eba89b598..7dfa0e54043e60c59bdd3d2d1bd9a6be07aba7a7 100644
--- a/llvm/test/Regression/Assembler/2005-01-03-FPConstantDisassembly.ll
+++ b/llvm/test/Regression/Assembler/2005-01-03-FPConstantDisassembly.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep '1.0'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep '1.0'
 
 double %test() {
         ret double 1.0   ;; This should not require hex notation
diff --git a/llvm/test/Regression/Assembler/2005-02-09-AsmWriterStoreBug.ll b/llvm/test/Regression/Assembler/2005-02-09-AsmWriterStoreBug.ll
index 3e7f5e44f191e6f1a3ecc6a83beb8f52dcabbe45..f2e186d02445478be23c78de0a2865b78d293bf9 100644
--- a/llvm/test/Regression/Assembler/2005-02-09-AsmWriterStoreBug.ll
+++ b/llvm/test/Regression/Assembler/2005-02-09-AsmWriterStoreBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as
 
 ; Ensure that the asm writer emits types before both operands of the 
 ; store, even though they can be the same.
diff --git a/llvm/test/Regression/Assembler/2005-05-05-OpaqueUndefValues.ll b/llvm/test/Regression/Assembler/2005-05-05-OpaqueUndefValues.ll
index 9321d3bf30b1baec341df4496a39067003f6a0df..8ea8d97c5806da9b3a70d67b83f3760e7fceeb97 100644
--- a/llvm/test/Regression/Assembler/2005-05-05-OpaqueUndefValues.ll
+++ b/llvm/test/Regression/Assembler/2005-05-05-OpaqueUndefValues.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as
 
 %t = type opaque
 %x = global %t undef
diff --git a/llvm/test/Regression/Assembler/2006-05-26-VarargsCallEncode.ll b/llvm/test/Regression/Assembler/2006-05-26-VarargsCallEncode.ll
index c06de84386d86d9269f994f082666b4abec86ef8..0c76d6fe86e7dfeca9261784f26cbfd241fa6e15 100644
--- a/llvm/test/Regression/Assembler/2006-05-26-VarargsCallEncode.ll
+++ b/llvm/test/Regression/Assembler/2006-05-26-VarargsCallEncode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep 'tail call csretcc'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'tail call csretcc'
 
 declare csretcc void %foo({}*, ...)
 
diff --git a/llvm/test/Regression/Assembler/ConstantExprFold.llx b/llvm/test/Regression/Assembler/ConstantExprFold.llx
index a0e95059095d58f2eadd16036d5482c09ef8e9ea..06d0b75a98b33d933d71020eb8f8adc7589c5b01 100644
--- a/llvm/test/Regression/Assembler/ConstantExprFold.llx
+++ b/llvm/test/Regression/Assembler/ConstantExprFold.llx
@@ -1,6 +1,6 @@
 ; This test checks to make sure that constant exprs fold in some simple situations
 
-; RUN: llvm-as < %s | llvm-dis | not grep '(' &&
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep '(' &&
 ; RUN: llvm-as < %s
 
 %A = global long 0
diff --git a/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx b/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
index 48394ddfab425604616a2b89111764a58b2e47fe..abc93168cfe1e2875fcfd1f2016dd0e48d394e56 100644
--- a/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
+++ b/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
@@ -1,6 +1,6 @@
 ; This test checks to make sure that constant exprs fold in some simple situations
 
-; RUN: llvm-as < %s | llvm-dis | not grep cast
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep cast
 
 %A = global int* cast (sbyte* null to int*)  ; Cast null -> fold
 %B = global int** cast (int** %A to int**)   ; Cast to same type -> fold
diff --git a/llvm/test/Regression/CodeGen/ARM/alloca.ll b/llvm/test/Regression/CodeGen/ARM/alloca.ll
index b77f234e108799338ff0cea5e7639d6bfec5c0f3..6722026835a7cd5fe75faf33603904d3d9818b16 100644
--- a/llvm/test/Regression/CodeGen/ARM/alloca.ll
+++ b/llvm/test/Regression/CodeGen/ARM/alloca.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 void %f(uint %a) {
 entry:
 	%tmp = alloca sbyte, uint %a
diff --git a/llvm/test/Regression/CodeGen/ARM/argaddr.ll b/llvm/test/Regression/CodeGen/ARM/argaddr.ll
index abdf215ee02660b175d6bc8be7e193a539f3e7b3..a1317213fc24968e38a364f534dee27460c27593 100644
--- a/llvm/test/Regression/CodeGen/ARM/argaddr.ll
+++ b/llvm/test/Regression/CodeGen/ARM/argaddr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 void %f(int %a, int %b, int %c, int %d, int %e) {
 entry:
 	%a_addr = alloca int		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/ARM/bits.ll b/llvm/test/Regression/CodeGen/ARM/bits.ll
index ca79e49829a2c5f29bb46188757a563534b37a8e..c5052e5bacbf558df70edcdba69cf0c53a8f36d1 100644
--- a/llvm/test/Regression/CodeGen/ARM/bits.ll
+++ b/llvm/test/Regression/CodeGen/ARM/bits.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep and      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep orr      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep eor      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep mov.*lsl | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep mov.*asr | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep and      | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep orr      | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep eor      | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov.*lsl | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov.*asr | wc -l | grep 1
 
 int %f1(int %a, int %b) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/branch.ll b/llvm/test/Regression/CodeGen/ARM/branch.ll
index 57aa179a7cdd7337051527262b268594a2be7c41..54929ad5df4113f28364d7fe8ae49cc0b1e7a167 100644
--- a/llvm/test/Regression/CodeGen/ARM/branch.ll
+++ b/llvm/test/Regression/CodeGen/ARM/branch.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep bne &&
-; RUN: llvm-as < %s | llc -march=arm | grep bge &&
-; RUN: llvm-as < %s | llc -march=arm | grep bcs &&
-; RUN: llvm-as < %s | llc -march=arm | grep bcc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bne &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bge &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bcs &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bcc
 
 void %f1(int %a, int %b, int* %v) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/call.ll b/llvm/test/Regression/CodeGen/ARM/call.ll
index b223698c65ca260d3710af01430db84a78c5fa20..a4b6b807d6bcfc0808002588ce5ceda74a9aee20 100644
--- a/llvm/test/Regression/CodeGen/ARM/call.ll
+++ b/llvm/test/Regression/CodeGen/ARM/call.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep bl &&
-; RUN: llvm-as < %s | llc -march=arm | grep blx
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bl &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep blx
 
 void %f() {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/constants.ll b/llvm/test/Regression/CodeGen/ARM/constants.ll
index f161b9d070ba58a62bba7606cc1ac9d7ab9f0a73..0d69f53585bbef172e17cf19363de32469f70a42 100644
--- a/llvm/test/Regression/CodeGen/ARM/constants.ll
+++ b/llvm/test/Regression/CodeGen/ARM/constants.ll
@@ -1,11 +1,11 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #255" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #256" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep ".word.*257" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #-1073741761" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #1008" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "\.comm.*a,4,4" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #255" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #256" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*257" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #-1073741761" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #1008" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "\.comm.*a,4,4" | wc -l | grep 1
 
 %a = internal global int 0
 
diff --git a/llvm/test/Regression/CodeGen/ARM/div.ll b/llvm/test/Regression/CodeGen/ARM/div.ll
index 1d7839439dcc2355b0d0ab9fc7c6f964f019a5a7..5ad660ed5ab367970b664772b83394daec425bbe 100644
--- a/llvm/test/Regression/CodeGen/ARM/div.ll
+++ b/llvm/test/Regression/CodeGen/ARM/div.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep __divsi3  &&
-; RUN: llvm-as < %s | llc -march=arm | grep __udivsi3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __modsi3  &&
-; RUN: llvm-as < %s | llc -march=arm | grep __umodsi3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __divsi3  &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __udivsi3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __modsi3  &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __umodsi3
 
 int %f1(int %a, int %b) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/fp.ll b/llvm/test/Regression/CodeGen/ARM/fp.ll
index 681ccc1bf6030cbd58f534e02ea9aa570c87b8ad..127d9a1a217273a8c52311355c19795c6154c88b 100644
--- a/llvm/test/Regression/CodeGen/ARM/fp.ll
+++ b/llvm/test/Regression/CodeGen/ARM/fp.ll
@@ -1,13 +1,13 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmsr &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmrs &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmrrd &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmdrr &&
-; RUN: llvm-as < %s | llc -march=arm | grep fldd &&
-; RUN: llvm-as < %s | llc -march=arm | grep flds &&
-; RUN: llvm-as < %s | llc -march=arm | grep fstd &&
-; RUN: llvm-as < %s | llc -march=arm | grep fsts &&
-; RUN: llvm-as < %s | llc -march=arm | grep ".word.*1065353216"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmsr &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmrs &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmrrd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmdrr &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fldd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep flds &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fstd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsts &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*1065353216"
 
 
 double %h(double* %v) {
diff --git a/llvm/test/Regression/CodeGen/ARM/fparith.ll b/llvm/test/Regression/CodeGen/ARM/fparith.ll
index db115a95f04f51e2580a746910ecb040b2d858c2..0328cb35baa51e61f803c3ff27dcfafcc001f311 100644
--- a/llvm/test/Regression/CodeGen/ARM/fparith.ll
+++ b/llvm/test/Regression/CodeGen/ARM/fparith.ll
@@ -1,12 +1,12 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep fadds &&
-; RUN: llvm-as < %s | llc -march=arm | grep faddd &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmuls &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmuld &&
-; RUN: llvm-as < %s | llc -march=arm | grep fnegs &&
-; RUN: llvm-as < %s | llc -march=arm | grep fnegd &&
-; RUN: llvm-as < %s | llc -march=arm | grep fdivs &&
-; RUN: llvm-as < %s | llc -march=arm | grep fdivd
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fadds &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep faddd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmuls &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmuld &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fnegs &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fnegd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fdivs &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fdivd
 
 float %f1(float %a, float %b) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/fpcmp.ll b/llvm/test/Regression/CodeGen/ARM/fpcmp.ll
index 61dc489356e2680b1a3e4f19649a6adbfdada3d5..402dc7a1ac16112afa43c8295d7437fe28d5b49e 100644
--- a/llvm/test/Regression/CodeGen/ARM/fpcmp.ll
+++ b/llvm/test/Regression/CodeGen/ARM/fpcmp.ll
@@ -1,12 +1,12 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm  | grep movmi &&
-; RUN: llvm-as < %s | llc -march=arm  | grep moveq &&
-; RUN: llvm-as < %s | llc -march=arm  | grep movgt &&
-; RUN: llvm-as < %s | llc -march=arm  | grep movge &&
-; RUN: llvm-as < %s | llc -march=arm  | grep movls &&
-; RUN: llvm-as < %s | llc -march=arm  | grep movne &&
-; RUN: llvm-as < %s | llc -march=arm  | grep fcmps &&
-; RUN: llvm-as < %s | llc -march=arm  | grep fcmpd
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep movmi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep moveq &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep movgt &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep movge &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep movls &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep movne &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep fcmps &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm  | grep fcmpd
 
 int %f1(float %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/fpconv.ll b/llvm/test/Regression/CodeGen/ARM/fpconv.ll
index a86feb6c05b8a4c9b88728cc28528e096e425a5b..4ac542f0fdb507f135fe017caab7df88938965c2 100644
--- a/llvm/test/Regression/CodeGen/ARM/fpconv.ll
+++ b/llvm/test/Regression/CodeGen/ARM/fpconv.ll
@@ -1,14 +1,14 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep fcvtsd &&
-; RUN: llvm-as < %s | llc -march=arm | grep fcvtds &&
-; RUN: llvm-as < %s | llc -march=arm | grep ftosis &&
-; RUN: llvm-as < %s | llc -march=arm | grep ftouis &&
-; RUN: llvm-as < %s | llc -march=arm | grep ftosid &&
-; RUN: llvm-as < %s | llc -march=arm | grep ftouid &&
-; RUN: llvm-as < %s | llc -march=arm | grep fsitos &&
-; RUN: llvm-as < %s | llc -march=arm | grep fsitod &&
-; RUN: llvm-as < %s | llc -march=arm | grep fuitos &&
-; RUN: llvm-as < %s | llc -march=arm | grep fuitod
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcvtsd &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcvtds &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftosis &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftouis &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftosid &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftouid &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsitos &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsitod &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fuitos &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fuitod
 
 float %f1(double %x) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/fpmem.ll b/llvm/test/Regression/CodeGen/ARM/fpmem.ll
index b617a6911dba413de5828ce5b3b79aecc8aa8ca9..7704f2b9a7a32a40f8dba35ab3373c3b4d1e5cc6 100644
--- a/llvm/test/Regression/CodeGen/ARM/fpmem.ll
+++ b/llvm/test/Regression/CodeGen/ARM/fpmem.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep flds | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "flds.*\[" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "fsts.*\[" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep flds | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "flds.*\[" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "fsts.*\[" | wc -l | grep 1
 
 float %f1(float %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/hello.ll b/llvm/test/Regression/CodeGen/ARM/hello.ll
index 61354a0425cc010e374ebf7714f338a9fc41f9af..af5fafacc3bb97939f6e41835f821aab1a76b095 100644
--- a/llvm/test/Regression/CodeGen/ARM/hello.ll
+++ b/llvm/test/Regression/CodeGen/ARM/hello.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep mov | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov | wc -l | grep 1
 %str = internal constant [12 x sbyte] c"Hello World\00"		; <[12 x sbyte]*> [#uses=1]
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/CodeGen/ARM/ldr.ll b/llvm/test/Regression/CodeGen/ARM/ldr.ll
index 4f25a1e71f9ff8c686cd4930a35e42c0fda7bbe9..0b463bf0ba9470834ca8503200acf5b054ba418a 100644
--- a/llvm/test/Regression/CodeGen/ARM/ldr.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ldr.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldr r0.*#0" | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldr r0.*#4092" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr r0.*#0" | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr r0.*#4092" | wc -l | grep 1
 
 int %f1(int* %v) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/load.ll b/llvm/test/Regression/CodeGen/ARM/load.ll
index 603a8b2780635b682169c86253ceddee8fe57f2b..68d193b78f68489a37d8c82417529fb0735b52e8 100644
--- a/llvm/test/Regression/CodeGen/ARM/load.ll
+++ b/llvm/test/Regression/CodeGen/ARM/load.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep ldrsb &&
-; RUN: llvm-as < %s | llc -march=arm | grep ldrb &&
-; RUN: llvm-as < %s | llc -march=arm | grep ldrsh &&
-; RUN: llvm-as < %s | llc -march=arm | grep ldrh
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsb &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrb &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsh &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrh
 
 int %f1(sbyte* %p) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/long.ll b/llvm/test/Regression/CodeGen/ARM/long.ll
index b310bc00c03a7ab622c13a66daed226eef2a8671..33e9b31bd0f7fc6a3a5ee26b16dc9bc100d6136a 100644
--- a/llvm/test/Regression/CodeGen/ARM/long.ll
+++ b/llvm/test/Regression/CodeGen/ARM/long.ll
@@ -1,15 +1,15 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r1, #0" | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #1" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep ".word.*2147483647" | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #-2147483648" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep ".word.*4294967295" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "adds" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "adcs" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "subs" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "sbcs" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "smull" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "umull" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r1, #0" | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #1" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*2147483647" | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #-2147483648" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*4294967295" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adds" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adcs" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "subs" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "sbcs" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "smull" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "umull" | wc -l | grep 1
 
 long %f1() {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/longarith.ll b/llvm/test/Regression/CodeGen/ARM/longarith.ll
index ecf66c1cc8fc8ea98531b844f896c62ff89216be..63b81bcac05afba3e532f4e4e6c3866695ff0208 100644
--- a/llvm/test/Regression/CodeGen/ARM/longarith.ll
+++ b/llvm/test/Regression/CodeGen/ARM/longarith.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep __ashldi3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __ashrdi3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __lshrdi3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __ashldi3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __ashrdi3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __lshrdi3
 uint %f1(ulong %x, ubyte %y) {
 entry:
 	%a = shl ulong %x, ubyte %y
diff --git a/llvm/test/Regression/CodeGen/ARM/mem.ll b/llvm/test/Regression/CodeGen/ARM/mem.ll
index 1bd328c3cc3f2b3e2779d5c72e82354e51859232..6a0f0e1716753438adfe6909d41186cabbc93975 100644
--- a/llvm/test/Regression/CodeGen/ARM/mem.ll
+++ b/llvm/test/Regression/CodeGen/ARM/mem.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep strb &&
-; RUN: llvm-as < %s | llc -march=arm | grep strh
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strb &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strh
 
 void %f1() {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/mul.ll b/llvm/test/Regression/CodeGen/ARM/mul.ll
index 77f94f087f30ed740eb1b251c9a54845a3259167..4ef01b346b5809dd2d38c5c3d61ec46291a15640 100644
--- a/llvm/test/Regression/CodeGen/ARM/mul.ll
+++ b/llvm/test/Regression/CodeGen/ARM/mul.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mul r0, r12, r0"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "mul r0, r1, r0"  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mul r0, r12, r0"  | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mul r0, r1, r0"  | wc -l | grep 1
 
 int %mul1(int %u) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_arg1.ll b/llvm/test/Regression/CodeGen/ARM/ret_arg1.ll
index db7c7a04c311b5c3c07e8748f142716d4dd0ed3f..d490cb3430b14cf25088c2f77c19640c071a8daf 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_arg1.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_arg1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 int %test(int %a1) {
   ret int %a1
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_arg2.ll b/llvm/test/Regression/CodeGen/ARM/ret_arg2.ll
index 365bcd60e7fbeb1c099679ba36b5e6cd23ac718f..eb155da66fdbb5b6c5057e03eef1881ec5ed9a15 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_arg2.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_arg2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 int %test(int %a1, int %a2) {
   ret int %a2
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_arg3.ll b/llvm/test/Regression/CodeGen/ARM/ret_arg3.ll
index c1fc09263ffff1c5cd0e2269c91ead195bb83d4f..41fc9306be39d8904e3f34298f5b037bd82fc816 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_arg3.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_arg3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 int %test(int %a1, int %a2, int %a3) {
   ret int %a3
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_arg4.ll b/llvm/test/Regression/CodeGen/ARM/ret_arg4.ll
index cb7b1974db19745e084a67e8fbc2f1f2572ea9b6..e04f29695bad5ee483699e5b5b5ef3d1afcc50c3 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_arg4.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_arg4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 int %test(int %a1, int %a2, int %a3, int %a4) {
   ret int %a4
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_arg5.ll b/llvm/test/Regression/CodeGen/ARM/ret_arg5.ll
index e434bcab28443fd82b5bf12ba93efe14956deba9..a49929bca42c67bb18ea0e312fa173c44fc8742a 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_arg5.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_arg5.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 int %test(int %a1, int %a2, int %a3, int %a4, int %a5) {
   ret int %a5
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/ret_void.ll b/llvm/test/Regression/CodeGen/ARM/ret_void.ll
index c1c1556691f05c5b9daae8b4a687e10a1687165b..5cd82e33d0f461b370022bc19818e2c2523062e2 100644
--- a/llvm/test/Regression/CodeGen/ARM/ret_void.ll
+++ b/llvm/test/Regression/CodeGen/ARM/ret_void.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 void %test() {
   ret void
 }
diff --git a/llvm/test/Regression/CodeGen/ARM/select.ll b/llvm/test/Regression/CodeGen/ARM/select.ll
index 0bfffc89b4fd5c257bfc1063b9261ca54472c0e5..8ed6e401a9714c5597f4bfd91857f92e12c60d88 100644
--- a/llvm/test/Regression/CodeGen/ARM/select.ll
+++ b/llvm/test/Regression/CodeGen/ARM/select.ll
@@ -1,10 +1,10 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep moveq | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movgt | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movlt | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movle | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movls | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movhi | wc -l | grep 1
 
 int %f1(int %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/ARM/vargs.ll b/llvm/test/Regression/CodeGen/ARM/vargs.ll
index f60c51a3c96d85dcdb1f7e9393eb561072636fde..aa5e8e6f78a8be8342f00cb5b64f27bd8205a549 100644
--- a/llvm/test/Regression/CodeGen/ARM/vargs.ll
+++ b/llvm/test/Regression/CodeGen/ARM/vargs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 %str = internal constant [43 x sbyte] c"Hello World %d %d %d %d %d %d %d %d %d %d\0A\00"		; <[43 x sbyte]*> [#uses=1]
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/CodeGen/ARM/vargs2.ll b/llvm/test/Regression/CodeGen/ARM/vargs2.ll
index 232149cc8dc6d580b607d89922b5d1a1141ea3dd..1404a412eea2e2226cad8f606fece100aa2e1b64 100644
--- a/llvm/test/Regression/CodeGen/ARM/vargs2.ll
+++ b/llvm/test/Regression/CodeGen/ARM/vargs2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 %str = internal constant [7 x ubyte] c"%d %d\0A\00"		; <[7 x ubyte]*> [#uses=1]
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll b/llvm/test/Regression/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll
index 34ad65d21706911579bd354ff540d71297dd0a28..eb5c6d911d3a53e5edd242c016c900c206ddf04a 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll
@@ -1,5 +1,5 @@
 ; There should be exactly two calls here (memset and malloc), no more.
-; RUN: llvm-as < %s | llc -march=alpha | grep jsr | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep jsr | wc -l | grep 2
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/2005-12-12-MissingFCMov.ll b/llvm/test/Regression/CodeGen/Alpha/2005-12-12-MissingFCMov.ll
index 7307d967810fbd6c64529c920d8675dff26704f9..5b9fa19422da8980119109f212aaff8c66dfaab8 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2005-12-12-MissingFCMov.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2005-12-12-MissingFCMov.ll
@@ -1,5 +1,5 @@
 ; This shouldn't crash
-; RUN: llvm-as < %s | llc -march=alpha
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha
 
 ; ModuleID = 'bugpoint-reduced-simplified.bc'
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/Alpha/2006-01-18-MissedGlobal.ll b/llvm/test/Regression/CodeGen/Alpha/2006-01-18-MissedGlobal.ll
index c9d33d77f6d491c7d7b59d822883c4b7a6cb0ca3..f0a5c17ddcf486f2a7370c29d6b610b795d519b4 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2006-01-18-MissedGlobal.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2006-01-18-MissedGlobal.ll
@@ -1,5 +1,5 @@
 ; The global symbol should be legalized
-; RUN: llvm-as < %s | llc -march=alpha 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha 
 
 target endian = little
 target pointersize = 64
diff --git a/llvm/test/Regression/CodeGen/Alpha/2006-01-26-VaargBreak.ll b/llvm/test/Regression/CodeGen/Alpha/2006-01-26-VaargBreak.ll
index d282066d0a3d7c0a2e464a6fe8a15964a882b7f0..e58152ee80f7d93259ba72b0df8ea18f11dd9b19 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2006-01-26-VaargBreak.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2006-01-26-VaargBreak.ll
@@ -1,5 +1,5 @@
 ; This shouldn't crash
-; RUN: llvm-as < %s | llc -march=alpha 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha 
 
 ; ModuleID = 'simp.bc'
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/Alpha/2006-04-04-zextload.ll b/llvm/test/Regression/CodeGen/Alpha/2006-04-04-zextload.ll
index 055bc1048a7ba45ac4b9bda9b66535330ce566b2..75ad7e0c4255baa8c9867ab8b9aa70aa2b08e503 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2006-04-04-zextload.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2006-04-04-zextload.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha
 
 target endian = little
 target pointersize = 64
diff --git a/llvm/test/Regression/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll b/llvm/test/Regression/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll
index a68ec20937f680ab8b71895a203a180852d8829a..94cc0d3c67106b1b0a109d83c531fb1f36af27b9 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha
 
 target endian = little
 target pointersize = 64
diff --git a/llvm/test/Regression/CodeGen/Alpha/2006-11-01-vastart.ll b/llvm/test/Regression/CodeGen/Alpha/2006-11-01-vastart.ll
index 3a87a00000c070044a42f5b33dcce9ef9f20ea4e..61d6db9a574a982f53469ec6244254883a35d0b8 100644
--- a/llvm/test/Regression/CodeGen/Alpha/2006-11-01-vastart.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/2006-11-01-vastart.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha
 
 target datalayout = "e-p:64:64"
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/Alpha/add.ll b/llvm/test/Regression/CodeGen/Alpha/add.ll
index bbd5a59b7f644745f00f18789c08d3b4351b86e0..516270e0df6a2c37a6d0414e9b3dc033f9923449 100644
--- a/llvm/test/Regression/CodeGen/Alpha/add.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/add.ll
@@ -1,20 +1,20 @@
 ;test all the shifted and signextending adds and subs with and without consts
 
-; RUN: llvm-as < %s | llc -march=alpha | grep '	addl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep '	addq' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep '	subl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep '	subq' |wc -l |grep 1 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 'lda $0,-100($16)' |wc -l |grep 1 &&
-
-; RUN: llvm-as < %s | llc -march=alpha | grep 's4addl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's8addl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's4addq' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's8addq' |wc -l |grep 2 &&
-
-; RUN: llvm-as < %s | llc -march=alpha | grep 's4subl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's8subl' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's4subq' |wc -l |grep 2 &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 's8subq' |wc -l |grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '	addl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '	addq' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '	subl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '	subq' |wc -l |grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'lda $0,-100($16)' |wc -l |grep 1 &&
+
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4addl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8addl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4addq' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8addq' |wc -l |grep 2 &&
+
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4subl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8subl' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4subq' |wc -l |grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8subq' |wc -l |grep 2
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/bic.ll b/llvm/test/Regression/CodeGen/Alpha/bic.ll
index 46e0d88bd8d7753331c3da2bce64b7354ac9f484..f4664c82e32daf2136f1530dc5233aa657a9d961 100644
--- a/llvm/test/Regression/CodeGen/Alpha/bic.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/bic.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the bic instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'bic'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bic'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/bsr.ll b/llvm/test/Regression/CodeGen/Alpha/bsr.ll
index 1f88767c7ed816489fd8ca21a87d9d46e5563bca..1cd68067ef23005b60cb8ab883a01b4542b8e230 100644
--- a/llvm/test/Regression/CodeGen/Alpha/bsr.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/bsr.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens the bsr instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'bsr'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bsr'
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/call_adj.ll b/llvm/test/Regression/CodeGen/Alpha/call_adj.ll
index d56257850c4350c6175f4c0e658bab90962db9f2..da47c6ca6266e094b0490971c2b4763259f565a7 100644
--- a/llvm/test/Regression/CodeGen/Alpha/call_adj.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/call_adj.ll
@@ -1,5 +1,5 @@
 ;All this should do is not crash
-;RUN: llvm-as < %s | llc -march=alpha
+;RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha
 
 target endian = little
 target pointersize = 64
diff --git a/llvm/test/Regression/CodeGen/Alpha/cmov.ll b/llvm/test/Regression/CodeGen/Alpha/cmov.ll
index 68ab61e2ec5d2983f72d34e33d741b9bd8515198..c5f9f63c342c7abeee1f09904ed1cd0bf7c899fc 100644
--- a/llvm/test/Regression/CodeGen/Alpha/cmov.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/cmov.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=alpha | not grep cmovlt
-; RUN: llvm-as < %s | llc -march=alpha | grep cmoveq
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | not grep cmovlt
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmoveq
 
 long %cmov_lt(long %a, long %c) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/Alpha/cmpbge.ll b/llvm/test/Regression/CodeGen/Alpha/cmpbge.ll
index 50f00bf4aa8114e774d3ad6554ab4bd6e1079c11..b7b1c09ce06ddc12d7ddbf6d01d7c68dcebd370b 100644
--- a/llvm/test/Regression/CodeGen/Alpha/cmpbge.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/cmpbge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha | grep cmpbge | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmpbge | wc -l | grep 2
 
 bool %test1(ulong %A, ulong %B) {
 	%C = and ulong %A, 255
diff --git a/llvm/test/Regression/CodeGen/Alpha/ctlz.ll b/llvm/test/Regression/CodeGen/Alpha/ctlz.ll
index 8b6526a8cd7d3f91eccb6458cc7e227db1235dfc..75035f2c26092eebbb280f1be65eaca89725b11b 100644
--- a/llvm/test/Regression/CodeGen/Alpha/ctlz.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/ctlz.ll
@@ -1,9 +1,9 @@
 ; Make sure this testcase codegens to the ctlz instruction
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev67 | grep -i 'ctlz'
-; RUN: llvm-as < %s | llc -march=alpha -mattr=+CIX | grep -i 'ctlz'
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev6 | not grep -i 'ctlz'
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev56 | not grep -i 'ctlz'
-; RUN: llvm-as < %s | llc -march=alpha -mattr=-CIX | not grep -i 'ctlz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctlz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctlz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctlz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctlz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctlz'
 
 declare ubyte %llvm.ctlz(ubyte)
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/ctlz_e.ll b/llvm/test/Regression/CodeGen/Alpha/ctlz_e.ll
index dc16eb50bed66c807218edb65ce647d85769769f..d7dab23ea9a4aa09fa111bdc36756eb41fccf4f3 100644
--- a/llvm/test/Regression/CodeGen/Alpha/ctlz_e.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/ctlz_e.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase does not use ctpop
-; RUN: llvm-as < %s | llc -march=alpha | grep -i 'ctpop' |wc -l |grep 0
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'ctpop' |wc -l |grep 0
 
 declare ulong %llvm.ctlz(ulong)
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/ctpop.ll b/llvm/test/Regression/CodeGen/Alpha/ctpop.ll
index 7da46df16ab1952abe697e0696eb990cfa50622f..bbd35ffa9799c3022d43c6a3582bfb95ae7516be 100644
--- a/llvm/test/Regression/CodeGen/Alpha/ctpop.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/ctpop.ll
@@ -1,9 +1,9 @@
 ; Make sure this testcase codegens to the ctpop instruction
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev67 | grep -i 'ctpop'
-; RUN: llvm-as < %s | llc -march=alpha -mattr=+CIX | grep -i 'ctpop'
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev6 | not grep -i 'ctpop'
-; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev56 | not grep -i 'ctpop'
-; RUN: llvm-as < %s | llc -march=alpha -mattr=-CIX | not grep -i 'ctpop'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctpop'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctpop'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctpop'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctpop'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctpop'
 
 
 declare long %llvm.ctpop(long)
diff --git a/llvm/test/Regression/CodeGen/Alpha/eqv.ll b/llvm/test/Regression/CodeGen/Alpha/eqv.ll
index 2358c92f494ee94ff4d327579620d32b31d5b3bc..f8e699164715d8f287897ad42e1824b0d82fe1f2 100644
--- a/llvm/test/Regression/CodeGen/Alpha/eqv.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/eqv.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the eqv instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'eqv'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/i32_sub_1.ll b/llvm/test/Regression/CodeGen/Alpha/i32_sub_1.ll
index ea6ab9299cdccbb828dab4701d0646f7f0af1d86..473127809cd7f2ab358c13ab7a2f80b98a1116fe 100644
--- a/llvm/test/Regression/CodeGen/Alpha/i32_sub_1.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/i32_sub_1.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the ctpop instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep -i 'subl $16,1,$0'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'subl $16,1,$0'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/jmp_table.ll b/llvm/test/Regression/CodeGen/Alpha/jmp_table.ll
index 00ae601259a05414e97430d5703152172dc919d8..9c1f27877a60f3f3c8fe23fe7c0be7c8d2c6d269 100644
--- a/llvm/test/Regression/CodeGen/Alpha/jmp_table.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/jmp_table.ll
@@ -1,8 +1,8 @@
 ; try to check that we have the most important instructions, which shouldn't appear otherwise
-; RUN: llvm-as < %s | llc -march=alpha | grep 'jmp' &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 'gprel32' &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 'ldl' &&
-; RUN: llvm-as < %s | llc -march=alpha | grep 'rodata'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'jmp' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'gprel32' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ldl' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'rodata'
 
 target endian = little
 target pointersize = 64
diff --git a/llvm/test/Regression/CodeGen/Alpha/mul5.ll b/llvm/test/Regression/CodeGen/Alpha/mul5.ll
index 4f2a4c2698857e32e6585408432ba40408bf1c01..5e41d0fd8565fc61c12b75b7de68f581dc546012 100644
--- a/llvm/test/Regression/CodeGen/Alpha/mul5.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/mul5.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase does not use mulq
-; RUN: llvm-as < %s | llc -march=alpha | grep -i 'mul' |wc -l |grep 0
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'mul' |wc -l |grep 0
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/neg1.ll b/llvm/test/Regression/CodeGen/Alpha/neg1.ll
index b8f7d69ee5da406bf922dcab9dfcbe3e42a34045..e8e50860bbeb0d533003a213e717b26c7124260e 100644
--- a/llvm/test/Regression/CodeGen/Alpha/neg1.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/neg1.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the lda -1 instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep '\-1'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '\-1'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/not.ll b/llvm/test/Regression/CodeGen/Alpha/not.ll
index fca659cd42e0eaa068be83ba7855d6a61d6484bb..406f6242938330f86731d564c17323e99e7cba18 100644
--- a/llvm/test/Regression/CodeGen/Alpha/not.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/not.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the ornot instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'eqv'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/ornot.ll b/llvm/test/Regression/CodeGen/Alpha/ornot.ll
index 1ab30a6cb9c2aea1295923a2a290b93f55cb5a8e..fc982b34aa2f96af45d4da2e93117d9bb5dd13f8 100644
--- a/llvm/test/Regression/CodeGen/Alpha/ornot.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/ornot.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the ornot instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'ornot'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ornot'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/rpcc.ll b/llvm/test/Regression/CodeGen/Alpha/rpcc.ll
index fbf97ad60c32fa4fd3d0edfa6e055e6f40b7f54f..ba143a6fd7f0a20753d4e1427e941bc66280d571 100644
--- a/llvm/test/Regression/CodeGen/Alpha/rpcc.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/rpcc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha | grep rpcc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep rpcc
 
 declare ulong %llvm.readcyclecounter()
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/srl_and.ll b/llvm/test/Regression/CodeGen/Alpha/srl_and.ll
index 5d3c2b6d61010b0c5689c9c1da90104709d276ed..49074cc9168906a5dd4434af4dff881e2dacb968 100644
--- a/llvm/test/Regression/CodeGen/Alpha/srl_and.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/srl_and.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the zapnot instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot'
 
 ulong %foo(ulong %y) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/Alpha/zapnot.ll b/llvm/test/Regression/CodeGen/Alpha/zapnot.ll
index f7cb294da9d5632c003c15e7652f851669e6391c..057d16b1b95eff8597c03f1a4ada8c50578111d0 100644
--- a/llvm/test/Regression/CodeGen/Alpha/zapnot.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/zapnot.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the bic instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/zapnot2.ll b/llvm/test/Regression/CodeGen/Alpha/zapnot2.ll
index 50ab112b3e819ed7b452dd9b8ff0faa6602e8b5c..a84400f5563a859e16895ad4b46423eec847c5b9 100644
--- a/llvm/test/Regression/CodeGen/Alpha/zapnot2.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/zapnot2.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase codegens to the zapnot instruction
-; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Alpha/zapnot3.ll b/llvm/test/Regression/CodeGen/Alpha/zapnot3.ll
index 371044a081f21e3ea826512f3c2e33b0015f54ec..1784c4a1af113df56c2c8fdd46c29601c70ddc37 100644
--- a/llvm/test/Regression/CodeGen/Alpha/zapnot3.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/zapnot3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha | grep zapnot | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot | wc -l | grep 2
 
 ulong %foo(ulong %y) {
         %tmp = and ulong %y,  65535
diff --git a/llvm/test/Regression/CodeGen/Alpha/zapnot4.ll b/llvm/test/Regression/CodeGen/Alpha/zapnot4.ll
index bf1b88bed14d16cc4c1e4bb8e14e80212991cac5..b805607bee00bb50886f83990d5fa93acdb12662 100644
--- a/llvm/test/Regression/CodeGen/Alpha/zapnot4.ll
+++ b/llvm/test/Regression/CodeGen/Alpha/zapnot4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=alpha | grep zapnot
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot
 
 ulong %foo(ulong %y) {
         %tmp = shl ulong %y, ubyte 3            ; <ulong> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-05-16-NameCollide.ll b/llvm/test/Regression/CodeGen/CBackend/2002-05-16-NameCollide.ll
index e9206b5045ad28fdfc629aee56f927244b7693a4..249927d1ffe201c6342e9478782cebeaeb1df845 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-05-16-NameCollide.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-05-16-NameCollide.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; Make sure that global variables do not collide if they have the same name,
 ; but different types.
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-05-21-MissingReturn.ll b/llvm/test/Regression/CodeGen/CBackend/2002-05-21-MissingReturn.ll
index a5045b5f4abb2f146aef572660708fd0d9936d74..775a7623e5dce3a67f5c0d7a7f0a659a528b64f8 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-05-21-MissingReturn.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-05-21-MissingReturn.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; This case was emitting code that looked like this:
 ; ...
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
index 4b776cd938f560b17717bf8c57a974ad942124bb..c8d12013e92c800104b02cfd6b7816ac50f076e6 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; Test const pointer refs & forward references
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstantExpr.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
index 813a3478ee2494b45018093df8332cad9c14c6d6..2842faae09d046d4e10fd77da8c36bb20211f820 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 global int* cast (float* %0 to int*)   ;; Forward numeric reference
 global float* %0                       ;; Duplicate forward numeric reference
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-DataPointer.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-DataPointer.ll
index b76f1d22bee900e972a46ae3a6e7e54060526943..ca2af794c7e6b584949ef8a293d0370d40b5b928 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-DataPointer.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-DataPointer.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %sptr1   = global [11x sbyte]* %somestr         ;; Forward ref to a constant
 %somestr = constant [11x sbyte] c"hello world"
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-FunctionPointer.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
index c06d72dd6313f86eec575503b2f3fec05f0d510f..baf7d78a0c62e03c666ca0cfb202360802054d47 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %fptr = global void() * %f       ;; Forward ref method defn
 declare void "f"()               ;; External method
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
index f4f0a122debf40a1de291dccda1f1b190142672b..51bc9503dd52f86639c411efc836b2bc3957d598 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %array = constant [2 x int] [ int 12, int 52 ]          ; <[2 x int]*> [#uses=1]
 %arrayPtr = global int* getelementptr ([2 x int]* %array, long 0, long 0)               ; <int**> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
index 1ae02d0ec2dd3e05be8e06908ab7859219ae0d99..fdcdeed599ada71d83c674ad6ef4a986ee07ce10 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %MyIntList = uninitialized global { \2 *, int }
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
index 46ac9b6ae98def101960b4c4cc7f9c72fbf66483..3ec23fb6b7d4e7a4dddb2ff08be9fb72a6b84972 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; The C Writer bombs on this testcase because it tries the print the prototype
 ; for the test function, which tries to print the argument name.  The function
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
index 9a76cfbc7a3125399e14d4641b46fb60d4e69d0a..4a977e864b882e37496b8a62924cdf9c37acc7c6 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; Indirect function call test... found by Joel & Brian
 ;
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll b/llvm/test/Regression/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
index 141928332f68e649658c8a4ae7b85ce73b64dac5..d8477d5cb83804cfd72a12983ffe0f66bf899c1a 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; This testcase fails because the C backend does not arrange to output the 
 ; contents of a structure type before it outputs the structure type itself.
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll b/llvm/test/Regression/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
index 66514c647c923df54914f3ee553c2e2be497f347..6158b2f565a42bc838fb5cfe9d97162f1f131960 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll b/llvm/test/Regression/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
index 934bee45c4836c92293d03073815538e24f4b177..f3841f44ee0b8dc8a0eca15663e75c78a40982bf 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 declare void %foo(...)
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll b/llvm/test/Regression/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
index 4a82f279aa2a7e5bffe3ea2bcb802a537c34f1fd..1a9cdb766c4278921c7ea4c555a1c00adf60e004 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 	%MPI_Comm = type %struct.Comm*
 	%struct.Comm = type opaque
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-10-16-External.ll b/llvm/test/Regression/CodeGen/CBackend/2002-10-16-External.ll
index edfc397a9cf6c5c5930108acf179383552849da3..d60a3d87c1cfd4b8ec63cc5fdca60871fd86b32c 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-10-16-External.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-10-16-External.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %bob = external global int              ; <int*> [#uses=2]
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll b/llvm/test/Regression/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
index 4e1ff83e014c0adb49a9408de3c617c6f3ac7842..b8874883bc4535ebdb393fa587ff7304c9f547d3 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 	%BitField = type int
diff --git a/llvm/test/Regression/CodeGen/CBackend/2002-11-06-PrintEscaped.ll b/llvm/test/Regression/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
index 3d267325b7a216effed876826b22ce997b7ef6cd..62c0e274f903ade24b5f26cfb14e8d20c110275d 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %testString = internal constant [18 x sbyte] c "Escaped newline\n\00"
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll b/llvm/test/Regression/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
index 0f2fc1bbe39daadade940d0a17bf4fc2bcb4d0ea..2c6a596a75089dd3a458f2b6a54123097a060083 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; Apparently this constant was unsigned in ISO C 90, but not in C 99.
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-05-13-VarArgFunction.ll b/llvm/test/Regression/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
index 45638a08833479f12ff3e1d2f6b5116fe70b1a1b..1e08b2d61f37dfe7d2be4109e28243c5f38dfafc 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; This testcase breaks the C backend, because gcc doesn't like (...) functions
 ; with no arguments at all.
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-05-31-MissingStructName.ll b/llvm/test/Regression/CodeGen/CBackend/2003-05-31-MissingStructName.ll
index 6e86a2a01752fc5d1e63e909523e9adbc9cbe370..567d8e436785f442d68b45d2d9f08961fba3a14c 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-05-31-MissingStructName.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-05-31-MissingStructName.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; The C backend was dying when there was no typename for a struct type!
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-01-NullPointerType.ll b/llvm/test/Regression/CodeGen/CBackend/2003-06-01-NullPointerType.ll
index c970786a71e8535995193312a12208089f5b7c90..224ba151875420e31e231a30ea1808dc57f2a771 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-01-NullPointerType.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-01-NullPointerType.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 %X = type { int, float }
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-11-HexConstant.ll b/llvm/test/Regression/CodeGen/CBackend/2003-06-11-HexConstant.ll
index 4b5ddaadff4a0d5dab5fda80a508b07776c54932..bc5691f22f6d7c4801749c718a4237a1194dc7c7 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-11-HexConstant.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-11-HexConstant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; Make sure hex constant does not continue into a valid hexadecimal letter/number
 %version = global [3 x sbyte] c"\001\00"
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll b/llvm/test/Regression/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
index bd89ec5848b02a0eedc1042a980113098d40f4de..7af255b73be4428adbdea922732f3142107cb90a 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 %version = global [3 x sbyte] c"1\00\00"
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-23-PromotedExprs.llx b/llvm/test/Regression/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
index 286d65b345a5494a87b49bac814eafdcd43222f8..d7f8e56213478c21d5576275f7b1490bdcc8eee6 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
@@ -1,5 +1,5 @@
 
-; RUN: llvm-as < %s | llc -march=c > %t1.cbe.c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c > %t1.cbe.c
 ; RUN: gcc -B/usr/bin/ %t1.cbe.c -o %t1.cbe
 ; RUN: %t1.cbe
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-28-InvokeSupport.ll b/llvm/test/Regression/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
index cc59035f37ba9f4952163fc1cd8d397edae2e952..2d87233a8c837fa1796f38e3ead79f2531e1c938 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 declare int %callee(int, int)
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx b/llvm/test/Regression/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
index acb3c22db8cdb2f817b03afb6e55b688912645fb..75e223d410e11b76f35e974ae6f8210a11eccb84 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | grep common | grep X
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep common | grep X
 
 %X = linkonce global int 5
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll b/llvm/test/Regression/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
index 2addddaa5a911c2c0944fd6d67fb0eea31233d95..a82d7e596967cdb63250a3a74252ad9794657fa8 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; This is a non-normal FP value: it's a nan.
 %NAN = global { float } { float 0x7FF8000000000000 } 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-10-23-UnusedType.ll b/llvm/test/Regression/CodeGen/CBackend/2003-10-23-UnusedType.ll
index bb9f4b7091be3e4bdd9d75c9555d3fd8509bb04e..e073928b2f8f6c35161360604dead246d64bfc70 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-10-23-UnusedType.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-10-23-UnusedType.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 %A = type { uint, sbyte*, { uint, uint, uint, uint, uint, uint, uint, uint }*, ushort }
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll b/llvm/test/Regression/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll
index 3072bb6d6abe5aea782eb19c24d7b93c83df831a..e1c71072b013c73b595457575b4260dee3217284 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 
 declare sbyte* %llvm.va_start()
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll b/llvm/test/Regression/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
index 0fd4fbacfc8db709510fc38c829d47d8876f458f..4c7ab32f9fc40aaa10b0f1610a2aba8a3c3cf8e7 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 ; reduced from DOOM.
 %union._XEvent = type { int }
diff --git a/llvm/test/Regression/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll b/llvm/test/Regression/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
index 32358a409f4754eb937543116e7e3ed0ea6853f0..3866200de08c620fe456524de6af22ddfaec1f7c 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %y = weak global sbyte 0
 implementation
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx b/llvm/test/Regression/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
index 613c03ecc9875186044070952460b96aab2c4c62..973e6d8b7ef3f8b04b3b4e27f0434d868d7ac594 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | grep builtin_return_address
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep builtin_return_address
 
 declare sbyte* %llvm.returnaddress(uint)
 declare sbyte* %llvm.frameaddress(uint)
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx b/llvm/test/Regression/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
index 1c07708e57c99b5decf348dc77baa5fd96a462c6..d880876afaaf573b49fd73d5de85b1a7539972c4 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
@@ -4,7 +4,7 @@
 ; this testcase for example, which caused the CBE to mangle one, screwing
 ; everything up.  :(  Test that this does not happen anymore.
 ;
-; RUN: llvm-as < %s | llc -march=c | not grep _memcpy
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep _memcpy
 
 declare void %llvm.memcpy(sbyte*, sbyte*, uint,uint)
 declare float* %memcpy(int*, uint,int)
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx b/llvm/test/Regression/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
index 36b19f3d8c40dd68c506d8a5c4fa5e2cf7e0813b..87a642b69d699d7b572bb32f034041b431db92d2 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
@@ -1,5 +1,5 @@
 ; This is a non-normal FP value
-; RUN: llvm-as < %s | llc -march=c | grep FPConstant | grep static
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep FPConstant | grep static
 
 float %func () {
   ret float 0xFFF0000000000000  ; -inf
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx b/llvm/test/Regression/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
index 918252d73679ae510985b2fddff4b66db4c854bc..997f1c9fda323c98756f9da14b8482d9b18782d7 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | grep func1 | grep WEAK
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep func1 | grep WEAK
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-08-09-va-end-null.ll b/llvm/test/Regression/CodeGen/CBackend/2004-08-09-va-end-null.ll
index f15fa86897d9bbed6ef5c708ae6e02aac96d1642..f8e8fe5bb7ebf8488e5ca143b7d53320d1a16a57 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-08-09-va-end-null.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-08-09-va-end-null.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 declare void %llvm.va_end(sbyte*)
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx b/llvm/test/Regression/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
index 8af996c2bc8487d62a6ef659810b9e8c61e1d8ba..99bb602ce3e7ffb2c9af541da3b3eb150cf240f6 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
@@ -1,7 +1,7 @@
 ; The CBE should not emit code that casts the function pointer.  This causes
 ; GCC to get testy and insert trap instructions instead of doing the right
 ; thing. :(
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-12-03-ExternStatics.ll b/llvm/test/Regression/CodeGen/CBackend/2004-12-03-ExternStatics.ll
index ca4aa5921c3a70b08f7e1638bd2430aa8965f4c2..6a55db8617c7c78681b493fedcd7d36e701574a5 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-12-03-ExternStatics.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-12-03-ExternStatics.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | not grep 'extern.*msg'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep 'extern.*msg'
 
 ; This is PR472
 
diff --git a/llvm/test/Regression/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll b/llvm/test/Regression/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
index 3377fd1feade152bec895b564f0269d67019c0c4..ebe4566aa18cbf3441814a4c4af95eab713ec565 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 int %foo() {
   ret int and (int 123456, int cast (int()* %foo to int))
diff --git a/llvm/test/Regression/CodeGen/CBackend/2005-02-14-VolatileOperations.ll b/llvm/test/Regression/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
index b6089d1d19ac49a859a598714ec49b90ec5e7be3..e161e46b558c069f8cafbcd5dadc530984dddf34 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | grep volatile
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep volatile
 
 void %test(int* %P) {
 	%X = volatile load int*%P
diff --git a/llvm/test/Regression/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll b/llvm/test/Regression/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
index 382c817d6d4835ee514f6d47ef80b3b2bc628e95..5349488d64b307e4ea3b7b523212675b698d8bc2 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
 
 %JNIEnv = type %struct.JNINa*
 %struct.JNINa = type { sbyte*, sbyte*, sbyte*, void (%JNIEnv*)* }
diff --git a/llvm/test/Regression/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll b/llvm/test/Regression/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
index 9880456dbe160bbc86ea6b555658f216841d659d..0411fb6a79d61087c0ea08929e9eb897a59f6491 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | not grep "\-\-65535"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep "\-\-65535"
 ; ModuleID = '<stdin>'
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/CBackend/2005-08-23-Fmod.ll b/llvm/test/Regression/CodeGen/CBackend/2005-08-23-Fmod.ll
index 20f05b651bb865eab61047ca248a6b08e28dcca0..5ce1e9660fd884b74b1b3666e7c01b0043447666 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2005-08-23-Fmod.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2005-08-23-Fmod.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=c | grep fmod
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep fmod
 
 double %test(double %A, double %B) {
 	%C = rem double %A, %B
diff --git a/llvm/test/Regression/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll b/llvm/test/Regression/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
index 96223f2edf1e50b70fac00f152defba9addb9eab..a29c20b13a79f96baaea966211e32911c8686f45 100644
--- a/llvm/test/Regression/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
+++ b/llvm/test/Regression/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=c &&
-; RUN: llvm-as < %s | llc -march=c | grep '\* *volatile *\*'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep '\* *volatile *\*'
 
 %G = external global void()*
 
diff --git a/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx b/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx
index 2b952f9fbf35e6b51d0d55fc338f381ead2134b7..6e57fbc2095d4371d612d38319f6a6eb5ad8d2da 100644
--- a/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx
+++ b/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-correct-eh-support
+; RUN: llvm-upgrade < %s | llvm-as | llc -enable-correct-eh-support
 
 int %test() {
   unwind
diff --git a/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx b/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx
index a98ae856e9b183be060c96e7870295bc71906a14..82d33a0db59f65a9cc26a9cf4e7e06b5a9c922c1 100644
--- a/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx
+++ b/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %global_long_1 = linkonce global long 7
 %global_long_2 = linkonce global long 49
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll b/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
index 072841d948f0839e49b0f2558478f6e1e51fa083..e47aa18f414244bf59c4f0a4aa594502a7ba0f52 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %intersect_pixel() {
 entry:
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll b/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll
index ad379dac5925a5ee74afa05c8295436222064185..54f9883ae91183fa2b0597babb0a262feafa5c5f 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc 
+; RUN: llvm-upgrade < %s | llvm-as | llc 
 	%struct.TypHeader = type { uint, %struct.TypHeader**, [3 x sbyte], ubyte }
 %.str_67 = external global [4 x sbyte]		; <[4 x sbyte]*> [#uses=1]
 %.str_87 = external global [17 x sbyte]		; <[17 x sbyte]*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll b/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll
index c6eea6a1bf528f2417ef017df131c8b25b9a8e96..96b9435e7f44b1fba69980275d9c8fed629cb107 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; Test that llvm.memcpy works with a i64 length operand on all targets.
 
 
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll b/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll
index 59b31d95b14cf76d8753cb342da40fa2066113e5..e7cce1f4ef7342d9a7d6ee53d1121b415822c6db 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %test() {
   %X = alloca {}
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll b/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll
index 7d12d78cf25eccf7bd501a4b3b212f7696b6bc5e..602321398af29beb902216845925828ec1d2a6fa 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 float %t(long %u) {
 	%u = cast long %u to ulong		; <ulong> [#uses=1]
 	%tmp5 = add ulong %u, 9007199254740991		; <ulong> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll
index a3238da00186dcb0985d2ef0d0feabbf1716e08d..a9d8deb6d67a64b8759db41177b09d36b61ddc33 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %str = external global [36 x sbyte]		; <[36 x sbyte]*> [#uses=0]
 %str = external global [29 x sbyte]		; <[29 x sbyte]*> [#uses=0]
diff --git a/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll b/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll
index 20ef2d9f0634cd594f44f24f3f26a45a0e39c3a5..ef1359ee7cdd195e54b936fc2f35c82e2dab60b0 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 long %test(long %A) {
 	%B = cast long %A to sbyte
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll b/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
index fb5092a58811318334c2b73da11153b3a121df3b..192274a8454c5b5eeccd0de8c75c105f15502f7b 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll b/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll
index 5f5aed43e3709028f1de77ff90cd3041f5a2e10c..73fd6582a29276f59455ab979fbcdaa8cbbb6332 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; This crashed the PPC backend.
 
 void %test() {
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll b/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll
index 5a48570d323b588dbb0fde8d414c0b6cfdf93908..d18ce14c63b611344043f8b484b4b8e29382ee6e 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 %G = external global int
 
 void %encode_one_frame(long %tmp.2i) {
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll b/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll
index 27b00d5f9f4449b6bf8a6a5e56ed632aabc45b04..797af74c20b5588ab83037bddd11a4dff9455640 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; Infinite loop in the dag combiner, reduced from 176.gcc.
 
 	%struct._obstack_chunk = type { sbyte*, %struct._obstack_chunk*, [4 x sbyte] }
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll b/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll
index e778a6f1091108e65ca1fa03ad9bde19a60bbb8f..4e262f85a3d0a490db13ca6bde1e8761f49a8de4 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll
index 9df1c0a290585fc66e0bed8a753fa23b42e2689e..056edac00809590f920fae63c587909976c79d06 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah
 
 ; The vload was getting memoized to the previous scalar load!
 
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll
index d827a0cc14b4540f402d75738a62e10e26f9279b..2a424be94ec37625f48f34e379efaf4e70f54133 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; PR748
 
 %G = external global ushort		; <ushort*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll
index 719c66d552e3f422f6c51cf2d6100d7c15ef7965..068d6807b81cdf63974a9f5879caaaa83c7273eb 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %test(int %tmp93) {
 	%tmp98 = shl int %tmp93, ubyte 31		; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll
index cbe77a2e7cf751b44010c59d32414aca05d0f15f..ac7e19d381ef4b6f509beab2c01ad9f915102363 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
        %struct.FILE = type { ubyte*, int, int, short, short, %struct.__sbuf, int, sbyte*, int (sbyte*)*, int (sbyte*, sbyte*, int)*, long (sbyte*, long, int)*, int (sbyte*, sbyte*, int)*, %struct.__sbuf, %struct.__sFILEX*, int, [3 x ubyte], [1 x ubyte], %struct.__sbuf, int, long }
         %struct.SYMBOL_TABLE_ENTRY = type { [9 x sbyte], [9 x sbyte], int, int, uint, %struct.SYMBOL_TABLE_ENTRY* }
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll
index c7cd33fe7a7d0861ce88ee59e57fcb8306f643cc..0cf2e9359d15d2902bd604b24419809ce291a908 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -fast
+; RUN: llvm-upgrade < %s | llvm-as | llc -fast
 
 float %test(uint %tmp12771278) {
         switch uint %tmp12771278, label %bb1279 [
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
index 5c5a1dc4e294ad9dc8bb7a51e4ee9a08200c45f6..a910b58ac89ff9d951d5df46aedfb1a321483730 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -fast
+; RUN: llvm-upgrade < %s | llvm-as | llc -fast
 
 	%struct.cl_perfunc_opts = type { ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, int, int, int, int, int, int, int }
 %cl_pf_opts = external global %struct.cl_perfunc_opts		; <%struct.cl_perfunc_opts*> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
index 0c2acc86ced76f781f972964e193379a1a3f12d7..f5d0fb35c4787fddcade9156e60669a679a7bf7b 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 	%struct.rtunion = type { long }
 	%struct.rtx_def = type { ushort, ubyte, ubyte, [1 x %struct.rtunion] }
 %ix86_cpu = external global uint		; <uint*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll
index ea50cec318733e00b8725cbc1807d2e2026f0e3b..68aadc57104bb68e7f0910f1767c52f287710646 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc 
+; RUN: llvm-upgrade < %s | llvm-as | llc 
 
 	%struct.CUMULATIVE_ARGS = type { int, int, int, int, int, int, int, int, int, int, int, int, int, int }
 	%struct.VEC_edge = type { uint, uint, [1 x %struct.edge_def*] }
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
index 3231a3cec2914461e0cd64a49b3fbb9f48c2016c..e2f07e8ae2c2a8e548e95940a0434f7780934442 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -regalloc=local
+; RUN: llvm-upgrade < %s | llvm-as | llc -regalloc=local
 
 	%struct.CHESS_POSITION = type { ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, uint, int, sbyte, sbyte, [64 x sbyte], sbyte, sbyte, sbyte, sbyte, sbyte }
 %search = external global %struct.CHESS_POSITION		; <%struct.CHESS_POSITION*> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll b/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll
index 29b81bb70a7531cb56657458ead4b35ed0c3d10b..2b1292617405914cddb8aac37681f4a546097aee 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %foo() {
 	br label %cond_true813.i
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll b/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll
index 6ebe9fbcf5df91feae808a585911f8593338204d..8bf3c11e26092b0f29e1572350031017f22bbc9d 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc 
+; RUN: llvm-upgrade < %s | llvm-as | llc 
 
 void %start_pass_huff(int %gather_statistics) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll
index 0296cb07bddeed014b96a1c13e162384bdeb544b..8857c930dd30c6c574e0e42b895e83a64322a254 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %form_component_prediction(int %dy) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
index b329520614f53bb4c3ebcd02ccc753a881f292a2..d7ef1db635367c103256fff5a27e8753b26b5eaa 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | not grep adc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep adc
 
 ; PR987
 
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll
index 972418c037640912a81bd5162ba7c18f8d49424f..a5476eb3b50df6fbb34788b3ed55f783c8356846 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi
 
 void %test(short %div.0.i.i.i.i, int %L_num.0.i.i.i.i, int %tmp1.i.i206.i.i, short* %P) {
         %X = shl short %div.0.i.i.i.i, ubyte 1          ; <short> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll
index 93b58575dc267e4ac0502fd59656657b43c12e04..6a76079e253ef88b59cf02e11bbfa43d4f4fc1df 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll
+++ b/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; PR1011
 
 	%struct.mng_data = type { sbyte* (%struct.mng_data*, uint)*, int, int, int, sbyte, sbyte, int, int, int, int, int }
diff --git a/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx b/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx
index 2d969345fe2d866434997c585ff6ca2d7c46078d..82606094c37a26f1a1a3ae82e2933caa13a07c69 100644
--- a/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx
+++ b/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx
@@ -1,7 +1,7 @@
 ; New testcase, this contains a bunch of simple instructions that should be 
 ; handled by a code generator.
 
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %add(int %A, int %B) {
 	%R = add int %A, %B
diff --git a/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx b/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx
index 20c3ef6f81af6da3d9a7860fec9c90cd61b1594d..afb6530bab9aeffcec9d54640b7a00a598686153 100644
--- a/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx
+++ b/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %.str_1 = internal constant [16 x sbyte] c"%d %d %d %d %d\0A\00"
 
diff --git a/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll b/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll
index 76d354be0c332251dbff129de961d29f430832cb..fd60d0b60410d9c8ea4f5115ef493bac8453abd1 100644
--- a/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll
+++ b/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll
@@ -1,5 +1,5 @@
 ; Verify debugger intrinsics are ignored or accepted.
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 ;; Debugger type declarations
 %lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, {}* }
diff --git a/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll b/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll
index 3311470108993b4f6181c4c2544eef607c2b9d9e..11294e1eb2a7352b062053a6bc28fc6ee425f011 100644
--- a/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll
+++ b/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll b/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll
index 136bdb494b6ad1f8558c52ce93f3a3dedcc49295..37bfffaa02652a8cf6027d33f238891da5028d40 100644
--- a/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll
+++ b/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | wc -l | grep 1
 ; PR964
 
 sbyte* %FindChar(sbyte* %CurPtr) {
diff --git a/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll b/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll
index b2396ea04cd5107df74c04c0ffa28a412331e199..ad9bc8e86fcdc60397de5f58c93e707ae24eca83 100644
--- a/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll
+++ b/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 double %test(bool %X) {
         %Y = cast bool %X to double
         ret double %Y
diff --git a/llvm/test/Regression/CodeGen/Generic/call-ret0.ll b/llvm/test/Regression/CodeGen/Generic/call-ret0.ll
index 79edc1e6459889ec750cc398b7cd3a01301673f2..44c30d3f6fde6c2ea602f34ae59801f017461f4b 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-ret0.ll
+++ b/llvm/test/Regression/CodeGen/Generic/call-ret0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %foo(int %x) {
   ret int %x
diff --git a/llvm/test/Regression/CodeGen/Generic/call-ret42.ll b/llvm/test/Regression/CodeGen/Generic/call-ret42.ll
index 2e8ed381a0c3461140f5db95551faacb30aae3db..b0a480f045011a9d551ff3f7d3ce487835471cbf 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-ret42.ll
+++ b/llvm/test/Regression/CodeGen/Generic/call-ret42.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %foo(int %x) {
   ret int 42
diff --git a/llvm/test/Regression/CodeGen/Generic/call-void.ll b/llvm/test/Regression/CodeGen/Generic/call-void.ll
index 1263b98976581380ff63ce668ca578552b762ca6..64e6336b16f92fd5179ba1bf11bc7cad3d0000d1 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-void.ll
+++ b/llvm/test/Regression/CodeGen/Generic/call-void.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %foo() {
   ret void
diff --git a/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll b/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll
index a0bde8de2b45633097825dbb93df923c3b2e485d..55be5c68b65c751c482079502ae9d03526e2b25e 100644
--- a/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll
+++ b/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %bar(int %x) {
   ret int 0
diff --git a/llvm/test/Regression/CodeGen/Generic/cast-fp.ll b/llvm/test/Regression/CodeGen/Generic/cast-fp.ll
index 1b80385cd4d7c370d69f9503f48d107f2d7294fb..8359329035c9e8d41cfd0befa0fe749fdb60f68f 100644
--- a/llvm/test/Regression/CodeGen/Generic/cast-fp.ll
+++ b/llvm/test/Regression/CodeGen/Generic/cast-fp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_fstr = internal constant [8 x sbyte] c"a = %f\0A\00"
 %a_lstr = internal constant [10 x sbyte] c"a = %lld\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/debug-info.ll b/llvm/test/Regression/CodeGen/Generic/debug-info.ll
index 0c69ea0eb6e151928de3a1da48747826ae004aa8..cd5c3557f789ba721e8cd9b3bf85ea415e391dc9 100644
--- a/llvm/test/Regression/CodeGen/Generic/debug-info.ll
+++ b/llvm/test/Regression/CodeGen/Generic/debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 %lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, {  }* }
 %d.compile_unit7 = external global %lldb.compile_unit		; <%lldb.compile_unit*> [#uses=1]
 
diff --git a/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll b/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll
index 76d6182931cc31eeb0c3d7115915fee0917a4b9e..7452c7e3aa0cc9c588e20afe0f1e09945b6b183d 100644
--- a/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll
+++ b/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %test(int %X) {
   %Y = div int %X, -2
diff --git a/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll b/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll
index a533fe559960b64ccdf3fee6bcc54905ba0097b9..3dc4588eeabcd5cbb0519d6d96e5cc18b2938377 100644
--- a/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll
+++ b/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 double %fneg(double %X) {
 	%Y = sub double -0.0, %X
diff --git a/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll b/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll
index 7b9c0e985bb43acd454b0811c66fec86919a47c6..a99c5b5e8dd84b60d212483be743ea836dad4c52 100644
--- a/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll
+++ b/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 sbyte %test1(double %X) {
 	%tmp.1 = cast double %X to sbyte
diff --git a/llvm/test/Regression/CodeGen/Generic/global-ret0.ll b/llvm/test/Regression/CodeGen/Generic/global-ret0.ll
index 993049dfb996fff61b850c9cb8941ff998f27b1e..dfe6aef67d36f6c58bb14a696b15bd4000d6a3e7 100644
--- a/llvm/test/Regression/CodeGen/Generic/global-ret0.ll
+++ b/llvm/test/Regression/CodeGen/Generic/global-ret0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %g = global int 0
 
diff --git a/llvm/test/Regression/CodeGen/Generic/hello.ll b/llvm/test/Regression/CodeGen/Generic/hello.ll
index e68d588519000a33cbbacd95140e33a569432156..d9e9d587ce6dfb9538b7efaf6f1c448e359af77b 100644
--- a/llvm/test/Regression/CodeGen/Generic/hello.ll
+++ b/llvm/test/Regression/CodeGen/Generic/hello.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %.str_1 = internal constant [7 x sbyte] c"hello\0A\00"
 
diff --git a/llvm/test/Regression/CodeGen/Generic/intrinsics.ll b/llvm/test/Regression/CodeGen/Generic/intrinsics.ll
index f8a64f7cba6354e69bae308112dc890361b17ade..7c1d1a52bc9365921990d4bf1cc3c5fd9121f7d2 100644
--- a/llvm/test/Regression/CodeGen/Generic/intrinsics.ll
+++ b/llvm/test/Regression/CodeGen/Generic/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 ;; SQRT
 declare float %llvm.sqrt(float)
diff --git a/llvm/test/Regression/CodeGen/Generic/isunord.ll b/llvm/test/Regression/CodeGen/Generic/isunord.ll
index 21205c181d61c350562e94504241cb165ed5a39c..f11ec33736673efa8c848f946551c8af7f8f6bc1 100644
--- a/llvm/test/Regression/CodeGen/Generic/isunord.ll
+++ b/llvm/test/Regression/CodeGen/Generic/isunord.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 ; XFAIL: ia64|sparcv8
 
 
diff --git a/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll b/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll
index 2095ca3584f15bff0bf8ce5f5e2005aec667fb94..1897abee570b8e1159c0b893145c313aaf62698a 100644
--- a/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll
+++ b/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase is supported by all code generators
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 declare long %llvm.ctpop(long)
 declare int %llvm.ctpop(int)
diff --git a/llvm/test/Regression/CodeGen/Generic/nested-select.ll b/llvm/test/Regression/CodeGen/Generic/nested-select.ll
index c2dd580a44e0dffd07ed99dd9bad7454148b22f3..18798d1d276a7a5643ce3d6aa4b701b1b1cfb67f 100644
--- a/llvm/test/Regression/CodeGen/Generic/nested-select.ll
+++ b/llvm/test/Regression/CodeGen/Generic/nested-select.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as | llc -o /dev/null -f
 
 ; Test that select of a select works
 
diff --git a/llvm/test/Regression/CodeGen/Generic/print-add.ll b/llvm/test/Regression/CodeGen/Generic/print-add.ll
index 6e5c3c48fa4dd8d09a8469dd8ec0b72458d2a51b..ef224a14036f0baddee772364641bff70a834ff6 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-add.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-add.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %.str_1 = internal constant [4 x sbyte] c"%d\0A\00"
 
diff --git a/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll b/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll
index 446dbea3fd800c7d312792707d272ef8de86426d..cfa758398175f6e594d655dfc2493dabd66a93ed 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_str = internal constant [8 x sbyte] c"a = %f\0A\00"
 %b_str = internal constant [8 x sbyte] c"b = %f\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll b/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll
index b67850388c501131d4a48664e8419ae8b51b2ad0..708abec5f2e8f883fcae08783191993aea48c840 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
 %b_str = internal constant [8 x sbyte] c"b = %d\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/print-int.ll b/llvm/test/Regression/CodeGen/Generic/print-int.ll
index cd3e2b276dafd137cfc7ef98fdde78b5c8d0af0f..27cf637e10bcf32828a5ea46cff6f9dcc10e0a81 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-int.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-int.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %.str_1 = internal constant [4 x sbyte] c"%d\0A\00"
 
diff --git a/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll b/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll
index 0a8fd782b75f46857001c30b5a7dd3ef1e7d9ec2..d5f5f935573f4674bd0284c48c27a1f611c2c4d5 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
 %a_mul_str = internal constant [13 x sbyte] c"a * %d = %d\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/print-mul.ll b/llvm/test/Regression/CodeGen/Generic/print-mul.ll
index 80d2d5140d5a5d6815d7094c9ed09993f4b97c1e..911c73e9935a50b43404ef81419e83086a9b7377 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-mul.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-mul.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
 %b_str = internal constant [8 x sbyte] c"b = %d\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/print-shift.ll b/llvm/test/Regression/CodeGen/Generic/print-shift.ll
index 8ce3bac15901afcaad25ec2bddd7fe3587688ed7..4f699d5c18e004a55cdf17982938640fd429d28a 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-shift.ll
+++ b/llvm/test/Regression/CodeGen/Generic/print-shift.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
 %b_str = internal constant [8 x sbyte] c"b = %d\0A\00"
diff --git a/llvm/test/Regression/CodeGen/Generic/ret0.ll b/llvm/test/Regression/CodeGen/Generic/ret0.ll
index 439a2f3284b9c5ab02bd8b926293ab0f01b01dfb..4d0d10b0e09d165ae23fb30d6462a07a0754fefe 100644
--- a/llvm/test/Regression/CodeGen/Generic/ret0.ll
+++ b/llvm/test/Regression/CodeGen/Generic/ret0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %main() {  
   ret int 0
diff --git a/llvm/test/Regression/CodeGen/Generic/ret42.ll b/llvm/test/Regression/CodeGen/Generic/ret42.ll
index ac14231b8b8c1fb6b6afb6061bea77c6e3298b85..88d3c986e27712bf04444c42ff61b019e70b8088 100644
--- a/llvm/test/Regression/CodeGen/Generic/ret42.ll
+++ b/llvm/test/Regression/CodeGen/Generic/ret42.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 int %main() {  
   ret int 42
diff --git a/llvm/test/Regression/CodeGen/Generic/shift-int64.ll b/llvm/test/Regression/CodeGen/Generic/shift-int64.ll
index 50299af071334bee38d20fd2ac4333a5105784ac..a5ab37d725febf81e1f7eca7f0011d625aaed7bf 100644
--- a/llvm/test/Regression/CodeGen/Generic/shift-int64.ll
+++ b/llvm/test/Regression/CodeGen/Generic/shift-int64.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 long %test_imm(long %X) {
    %Y = shr long %X, ubyte 17 
diff --git a/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll b/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll
index 8ef0dac46d70ea0fc4e4fbcf55c4e27e706758d4..65cf6c1e61746c613fe0d072d8eb1364996e03b4 100644
--- a/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll
+++ b/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 declare sbyte* %llvm.stacksave()
 declare void %llvm.stackrestore(sbyte*)
diff --git a/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll b/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll
index 460354e9b93a82ecd8eb05379bbb6f6e5f5100a7..12c15159af1c8b56e49f5d7e3e4991d6cc7816c2 100644
--- a/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll
+++ b/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 'mov.*str1' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'mov.*str1' | wc -l | grep 1
 ; PR925
 
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll b/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll
index eb49dbfbd737d4433d5900ed5151931e0650939b..31b60a4d687ef541a53ee67a634f9d995b54ea61 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll
+++ b/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 	
 void ""(float* %inregs, float* %outregs) {
         %a_addr.i = alloca <4 x float>          ; <<4 x float>*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll b/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll
index 7ee5fd6d2b0d70d9a750859546f8f41d08bb5903..1cdf580cfb11a9906c63d0f2ec1b79ba7398a53e 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll
+++ b/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep _test &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vperm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep _test &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm
 
 void %test(<4 x float> *%tmp2.i) {
 	%tmp2.i = load <4x float>* %tmp2.i
diff --git a/llvm/test/Regression/CodeGen/Generic/vector.ll b/llvm/test/Regression/CodeGen/Generic/vector.ll
index 34a3b2444b880feb36842277194580e3ecaf9cfa..207c51dc4318feea405d0125ae1bcff2482c1cae 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector.ll
+++ b/llvm/test/Regression/CodeGen/Generic/vector.ll
@@ -1,10 +1,10 @@
 ; Test that vectors are scalarized/lowered correctly.
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc -mtriple a-b-c &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g3 &&
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 &&
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah
+; RUN: llvm-upgrade < %s | llvm-as | llc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple a-b-c &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah
 
 %f1 = type <1 x float>
 %f2 = type <2 x float>
diff --git a/llvm/test/Regression/CodeGen/IA64/2005-08-22-LegalizerCrash.ll b/llvm/test/Regression/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
index a4946a8659a37dcc739e2cf534277ebcc5f98f6f..c160e7fe82ef502f234e1c5c31bc12ab2173199b 100644
--- a/llvm/test/Regression/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
+++ b/llvm/test/Regression/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ia64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64
 
 %_ZN9__gnu_cxx16__stl_prime_listE = external global [28 x uint]		; <[28 x uint]*> [#uses=3]
 
diff --git a/llvm/test/Regression/CodeGen/IA64/2005-10-29-shladd.ll b/llvm/test/Regression/CodeGen/IA64/2005-10-29-shladd.ll
index 0f241abca6e176877be9db28694d924cc6705ffe..355b487ef5681829f914eb3b16593a5c04205ea3 100644
--- a/llvm/test/Regression/CodeGen/IA64/2005-10-29-shladd.ll
+++ b/llvm/test/Regression/CodeGen/IA64/2005-10-29-shladd.ll
@@ -1,5 +1,5 @@
 ; this should turn into shladd 
-; RUN: llvm-as < %s | llc -march=ia64 | grep 'shladd'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 | grep 'shladd'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/IA64/ret-0.ll b/llvm/test/Regression/CodeGen/IA64/ret-0.ll
index 7f240cde767002c29df37893bf741a249530030f..0f5cf8947a6bde714973b8e8510cb803494d74b9 100644
--- a/llvm/test/Regression/CodeGen/IA64/ret-0.ll
+++ b/llvm/test/Regression/CodeGen/IA64/ret-0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ia64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64
 
 double %test() {
   ret double 0.0
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2004-11-29-ShrCrash.ll b/llvm/test/Regression/CodeGen/PowerPC/2004-11-29-ShrCrash.ll
index 3e5e89d16e4607a79beedfd6f6042b6ce696fefb..e2a00d1e6e0f5e8e23dec97c001e8fe23b94a5fe 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2004-11-29-ShrCrash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2004-11-29-ShrCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 void %main() {
 	%tr1 = shr uint 1, ubyte 0
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shift-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shift-crash.ll
index 9c611649e6a80ed382a889f8e2e643250d460eef..4603bdbbf09fe2ce7ad9f986c12b480c69492ebf 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shift-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shift-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 void %main() {
 	%tr4 = shl ulong 1, ubyte 0		; <ulong> [#uses=0]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll
index e768753d810ab03ed796e2587e0e849d1ee2db89..8f54c78e7a9df3f417f5cd29fe0a20898bdac223 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 void %main() {
 	%shamt = add ubyte 0, 1		; <ubyte> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll b/llvm/test/Regression/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
index 9773de27000585db9381e741cbbf4d207e6a97eb..839e88c51ef63bd151011b5d4ae835be58f259e9 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
@@ -1,3 +1,3 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep '.comm.*X,0'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep '.comm.*X,0'
 
 %X = linkonce global {} {}
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll
index fe2dcf536bc0e538f6952f92349fa1bd9adcf08d..5dc4b28655af6c271bd3c25a184cce98782fa749 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 
 
 int %main() {
         %setle = setle long 1, 0
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-UndefLong.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-UndefLong.ll
index 21e72e0c66b26c07f69917eb6d594d586382b24e..a4121c522faba6e2a027a880669bc31143b99c16 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-UndefLong.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-01-14-UndefLong.ll
@@ -1,3 +1,3 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 long %test() { ret long undef }
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll
index e9deb8f27616e5c3067e91edaa28e599457dc8c0..ef0137f4cd6f51ba316f85f0356fd70b2e8e6e99 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll
@@ -1,6 +1,6 @@
 ; this should not crash the ppc backend
 
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 uint %test( int %j.0.0.i) {
   %tmp.85.i = and int %j.0.0.i, 7
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
index 1c30f09716cba3a48b9717a6c0904665d13cf0dc..1e748b752c92e7446bc5a9ee7e801ae12f1a6282 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
@@ -1,6 +1,6 @@
 ; This function should have exactly one call to fixdfdi, no more!
 
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | grep 'bl .*fixdfdi' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | grep 'bl .*fixdfdi' | wc -l | grep 1
 
 double %test2(double %tmp.7705) {
         %mem_tmp.2.0.in = cast double %tmp.7705 to long                ; <long> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll
index 44d725d9c17fd4cf82e5866faa410fec43d49fe2..edbdc4a09d019b26410cb11c6e5e2f79386b9a7a 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll
@@ -1,7 +1,7 @@
 ; This was erroneously being turned into an rlwinm instruction.
 ; The sign bit does matter in this case.
 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep srawi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep srawi
 int %test(int %X) {
 	%Y = and int %X, -2
 	%Z = shr int %Y, ubyte 11
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2005-11-30-vastart-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2005-11-30-vastart-crash.ll
index 665429b4e8eec23b4fd69a54a9ba31809bd4b01a..4264e9e82fe3ec5026d750dced1ab4c35ee90330 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2005-11-30-vastart-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2005-11-30-vastart-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 target endian = big
 target pointersize = 32
 target triple = "powerpc-apple-darwin8.2.0"
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll
index 916f38331100c36c1e0537692a35828b3e3757d8..fd7f27d0bdbf4628a28738544a7f6bebbdf04b17 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc | not grep ', f1'
+; RUN: llvm-upgrade < %s | llvm-as | llc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc | not grep ', f1'
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
index eb8046f395d4412f24cb19db793459dc03af2bfc..8edb96284ec5382766310c78a5cd76d5d88d5de5 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 void %iterative_hash_host_wide_int() {
 	%zero = alloca int		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll
index f662ce289b5a49884ab21a09cc302104fcceb15f..dcf599b1a3bb14394c4ad9009fa3487c2f7cc894 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 double %CalcSpeed(float %tmp127) {
 	%tmp145 = cast float %tmp127 to double		; <double> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-04-05-splat-ish.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-04-05-splat-ish.ll
index 69cb89f11ed70973e2bae1dcd22e8a9dbadb2242..1aca3e35161725caaa4c1442a284d2df9bd73fba 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-04-05-splat-ish.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-04-05-splat-ish.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'vspltish v.*, 10'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'vspltish v.*, 10'
 
 void %test(<8 x short>* %P) {
 	%tmp = load <8 x short>* %P		; <<8 x short>> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll
index 32188cfd13fc95861493d0471f6c487f462f3d94..59f7ed4662b50e7f53f63e837efc449399391402 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5
 
 void %test(sbyte* %stack) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll
index 283f93570b4996841d2b8e9ea66350164ce372ab..6c34cd7861a69a92fc9fbb8295ecce49727dd893 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 	%struct.attr_desc = type { sbyte*, %struct.attr_desc*, %struct.attr_value*, %struct.attr_value*, uint }
 	%struct.attr_value = type { %struct.rtx_def*, %struct.attr_value*, %struct.insn_ent*, int, int }
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll
index 396da37d2f52d8ec3a1e4512ec470b273959e3ca..10260725f04524c627536c4b87554c08a1c33b8b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=powerpc64-apple-darwin | grep extsw | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=powerpc64-apple-darwin | grep extsw | wc -l | grep 2
 
 %lens = external global ubyte*
 %vals = external global int*
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll
index 6f2fbcb08abbfb1f0cf57d4f4619dbc15a308642..d71ba5a3822a414107933dca6d2951f29b0f4071 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 void %img2buf(int %symbol_size_in_bytes, ushort* %ui16) {
 	%tmp93 = load ushort* null		; <ushort> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-08-11-RetVector.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-08-11-RetVector.ll
index ca9841e30ed597eb8077ae9a6ae6858509809402..ab9ef35a0f16844a22dd1cf019bf6e34f6197601 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-08-11-RetVector.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-08-11-RetVector.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsldoi &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vor
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsldoi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vor
 
 <4 x float> %func(<4 x float> %fp0, <4 x float> %fp1) {
         %tmp76 = shufflevector <4 x float> %fp0, <4 x float> %fp1, <4 x uint> < uint 0, uint 1, uint 2, uint 7 >                ; <<4 x float>> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
index 2218fcad7b087f48bb8013566df9b3a83fa1547b..287a79d29a9c032614b9c340dc135a1fb169a4c1 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 
 	%struct..0anon = type { int }
 	%struct.rtx_def = type { ushort, ubyte, ubyte, [1 x %struct..0anon] }
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-09-28-shift_64.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-09-28-shift_64.ll
index d5da348bcf7755fec85bfb68427dd5be97dab653..58d1f265f67e02cdfdc39b8d0f2052d147d2050e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-09-28-shift_64.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-09-28-shift_64.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64
 target endian = big
 target pointersize = 64
 target triple = "powerpc64-apple-darwin8"
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll
index 474492a2995bf40489c0b75889b147cfbc0e6335..72ba9932aecf2153abbc5918db74b8b0564dd713 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -combiner-alias-analysis | grep 'f5'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -combiner-alias-analysis | grep 'f5'
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-10-13-Miscompile.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-10-13-Miscompile.ll
index d19245945f50d4d74ca47aaef707045c28bbb65b..162cbdb1d379a1749c35490ef691c3c938910e50 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-10-13-Miscompile.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-10-13-Miscompile.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep IMPLICIT_DEF
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep IMPLICIT_DEF
 
 void %foo(long %X) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll
index b8e714eb6a073120fbcc8770c7ecb4221287a55d..397ada76c638bc32247642495f7008d5152feeba 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep xor 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep xor 
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll
index bb46a1bdfc70ceb03c57e30279c3700512097a97..c981c269dc3cb3141113902649fe99559bf0a4ca 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64
 
 int * %foo(uint %n) {
 	%A = alloca int, uint %n
diff --git a/llvm/test/Regression/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll b/llvm/test/Regression/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll
index d74e47e6b6c1cd57e7cc4bb88038ecd41824631d..0411eb593063da174f6961361d777d448c545dc7 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5
 
 void %glgRunProcessor15() {
 	%tmp26355.i = shufflevector <4 x float> zeroinitializer, <4 x float> < float 0x379FFFE000000000, float 0x379FFFE000000000, float 0x379FFFE000000000, float 0x379FFFE000000000 >, <4 x uint> < uint 0, uint 1, uint 2, uint 7 >		; <<4 x float>> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/Frames-align.ll b/llvm/test/Regression/CodeGen/PowerPC/Frames-align.ll
index 4172bd465b8d0d3f389b35127ff8af12500c8b37..5eb6c0801678f59617e50aa3971cf4d623b3f1a1 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/Frames-align.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/Frames-align.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'rlwinm r0, r1, 0, 22, 31' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'subfic r0, r0, -17408' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'rldicl r0, r1, 0, 54'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'rlwinm r0, r1, 0, 22, 31' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'subfic r0, r0, -17408' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'rldicl r0, r1, 0, 54'
 
 
 implementation
diff --git a/llvm/test/Regression/CodeGen/PowerPC/Frames-alloca.ll b/llvm/test/Regression/CodeGen/PowerPC/Frames-alloca.ll
index 0fcae1a522cb605073b5b6ced44513fad6ba7b5d..91d18068263c050cc8201b13de43ee6616c0d059 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/Frames-alloca.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/Frames-alloca.ll
@@ -1,19 +1,19 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwu r1, -64(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -64(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdu r1, -112(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -112(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwu r1, -64(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -64(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdu r1, -112(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -112(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
 
 
 implementation
diff --git a/llvm/test/Regression/CodeGen/PowerPC/Frames-large.ll b/llvm/test/Regression/CodeGen/PowerPC/Frames-large.ll
index d41c8cfb6ca05dc346093d6f63d30c92f44506b4..ae2701086272471f1c2ead754c3da1ffcab5e772 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/Frames-large.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/Frames-large.ll
@@ -1,27 +1,27 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lis r0, -1' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'ori r0, r0, 32704' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwux r1, r1, r0' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lis r0, -1' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'ori r0, r0, 32704' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwux r1, r1, r0' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'lis r0, -1' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ori r0, r0, 32656' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdux r1, r1, r0' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'lis r0, -1' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ori r0, r0, 32656' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdux r1, r1, r0' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lis r0, -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'ori r0, r0, 32704' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwux r1, r1, r0' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lis r0, -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'ori r0, r0, 32704' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwux r1, r1, r0' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'lis r0, -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ori r0, r0, 32656' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdux r1, r1, r0' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'lis r0, -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ori r0, r0, 32656' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdux r1, r1, r0' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
 
 
 implementation
diff --git a/llvm/test/Regression/CodeGen/PowerPC/Frames-leaf.ll b/llvm/test/Regression/CodeGen/PowerPC/Frames-leaf.ll
index 29a187b3966fb9aded5e8a768bf05a698e002478..933ca121adc033b8e43ac126e7faed8bf1d90092 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/Frames-leaf.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/Frames-leaf.ll
@@ -1,19 +1,19 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stwu r1, -.*(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'addi r1, r1, ' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'stwu r1, -.*(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'addi r1, r1, ' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'stdu r1, -.*(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'addi r1, r1, ' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'stw r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'stdu r1, -.*(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'addi r1, r1, ' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'ld r31, 40(r1)'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stwu r1, -.*(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'addi r1, r1, ' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'stwu r1, -.*(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'addi r1, r1, ' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'stdu r1, -.*(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'addi r1, r1, ' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'stw r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'stdu r1, -.*(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'addi r1, r1, ' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'ld r31, 40(r1)'
 
 
 implementation
diff --git a/llvm/test/Regression/CodeGen/PowerPC/Frames-small.ll b/llvm/test/Regression/CodeGen/PowerPC/Frames-small.ll
index 4f29fb43ad1af3d0d3995dd8db5ad79a4c37c238..49111424160630ad69c56cffb1f2f57189beb403 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/Frames-small.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/Frames-small.ll
@@ -1,19 +1,19 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwu r1, -16448(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'addi r1, r1, 16448' &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -16448(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'addi r1, r1, 16448' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdu r1, -16496(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'addi r1, r1, 16496' &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -16496(r1)' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'addi r1, r1, 16496' &&
-; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwu r1, -16448(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'addi r1, r1, 16448' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -16448(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'addi r1, r1, 16448' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdu r1, -16496(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'addi r1, r1, 16496' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -16496(r1)' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'addi r1, r1, 16496' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)'
 
 
 implementation
diff --git a/llvm/test/Regression/CodeGen/PowerPC/addc.ll b/llvm/test/Regression/CodeGen/PowerPC/addc.ll
index dbf19d9f8cadf6214c662b659afd2d425002a55c..25f38547cc240f76d214dac89a2cfd1fd2a86a05 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/addc.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/addc.ll
@@ -1,9 +1,9 @@
 ; All of these should be codegen'd without loading immediates
-; RUN: llvm-as < %s | llc -march=ppc32 | grep addc | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep adde | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep addze | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep addme | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep addic | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addc | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep adde | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addze | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addme | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addic | wc -l | grep 2
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/addi-reassoc.ll b/llvm/test/Regression/CodeGen/PowerPC/addi-reassoc.ll
index 7dbbfc7c49874118ec45a1079d4229a33d7da405..7cfbd8653f5dd09b4816c94ec1deb05943c0b9f2 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/addi-reassoc.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/addi-reassoc.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep addi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep addi
 
         %struct.X = type { [5 x sbyte] }
 implementation   ; Functions:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/align.ll b/llvm/test/Regression/CodeGen/PowerPC/align.ll
index e2045d71e85ce81ea976454e1ae2bc07ccb5a388..e74b6091686068987da037c23975099b480f07f7 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/align.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/align.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.4" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.2" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.3" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.4" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.2" | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.3" | wc -l | grep 1
 
 
 %A = global <4 x uint> < uint 10, uint 20, uint 30, uint 40 >
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and-branch.ll b/llvm/test/Regression/CodeGen/PowerPC/and-branch.ll
index 676e898e3ada6fd7cb9d9221708cd6c96d187cb1..ef53d6c314e2aea96865a995775bbb344d0410e4 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and-branch.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and-branch.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep mfcr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mfcr
 
 void %foo(int %X, int %Y, int %Z) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and-elim.ll b/llvm/test/Regression/CodeGen/PowerPC/and-elim.ll
index d49672d8ce4f5b4a28004ffc5b95008f06c937df..ae1f57d07d29abc77a378c43231b40a1fb52cd34 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and-elim.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and-elim.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwin
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwin
 
 void %test(ubyte* %P) {
 	%W = load ubyte* %P
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and-imm.ll b/llvm/test/Regression/CodeGen/PowerPC/and-imm.ll
index 09cc1a27a4ad4db61b9987300355e87f138471ee..e81f7768a6062fbf4bc04bee1dc19e369af31a32 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and-imm.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and-imm.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'ori\|lis'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'ori\|lis'
 
 int %test(int %X) {
 	%Y = and int %X, 32769   ; andi. r3, r3, 32769
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and_add.ll b/llvm/test/Regression/CodeGen/PowerPC/and_add.ll
index c2293c25f3270991b9eb2c57b43792676f8caf95..dc82fc94402fcb0bf41eacdd0a7fc66c9272f3ea 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and_add.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and_add.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep slwi &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep addi &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep slwi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep addi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm
 
 int %test(int %A) {
   %B = mul int %A, 8  ;; shift
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and_sext.ll b/llvm/test/Regression/CodeGen/PowerPC/and_sext.ll
index 78debf3e86ab23d1651b3bf1bce717aae7e656be..fa7947f373381cc66ddcc18526c88bf657f676d0 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and_sext.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and_sext.ll
@@ -1,7 +1,7 @@
 ; These tests should not contain a sign extend.
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsh  &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsh  &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsb
 
 int %test1(uint %mode.0.i.0) {
         %tmp.79 = cast uint %mode.0.i.0 to short
diff --git a/llvm/test/Regression/CodeGen/PowerPC/and_sra.ll b/llvm/test/Regression/CodeGen/PowerPC/and_sra.ll
index 6b315e1ed3709e6debe5434d89b2349fbe0a3a78..abfa9f113adac677a91b4dcb0afa1b3422180e5b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/and_sra.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/and_sra.ll
@@ -1,5 +1,5 @@
 ; Neither of these functions should contain algebraic right shifts
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi 
 
 int %test1(uint %mode.0.i.0) {
         %tmp.79 = cast uint %mode.0.i.0 to int        ; <sbyte> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/branch-opt.ll b/llvm/test/Regression/CodeGen/PowerPC/branch-opt.ll
index a8abec5c8bcbc665c03abfcb457e71141eb7146b..7f40a2d86680faa4044cb2504606b678d7a37777 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/branch-opt.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/branch-opt.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'b LBB.*cond_next48.loopexit' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'b LBB.*cond_next48.loopexit' | wc -l | grep 1
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/PowerPC/bswap-load-store.ll b/llvm/test/Regression/CodeGen/PowerPC/bswap-load-store.ll
index b8668bb6f025cf561e39abcffa98a0f358d78f07..853abc425585d3d5714a6262e16f0a2eb8b838fc 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/bswap-load-store.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/bswap-load-store.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwimi &&
-; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep rlwinm &&
-; RUN: llvm-as < %s | llc -march=ppc64 | not grep rlwimi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwimi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwinm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwimi
 
 void %STWBRX(uint %i, sbyte* %ptr, int %off) {
 	%tmp1 = getelementptr sbyte* %ptr, int %off
diff --git a/llvm/test/Regression/CodeGen/PowerPC/buildvec_canonicalize.ll b/llvm/test/Regression/CodeGen/PowerPC/buildvec_canonicalize.ll
index c642d42fc435275dfa1d7344f0f488b5810e231a..6e41a59ceef59fc12195ab017adffed9524f4a1e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/buildvec_canonicalize.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/buildvec_canonicalize.ll
@@ -1,8 +1,8 @@
 ; There should be exactly one vxor here.
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vxor | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vxor | wc -l | grep 1 &&
 
 ; There should be exactly one vsplti here.
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vsplti | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vsplti | wc -l | grep 1
 
 
 void %VXOR(<4 x float>* %P1, <4 x int>* %P2, <4 x float>* %P3) {
diff --git a/llvm/test/Regression/CodeGen/PowerPC/calls.ll b/llvm/test/Regression/CodeGen/PowerPC/calls.ll
index 105f470deeb1a5fe55669701d1ee84a32fb5d191..73aa2aa2d4bf0bc9549abf15b193d8761659e819 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/calls.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/calls.ll
@@ -1,8 +1,8 @@
 ; Test various forms of calls.
 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bl ' | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bctrl' | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bla ' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bl ' | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bctrl' | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bla ' | wc -l | grep 1
 
 declare void %foo()
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/cmp-cmp.ll b/llvm/test/Regression/CodeGen/PowerPC/cmp-cmp.ll
index 5a9e8e8269472b84a99bf0967ed136c87f4772c3..d505736005cb173f6820eae413195d164ef63e4e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/cmp-cmp.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/cmp-cmp.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep mfcr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mfcr
 
 void %test(long %X) {
         %tmp1 = and long %X, 3          ; <long> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/constants.ll b/llvm/test/Regression/CodeGen/PowerPC/constants.ll
index 7a285ec284a77f5483ef45308d40da03574cdc3e..37164cb4c947737c55233e2ede7acea738bf0f2b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/constants.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/constants.ll
@@ -1,7 +1,7 @@
 ; All of these routines should be perform optimal load of constants.
-; RUN: llvm-as < %s | llc -march=ppc32 | grep lis   | wc -l | grep 5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep ori   | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'li ' | wc -l | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lis   | wc -l | grep 5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep ori   | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'li ' | wc -l | grep 4
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/cttz.ll b/llvm/test/Regression/CodeGen/PowerPC/cttz.ll
index f860456d647c1122d7f2e917a7725aca11a8df8f..bfb7b5d2f9358061171192e266a40a1ad924e987 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/cttz.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/cttz.ll
@@ -1,5 +1,5 @@
 ; Make sure this testcase does not use ctpop
-; RUN: llvm-as < %s | llc -march=ppc32 | grep -i 'cntlzw'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep -i 'cntlzw'
 
 declare int %llvm.cttz(int)
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/darwin-labels.ll b/llvm/test/Regression/CodeGen/PowerPC/darwin-labels.ll
index 0c803d55f71c510586463d4479b954e924f07998..8178c8401c8b92f33f368ba035e0b24292bd7a80 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/darwin-labels.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/darwin-labels.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc | grep 'foo bar":'
+; RUN: llvm-upgrade < %s | llvm-as | llc | grep 'foo bar":'
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/PowerPC/div-2.ll b/llvm/test/Regression/CodeGen/PowerPC/div-2.ll
index 50c56a2cae91e01b04ed6d8d53c03f1af3b0777f..d89361820ab331156ebf838b53345a81f488e43e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/div-2.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/div-2.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep blr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep blr
 
 int %test1(int %X) {
 	%Y = and int %X, 15
diff --git a/llvm/test/Regression/CodeGen/PowerPC/eqv-andc-orc-nor.ll b/llvm/test/Regression/CodeGen/PowerPC/eqv-andc-orc-nor.ll
index d2be3c93ebadf563ab1725bc439bb96a2445f89f..a2ab4e1a81a6174d58c37a624cbaa3a10b9e6c12 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/eqv-andc-orc-nor.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/eqv-andc-orc-nor.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep eqv | wc -l  | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep andc | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep orc | wc -l  | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep nor | wc -l  | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep nand | wc -l  | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep eqv | wc -l  | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep andc | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep orc | wc -l  | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep nor | wc -l  | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep nand | wc -l  | grep 1
 
 int %EQV1(int %X, int %Y) {
 	%A = xor int %X, %Y
diff --git a/llvm/test/Regression/CodeGen/PowerPC/extsh.ll b/llvm/test/Regression/CodeGen/PowerPC/extsh.ll
index 4ac7735e68c470289402a1d95ba441660ab0c41a..0f4f512a25ed3b233c0e28468a6aca6782f310ee 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/extsh.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/extsh.ll
@@ -1,5 +1,5 @@
 ; This should turn into a single extsh
-; RUN: llvm-as < %s | llc -march=ppc32 | grep extsh | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep extsh | wc -l | grep 1
 int %test(int %X) {
         %tmp.81 = shl int %X, ubyte 16             ; <int> [#uses=1]
         %tmp.82 = shr int %tmp.81, ubyte 16             ; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fma.ll b/llvm/test/Regression/CodeGen/PowerPC/fma.ll
index afc9af4e689cc8b19bda99776522ec5d3746b038..0e10ad3b2ff5101e1d25ec27a8adb6c00166200f 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fma.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fma.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | egrep 'fn?madd|fn?msub' | wc -l | grep 8
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | egrep 'fn?madd|fn?msub' | wc -l | grep 8
 
 double %test_FMADD1(double %A, double %B, double %C) {
 	%D = mul double %A, %B
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fnabs.ll b/llvm/test/Regression/CodeGen/PowerPC/fnabs.ll
index af4c2dee385efcb4a01942a48521b0ba36300ea2..5d0ef5f66d217d289b050352a013821cad6e7d65 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fnabs.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fnabs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep fnabs
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fnabs
 
 declare double %fabs(double)
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fnegsel.ll b/llvm/test/Regression/CodeGen/PowerPC/fnegsel.ll
index da644536e206d042928bb8707778805114b6aa5c..b1b06453aa12a353759ec0fd3f3be468a9b3e1b4 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fnegsel.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fnegsel.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep fneg
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep fneg
 
 double %test_FNEG_sel(double %A, double %B, double %C) {
     %D = sub double -0.0, %A
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fold-li.ll b/llvm/test/Regression/CodeGen/PowerPC/fold-li.ll
index 725f1d48484e4d7c12091e79fa2e3bde2e9b9abf..d3647753bc3fe601a74dc82781b3521e951ccce6 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fold-li.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fold-li.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep -v align | not grep li
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep -v align | not grep li
 
 ;; Test that immediates are folded into these instructions correctly.
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fp-branch.ll b/llvm/test/Regression/CodeGen/PowerPC/fp-branch.ll
index 3edda73c69c0470f6109dcf121ad9e6e8f4c39a0..1a371ed09a9ea9521bba87f6ed7cc95c21f640cf 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fp-branch.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fp-branch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep fcmp | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fcmp | wc -l | grep 1
 
 declare bool %llvm.isunordered.f64(double, double)
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fp-int-fp.ll b/llvm/test/Regression/CodeGen/PowerPC/fp-int-fp.ll
index 93ca94745f97db8fe3f1f572c3554fa19f4cd370..bcea406ab71ad93a1f70ecb596113983787c7a17 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fp-int-fp.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fp-int-fp.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep r1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep r1
 
 double %test1(double %X) {
         %Y = cast double %X to long
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fp_to_uint.ll b/llvm/test/Regression/CodeGen/PowerPC/fp_to_uint.ll
index 44d6e9092b31cb805e48efc7e80189a76a4199f9..83468a42b868de78a9395d1071fe100408efdd8e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fp_to_uint.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fp_to_uint.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep fctiwz | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fctiwz | wc -l | grep 1
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fpcopy.ll b/llvm/test/Regression/CodeGen/PowerPC/fpcopy.ll
index 00f2e48a6a5aceed607ed8978af91bdd12f29eb3..43087bd56dc28c066af36f2b2dac5e12f422bcec 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fpcopy.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fpcopy.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep fmr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep fmr
 
 double %test(float %F) {
 	%F = cast float %F to double
diff --git a/llvm/test/Regression/CodeGen/PowerPC/fsqrt.ll b/llvm/test/Regression/CodeGen/PowerPC/fsqrt.ll
index 29eed4edace866ba80ecb194b979fcecbe6699cd..87eaebbf0b7ef9e4045fb74c6cb2669c3cad5958 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/fsqrt.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/fsqrt.ll
@@ -1,10 +1,10 @@
 ; fsqrt should be generated when the fsqrt feature is enabled, but not 
 ; otherwise.
 
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+fsqrt | grep 'fsqrt f1, f1' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5      | grep 'fsqrt f1, f1' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-fsqrt | not grep 'fsqrt f1, f1' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fsqrt f1, f1'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+fsqrt | grep 'fsqrt f1, f1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5      | grep 'fsqrt f1, f1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-fsqrt | not grep 'fsqrt f1, f1' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fsqrt f1, f1'
 
 declare double %llvm.sqrt(double)
 double %X(double %Y) {
diff --git a/llvm/test/Regression/CodeGen/PowerPC/i64_fp.ll b/llvm/test/Regression/CodeGen/PowerPC/i64_fp.ll
index 54ccab4ce90b9e3154d8eba5eb1ebd2b1a88706d..0c76bbd2eea27ae81244386577ff86c5b854155f 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/i64_fp.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/i64_fp.ll
@@ -1,14 +1,14 @@
 ; fcfid and fctid should be generated when the 64bit feature is enabled, but not 
 ; otherwise.
 
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+64bit | grep 'fcfid' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+64bit | grep 'fctidz' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'fcfid' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'fctidz' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | not grep 'fcfid' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | not grep 'fctidz' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fcfid' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fctidz'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+64bit | grep 'fcfid' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+64bit | grep 'fctidz' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'fcfid' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'fctidz' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | not grep 'fcfid' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | not grep 'fctidz' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fcfid' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fctidz'
 
 double %X(double %Y) {
     %A = cast double %Y to long
diff --git a/llvm/test/Regression/CodeGen/PowerPC/inlineasm-copy.ll b/llvm/test/Regression/CodeGen/PowerPC/inlineasm-copy.ll
index 60775e3c25e41b5275102352dddf8fbc4362d9b3..8b6aa3331a41d7e5fbe57ce1dd406f4e29b1e5e4 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/inlineasm-copy.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/inlineasm-copy.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep mr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mr
 
 int %test(int %Y, int %X) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/inverted-bool-compares.ll b/llvm/test/Regression/CodeGen/PowerPC/inverted-bool-compares.ll
index c51f2673123684c4757960aff9ac39714605d443..6c5c288a2bc261ec723e39b2285f24e17f34ea29 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/inverted-bool-compares.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/inverted-bool-compares.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep xori &&
-; RUN: llvm-as < %s | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep xori &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 
 int %test(bool %B, int* %P) {
    br bool %B, label %T, label %F
diff --git a/llvm/test/Regression/CodeGen/PowerPC/lha.ll b/llvm/test/Regression/CodeGen/PowerPC/lha.ll
index 158e75ec5a93efbecc6ccf6f3da765b74281d94f..cc35e8ab9e9ff058edf28173ee6426545fb6876d 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/lha.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/lha.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep lha
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lha
 
 uint %test(short* %a) {
     %tmp.1 = load short* %a
diff --git a/llvm/test/Regression/CodeGen/PowerPC/load-constant-addr.ll b/llvm/test/Regression/CodeGen/PowerPC/load-constant-addr.ll
index c4d8f972bc7b56272ae53fceb2350496d8c5546e..d7e3d454e4e577fa6dacf1046b1dd06ec92b53c7 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/load-constant-addr.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/load-constant-addr.ll
@@ -1,6 +1,6 @@
 ; Should fold the ori into the lfs.
-; RUN: llvm-as < %s | llc -march=ppc32 | grep lfs &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep ori
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lfs &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep ori
 
 float %test() {
   %tmp.i = load float* cast (uint 186018016 to float*)
diff --git a/llvm/test/Regression/CodeGen/PowerPC/mem-rr-addr-mode.ll b/llvm/test/Regression/CodeGen/PowerPC/mem-rr-addr-mode.ll
index 4cb3808109ba26c8460256b504faefad31a255b2..5d8a3a1a0166cb17c4fc4d0efe42f81d683585b2 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/mem-rr-addr-mode.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/mem-rr-addr-mode.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'li.*16' &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep addi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'li.*16' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep addi
 
 ; Codegen lvx (R+16) as t = li 16,  lvx t,R
 ; This shares the 16 between the two loads.
diff --git a/llvm/test/Regression/CodeGen/PowerPC/mem_update.ll b/llvm/test/Regression/CodeGen/PowerPC/mem_update.ll
index 935740643fe70db3d2472d9cc772ffb640f745c8..2a8f83fbd36c7e7bf9f487f15fbf0b05e68fc570 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/mem_update.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/mem_update.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -enable-ppc-preinc &&
-; RUN: llvm-as < %s | llc -march=ppc32 -enable-ppc-preinc | not grep addi &&
-; RUN: llvm-as < %s | llc -march=ppc64 -enable-ppc-preinc &&
-; RUN: llvm-as < %s | llc -march=ppc64 -enable-ppc-preinc | not grep addi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -enable-ppc-preinc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -enable-ppc-preinc | not grep addi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -enable-ppc-preinc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -enable-ppc-preinc | not grep addi
 %Glob = global ulong 4
 
 int *%test0(int *%X,  int *%dest) {
diff --git a/llvm/test/Regression/CodeGen/PowerPC/mul-neg-power-2.ll b/llvm/test/Regression/CodeGen/PowerPC/mul-neg-power-2.ll
index 9b784e361f52120bbe6fec533a497b7e18d5a4b1..cb1f46c672d903ed446803bc3c36d099a00891ca 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/mul-neg-power-2.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/mul-neg-power-2.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep mul
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mul
 
 int %test1(int %a) {
         %tmp.1 = mul int %a, -2         ; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/mulhs.ll b/llvm/test/Regression/CodeGen/PowerPC/mulhs.ll
index 309102a1fababebf303554754a246da529e38ec8..e5e25e99f44cda13d8cecc8d370f702a8e05f6e3 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/mulhs.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/mulhs.ll
@@ -1,8 +1,8 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep mulhwu && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep add && 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep mulhw | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mulhwu && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep add && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep mulhw | wc -l | grep 1
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/neg.ll b/llvm/test/Regression/CodeGen/PowerPC/neg.ll
index 59e14dbd70503f377f8071f2da45e9a21ba645fd..7119f6c0da9dee159ae814975444e2b463775a95 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/neg.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/neg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep neg
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep neg
 
 int %test(int %X) {
     %Y = sub int 0, %X
diff --git a/llvm/test/Regression/CodeGen/PowerPC/or-addressing-mode.ll b/llvm/test/Regression/CodeGen/PowerPC/or-addressing-mode.ll
index 0d4fd965e8e0f31a2e7e0e6bc07f5c539cc2799e..9c1d949505a7ff2880bb24cc1a477a8bc1136d5c 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/or-addressing-mode.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/or-addressing-mode.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc | not grep ori && 
-; RUN: llvm-as < %s | llc | not grep rlwimi
+; RUN: llvm-upgrade < %s | llvm-as | llc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc | not grep ori && 
+; RUN: llvm-upgrade < %s | llvm-as | llc | not grep rlwimi
 
 int %test1(sbyte* %P) {  ;; or -> lwzx
         %tmp.2.i = cast sbyte* %P to uint
diff --git a/llvm/test/Regression/CodeGen/PowerPC/reg-coalesce-simple.ll b/llvm/test/Regression/CodeGen/PowerPC/reg-coalesce-simple.ll
index bc14a2d86c41dd1c1135b6146bdfc9163c1e0d82..5f3049d221d4735a468ac1c2b7272d77831abe5d 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/reg-coalesce-simple.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/reg-coalesce-simple.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep or
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep or
 
 %struct.foo = type { int, int, [0 x ubyte] }
 int %test(%struct.foo* %X) {
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwimi-commute.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwimi-commute.ll
index e6719ebd87897e129cd2d5b260bfe231f4a1a148..4b2b07f33504c736d4ad5cebb2b94c9b2b1ea73a 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwimi-commute.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwimi-commute.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'or '
 
 ; Make sure there is no register-register copies here.
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwimi.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwimi.ll
index 7736062903327ba989b8f0c40b3e9fb13b501c9f..3b5816b5a0e6ff377b9a1f0e33bad0127e9659f2 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwimi.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwimi.ll
@@ -1,6 +1,6 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi | wc -l | grep 8
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | wc -l | grep 8
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwimi2.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwimi2.ll
index 0ec630dd990e17ddd0556c33030c8c7279c54c35..966705dcffb0870efb9ff05a5c1a214f2fca27af 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwimi2.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwimi2.ll
@@ -1,7 +1,7 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep srwi   | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep srwi   | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwimi3.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwimi3.ll
index a55d88ba1c4581bc3575f2cb81af585587f6d159..44bc034237ca67e8da0c57739e176c84f0acfb39 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwimi3.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwimi3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -stats 2>&1 | grep 'Number of machine instrs printed' | grep 12
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -stats 2>&1 | grep 'Number of machine instrs printed' | grep 12
 
 ushort %Trans16Bit(uint %srcA, uint %srcB, uint %alpha) {
         %tmp1 = shl uint %srcA, ubyte 15                ; <uint> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwinm.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwinm.ll
index b16b9051dd3e15e443763f10178b672576e953e4..45f26d77dd8d522be86adfe9ab1328aeeb914c67 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwinm.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwinm.ll
@@ -1,9 +1,9 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srwi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 8
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srwi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 8
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rlwinm2.ll b/llvm/test/Regression/CodeGen/PowerPC/rlwinm2.ll
index 8a789ee6e6b18eda48f7f34f7529761a43dd9c92..70ad636e3bd733cd1f21954bfccbed2dc25a9c89 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rlwinm2.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rlwinm2.ll
@@ -1,10 +1,10 @@
 ; All of these ands and shifts should be folded into rlw[i]nm instructions
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep srwi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi && 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srwi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwnm | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 1
 
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/rotl.ll b/llvm/test/Regression/CodeGen/PowerPC/rotl.ll
index 76a998942f0150358836986eed7ac8bb36add033..fc3a6bc6ac4e387f46dbb1eb97e20d922ae95d9b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/rotl.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/rotl.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep or && 
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep or && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 2
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/select_lt0.ll b/llvm/test/Regression/CodeGen/PowerPC/select_lt0.ll
index 676c27fe57aed77abf014a5ef82a2007c7719e19..bb5213f946d7072be112c2234523e930b0a50115 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/select_lt0.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/select_lt0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep cmp
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep cmp
 
 int %seli32_1(int %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/setcc_no_zext.ll b/llvm/test/Regression/CodeGen/PowerPC/setcc_no_zext.ll
index e751717e65a6e5ec42c28ce378d87a4bed1e2db8..00e9bf0710cca73ab68cc39450d36fea0f311cc5 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/setcc_no_zext.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/setcc_no_zext.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm
 
 int %setcc_one_or_zero(int* %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/seteq-0.ll b/llvm/test/Regression/CodeGen/PowerPC/seteq-0.ll
index 292cccf1ee6e923da18e41e76404ad94b7ff011a..db57064d038881cedd74603c63bb27e29108f038 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/seteq-0.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/seteq-0.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep 'srwi r., r., 5'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'srwi r., r., 5'
 
 int %eq0(int %a) {
 	%tmp.1 = seteq int %a, 0		; <bool> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/shl_sext.ll b/llvm/test/Regression/CodeGen/PowerPC/shl_sext.ll
index 60fcda58f939f2120c8bc9b773bc814d38959a25..af18338f4b2063808f2940459ccc5727ff079211 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/shl_sext.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/shl_sext.ll
@@ -1,5 +1,5 @@
 ; This test should not contain a sign extend
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsb 
 
 int %test(uint %mode.0.i.0) {
         %tmp.79 = cast uint %mode.0.i.0 to sbyte        ; <sbyte> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/PowerPC/small-arguments.ll b/llvm/test/Regression/CodeGen/PowerPC/small-arguments.ll
index a4a886b09a188f8c8a2e19fa21a00cc8827612a9..40217f65569fe5afbfeb1ab5293658aa1ed53bb6 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/small-arguments.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/small-arguments.ll
@@ -1,6 +1,6 @@
 
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'extsh\|rlwinm'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'extsh\|rlwinm'
 
 declare short %foo()
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/stfiwx.ll b/llvm/test/Regression/CodeGen/PowerPC/stfiwx.ll
index acc9c67aaf585af989c0c2f1d2531a4e6105893d..dc0bed8d526a2f51dbbac8e136bf571485818e92 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/stfiwx.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/stfiwx.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=stfiwx | grep stfiwx &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=stfiwx | not grep r1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-stfiwx | not grep stfiwx &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-stfiwx | grep r1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=stfiwx | grep stfiwx &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=stfiwx | not grep r1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-stfiwx | not grep stfiwx &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-stfiwx | grep r1
 
 void %test(float %a, int* %b) {
         %tmp.2 = cast float %a to int
diff --git a/llvm/test/Regression/CodeGen/PowerPC/store-load-fwd.ll b/llvm/test/Regression/CodeGen/PowerPC/store-load-fwd.ll
index 8ebd02b79fd71a3b1566c6d372c683b620a9b697..d4a8a543d19bd19c82771d00b8c7c2378e9cd0a3 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/store-load-fwd.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/store-load-fwd.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep lwz
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep lwz
 int %test(int* %P) {
 	store int 1, int* %P
 	%V = load int* %P
diff --git a/llvm/test/Regression/CodeGen/PowerPC/subc.ll b/llvm/test/Regression/CodeGen/PowerPC/subc.ll
index 697a9341cf1631dca5984fd3b44cd21bc6f09e38..36e1c0a37036c6e5166f5098070d3e8e106e301e 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/subc.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/subc.ll
@@ -1,9 +1,9 @@
 ; All of these should be codegen'd without loading immediates
-; RUN: llvm-as < %s | llc -march=ppc32 | grep subfc | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep subfe | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep subfze | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep subfme | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | grep subfic | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfc | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfe | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfze | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfme | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfic | wc -l | grep 2
 implementation   ; Functions:
 
 long %sub_ll(long %a, long %b) {
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vcmp-fold.ll b/llvm/test/Regression/CodeGen/PowerPC/vcmp-fold.ll
index 04698d7d20b9cdcb20308139e3d959303f35eef5..6ae41a980c9fdc68634b9a674e8b1435a59396b6 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vcmp-fold.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vcmp-fold.ll
@@ -1,6 +1,6 @@
 ; This should fold the "vcmpbfp." and "vcmpbfp" instructions into a single 
 ; "vcmpbfp.".
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | wc -l | grep 1
 
 void %test(<4 x float>* %x, <4 x float>* %y, int* %P) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_br_cmp.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_br_cmp.ll
index 3ce99aa54aae765d8afbe68238168ba5597fbb83..62a9552f0801df136b423817a50cad0284b0e511 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_br_cmp.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_br_cmp.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vcmpeqfp. &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep mfcr
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpeqfp. &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep mfcr
 
 ; A predicate compare used immediately by a branch should not generate an mfcr.
 
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_call.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_call.ll
index 5f8faee5105f42a331f76695e4fcb85a89ec0bf6..b2b91fe3f45cfbfb256f5ddc1a13099d267a8403 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_call.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5
 
 <4 x int> %test_arg(<4 x int> %A, <4 x int> %B) {
         %C = add <4 x int> %A, %B
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_constants.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_constants.ll
index 59b7f7f6c669f7f9552bca9680270a58e37813c7..9d51e3c6821031df8417f5a701d023500ac13104 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_constants.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_constants.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep CPI
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep CPI
 
 
 ; Tests spltw(0x80000000) and spltw(0x7FFFFFFF).
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_mul.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_mul.ll
index f1d1b2cef718328b06c53d25012f09a07f3ffdc9..1f571f448678cb603cb0e77d5b12f1f4d3a74cc1 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_mul.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_mul.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep mullw &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmsumuhm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep mullw &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmsumuhm
 
 <4 x int> %test_v4i32(<4 x int>* %X, <4 x int>* %Y) {
         %tmp = load <4 x int>* %X
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_perf_shuffle.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_perf_shuffle.ll
index 4bae1c4a76cb57258c9556e4c4c1169659a79077..4f67f83f7e3fc54b065fbc56d0611f1eb5ddbd3b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_perf_shuffle.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_perf_shuffle.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vperm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm
 
 <4 x float> %test_uu72(<4 x float> *%P1, <4 x float> *%P2) {
 	%V1 = load <4 x float> *%P1
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_shuffle.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_shuffle.ll
index cfb7396f82f5a1ccbb8356645b04f4551e8fbf78..8e64aacb943db8147c9652dbc18d5fed85c3706b 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_shuffle.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_shuffle.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | opt -instcombine | llc -march=ppc32 -mcpu=g5 | not grep vperm &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsldoi | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmrgh | wc -l | grep 7 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmrgl | wc -l | grep 6 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vpkuhum | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vpkuwum | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llc -march=ppc32 -mcpu=g5 | not grep vperm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsldoi | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmrgh | wc -l | grep 7 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmrgl | wc -l | grep 6 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vpkuhum | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vpkuwum | wc -l | grep 1
 
 void %VSLDOI_xy(<8 x short>* %A, <8 x short>* %B) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_spat.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_spat.ll
index f6587b010e9fdd151d014811cce68b087aa3c41d..fb25402b17671acf5795de8aa93f460118e92421 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_spat.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_spat.ll
@@ -1,8 +1,8 @@
 ; Test that vectors are scalarized/lowered correctly.
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vspltw | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g3 | grep stfs | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsplti | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsplth | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vspltw | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 | grep stfs | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsplti | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsplth | wc -l | grep 1
 
 %f4 = type <4 x float>
 %i4 = type <4 x int>
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_vrsave.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_vrsave.ll
index 4cf0e48386198fcafe4542a653d1cfd76ddc4596..936580aa798c9baaaa427db2a9e6de0b2c2a37f8 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_vrsave.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_vrsave.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vrlw &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep spr &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vrsave
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vrlw &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep spr &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vrsave
 
 <4 x int> %test_rol() {
         ret <4 x int> < int -11534337, int -11534337, int -11534337, int -11534337 >
diff --git a/llvm/test/Regression/CodeGen/PowerPC/vec_zero.ll b/llvm/test/Regression/CodeGen/PowerPC/vec_zero.ll
index 09f6e37a5332b9143abc57d40e94708c52cfba38..c845c0e8db2f39119ba8d861b2eb1383cbfd52e6 100644
--- a/llvm/test/Regression/CodeGen/PowerPC/vec_zero.ll
+++ b/llvm/test/Regression/CodeGen/PowerPC/vec_zero.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vxor
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vxor
 
 void %foo(<4 x float> *%P) {
 	%T = load <4 x float> * %P
diff --git a/llvm/test/Regression/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll b/llvm/test/Regression/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll
index b7238ee23b80c2deae0d4cdacad25569327cc0fd..d93c839bee185204d8d332123565cbd8cec6d88f 100644
--- a/llvm/test/Regression/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll
+++ b/llvm/test/Regression/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=sparc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc
 
 void %execute_list() {
 	%tmp.33.i = div float 0.000000e+00, 0.000000e+00		; <float> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/SPARC/basictest.ll b/llvm/test/Regression/CodeGen/SPARC/basictest.ll
index 274f2ce80b12b08cfc1c9ea7f7414f74c1bd7c1a..11bbe16bb162a79f7c518352133355e5409fd6d4 100644
--- a/llvm/test/Regression/CodeGen/SPARC/basictest.ll
+++ b/llvm/test/Regression/CodeGen/SPARC/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=sparc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc
 
 int %test(int %X) {
 	%tmp.1 = add int %X, 1		; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/SPARC/ctpop.ll b/llvm/test/Regression/CodeGen/SPARC/ctpop.ll
index ffe00fcc406a2cdc27a810b659ce7840d1642ea2..ea88bd2fbcd0155c65e2a514b6cc092b91b2ac7d 100644
--- a/llvm/test/Regression/CodeGen/SPARC/ctpop.ll
+++ b/llvm/test/Regression/CodeGen/SPARC/ctpop.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=sparc -mattr=-v9 &&
-; RUN: llvm-as < %s | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts &&
-; RUN: llvm-as < %s | llc -march=sparc -mattr=-v9 | not grep popc &&
-; RUN: llvm-as < %s | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts | grep popc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=-v9 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=-v9 | not grep popc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts | grep popc
 
 declare uint %llvm.ctpop.i32(uint)
 uint %test(uint %X) {
diff --git a/llvm/test/Regression/CodeGen/SPARC/xnor.ll b/llvm/test/Regression/CodeGen/SPARC/xnor.ll
index 3a06a415c21137bc10fc2efc72fc20ba92f4b725..c3b8010595f60c8bc5ef4602043a466df0605adf 100644
--- a/llvm/test/Regression/CodeGen/SPARC/xnor.ll
+++ b/llvm/test/Regression/CodeGen/SPARC/xnor.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=sparc &&
-; RUN: llvm-as < %s | llc -march=sparc | grep xnor | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc | grep xnor | wc -l | grep 2
 
 int %test1(int %X, int %Y) {
 	%A = xor int %X, %Y
diff --git a/llvm/test/Regression/CodeGen/X86/2002-12-23-LocalRAProblem.llx b/llvm/test/Regression/CodeGen/X86/2002-12-23-LocalRAProblem.llx
index afdd20209c67ba1bc93e18e7ae233fdea515b5f7..f79781cb7b979a192d64c0f6f329e8bc948c165d 100644
--- a/llvm/test/Regression/CodeGen/X86/2002-12-23-LocalRAProblem.llx
+++ b/llvm/test/Regression/CodeGen/X86/2002-12-23-LocalRAProblem.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -regalloc=simple
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=simple
 
 int %main() {
 	%A = add int 0, 0   ; %A = 0
diff --git a/llvm/test/Regression/CodeGen/X86/2002-12-23-SubProblem.llx b/llvm/test/Regression/CodeGen/X86/2002-12-23-SubProblem.llx
index 744db0ff1bc237d0aec5177f49d0fc0dd6e27720..3d89378609970ffdeee5b8705fdc4c666101c13f 100644
--- a/llvm/test/Regression/CodeGen/X86/2002-12-23-SubProblem.llx
+++ b/llvm/test/Regression/CodeGen/X86/2002-12-23-SubProblem.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -regalloc=simple
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=simple
 
 int %main(int %B) {
 	;%B = add int 0, 1
diff --git a/llvm/test/Regression/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx b/llvm/test/Regression/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
index 34232b9884ec958d0e4fecbe26a20743c56edd78..77ac17bc30ea39bf50ba5336d00ac7753e73387f 100644
--- a/llvm/test/Regression/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
+++ b/llvm/test/Regression/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
@@ -3,7 +3,7 @@
 ; it makes a ton of annoying overlapping live ranges.  This code should not
 ; cause spills!
 ;
-; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | not grep spilled
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep spilled
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/2003-08-23-DeadBlockTest.llx b/llvm/test/Regression/CodeGen/X86/2003-08-23-DeadBlockTest.llx
index 9efbf09b42665b035965bba55fc471be646e0b97..48623b90120eb73c3953dd322c8a93abb3c939ad 100644
--- a/llvm/test/Regression/CodeGen/X86/2003-08-23-DeadBlockTest.llx
+++ b/llvm/test/Regression/CodeGen/X86/2003-08-23-DeadBlockTest.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 implementation
 
diff --git a/llvm/test/Regression/CodeGen/X86/2003-11-03-GlobalBool.llx b/llvm/test/Regression/CodeGen/X86/2003-11-03-GlobalBool.llx
index c9e4bb5865804cbe2c1e3723796d26df6ec78091..64236853e4c07f0695bffc9f8791e04667d71b09 100644
--- a/llvm/test/Regression/CodeGen/X86/2003-11-03-GlobalBool.llx
+++ b/llvm/test/Regression/CodeGen/X86/2003-11-03-GlobalBool.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep '.byte[[:space:]]*true'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep '.byte[[:space:]]*true'
 
 %X = global bool true
 
diff --git a/llvm/test/Regression/CodeGen/X86/2004-02-12-Memcpy.llx b/llvm/test/Regression/CodeGen/X86/2004-02-12-Memcpy.llx
index 13b4bf31128c65b7850bb96ba01af9731b0109f8..ab403432585b39aa43cc291a0e37fa577069f681 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-02-12-Memcpy.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-02-12-Memcpy.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep movs
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movs
 declare sbyte* %llvm.memcpy(sbyte* %A, sbyte* %B, uint %amt, uint %align)
 
 %A = global [1000 x int] zeroinitializer
diff --git a/llvm/test/Regression/CodeGen/X86/2004-02-13-FrameReturnAddress.llx b/llvm/test/Regression/CodeGen/X86/2004-02-13-FrameReturnAddress.llx
index d6140caedc44e363b5190221326125a72e14c77c..3eec89a032fb6634ba9783d8f641e514152696ca 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-02-13-FrameReturnAddress.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-02-13-FrameReturnAddress.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep '(%esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '(%esp'
 
 declare sbyte* %llvm.returnaddress(uint)
 declare sbyte* %llvm.frameaddress(uint)
diff --git a/llvm/test/Regression/CodeGen/X86/2004-02-14-InefficientStackPointer.llx b/llvm/test/Regression/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
index f7e4cc84863f33b63270b669fe47b0a5c74aed6c..69e4c1d011f6fd99bb2ee973cb0b21ae10bc3f9b 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep ESP | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep ESP | not grep sub
 
 int %test(int %X) {
 	ret int %X
diff --git a/llvm/test/Regression/CodeGen/X86/2004-02-22-Casts.llx b/llvm/test/Regression/CodeGen/X86/2004-02-22-Casts.llx
index da860ab94166319c6db975e94790dfaf8de8c759..8f5f5f8671d19398ba542bccd076df3e87005f0d 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-02-22-Casts.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-02-22-Casts.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 bool %test1(double %X) {
    %V = cast double %X to bool
diff --git a/llvm/test/Regression/CodeGen/X86/2004-03-30-Select-Max.llx b/llvm/test/Regression/CodeGen/X86/2004-03-30-Select-Max.llx
index 292762a7eb2784cd45520d3b9957bcc8e97d5326..5ae8be2b318f7c4078d2c6a3152922b879caa502 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-03-30-Select-Max.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-03-30-Select-Max.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'j[lgbe]'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'j[lgbe]'
 
 int %max(int %A, int %B) {
   %gt = setgt int %A, %B
diff --git a/llvm/test/Regression/CodeGen/X86/2004-04-09-SameValueCoalescing.llx b/llvm/test/Regression/CodeGen/X86/2004-04-09-SameValueCoalescing.llx
index 981df5a97cb934da43f1c1f10a3529f4526ba724..83434f99fc7470b564eefaca4972833766f4f298 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-04-09-SameValueCoalescing.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-04-09-SameValueCoalescing.llx
@@ -2,7 +2,7 @@
 ; overlapping live intervals. When two overlapping intervals have the same
 ; value, they can be joined though.
 ;
-; RUN: llvm-as < %s | llc -march=x86 -regalloc=linearscan | not grep 'mov %[A-Z]\{2,3\}, %[A-Z]\{2,3\}'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=linearscan | not grep 'mov %[A-Z]\{2,3\}, %[A-Z]\{2,3\}'
 
 long %test(long %x) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx b/llvm/test/Regression/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx
index 47ce1d9f9e75bbd0108784f89cef77ec31e153e5..5896c142ee6d46b731487c80412cdecc271642c4 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/CodeGen/X86/2004-06-10-StackifierCrash.llx b/llvm/test/Regression/CodeGen/X86/2004-06-10-StackifierCrash.llx
index 295c1fce4a6d1ef217db06c8ec9ecbaad39bf43e..3df962b5a313c62b0b0f7563be87bf43f5d47a99 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-06-10-StackifierCrash.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-06-10-StackifierCrash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 bool %T(double %X) {
   %V = seteq double %X, %X
diff --git a/llvm/test/Regression/CodeGen/X86/2004-10-08-SelectSetCCFold.llx b/llvm/test/Regression/CodeGen/X86/2004-10-08-SelectSetCCFold.llx
index cf65a26072ad531ff226a53a3b1cc908531473f6..6757be2782f16561383d29a9ded017123254060e 100644
--- a/llvm/test/Regression/CodeGen/X86/2004-10-08-SelectSetCCFold.llx
+++ b/llvm/test/Regression/CodeGen/X86/2004-10-08-SelectSetCCFold.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 bool %test(bool %C, bool %D, int %X, int %Y) {
 	%E = setlt int %X, %Y
diff --git a/llvm/test/Regression/CodeGen/X86/2005-01-17-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2005-01-17-CycleInDAG.ll
index 6925bb01a4c8939ed6407619064932a99269cd81..8dbff537f593e01ce62e2dc843587237861a7407 100644
--- a/llvm/test/Regression/CodeGen/X86/2005-01-17-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2005-01-17-CycleInDAG.ll
@@ -3,7 +3,7 @@
 ; is invalid code (there is no correct way to order the instruction).  Check
 ; that we do not fold the load into the sub.
 
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'sub.*GLOBAL'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'sub.*GLOBAL'
 
 %GLOBAL = external global int
 
diff --git a/llvm/test/Regression/CodeGen/X86/2005-02-14-IllegalAssembler.ll b/llvm/test/Regression/CodeGen/X86/2005-02-14-IllegalAssembler.ll
index a37d2023051d8886dea0798a503721495abacd27..4547bff657e7e5f18c13d73903ce0432e50bf4b1 100644
--- a/llvm/test/Regression/CodeGen/X86/2005-02-14-IllegalAssembler.ll
+++ b/llvm/test/Regression/CodeGen/X86/2005-02-14-IllegalAssembler.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 18446744073709551612
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 18446744073709551612
 
 %A = external global int
 
diff --git a/llvm/test/Regression/CodeGen/X86/2005-05-08-FPStackifierPHI.ll b/llvm/test/Regression/CodeGen/X86/2005-05-08-FPStackifierPHI.ll
index 4cb94b37c91aecf794c4385e87121023ebe462e4..5a304db3fbb8d9d077e06c0e31494a3854cff133 100644
--- a/llvm/test/Regression/CodeGen/X86/2005-05-08-FPStackifierPHI.ll
+++ b/llvm/test/Regression/CodeGen/X86/2005-05-08-FPStackifierPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=generic
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=generic
 ; Make sure LLC doesn't crash in the stackifier due to FP PHI nodes.
 
 void %radfg_() {
diff --git a/llvm/test/Regression/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll b/llvm/test/Regression/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll
index 8aa5f4da5ded4ce9cdceb12b36170a28b3123e2e..eef09d8d73b18b772e74a4e219e7fda3b15901d5 100644
--- a/llvm/test/Regression/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll
+++ b/llvm/test/Regression/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'test.*AL' || \
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'cmove.*EAX'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'test.*AL' || \
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'cmove.*EAX'
 
 ; This testcase was compiling to:
 ;
diff --git a/llvm/test/Regression/CodeGen/X86/2005-12-03-IndirectTailCall.ll b/llvm/test/Regression/CodeGen/X86/2005-12-03-IndirectTailCall.ll
index 4efc4b7ce8a862ce6ae6bbac0619a6510cab29e9..9847a3641d04cffbc8d07d2d26c6c08f6b0e3d85 100644
--- a/llvm/test/Regression/CodeGen/X86/2005-12-03-IndirectTailCall.ll
+++ b/llvm/test/Regression/CodeGen/X86/2005-12-03-IndirectTailCall.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-as < %s | llc -march=x86 -enable-x86-fastcc | grep 'jmp \*ecx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-x86-fastcc | grep 'jmp \*ecx'
 declare int %putchar(int)
 
 int %main(){ 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-01-19-ISelFoldingBug.ll b/llvm/test/Regression/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
index 4dc9165434dd3fb34b087217d9412a0bba6375ba..7d68747234623baf9a507dec3140e155320cac49 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'shld' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'shld' | wc -l | grep 1
 ;
 ; Check that the isel does not fold the shld, which already folds a load
 ; and has two uses, into a store.
diff --git a/llvm/test/Regression/CodeGen/X86/2006-01-30-LongSetcc.ll b/llvm/test/Regression/CodeGen/X86/2006-01-30-LongSetcc.ll
index 52d25c27a65235cef0efbb6845d893bd2b146f26..2195645f7f1cdc73b3e67689b98a77e59e6db555 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-01-30-LongSetcc.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-01-30-LongSetcc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 bool %test(long %X) {
 	%B = setlt long %X, 0		; <bool> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/2006-03-01-InstrSchedBug.ll b/llvm/test/Regression/CodeGen/X86/2006-03-01-InstrSchedBug.ll
index 0d2eda05562332b056b99b938c2e2108e5939b6e..c9e4b0675e1c2a16928c4674fc9b96566f13cab3 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-03-01-InstrSchedBug.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-03-01-InstrSchedBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'subl.*%esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'subl.*%esp'
 
 int %f(int %a, int %b) {
 	%tmp.2 = mul int %a, %a
diff --git a/llvm/test/Regression/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/llvm/test/Regression/CodeGen/X86/2006-03-02-InstrSchedBug.ll
index e9b9946a08355f83597baadbf3d1e45b0aeadb4c..bf96708da25e71284c989d67ab07e06df3e51bbc 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-03-02-InstrSchedBug.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-03-02-InstrSchedBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7
 
 int %g(int %a, int %b) {
 	%tmp.1 = shl int %b, ubyte 1
diff --git a/llvm/test/Regression/CodeGen/X86/2006-04-04-CrossBlockCrash.ll b/llvm/test/Regression/CodeGen/X86/2006-04-04-CrossBlockCrash.ll
index d59babf9980cace685d6ecb40295be6e342f399f..5d380b57912d8f9bfe0f2b73c84f99bdd5f47cab 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-04-04-CrossBlockCrash.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-04-04-CrossBlockCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah 
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/2006-04-27-ISelFoldingBug.ll b/llvm/test/Regression/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
index 2d4e94f2886fd4e3c1b751b1b2f41d07565155f8..25a2ca84526f141fbebabc2e47645a5daa1d107c 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1
 
 %block = external global ubyte*		; <ubyte**> [#uses=1]
 %last = external global int		; <int*> [#uses=3]
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/llvm/test/Regression/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
index 5015b210df333f62eb93a225d40588b70b3edb55..71b90760e3364e5ce1b80324cd4809e21f3b439e 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills'
 
 int %foo(<4 x float>* %a, <4 x float>* %b, <4 x float>* %c, <4 x float>* %d) {
 	%tmp44 = load <4 x float>* %a		; <<4 x float>> [#uses=9]
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched1.ll b/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched1.ll
index e6e8f693b82f4bc58412085e8e1c21472e931e89..631e416836de4b82da0b817804c088296bfd8687 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched1.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14
 %size20 = external global uint		; <uint*> [#uses=1]
 %in5 = external global ubyte*		; <ubyte**> [#uses=1]
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched2.ll b/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched2.ll
index 1af301f592142aebeb95527bd52bd6c03130367f..b51ee770126311c471a196126de19a2da5c20e75 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched2.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-02-InstrSched2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 19
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 19
 ; XFAIL: *
 
 void %_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(sbyte* %tmp435.i, uint* %tmp449.i.out) {
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll b/llvm/test/Regression/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll
index 35efceed7c1f5f36beb9fddb56ac54c03621b05e..009a4bb759ed6ac97f8f4a441416dfc450b1863f 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll
@@ -1,7 +1,7 @@
 ; Coalescing from R32 to a subset R32_. Once another register coalescer bug is
 ; fixed, the movb should go away as well.
 
-; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'movl' | wc -l
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'movl' | wc -l
 
 %B = external global uint
 %C = external global ushort*
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-08-InstrSched.ll b/llvm/test/Regression/CodeGen/X86/2006-05-08-InstrSched.ll
index 8743909fffd8edad04c53e32e6ddb9abcae33eee..8897692be2150d75ea0c79d1f38d1208c2d23e31 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-08-InstrSched.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-08-InstrSched.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | not grep 'subl.*%esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | not grep 'subl.*%esp'
 
 %A = external global ushort*
 %B = external global uint
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-11-InstrSched.ll b/llvm/test/Regression/CodeGen/X86/2006-05-11-InstrSched.ll
index f33716be2c5ada84534151671d38c43af4e7071d..40dd61a2d12149adc108057b80db69d6358621e9 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-11-InstrSched.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-11-InstrSched.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats 2>&1 | grep 'asm-printer' | grep 39
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -stats 2>&1 | grep 'asm-printer' | grep 39
 
 void %foo(int* %mc, int* %bp, int* %ms, int* %xmb, int* %mpp, int* %tpmm, int* %ip, int* %tpim, int* %dpp, int* %tpdm, int* %bpi, int %M) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-17-VectorArg.ll b/llvm/test/Regression/CodeGen/X86/2006-05-17-VectorArg.ll
index 7fb1b72c96203fc1a9839126d209b774c976ae3a..1f2af1473abe8c7cae8238adb5da84eaeeb7c383 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-17-VectorArg.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-17-VectorArg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2
 
 <4 x float> %opRSQ(<4 x float> %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-22-FPSetEQ.ll b/llvm/test/Regression/CodeGen/X86/2006-05-22-FPSetEQ.ll
index 999716e393c226e2a5f10922a316d142e57ba3cc..a6f7bd68e2326cd978252794a87f80e8ca0b8650 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-22-FPSetEQ.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-22-FPSetEQ.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 'setnp'
-; RUN: llvm-as < %s | llc -march=x86 -enable-unsafe-fp-math | not grep 'setnp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'setnp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-unsafe-fp-math | not grep 'setnp'
 
 uint %test(float %f) {
 	%tmp = seteq float %f, 0.000000e+00
diff --git a/llvm/test/Regression/CodeGen/X86/2006-05-25-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-05-25-CycleInDAG.ll
index 44deaeb5bd974a1aea329ed72502d16999df6ac4..8258f0b322780ffefe6701c7f82773b9761aff01 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-05-25-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-05-25-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 int %test() {
 	br bool false, label %cond_next33, label %cond_true12
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll b/llvm/test/Regression/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll
index b1290b186da47405ac5696f61301d1b24fe9a661..d044fd71531ce9d163adbe030f5747640fee98ec 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 ; PR825
 
 long %test() {
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll b/llvm/test/Regression/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll
index 5bca651d9029f710812258fb119b6daa77b39968..1bacc16573b44c9ecb95947b68794e0b4e98808f 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 ; PR828
 
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-19-ATTAsm.ll b/llvm/test/Regression/CodeGen/X86/2006-07-19-ATTAsm.ll
index f33475a9225801f0265e3dd4b548ef54fb99ba33..adfe88c9d107587e89d73b93e6e64e349e079e19 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-19-ATTAsm.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-19-ATTAsm.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att
 ; PR834
 
 target endian = little
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-20-InlineAsm.ll b/llvm/test/Regression/CodeGen/X86/2006-07-20-InlineAsm.ll
index 6bf9cc94a468e2e3719c9919e859fd64955364b6..8f409eb8412a5642f1c9c804f6a06993689fa3a3 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-20-InlineAsm.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-20-InlineAsm.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 ; PR833
 
 %G = weak global int 0		; <int*> [#uses=3]
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll b/llvm/test/Regression/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll
index f047a73e44f3b74ce4934c9bc02d5e8c40e87c9d..805de7c62c1411aee60aeba285889f56be2a5c08 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 4294967240
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 4294967240
 ; PR853
 
 %X = global int* cast (ulong 18446744073709551560 to int*)
diff --git a/llvm/test/Regression/CodeGen/X86/2006-07-31-SingleRegClass.ll b/llvm/test/Regression/CodeGen/X86/2006-07-31-SingleRegClass.ll
index 92eb1cbb8e5089b1f95efb3e9e0f035568e5378c..99e2f70f59e8f6f217c564263016088bfced8b78 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-07-31-SingleRegClass.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-07-31-SingleRegClass.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep 'movl 4(%eax),%ebp' &&
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep 'movl 0(%eax), %ebx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 4(%eax),%ebp' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 0(%eax), %ebx'
 
 ; PR850
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-08-07-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-08-07-CycleInDAG.ll
index a8a37325b65e6be94c99c8b9dba89a75249c816d..1de402858eaa182260cc0c136947ee6c15c1c9c8 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-08-07-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-08-07-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2
 
 fastcc int %test(%struct.foo* %v, %struct.foo* %vi) {
 	br bool false, label %ilog2.exit, label %cond_true.i
diff --git a/llvm/test/Regression/CodeGen/X86/2006-08-16-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-08-16-CycleInDAG.ll
index e643a822ca27d811854dc805aa8409b804023aa3..c0668a9dbd5c3f39f2e0854dc870a734253bc020 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-08-16-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-08-16-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 	%struct.expr = type { %struct.rtx_def*, int, %struct.expr*, %struct.occr*, %struct.occr*, %struct.rtx_def* }
 	%struct.hash_table = type { %struct.expr**, uint, uint, int }
diff --git a/llvm/test/Regression/CodeGen/X86/2006-08-21-ExtraMovInst.ll b/llvm/test/Regression/CodeGen/X86/2006-08-21-ExtraMovInst.ll
index c2c92c6fa704750095371f7d65d757934a6ea441..c2d905a5e394e4af5f17b5e06168aa762039b87b 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-08-21-ExtraMovInst.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-08-21-ExtraMovInst.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 | not grep 'movl %eax, %edx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | not grep 'movl %eax, %edx'
 
 int %foo(int %t, int %C) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/2006-09-01-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-09-01-CycleInDAG.ll
index 68b5c43139e5974560f879df543e86ff3fd9d09b..2e0a69a5514eb99f388e002296e1317c79858831 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-09-01-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-09-01-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-02-BoolRetCrash.ll b/llvm/test/Regression/CodeGen/X86/2006-10-02-BoolRetCrash.ll
index d7571d891924e9cbeb93ab98c978c81f4ac6bb23..c918ef93129539cc4b8caa72ac0820430e58a0d9 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-02-BoolRetCrash.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-02-BoolRetCrash.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc -enable-x86-fastcc
+; RUN: llvm-upgrade < %s | llvm-as | llc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -enable-x86-fastcc
 ; PR933
 
 fastcc bool %test() {
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll b/llvm/test/Regression/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll
index 7bb5a8dcd22ff7e0cbffe87ab07a2c69d808c773..d8b2defea88d24113063050479ce4e7669583817 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=sse | grep movaps
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=sse | grep movaps
 ; Test that the load is NOT folded into the intrinsic, which would zero the top
 ; elts of the loaded vector.
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-09-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-10-09-CycleInDAG.ll
index fab720f599d509745ac4204c5f066278cc753824..fbcc5cd078e7a1c76d2495be59bbe5b857f6d5f3 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-09-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-09-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 void %_ZN13QFSFileEngine4readEPcx() {
 	%tmp201 = load int* null
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll b/llvm/test/Regression/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll
index 5cb233bd5fbe8db5c7a2b69ddc377367585496ab..8baba8118c5eba2f1cef58b4cbbc045bc4708274 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep shrl
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep shrl
 ; Bug in FindModifiedNodeSlot cause tmp14 load to become a zextload and shr 31
 ; is then optimized away.
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-12-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-10-12-CycleInDAG.ll
index 752b8ecbef012abd1afe9362bce551fbfd6b928d..b96ec98fcc3f83f9df30d94a78d6476f078fc3cf 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-12-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-12-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 	%struct.function = type opaque
 	%struct.lang_decl = type opaque
 	%struct.location_t = type { sbyte*, int }
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-13-CycleInDAG.ll b/llvm/test/Regression/CodeGen/X86/2006-10-13-CycleInDAG.ll
index abf5bcdd6421a11aa56d246406343186d8cf6cab..c2b43fb7012d3bfbd0614dbd188a24da6a258fca 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-13-CycleInDAG.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-13-CycleInDAG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 %str = external global [18 x sbyte]
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll b/llvm/test/Regression/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
index 78e38c7c0c00bb413a38c65c0fcbfecfc7744371..5103679cccd01e6d726a3a8848ece4a67fb122c8 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | %prcontext je 1 | grep "BB1_4:"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | grep "BB1_4:"
 
 %str = internal constant [14 x sbyte] c"Hello world!\0A\00"		; <[14 x sbyte]*> [#uses=1]
 %str = internal constant [13 x sbyte] c"Blah world!\0A\00"		; <[13 x sbyte]*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/2006-11-12-CSRetCC.ll b/llvm/test/Regression/CodeGen/X86/2006-11-12-CSRetCC.ll
index e8f761bf3fa45d0322578a6aee3bcd504736bfda..04cca162c4e36b0cbf4b5474f5117ac475323bf8 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-11-12-CSRetCC.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-11-12-CSRetCC.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'subl $4, %esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'subl $4, %esp'
 
 target triple = "i686-pc-linux-gnu"
 
diff --git a/llvm/test/Regression/CodeGen/X86/2006-11-17-IllegalMove.ll b/llvm/test/Regression/CodeGen/X86/2006-11-17-IllegalMove.ll
index c4b97c9cfddb13ba752d01a0fedd08ca5f408ffc..98543e56798fcfab1b961a91e4096a646623fd61 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-11-17-IllegalMove.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-11-17-IllegalMove.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86-64 &&
-; RUN: llvm-as < %s | llc -march=x86-64 | not grep 'movb %sil, %ah' &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep 'movzbw %al, %ax'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | not grep 'movb %sil, %ah' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep 'movzbw %al, %ax'
 
 void %handle_vector_size_attribute() {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/2006-11-27-SelectLegalize.ll b/llvm/test/Regression/CodeGen/X86/2006-11-27-SelectLegalize.ll
index 368cc34936e00fb1ef60114148ff83b5acfdbcfc..5cebff5bacc18e8dc60881797144fc42b109fe51 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-11-27-SelectLegalize.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-11-27-SelectLegalize.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep test.*1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test.*1
 ; PR1016
 
 int %test(int %A, int %B, int %C) {
diff --git a/llvm/test/Regression/CodeGen/X86/2006-11-28-Memcpy.ll b/llvm/test/Regression/CodeGen/X86/2006-11-28-Memcpy.ll
index 0726f80de17881b6c045f02a38ca7e2f2b009543..f9c0be30abba446ec3d719fc00d94affe0b87b89 100644
--- a/llvm/test/Regression/CodeGen/X86/2006-11-28-Memcpy.ll
+++ b/llvm/test/Regression/CodeGen/X86/2006-11-28-Memcpy.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 3721182122 | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 'movl _bytes2' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 3721182122 | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'movl _bytes2' | wc -l | grep 1
 ; PR1022, 1023
 
 %fmt = constant [4 x sbyte] c"%x\0A\00"
diff --git a/llvm/test/Regression/CodeGen/X86/and-or-fold.ll b/llvm/test/Regression/CodeGen/X86/and-or-fold.ll
index 51a3ac64611c5e89e19bb1d9151d80e9b2583e95..3240bdf25ae28041656729d4af075e79517d2a38 100644
--- a/llvm/test/Regression/CodeGen/X86/and-or-fold.ll
+++ b/llvm/test/Regression/CodeGen/X86/and-or-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep and | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep and | wc -l | grep 1
 
 ; The dag combiner should fold together (x&127)|(y&16711680) -> (x|y)&c1
 ; in this case.
diff --git a/llvm/test/Regression/CodeGen/X86/asm-global-imm.ll b/llvm/test/Regression/CodeGen/X86/asm-global-imm.ll
index 725fc9463600e58b958e7d378e91caed7cb5c069..aebd457844866784ed2896b1577426fa4e109d77 100644
--- a/llvm/test/Regression/CodeGen/X86/asm-global-imm.ll
+++ b/llvm/test/Regression/CodeGen/X86/asm-global-imm.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'test1 $_GV' &&
-; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'test2 _GV'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test1 $_GV' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test2 _GV'
 ; PR882
 
 target datalayout = "e-p:32:32"
diff --git a/llvm/test/Regression/CodeGen/X86/bswap.ll b/llvm/test/Regression/CodeGen/X86/bswap.ll
index 4285c7300865549872aeeddbcee3f4be9dc16bc6..79467e0838b93ccfa8e97a08c867a3ace18bc10b 100644
--- a/llvm/test/Regression/CodeGen/X86/bswap.ll
+++ b/llvm/test/Regression/CodeGen/X86/bswap.ll
@@ -1,7 +1,7 @@
 ; bswap should be constant folded when it is passed a constant argument
 
-; RUN: llvm-as < %s | llc -march=x86 | grep bswapl | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep rolw | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep bswapl | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rolw | wc -l | grep 1
 
 declare ushort %llvm.bswap.i16(ushort)
 declare uint %llvm.bswap.i32(uint)
diff --git a/llvm/test/Regression/CodeGen/X86/cmp-test.ll b/llvm/test/Regression/CodeGen/X86/cmp-test.ll
index 43430fdeb80e714c7e6fddf604d93b1eb94aa9cf..7a7ec08d18b4cde93e59fae27e09b493d0d83b08 100644
--- a/llvm/test/Regression/CodeGen/X86/cmp-test.ll
+++ b/llvm/test/Regression/CodeGen/X86/cmp-test.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep cmp  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep test | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp  | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test | wc -l | grep 1
 
 int %f1(int %X, int* %y) {
 	%tmp = load int* %y
diff --git a/llvm/test/Regression/CodeGen/X86/commute-two-addr.ll b/llvm/test/Regression/CodeGen/X86/commute-two-addr.ll
index ac1aa60319e3f793f6f42d86e8229be00e91ca81..29c22c34a501843761f0b9695955573977faca8c 100644
--- a/llvm/test/Regression/CodeGen/X86/commute-two-addr.ll
+++ b/llvm/test/Regression/CodeGen/X86/commute-two-addr.ll
@@ -2,7 +2,7 @@
 ; insertion of register-register copies.
 
 ; Make sure there are only 3 mov's for each testcase
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'mov ' | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'mov ' | wc -l | grep 6
 
 
 target triple = "i686-pc-linux-gnu"
diff --git a/llvm/test/Regression/CodeGen/X86/compare-add.ll b/llvm/test/Regression/CodeGen/X86/compare-add.ll
index 5665ad4829885af6a3b23b24451498d3120c4cb1..866e36b17d5320d3a5d2cf843b025c53082f46c2 100644
--- a/llvm/test/Regression/CodeGen/X86/compare-add.ll
+++ b/llvm/test/Regression/CodeGen/X86/compare-add.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep add
 bool %X(int %X) {
         %Y = add int %X, 14
         %Z = setne int %Y, 12345
diff --git a/llvm/test/Regression/CodeGen/X86/compare_folding.llx b/llvm/test/Regression/CodeGen/X86/compare_folding.llx
index 5a4471b9da90501c3f1799b57ecffe5b5e8590c6..652057e9bb773393d7217a839e23233b622669dd 100644
--- a/llvm/test/Regression/CodeGen/X86/compare_folding.llx
+++ b/llvm/test/Regression/CodeGen/X86/compare_folding.llx
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep movsd | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep ucomisd
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | grep movsd | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | grep ucomisd
 declare bool %llvm.isunordered.f64(double,double)
 
 bool %test1(double %X, double %Y) {  ;; Returns isunordered(X,Y)
diff --git a/llvm/test/Regression/CodeGen/X86/darwin-no-dead-strip.ll b/llvm/test/Regression/CodeGen/X86/darwin-no-dead-strip.ll
index 4a594c6b43ae307ffe9715b412a0d2e9be545d81..8e671ffccdb57325a896ad3f225e2d3603c5a4e6 100644
--- a/llvm/test/Regression/CodeGen/X86/darwin-no-dead-strip.ll
+++ b/llvm/test/Regression/CodeGen/X86/darwin-no-dead-strip.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc | grep no_dead_strip
+; RUN: llvm-upgrade < %s | llvm-as | llc | grep no_dead_strip
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/div_const.ll b/llvm/test/Regression/CodeGen/X86/div_const.ll
index 7a3c7d0096315d5a084207609ab79e0a35569d30..326fd77e51b1f6a005980d1df5d5e639322e44ca 100644
--- a/llvm/test/Regression/CodeGen/X86/div_const.ll
+++ b/llvm/test/Regression/CodeGen/X86/div_const.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 365384439
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 365384439
 
 uint %f9188_mul365384439_shift27(uint %A) {
         %tmp1 = div uint %A, 1577682821         ; <uint> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/extend.ll b/llvm/test/Regression/CodeGen/X86/extend.ll
index 1685d3ba421a0c2fc3b3fb54e91758a6ea6a1bc0..fdad79076422d66d0c3e728bf1fb418241c80dc1 100644
--- a/llvm/test/Regression/CodeGen/X86/extend.ll
+++ b/llvm/test/Regression/CodeGen/X86/extend.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep movzx | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep movsx | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movzx | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movsx | wc -l | grep 1
 
 %G1 = internal global ubyte 0		; <ubyte*> [#uses=1]
 %G2 = internal global sbyte 0		; <sbyte*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/extern_weak.ll b/llvm/test/Regression/CodeGen/X86/extern_weak.ll
index 4200bbf1a88d38b28d280a84a3a2a97675395760..853a7133102c8bc9b36b2c0354c233fa604cc850 100644
--- a/llvm/test/Regression/CodeGen/X86/extern_weak.ll
+++ b/llvm/test/Regression/CodeGen/X86/extern_weak.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep weak_reference | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin | grep weak_reference | wc -l | grep 2
 
 %Y = global int (sbyte*)* %X
 declare extern_weak int %X(sbyte*)
diff --git a/llvm/test/Regression/CodeGen/X86/fabs.ll b/llvm/test/Regression/CodeGen/X86/fabs.ll
index ce28c6de8ad3ef6a20184a400db42fcb45227c96..221f078f0fd7fc901c404f1240bad76d8448f634 100644
--- a/llvm/test/Regression/CodeGen/X86/fabs.ll
+++ b/llvm/test/Regression/CodeGen/X86/fabs.ll
@@ -1,6 +1,6 @@
 ; Make sure this testcase codegens to the fabs instruction, not a call to fabsf
-; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep 'fabs$' | wc -l | grep 1 && 
-; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math  | grep 'fabs$' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep 'fabs$' | wc -l | grep 1 && 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math  | grep 'fabs$' | wc -l | grep 2
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/fast-cc-callee-pops.ll b/llvm/test/Regression/CodeGen/X86/fast-cc-callee-pops.ll
index 51527ceae162cd5107524f4c7d50d01489ac607b..7d5df801239ecf639dd9a16362204a26954121b9 100644
--- a/llvm/test/Regression/CodeGen/X86/fast-cc-callee-pops.ll
+++ b/llvm/test/Regression/CodeGen/X86/fast-cc-callee-pops.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc -mcpu=yonah | grep 'ret 28'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc -mcpu=yonah | grep 'ret 28'
 
 ; Check that a fastcc function pops its stack variables before returning.
 
diff --git a/llvm/test/Regression/CodeGen/X86/fast-cc-merge-stack-adj.ll b/llvm/test/Regression/CodeGen/X86/fast-cc-merge-stack-adj.ll
index f31b180b2718899c56a552512a86420acd2cf17d..e6cd0f0da94b2535bef9504582049e804a6044a6 100644
--- a/llvm/test/Regression/CodeGen/X86/fast-cc-merge-stack-adj.ll
+++ b/llvm/test/Regression/CodeGen/X86/fast-cc-merge-stack-adj.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc  | grep 'add ESP, 8'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc  | grep 'add ESP, 8'
 
 target triple = "i686-pc-linux-gnu"
 
diff --git a/llvm/test/Regression/CodeGen/X86/fast-cc-pass-in-regs.ll b/llvm/test/Regression/CodeGen/X86/fast-cc-pass-in-regs.ll
index 6899683c4c474a64e88e3c87388d2b35ca912a4c..ab6248e19519dd579e8ce44a36035321fbcb24c8 100644
--- a/llvm/test/Regression/CodeGen/X86/fast-cc-pass-in-regs.ll
+++ b/llvm/test/Regression/CodeGen/X86/fast-cc-pass-in-regs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc  | grep 'mov EDX, 1'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc  | grep 'mov EDX, 1'
 ; check that fastcc is passing stuff in regs.
 
 ; Argument reg passing is disabled due to regalloc issues.  FIXME!
diff --git a/llvm/test/Regression/CodeGen/X86/fast-cc-tail-call.ll b/llvm/test/Regression/CodeGen/X86/fast-cc-tail-call.ll
index 25ba384b785a88c94fc7c22dbe6ba9df6dd02ea1..b7799793b21ec6c21d812bb2a4adc6a1ec43e09a 100644
--- a/llvm/test/Regression/CodeGen/X86/fast-cc-tail-call.ll
+++ b/llvm/test/Regression/CodeGen/X86/fast-cc-tail-call.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | not grep call
 
 fastcc int %bar(int %X, int(double, int) *%FP) {
      %Y = tail call fastcc int %FP(double 0.0, int %X)
diff --git a/llvm/test/Regression/CodeGen/X86/fildll.ll b/llvm/test/Regression/CodeGen/X86/fildll.ll
index dbf9aca2097179f110f7e5330bbab4f9082c6b33..711eedeaac552fb7545e370676a3f74a1438f69f 100644
--- a/llvm/test/Regression/CodeGen/X86/fildll.ll
+++ b/llvm/test/Regression/CodeGen/X86/fildll.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | wc -l | grep 2
 
 fastcc double %sint64_to_fp(long %X) {
 	%R = cast long %X to double
diff --git a/llvm/test/Regression/CodeGen/X86/fp-immediate-shorten.ll b/llvm/test/Regression/CodeGen/X86/fp-immediate-shorten.ll
index c20a2e8d58c4b86b1f6494408f6e0ff046ce3065..6acc2c2684eb66fededf45a870913caf00b57c05 100644
--- a/llvm/test/Regression/CodeGen/X86/fp-immediate-shorten.ll
+++ b/llvm/test/Regression/CodeGen/X86/fp-immediate-shorten.ll
@@ -1,5 +1,5 @@
 ;; Test that this FP immediate is stored in the constant pool as a float.
 
-; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep '.long.1123418112'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep '.long.1123418112'
 
 double %D() { ret double 123.0 }
diff --git a/llvm/test/Regression/CodeGen/X86/fp-stack-compare.ll b/llvm/test/Regression/CodeGen/X86/fp-stack-compare.ll
index cc52c41d1a9e09c083febbf97aa09af56b63ac01..86286bd20eb84f50e571f8a472db770b515c2b80 100644
--- a/llvm/test/Regression/CodeGen/X86/fp-stack-compare.ll
+++ b/llvm/test/Regression/CodeGen/X86/fp-stack-compare.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 | grep fucomi.*st.[12]
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | grep fucomi.*st.[12]
 ; PR1012
 
 float %foo(float *%col.2.0) {
diff --git a/llvm/test/Regression/CodeGen/X86/fp_constant_op.llx b/llvm/test/Regression/CodeGen/X86/fp_constant_op.llx
index d241235d3ca3f5abfe66be9f00d43b91c5d36afb..02c76a84f35d23da799b5ad69089d05b32e9ccab 100644
--- a/llvm/test/Regression/CodeGen/X86/fp_constant_op.llx
+++ b/llvm/test/Regression/CodeGen/X86/fp_constant_op.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
 
 ; Test that the load of the constant is folded into the operation.
 
diff --git a/llvm/test/Regression/CodeGen/X86/fp_load_cast_fold.llx b/llvm/test/Regression/CodeGen/X86/fp_load_cast_fold.llx
index 7459c003c13762a18c742008072a5e86638d1eba..b1346958cedc61e22621b1fdbdf579864efca1f9 100644
--- a/llvm/test/Regression/CodeGen/X86/fp_load_cast_fold.llx
+++ b/llvm/test/Regression/CodeGen/X86/fp_load_cast_fold.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep fild | not grep ESP
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep fild | not grep ESP
 double %short(short* %P) {
 	%V = load short* %P
 	%V2 = cast short %V to double
diff --git a/llvm/test/Regression/CodeGen/X86/fp_load_fold.llx b/llvm/test/Regression/CodeGen/X86/fp_load_fold.llx
index 7e89edf943749fdb264e1f5c6bf81e6402d1904a..c3a00094dacf0fb143a98750dae607d042c47e37 100644
--- a/llvm/test/Regression/CodeGen/X86/fp_load_fold.llx
+++ b/llvm/test/Regression/CodeGen/X86/fp_load_fold.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
 
 ; Test that the load of the memory location is folded into the operation.
 
diff --git a/llvm/test/Regression/CodeGen/X86/imul-lea.ll b/llvm/test/Regression/CodeGen/X86/imul-lea.ll
index 6f2e3a986e7e4aa02eb4e2ad1ce07ba5ca8caa7c..9d6fd98e33fbf6ce35148346e54c396b8495b430 100644
--- a/llvm/test/Regression/CodeGen/X86/imul-lea.ll
+++ b/llvm/test/Regression/CodeGen/X86/imul-lea.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep lea
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep lea
 
 declare int %foo()
 int %test() {
diff --git a/llvm/test/Regression/CodeGen/X86/inline-asm.ll b/llvm/test/Regression/CodeGen/X86/inline-asm.ll
index a38596df62f73fb0a7b3a2f3bf755e2ccc507b0d..1e96efce3e46ad3ceaa14d58722e94ea15defddf 100644
--- a/llvm/test/Regression/CodeGen/X86/inline-asm.ll
+++ b/llvm/test/Regression/CodeGen/X86/inline-asm.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 
 int %test1() {
 	; Dest is AX, dest type = i32.
diff --git a/llvm/test/Regression/CodeGen/X86/isnan.llx b/llvm/test/Regression/CodeGen/X86/isnan.llx
index df4390a4ab4e544e319f3ad63d39da809fac1475..fb02c1f5ddccd87ca758c326d498a020d4477b42 100644
--- a/llvm/test/Regression/CodeGen/X86/isnan.llx
+++ b/llvm/test/Regression/CodeGen/X86/isnan.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep call
 declare bool %llvm.isunordered(double)
 
 bool %test_isnan(double %X) {
diff --git a/llvm/test/Regression/CodeGen/X86/jump_sign.ll b/llvm/test/Regression/CodeGen/X86/jump_sign.ll
index aed39bf8a1ececfc387a16e96645441ec25be634..16bd7bc62764cdc868e1c8026d6aa64f23620f47 100644
--- a/llvm/test/Regression/CodeGen/X86/jump_sign.ll
+++ b/llvm/test/Regression/CodeGen/X86/jump_sign.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep jns
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep jns
 int %f(int %X) {
 entry:
         %tmp1 = add int %X, 1           ; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/lea-2.ll b/llvm/test/Regression/CodeGen/X86/lea-2.ll
index ad510c072e87427d11c542239b4b93dc7f9cf4ad..3bbd146915c8f8d23513528e80d7ed7e081ee202 100644
--- a/llvm/test/Regression/CodeGen/X86/lea-2.ll
+++ b/llvm/test/Regression/CodeGen/X86/lea-2.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'lea EAX, DWORD PTR \[... + 4\*... - 5\]' &&
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'lea EAX, DWORD PTR \[... + 4\*... - 5\]' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep add
 
 int %test1(int %A, int %B) {
         %tmp1 = shl int %A, ubyte 2             ; <int> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/lea.ll b/llvm/test/Regression/CodeGen/X86/lea.ll
index dcbf73ea317acbe4b6652013710bce4d5749f053..675376b63f42694d91b595ebe2ad907bf4e4b7cf 100644
--- a/llvm/test/Regression/CodeGen/X86/lea.ll
+++ b/llvm/test/Regression/CodeGen/X86/lea.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86
-; RUN: llvm-as < %s | llc -march=x86 | not grep orl
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep orl
 int %test(int %x) {
 	%tmp1 = shl int %x, ubyte 3
 	%tmp2 = add int %tmp1, 7
diff --git a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
index 6c6347edcee36156666ab3f599771b02e09599cc..0eb20a52f5e6f708527b32d980fa893b3f311742 100644
--- a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
+++ b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | grep L_Arr.non_lazy_ptr &&
-; RUN: llvm-as < %s | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)'
+; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | grep L_Arr.non_lazy_ptr &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)'
 
 %Arr = external global [0 x int]                ; <[0 x int]*> [#uses=2]
 
diff --git a/llvm/test/Regression/CodeGen/X86/loop-strength-reduce.ll b/llvm/test/Regression/CodeGen/X86/loop-strength-reduce.ll
index ae39cc13f612e88c2cd64fc5d4d330a272187228..a54d907e59aa578ec414074e1ff7211a9a5bc3d7 100644
--- a/llvm/test/Regression/CodeGen/X86/loop-strength-reduce.ll
+++ b/llvm/test/Regression/CodeGen/X86/loop-strength-reduce.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'A(' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'A(' | wc -l | grep 1
 ;
 ; Make sure the common loop invariant _A(reg) is hoisted up to preheader.
 
diff --git a/llvm/test/Regression/CodeGen/X86/loop-strength-reduce2.ll b/llvm/test/Regression/CodeGen/X86/loop-strength-reduce2.ll
index eb22383f314277691253939b2d453dae51fd2644..7ed394427eae9a9b7a637a648c860deb58e17a6d 100644
--- a/llvm/test/Regression/CodeGen/X86/loop-strength-reduce2.ll
+++ b/llvm/test/Regression/CodeGen/X86/loop-strength-reduce2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin -relocation-model=pic | not grep lea
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin -relocation-model=pic | not grep lea
 ;
 ; Make sure the PIC label flags2-"L1$pb" is not moved up to the preheader.
 
diff --git a/llvm/test/Regression/CodeGen/X86/mul-shift-reassoc.ll b/llvm/test/Regression/CodeGen/X86/mul-shift-reassoc.ll
index f870f7aa6fd58091c7afc9d4ef03c668eaf53dfe..52d188d9430152fb09385afa646cec0bfff9fe8b 100644
--- a/llvm/test/Regression/CodeGen/X86/mul-shift-reassoc.ll
+++ b/llvm/test/Regression/CodeGen/X86/mul-shift-reassoc.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep lea
-; RUN: llvm-as < %s | llc -march=x86 | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep lea
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep add
 
 int %test(int %X, int %Y) {
 	; Push the shl through the mul to allow an LEA to be formed, instead
diff --git a/llvm/test/Regression/CodeGen/X86/negatize_zero.ll b/llvm/test/Regression/CodeGen/X86/negatize_zero.ll
index bb86438d28665aa740001f1ea04f9ea1f635c123..3328a6afec2231fcfbb0d1e27cae4143d5dd66ce 100644
--- a/llvm/test/Regression/CodeGen/X86/negatize_zero.ll
+++ b/llvm/test/Regression/CodeGen/X86/negatize_zero.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep fchs
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep fchs
 
 
 double %T() {
diff --git a/llvm/test/Regression/CodeGen/X86/or-branch.ll b/llvm/test/Regression/CodeGen/X86/or-branch.ll
index 5ad7fa14b358c18c4d8004b42990da68339595f7..62f7455d53c9b862dc6fb5cf937eb437bbeae477 100644
--- a/llvm/test/Regression/CodeGen/X86/or-branch.ll
+++ b/llvm/test/Regression/CodeGen/X86/or-branch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep set
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep set
 
 void %foo(int %X, int %Y, int %Z) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/overlap-add.ll b/llvm/test/Regression/CodeGen/X86/overlap-add.ll
index c5fc0bd89af2f92df05b22b783c92a7255ad4367..a7150d21e361a3c9b858d15ae6f280196a56b7c8 100644
--- a/llvm/test/Regression/CodeGen/X86/overlap-add.ll
+++ b/llvm/test/Regression/CodeGen/X86/overlap-add.ll
@@ -6,7 +6,7 @@
 
 ; Check that the shift gets turned into an LEA.
 
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X'
 
 ; FIXME: We need live variable information about flags to do this xform safely. :(
 ; XFAIL: *
diff --git a/llvm/test/Regression/CodeGen/X86/overlap-shift.ll b/llvm/test/Regression/CodeGen/X86/overlap-shift.ll
index 48f91e0cba9cacaac9b2390dec81b75c67a922da..14f3546cc16110e886d2872463c624ddc3f4a4b9 100644
--- a/llvm/test/Regression/CodeGen/X86/overlap-shift.ll
+++ b/llvm/test/Regression/CodeGen/X86/overlap-shift.ll
@@ -6,7 +6,7 @@
 
 ; Check that the shift gets turned into an LEA.
 
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X'
 
 %G = external global int
 
diff --git a/llvm/test/Regression/CodeGen/X86/pic_jumptable.ll b/llvm/test/Regression/CodeGen/X86/pic_jumptable.ll
index affc933af1a29d0b1ea94f952e941e373dcf6249..4c38fb806146cce9b6003f32b456d7fd5c108a1a 100644
--- a/llvm/test/Regression/CodeGen/X86/pic_jumptable.ll
+++ b/llvm/test/Regression/CodeGen/X86/pic_jumptable.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -relocation-model=pic -march=x86 | not grep -F .text
+; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=pic -march=x86 | not grep -F .text
 target endian = little
 target pointersize = 32
 target triple = "i386-linux-gnu"
diff --git a/llvm/test/Regression/CodeGen/X86/rdtsc.ll b/llvm/test/Regression/CodeGen/X86/rdtsc.ll
index 147838350f023e7ca804466373d277b36e9a6240..1473c775880aeb59f1ba53b5e5677a0af820dff9 100644
--- a/llvm/test/Regression/CodeGen/X86/rdtsc.ll
+++ b/llvm/test/Regression/CodeGen/X86/rdtsc.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep rdtsc &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep rdtsc
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rdtsc &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep rdtsc
 
 declare ulong %llvm.readcyclecounter()
 
diff --git a/llvm/test/Regression/CodeGen/X86/regpressure.ll b/llvm/test/Regression/CodeGen/X86/regpressure.ll
index 1615f81a924548c4d36c6148b0feb425357e4ad9..c3c681c30c75e6587edf6df3ca26260343d65da4 100644
--- a/llvm/test/Regression/CodeGen/X86/regpressure.ll
+++ b/llvm/test/Regression/CodeGen/X86/regpressure.ll
@@ -1,7 +1,7 @@
 ;; Both functions in this testcase should codegen to the same function, and
 ;; neither of them should require spilling anything to the stack.
 
-; RUN: llvm-as < %s | llc -march=x86 -stats  2>&1 | not grep 'Number of register spills'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats  2>&1 | not grep 'Number of register spills'
 
 ;; This can be compiled to use three registers if the loads are not
 ;; folded into the multiplies, 2 registers otherwise.
diff --git a/llvm/test/Regression/CodeGen/X86/rem.ll b/llvm/test/Regression/CodeGen/X86/rem.ll
index 905b1423939bbabe3acd41e5fa6c99fc043537eb..209f831fc80aeeac01fd6aaaa9c04542d6466f9f 100644
--- a/llvm/test/Regression/CodeGen/X86/rem.ll
+++ b/llvm/test/Regression/CodeGen/X86/rem.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | not grep div
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep div
 
 int %test1(int %X) {
         %tmp1 = rem int %X, 255
diff --git a/llvm/test/Regression/CodeGen/X86/rotate.ll b/llvm/test/Regression/CodeGen/X86/rotate.ll
index 59d0291c3e1960c02b28270e84ffe955927d5be6..acd22f5aef496a296e9e797b259aeded4e5bfaf5 100644
--- a/llvm/test/Regression/CodeGen/X86/rotate.ll
+++ b/llvm/test/Regression/CodeGen/X86/rotate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ro[rl] | wc -l | grep 12
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ro[rl] | wc -l | grep 12
 
 uint %rotl32(uint %A, ubyte %Amt) {
 	%B = shl uint %A, ubyte %Amt
diff --git a/llvm/test/Regression/CodeGen/X86/scalar_sse_minmax.ll b/llvm/test/Regression/CodeGen/X86/scalar_sse_minmax.ll
index 6a464e3d85067fc1fa2fe1ad3c6c5e2bf4609e1f..83401667edf58405d77c65904b4c05256e77bc96 100644
--- a/llvm/test/Regression/CodeGen/X86/scalar_sse_minmax.ll
+++ b/llvm/test/Regression/CodeGen/X86/scalar_sse_minmax.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep maxs | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | grep maxs | wc -l | grep 2
 
 declare bool %llvm.isunordered.f64( double %x, double %y )
 declare bool %llvm.isunordered.f32( float %x, float %y )
diff --git a/llvm/test/Regression/CodeGen/X86/select.ll b/llvm/test/Regression/CodeGen/X86/select.ll
index 68bac667b4248da417ad63490ac1d0aa43250aa0..71f4742c08bcc027f4759adb3c0e065bcd42a7f8 100644
--- a/llvm/test/Regression/CodeGen/X86/select.ll
+++ b/llvm/test/Regression/CodeGen/X86/select.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah &&
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=pentium
 
 bool %boolSel(bool %A, bool %B, bool %C) {
 	%X = select bool %A, bool %B, bool %C
diff --git a/llvm/test/Regression/CodeGen/X86/setuge.ll b/llvm/test/Regression/CodeGen/X86/setuge.ll
index 6d3736b27343bcc7a548fd8b78966e647d89aa94..0cdade2710d7ae23155c511239615be06e743bfd 100644
--- a/llvm/test/Regression/CodeGen/X86/setuge.ll
+++ b/llvm/test/Regression/CodeGen/X86/setuge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'set'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'set'
 
 declare bool %llvm.isunordered.f32(float, float)
 
diff --git a/llvm/test/Regression/CodeGen/X86/shift-coalesce.ll b/llvm/test/Regression/CodeGen/X86/shift-coalesce.ll
index 90295f146c4e45167211e9ed16b0103867f49b09..0945fe13ce30c4a066a879a4396cef3db817f1e6 100644
--- a/llvm/test/Regression/CodeGen/X86/shift-coalesce.ll
+++ b/llvm/test/Regression/CodeGen/X86/shift-coalesce.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'shld.*CL' &&
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov CL, BL'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'shld.*CL' &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov CL, BL'
 
 ; PR687
 
diff --git a/llvm/test/Regression/CodeGen/X86/shift-double.llx b/llvm/test/Regression/CodeGen/X86/shift-double.llx
index 4235edebda8602ebcb905c95f6ab8870eee1abcd..41cf79da4c0a319336f5adea0c23376794becc54 100644
--- a/llvm/test/Regression/CodeGen/X86/shift-double.llx
+++ b/llvm/test/Regression/CodeGen/X86/shift-double.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep sh[lr]d | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep sh[lr]d | wc -l | grep 5
 
 long %test1(long %X, ubyte %C) {
 	%Y = shl long %X, ubyte %C
diff --git a/llvm/test/Regression/CodeGen/X86/shift-folding.ll b/llvm/test/Regression/CodeGen/X86/shift-folding.ll
index e868128b714b3cf18872d312e179f27b6af156cb..a1ea084201da1185053c3206ade058bf9f6869e7 100644
--- a/llvm/test/Regression/CodeGen/X86/shift-folding.ll
+++ b/llvm/test/Regression/CodeGen/X86/shift-folding.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 's[ah][rl]l' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 's[ah][rl]l' | wc -l | grep 1
 
 int* %test1(int *%P, uint %X) {
 	%Y = shr uint %X, ubyte 2
diff --git a/llvm/test/Regression/CodeGen/X86/shift-one.ll b/llvm/test/Regression/CodeGen/X86/shift-one.ll
index 07449e45a61cdf6194edc190a34136dc3cade093..a91cbbc50300af0a10be1f173f233f580c7ae3ef 100644
--- a/llvm/test/Regression/CodeGen/X86/shift-one.ll
+++ b/llvm/test/Regression/CodeGen/X86/shift-one.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'leal'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'leal'
 
 %x = external global int
 
diff --git a/llvm/test/Regression/CodeGen/X86/sse-load-ret.ll b/llvm/test/Regression/CodeGen/X86/sse-load-ret.ll
index 71372d0ffab6e1b5c0257368e9e59f5bd2451db8..d5f4d19686b14d42d65990f47674e6a8b6ec2906 100644
--- a/llvm/test/Regression/CodeGen/X86/sse-load-ret.ll
+++ b/llvm/test/Regression/CodeGen/X86/sse-load-ret.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse &&
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm
 
 double %test1(double *%P) {
 	%X = load double* %P
diff --git a/llvm/test/Regression/CodeGen/X86/store-fp-constant.ll b/llvm/test/Regression/CodeGen/X86/store-fp-constant.ll
index 6dc0cb600f8ea8bc25aee68f9b7b69f429373657..4d1d708a1a59602462e8a92e9120953341374fd7 100644
--- a/llvm/test/Regression/CodeGen/X86/store-fp-constant.ll
+++ b/llvm/test/Regression/CodeGen/X86/store-fp-constant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep rodata
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep rodata
 ;
 ; Check that no FP constants in this testcase ends up in the 
 ; constant pool.
diff --git a/llvm/test/Regression/CodeGen/X86/store-global-address.ll b/llvm/test/Regression/CodeGen/X86/store-global-address.ll
index c933714ea611df092795b10eaa9c37231f15499f..77e344d9599924c10bd35c89cd68bd1b1d138016 100644
--- a/llvm/test/Regression/CodeGen/X86/store-global-address.ll
+++ b/llvm/test/Regression/CodeGen/X86/store-global-address.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep movl | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movl | wc -l | grep 1
 
 %dst = global int 0
 %ptr = global int* null
diff --git a/llvm/test/Regression/CodeGen/X86/store_op_load_fold.ll b/llvm/test/Regression/CodeGen/X86/store_op_load_fold.ll
index 3c844be605be1b66b9c529471baf02beeda4034c..d3ad90984c07bb8d88606793027d83877dc63fc2 100644
--- a/llvm/test/Regression/CodeGen/X86/store_op_load_fold.ll
+++ b/llvm/test/Regression/CodeGen/X86/store_op_load_fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'mov'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'mov'
 ;
 ; Test the add and load are folded into the store instruction.
 
diff --git a/llvm/test/Regression/CodeGen/X86/store_op_load_fold2.ll b/llvm/test/Regression/CodeGen/X86/store_op_load_fold2.ll
index c20e57213be9361ae4be2793633940ed60c9b34b..c7f720ad901f60a13548000536d8d5afaee1f2ab 100644
--- a/llvm/test/Regression/CodeGen/X86/store_op_load_fold2.ll
+++ b/llvm/test/Regression/CodeGen/X86/store_op_load_fold2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'and DWORD PTR' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'and DWORD PTR' | wc -l | grep 2
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/test-load-fold.ll b/llvm/test/Regression/CodeGen/X86/test-load-fold.ll
index 5d2d28656d5c78550c9726b9bd21f629fe5efb3c..847d91e03b634bdfc65e1a936b11a45f3dc472e1 100644
--- a/llvm/test/Regression/CodeGen/X86/test-load-fold.ll
+++ b/llvm/test/Regression/CodeGen/X86/test-load-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc
 	%struct._obstack_chunk = type { sbyte*, %struct._obstack_chunk*, [4 x sbyte] }
 	%struct.obstack = type { int, %struct._obstack_chunk*, sbyte*, sbyte*, sbyte*, int, int, %struct._obstack_chunk* (...)*, void (...)*, sbyte*, ubyte }
 %stmt_obstack = external global %struct.obstack		; <%struct.obstack*> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/trunc-to-bool.ll b/llvm/test/Regression/CodeGen/X86/trunc-to-bool.ll
index 92a0949308c7f100fdfd4021ead9d52e8d2ca3f1..3e00975b249fd42c59b0f4386c31458529354e06 100644
--- a/llvm/test/Regression/CodeGen/X86/trunc-to-bool.ll
+++ b/llvm/test/Regression/CodeGen/X86/trunc-to-bool.ll
@@ -1,8 +1,8 @@
 ; An integer truncation to bool should be done with an and instruction to make
 ; sure only the LSBit survives. Test that this is the case both for a returned
 ; value and as the operand of a branch.
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | wc -l | grep 6
 bool %test1(int %X) {
     %Y = trunc int %X to bool
     ret bool %Y
diff --git a/llvm/test/Regression/CodeGen/X86/vec_call.ll b/llvm/test/Regression/CodeGen/X86/vec_call.ll
index 9bbff18de9a976f9a0c31f267998659add072dc8..9fcc11dbb6829db8c4d78d0664122c981316a547 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_call.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_call.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep 'subl.*60'
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep 'movdqa.*32'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'subl.*60'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'movdqa.*32'
 
 void %test() {
 	tail call void %xx( int 1, int 2, int 3, int 4, int 5, int 6, int 7, <2 x long> cast (<4 x int> < int 4, int 3, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 7, int 6, int 5 > to <2 x long>), <2 x long> cast (<4 x int> < int 6, int 4, int 2, int 0 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 4, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 0, int 1, int 3, int 9 > to <2 x long>) )
diff --git a/llvm/test/Regression/CodeGen/X86/vec_clear.ll b/llvm/test/Regression/CodeGen/X86/vec_clear.ll
index 1c38825afc75ff721156db98fd9b60b31d9c778d..a43d67ccd23f3a21753c3721f23309756f20658e 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_clear.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_clear.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep and
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep and
 <4 x float> %test(<4 x float>* %v1) {
 	%tmp = load <4 x float>* %v1
 	%tmp15 = cast <4 x float> %tmp to <2 x long>
diff --git a/llvm/test/Regression/CodeGen/X86/vec_extract.ll b/llvm/test/Regression/CodeGen/X86/vec_extract.ll
index 59ca5666a4baa7ef82d2d99f165029389757d9bd..2f729ad244dcb0c5793bb84a8d4f6096a7f89731 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_extract.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_extract.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss    | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd   | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpckhpd | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss    | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps  | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd   | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpckhpd | wc -l | grep 1
 
 void %test1(<4 x float>* %F, float* %f) {
 	%tmp = load <4 x float>* %F
diff --git a/llvm/test/Regression/CodeGen/X86/vec_insert.ll b/llvm/test/Regression/CodeGen/X86/vec_insert.ll
index 933dfc5bd0a346f0e74ef26dca5cb30d32151897..fbe604d5a1e49d1b7ce5cc06e6e1ea42d407eebd 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_insert.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_insert.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss  | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2
 
 void %test(<4 x float>* %F, int %I) {
 	%tmp = load <4 x float>* %F
diff --git a/llvm/test/Regression/CodeGen/X86/vec_return.ll b/llvm/test/Regression/CodeGen/X86/vec_return.ll
index 9be341670420d93b4efa2ad533604bec411051e2..2b2d9540314bdaa57db962f7d0cfcf2b6841b82f 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_return.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_return.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah
 
 <2 x double> %test() {
 	ret <2 x double> <double 0.0, double 0.0>
diff --git a/llvm/test/Regression/CodeGen/X86/vec_select.ll b/llvm/test/Regression/CodeGen/X86/vec_select.ll
index 266b35872d5ac4e53beb7fb24924209483dd6c91..05f2a8cdd32e674b0b9278a3d2f94081c510e602 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_select.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_select.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse
 
 void %test(int %C, <4 x float>* %A, <4 x float>* %B) {
 	%tmp = load <4 x float>* %A
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-2.ll b/llvm/test/Regression/CodeGen/X86/vec_set-2.ll
index 6e54b6f16958976898d4769a4f5172a04d5a511a..db748f289bd50a2d2264be0877350843da90c005 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-2.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-2.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movd  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movd  | wc -l | grep 1
 
 <4 x float> %test1(float %a) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-3.ll b/llvm/test/Regression/CodeGen/X86/vec_set-3.ll
index 1458d37e00f12267f4f11d1630af89ef6ecbf718..5cb133c134b6c2e0f6c34055fda255d6d513b81d 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-3.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-3.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1
 
 <4 x float> %test(float %a) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-4.ll b/llvm/test/Regression/CodeGen/X86/vec_set-4.ll
index 14d84321d9a94a059e5da92cf50101f067fafd7b..745200fab929743c8eea77428b14fd8db2ecb99e 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-4.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2
 
 <2 x long> %test(short %a) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-5.ll b/llvm/test/Regression/CodeGen/X86/vec_set-5.ll
index cf4acd3b02e1a8974efe6e53c6a438e3f379986f..8761417a98a59225a58ff0d7af880652b52041c9 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-5.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-5.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movlhps   | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpckldq | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movlhps   | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps  | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckldq | wc -l | grep 1
 
 <4 x float> %test1(float %a, float %b) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-6.ll b/llvm/test/Regression/CodeGen/X86/vec_set-6.ll
index 0c325c928ae01cf16f72cb6d98b17c1026dd273e..439febb801fc4e277c756a73af99c343eb4fb4c1 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-6.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-6.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps   | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps   | wc -l | grep 1
 
 <4 x float> %test(float %a, float %b, float %c) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set-7.ll b/llvm/test/Regression/CodeGen/X86/vec_set-7.ll
index b0aff7ccfcacfe0e4692224d60f7944c1bfb4678..ab342df9055b2e20f2d4fed84907842570d6c3ab 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set-7.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set-7.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movq | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movq | wc -l | grep 1
 
 <2 x long> %test(<2 x long>* %p) {
 	%tmp = cast <2 x long>* %p to double*
diff --git a/llvm/test/Regression/CodeGen/X86/vec_set.ll b/llvm/test/Regression/CodeGen/X86/vec_set.ll
index fcce5f661552d0b0551b5d3c978668205329a54d..c190e41bd069a7c77bc58d948e87ce4cc870cdc0 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_set.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_set.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpckl | wc -l | grep 7
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckl | wc -l | grep 7
 
 void %test(<8 x short>* %b, short %a0, short %a1, short %a2, short %a3, short %a4, short %a5, short %a6, short %a7) {
 	%tmp = insertelement <8 x short> zeroinitializer, short %a0, uint 0
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-10.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-10.ll
index b3fc841a11412854b6a4eae9d72a4a38bdca5c2c..ccd1911417429b92a21f5d0cce645018cf86e218 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-10.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-10.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpckhps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep 'sub.*esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpckhps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep 'sub.*esp'
 
 void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B) {
         %tmp = load <4 x float>* %B             ; <<4 x float>> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-2.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-2.ll
index 3e53ed8327d2fbcd78c99bfc9e21c09ee696c036..dd4c269e075884cae3aacd121947c8e60444a0c8 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-2.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-2.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshuflw | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhps | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshuflw | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhps | wc -l | grep 1
 
 void %test1(<2 x long>* %res, <2 x long>* %A) {
 	%tmp = load <2 x long>* %A
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-3.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-3.ll
index a1eac1f1ec1b24cf6bb5a9ee58b675542f9860c5..d34a00646c783d4fa6a43ccfd6757c27ee4c2434 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-3.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-3.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1
 
 <4 x float> %test1(<4 x float>* %x, <4 x float>* %y) {
 	%tmp = load <4 x float>* %y
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-4.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-4.ll
index 1ed8555301dfe0543402dcf22b0362046e309091..7632992fee47a2f7486cbf105be10522ba54ea90 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-4.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-4.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shuf | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep unpck
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shuf | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep unpck
 void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B, <4 x float>* %C) {
 	%tmp3 = load <4 x float>* %B
 	%tmp5 = load <4 x float>* %C
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-5.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-5.ll
index 2480ce0e15e5122d31b4ed533d15627466e9c18b..b94769b1699c159dda25be5f9ce0fb55c0a4b2da 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-5.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-5.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps  | wc -l | grep 1
 
 void %test() {
 	%tmp1 = load <4 x float>* null
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-6.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-6.ll
index 130fefeaf51edbe4c54244f3161cdb0a4af7a530..92e141d831750ad21af8ff61a3197438530c73c9 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-6.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-6.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movapd | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movaps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movapd | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movaps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 2
 
 target triple = "i686-apple-darwin"
 
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-7.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-7.ll
index a5686d2de8b7c176ced9971ec2ed636feb54264b..bd978836c88d50018cb33653858c7fd9decbca85 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-7.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-7.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep shufps
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep shufps
 
 void %test() {
 	cast <4 x int> zeroinitializer to <4 x float>
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-8.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-8.ll
index 449a3abd20eb417dd0fd2f5abdecdd10b6d59d8e..13e8b9c22a236451d899ba1a74b6dcc64c79670b 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-8.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-8.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep shufps
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep shufps
 
 void %test(<4 x float>* %res, <4 x float>* %A) {
 	%tmp1 = load <4 x float>* %A
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle-9.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle-9.ll
index 05b3c77c01752b5a1f293b477855862eda749988..a9b325a77b5933e75d7f507904fc1b0111f77b65 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle-9.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle-9.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpck | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep pextrw
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpck | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep pextrw
 
 <4 x int> %test(sbyte** %ptr) {
 entry:
diff --git a/llvm/test/Regression/CodeGen/X86/vec_shuffle.ll b/llvm/test/Regression/CodeGen/X86/vec_shuffle.ll
index 746fa016d844e9a111c3b9e7911b2018a5770898..65aafe54b322ff834e7c042fe4c8103b88210355 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_shuffle.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_shuffle.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufp | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufp | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1
 
 void %test_v4sf(<4 x float>* %P, float %X, float %Y) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %X, uint 0
diff --git a/llvm/test/Regression/CodeGen/X86/vec_splat-2.ll b/llvm/test/Regression/CodeGen/X86/vec_splat-2.ll
index c1958fde2c74f28ea53900cf57f26f83a22d1067..a874500f3da6a362ba344ac6aa73f8f729845c6f 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_splat-2.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_splat-2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1
 
 void %test(<2 x long>* %P, sbyte %x) {
 	%tmp = insertelement <16 x sbyte> zeroinitializer, sbyte %x, uint 0		; <<16 x sbyte>> [#uses=1]
diff --git a/llvm/test/Regression/CodeGen/X86/vec_splat.ll b/llvm/test/Regression/CodeGen/X86/vec_splat.ll
index 5d5cdc83e1febc47b6c5d8496cc98505bf723018..bc0ae0327d623ed51f1a28ab5432d316fc5f53e0 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_splat.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_splat.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse3 | grep movddup
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse3 | grep movddup
 
 void %test_v4sf(<4 x float>* %P, <4 x float>* %Q, float %X) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %X, uint 0
diff --git a/llvm/test/Regression/CodeGen/X86/vec_ss_load_fold.ll b/llvm/test/Regression/CodeGen/X86/vec_ss_load_fold.ll
index 6be279af1baa76c58f7fd6a3d4f23824965dba0f..38eb1d1f2e14ecb804651af16e0ca8a4d1349b91 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_ss_load_fold.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_ss_load_fold.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse,+sse2 | grep minss | grep CPI | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse,+sse2 | grep CPI | not grep movss
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 | grep minss | grep CPI | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 | grep CPI | not grep movss
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/CodeGen/X86/vec_zero.ll b/llvm/test/Regression/CodeGen/X86/vec_zero.ll
index d9071575e64384f87a6c394119cdd36d4c2336e4..f976fc1834e35137a233c79a9ac8dcdc5f141c3c 100644
--- a/llvm/test/Regression/CodeGen/X86/vec_zero.ll
+++ b/llvm/test/Regression/CodeGen/X86/vec_zero.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2
 
 void %foo(<4 x float> *%P) {
 	%T = load <4 x float> * %P
diff --git a/llvm/test/Regression/CodeGen/X86/x86-64-mem.ll b/llvm/test/Regression/CodeGen/X86/x86-64-mem.ll
index ffa428ec5a6f5e506f70fbb3e11b410b815fd472..4426dc204796b8c84f01c15fe30b050c8e00a31f 100644
--- a/llvm/test/Regression/CodeGen/X86/x86-64-mem.ll
+++ b/llvm/test/Regression/CodeGen/X86/x86-64-mem.ll
@@ -1,11 +1,11 @@
-; RUN: llvm-as < %s | llc -march=x86-64 &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep GOTPCREL | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep rip | wc -l | grep 6 &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep movq | wc -l | grep 6 &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep leaq | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep rip | wc -l | grep 4 &&
-; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep movl | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep movq | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep GOTPCREL | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep rip | wc -l | grep 6 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep movq | wc -l | grep 6 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep leaq | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep rip | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep movl | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep movq | wc -l | grep 2
 
 %ptr = external global int*
 %src = external global [0 x int]
diff --git a/llvm/test/Regression/CodeGen/X86/xmm-r64.ll b/llvm/test/Regression/CodeGen/X86/xmm-r64.ll
index bf2d61ea529ef7508710201d186c752b61e9245d..596e5c99782c0be3d7393f495f511911f4dcae87 100644
--- a/llvm/test/Regression/CodeGen/X86/xmm-r64.ll
+++ b/llvm/test/Regression/CodeGen/X86/xmm-r64.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86-64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64
 
 <4 x int> %test() {
 	%tmp1039 = call <4 x int> %llvm.x86.sse2.psll.d( <4 x int> zeroinitializer, <4 x int> zeroinitializer )		; <<4 x int>> [#uses=1]
diff --git a/llvm/test/Regression/ExecutionEngine/2003-05-06-LivenessClobber.llx b/llvm/test/Regression/ExecutionEngine/2003-05-06-LivenessClobber.llx
index 3164dd85c19828ff650f0f977b3f4bee5304fa4c..ea3f14b5128459ad3fe626a2ac59bac0d57b21db 100644
--- a/llvm/test/Regression/ExecutionEngine/2003-05-06-LivenessClobber.llx
+++ b/llvm/test/Regression/ExecutionEngine/2003-05-06-LivenessClobber.llx
@@ -1,6 +1,6 @@
 ; This testcase shoudl return with an exit code of 1.
 ;
-; RUN: llvm-as < %s | not lli
+; RUN: llvm-upgrade < %s | llvm-as | not lli
 
 %test = global long 0
 implementation
diff --git a/llvm/test/Regression/ExecutionEngine/2003-05-07-ArgumentTest.llx b/llvm/test/Regression/ExecutionEngine/2003-05-07-ArgumentTest.llx
index 47b40c387a0787d6b9cd83d0f64b041367516043..e5dd04eafb5a1ead4b2dba7880d1331e498e8804 100644
--- a/llvm/test/Regression/ExecutionEngine/2003-05-07-ArgumentTest.llx
+++ b/llvm/test/Regression/ExecutionEngine/2003-05-07-ArgumentTest.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | lli - test
+; RUN: llvm-upgrade < %s | llvm-as | lli - test
 
 implementation  
 
diff --git a/llvm/test/Regression/ExecutionEngine/2005-12-02-TailCallBug.ll b/llvm/test/Regression/ExecutionEngine/2005-12-02-TailCallBug.ll
index fb3b6764585bc74acababae2c8f8b2e008fe4c7e..447f49e9ad5e8edf0243c3e6a7e8d07ef0e5fc6c 100644
--- a/llvm/test/Regression/ExecutionEngine/2005-12-02-TailCallBug.ll
+++ b/llvm/test/Regression/ExecutionEngine/2005-12-02-TailCallBug.ll
@@ -1,5 +1,5 @@
 ; PR672
-; RUN: llvm-as < %s | lli
+; RUN: llvm-upgrade < %s | llvm-as | lli
 
 int %main(){ 
  %f   = cast int (int, int*, int)* %check_tail to int*
diff --git a/llvm/test/Regression/Other/2002-01-31-CallGraph.ll b/llvm/test/Regression/Other/2002-01-31-CallGraph.ll
index 279369de6651f121a4a62d6bb7a09eb1b1da0952..61c1277d6420e9d39cb41c17e78b51c55c224b62 100644
--- a/llvm/test/Regression/Other/2002-01-31-CallGraph.ll
+++ b/llvm/test/Regression/Other/2002-01-31-CallGraph.ll
@@ -1,6 +1,6 @@
 ;  Call graph construction crash: Not handling indirect calls right
 ;
-; RUN: llvm-as < %s | opt -analyze -callgraph
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -callgraph
 ;
 
 %FunTy = type int(int)
diff --git a/llvm/test/Regression/Other/2002-01-31-PostDomSet-2.ll b/llvm/test/Regression/Other/2002-01-31-PostDomSet-2.ll
index cd11a24cb54e53b4842fdce256794dda4403e0fe..234bf4df343b52c4bb3b86996de81bfe6be33706 100644
--- a/llvm/test/Regression/Other/2002-01-31-PostDomSet-2.ll
+++ b/llvm/test/Regression/Other/2002-01-31-PostDomSet-2.ll
@@ -1,6 +1,6 @@
 ; Crash in post dominator set construction.
 ;
-; RUN: llvm-as < %s | opt -analyze -postdomset
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomset
 ;
 
 implementation
diff --git a/llvm/test/Regression/Other/2002-01-31-PostDomSet.ll b/llvm/test/Regression/Other/2002-01-31-PostDomSet.ll
index cf15e97cffc9290a83737de7ab43d1913e42b4f9..69a11ba76e3ba35d1375dff25f61d7bdf4eef2ff 100644
--- a/llvm/test/Regression/Other/2002-01-31-PostDomSet.ll
+++ b/llvm/test/Regression/Other/2002-01-31-PostDomSet.ll
@@ -1,6 +1,6 @@
 ; Crash in post dominator set construction.
 ;
-; RUN: llvm-as < %s | opt -analyze -postdomset
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomset
 ;
 
 implementation
diff --git a/llvm/test/Regression/Other/2002-02-24-InlineBrokePHINodes.ll b/llvm/test/Regression/Other/2002-02-24-InlineBrokePHINodes.ll
index 1088205cdcc86eeb067b77dff7f3a4b8b785654e..cb02ea486eddb4066e3e82bc03911236171f4b1e 100644
--- a/llvm/test/Regression/Other/2002-02-24-InlineBrokePHINodes.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline
 ;
 implementation
 
diff --git a/llvm/test/Regression/Other/2002-03-11-ConstPropCrash.ll b/llvm/test/Regression/Other/2002-03-11-ConstPropCrash.ll
index 62435747c23b719e8786bf0da380d33bc79098ee..91bea5324d8eba288645ad691854a8262fac875a 100644
--- a/llvm/test/Regression/Other/2002-03-11-ConstPropCrash.ll
+++ b/llvm/test/Regression/Other/2002-03-11-ConstPropCrash.ll
@@ -5,7 +5,7 @@
 ;
 ; Fixed by adding new arguments to ConstantFoldTerminator
 ;
-; RUN: llvm-as < %s | opt -constprop
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop
 
 implementation
 
diff --git a/llvm/test/Regression/Other/2002-08-02-DomSetProblem.ll b/llvm/test/Regression/Other/2002-08-02-DomSetProblem.ll
index ed7c86a480bfd704642c3b36eba012250cadebc5..f62135d3f1132b584eae9a8205169b8bbe61e8aa 100644
--- a/llvm/test/Regression/Other/2002-08-02-DomSetProblem.ll
+++ b/llvm/test/Regression/Other/2002-08-02-DomSetProblem.ll
@@ -2,7 +2,7 @@
 ; blocks.  These blocks should at least dominate themselves.  This is 
 ; fouling up the verify pass.
 ;
-; RUN: llvm-as < %s | opt -analyze -domset | grep BB
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -domset | grep BB
 
 void %test() {
 	ret void
diff --git a/llvm/test/Regression/Other/2003-02-19-LoopInfoNestingBug.ll b/llvm/test/Regression/Other/2003-02-19-LoopInfoNestingBug.ll
index e4fe0818fb8cbd9a136126802d9fc18014628e60..bf71f5f22e10e5d9c0ea7d8ad44e348289d54e14 100644
--- a/llvm/test/Regression/Other/2003-02-19-LoopInfoNestingBug.ll
+++ b/llvm/test/Regression/Other/2003-02-19-LoopInfoNestingBug.ll
@@ -2,7 +2,7 @@
 ; figure out that loop "Inner" should be nested inside of leep "LoopHeader", 
 ; and instead nests it just inside loop "Top"
 ;
-; RUN: llvm-as < %s | opt -analyze -loops | grep '     Loop Containing:[ ]*%Inner'
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | grep '     Loop Containing:[ ]*%Inner'
 ;
 
 implementation
diff --git a/llvm/test/Regression/Other/2004-08-16-LowerPacked.ll b/llvm/test/Regression/Other/2004-08-16-LowerPacked.ll
index 4c11f82c37c80848d139803d7b7e06f9f1920e21..1d8da1d5570881e23c9260653251f5746d023e3d 100644
--- a/llvm/test/Regression/Other/2004-08-16-LowerPacked.ll
+++ b/llvm/test/Regression/Other/2004-08-16-LowerPacked.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lower-packed | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -lower-packed | llvm-dis
 
 %foo = uninitialized global <2 x int>;
 %bar = uninitialized global <2 x int>;
diff --git a/llvm/test/Regression/Other/2004-08-16-PackedConstantInlineStore.ll b/llvm/test/Regression/Other/2004-08-16-PackedConstantInlineStore.ll
index 2d447f92ee53261ebbd014cf395f0608ce503be3..6f94d9925db9a977caeaf5fc2d78063842d18ffb 100644
--- a/llvm/test/Regression/Other/2004-08-16-PackedConstantInlineStore.ll
+++ b/llvm/test/Regression/Other/2004-08-16-PackedConstantInlineStore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 %bar = external global <2 x int>		; <<2 x int>*> [#uses=1]
 
diff --git a/llvm/test/Regression/Other/2004-08-16-PackedGlobalConstant.ll b/llvm/test/Regression/Other/2004-08-16-PackedGlobalConstant.ll
index 9a8c21c5962d1658296d593e147baad5b47e06c2..01b0d5dd4050b6d9b5ffb18117254879290802af 100644
--- a/llvm/test/Regression/Other/2004-08-16-PackedGlobalConstant.ll
+++ b/llvm/test/Regression/Other/2004-08-16-PackedGlobalConstant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 %foo = global <2 x int> <int 0, int 1>;
 %bar = uninitialized global <2 x int>;
diff --git a/llvm/test/Regression/Other/2004-08-16-PackedSelect.ll b/llvm/test/Regression/Other/2004-08-16-PackedSelect.ll
index 94a6c38efa47aecf3b03c8e2e09e732a7c301187..5bbf20caa5f19f6d0459eee955b1cef977843d71 100644
--- a/llvm/test/Regression/Other/2004-08-16-PackedSelect.ll
+++ b/llvm/test/Regression/Other/2004-08-16-PackedSelect.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 %foo = uninitialized global <4 x float>;
 %bar = uninitialized global <4 x float>;
diff --git a/llvm/test/Regression/Other/2004-08-16-PackedSimple.ll b/llvm/test/Regression/Other/2004-08-16-PackedSimple.ll
index 10cee3823ab93a76850c25ae44b0f921673d4c21..9835199ba7db0b7c5c708fc4b5871b143755b792 100644
--- a/llvm/test/Regression/Other/2004-08-16-PackedSimple.ll
+++ b/llvm/test/Regression/Other/2004-08-16-PackedSimple.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis
 
 %foo = uninitialized global <4 x float>;
 %bar = uninitialized global <4 x float>;
diff --git a/llvm/test/Regression/Other/2004-08-20-PackedControlFlow.ll b/llvm/test/Regression/Other/2004-08-20-PackedControlFlow.ll
index 8c03f9affba4a214550806f71e0be40c66bb2bb2..d2566b15638f41877864062302ac08651ea4a1d3 100644
--- a/llvm/test/Regression/Other/2004-08-20-PackedControlFlow.ll
+++ b/llvm/test/Regression/Other/2004-08-20-PackedControlFlow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | llvm-as > /dev/null
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as > /dev/null
 
 %v4f = type <4 x float>
 
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-01-31-UseStuckAround.ll b/llvm/test/Regression/Transforms/ADCE/2002-01-31-UseStuckAround.ll
index 162b0508fdc0247ae0d0c5f61bb903a1682a81d1..f902bc97b8f577b819bf5b8243d6364d18d2fc9e 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-01-31-UseStuckAround.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2002-01-31-UseStuckAround.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-05-22-PHITest.ll b/llvm/test/Regression/Transforms/ADCE/2002-05-22-PHITest.ll
index e13536cac02b9dcce0d4dc27b5164687a6306a90..cf9872e2e1169a6b56e32b0eed0eab3aee8487be 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-05-22-PHITest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -adce | llvm-dis | grep BB1
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | grep BB1
 
 
 int "test"(bool %C, int %A, int %B) {
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll b/llvm/test/Regression/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
index e3f8de2f1594f4f8ee16fb163710de4885dd6ecf..999675b55af41d1425739870b8edf9243ad1aaff 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 	
 %node_t = type { double*, %node_t*, %node_t**, double**, double*, int, int }
 
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash-distilled.ll b/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash-distilled.ll
index 1fcf6097863f90b0c50f525f3776d4aff7307483..0d5adf907f1f828f43193bb9688ac87d95438884 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash-distilled.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -adce 
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce 
 
 float "test"(int %i) {
 	%F = cast int %i to float    ; This BB is not dead
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash.ll b/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash.ll
index 5b4acda062168bde56aea8097b64bcd8401f57f4..b6340d540b1a35ade0fddc677c70764dc6854611 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2002-05-28-Crash.ll
@@ -11,7 +11,7 @@
 ;  return !s;
 ;}
 ;
-; RUN: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-07-17-AssertionFailure.ll b/llvm/test/Regression/Transforms/ADCE/2002-07-17-AssertionFailure.ll
index 36db7fb5de709ce20fbab6387172bf936ed5d575..61b140233dd41f70a0732a35b87adde1ec1b83d1 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-07-17-AssertionFailure.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 
 void %foo(sbyte* %reg5481) {
         %cast611 = cast sbyte* %reg5481 to sbyte**              ; <sbyte**> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/ADCE/2002-07-17-PHIAssertion.ll b/llvm/test/Regression/Transforms/ADCE/2002-07-17-PHIAssertion.ll
index bd88884756c737b2b7d99c22644266db33fc4ce1..6d15fae8ef731157e1fcb98553eed2192f6ac2b3 100644
--- a/llvm/test/Regression/Transforms/ADCE/2002-07-17-PHIAssertion.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2002-07-17-PHIAssertion.ll
@@ -1,6 +1,6 @@
 ; This testcase was extracted from the gzip SPEC benchmark
 ;
-; RUN: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 
 %bk = external global uint		; <uint*> [#uses=2]
 %hufts = external global uint		; <uint*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-01-22-PredecessorProblem.ll b/llvm/test/Regression/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
index 5023f9424607c6ceef4091d8210fe55117448a0a..d8c64485709df4221d1e01c43a352c0cc87e92a0 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
@@ -1,5 +1,5 @@
 ; Testcase reduced from 197.parser by bugpoint
-; RUN: llvm-as < %s | opt -adce 
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce 
 implementation   ; Functions:
 
 void %conjunction_prune() {
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll b/llvm/test/Regression/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
index 1a71ffe02e8103bbb8d4263e17df718dd9f8a9c3..92d7cad770dc88dd49308fcec333a1f26770450c 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -adce
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-06-11-InvalidCFG.ll b/llvm/test/Regression/Transforms/ADCE/2003-06-11-InvalidCFG.ll
index 9f28fc113ab11d88311e492efac36619b91cb0c3..590089d1c9d51bfea3b588684fdc49c32d7d4443 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-06-11-InvalidCFG.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-06-11-InvalidCFG.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 %G = external global int*
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-06-24-BadSuccessor.ll b/llvm/test/Regression/Transforms/ADCE/2003-06-24-BadSuccessor.ll
index 567aca793ec623c282e0f6ba340bfa5db071050e..1a730194ffd9e6a55e996d05cd0210315257b99e 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-06-24-BadSuccessor.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-06-24-BadSuccessor.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-06-24-BasicFunctionality.ll b/llvm/test/Regression/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
index 4591261815abd676636b75d7c2f80b223e373308..ac62699863f1544af291a50b27234e9829160884 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | not grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis | not grep then:
 
 void %dead_test8(int* %data.1, int %idx.1) {
 entry:		; No predecessors!
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll b/llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
index 72b87bb05d80388c0ac5db58f933c0e0ad79fbe3..a88e04155bff9e374cda686631394f95910558e4 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-09-15-InfLoopCrash.ll b/llvm/test/Regression/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
index 13b4f91cd661474668f7c382f0616117e43bdcd3..c61bd6d385efa6f985ef9ef5dad1fcebc3ef2644 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 int %main() {
 	br label %loop
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll b/llvm/test/Regression/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
index adeeaa6d562d40e11a399895cd3e1f597e8e6db1..cf7b08835b171fc1e7056378890350a9e6900916 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis | grep call
 declare void %exit(int)
 
 int %main(int %argc) {
diff --git a/llvm/test/Regression/Transforms/ADCE/2003-12-19-MergeReturn.llx b/llvm/test/Regression/Transforms/ADCE/2003-12-19-MergeReturn.llx
index 541f2abe97610abe06988b496859a11dbd2cb563..6b8b547fc727b72e7318a1f492ea0ccfdcba73ad 100644
--- a/llvm/test/Regression/Transforms/ADCE/2003-12-19-MergeReturn.llx
+++ b/llvm/test/Regression/Transforms/ADCE/2003-12-19-MergeReturn.llx
@@ -1,7 +1,7 @@
 ; This testcase was failing because without merging the return blocks, ADCE
 ; didn't know that it could get rid of the then.0 block.
 
-; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep load
 
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/Transforms/ADCE/2004-05-04-UnreachableBlock.llx b/llvm/test/Regression/Transforms/ADCE/2004-05-04-UnreachableBlock.llx
index b08fdfe10af7d31ecc5f7ec436a6ffae795bc605..56f2b2b002f117e86db64b00e8043e5f7d39c4d0 100644
--- a/llvm/test/Regression/Transforms/ADCE/2004-05-04-UnreachableBlock.llx
+++ b/llvm/test/Regression/Transforms/ADCE/2004-05-04-UnreachableBlock.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 void %test() {
 entry:
diff --git a/llvm/test/Regression/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll b/llvm/test/Regression/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll
index 6e439a7b20853c384d146a7cf43b138cdb5c0a63..b7a901b468362a8cd8c00a188d6ad8173dcdc7e9 100644
--- a/llvm/test/Regression/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll
+++ b/llvm/test/Regression/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/ADCE/adcetest.ll b/llvm/test/Regression/Transforms/ADCE/adcetest.ll
index 28b5852606758b9ede19dd9ba878e186e3c2fe1e..f0d78433af0e29f6b6b985003e808d2f95669961 100644
--- a/llvm/test/Regression/Transforms/ADCE/adcetest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
 
 int "test function"(int %i0, int %j0) {
 BB1:
diff --git a/llvm/test/Regression/Transforms/ADCE/basictest.ll b/llvm/test/Regression/Transforms/ADCE/basictest.ll
index 737f77526bca2a34660840058571ca99559fcfa3..6be744ef5e3bf950e84e866c8b4c78312ad1af5b 100644
--- a/llvm/test/Regression/Transforms/ADCE/basictest.ll
+++ b/llvm/test/Regression/Transforms/ADCE/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis
 
 int "Test"(int %A, int %B) {
 BB1:
diff --git a/llvm/test/Regression/Transforms/ADCE/basictest1.ll b/llvm/test/Regression/Transforms/ADCE/basictest1.ll
index 77a34df66e4329298908fc7cd65d6ebff46973ca..7d511e8f700d890713602fdd896d49c2def61e61 100644
--- a/llvm/test/Regression/Transforms/ADCE/basictest1.ll
+++ b/llvm/test/Regression/Transforms/ADCE/basictest1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/ADCE/basictest2.ll b/llvm/test/Regression/Transforms/ADCE/basictest2.ll
index ffb2c1ddbeb46f0fba6e95a9f1961d54fb6dd3c0..75b1d952b69ab24fd9f9235c8a4b7ad3a79bc99c 100644
--- a/llvm/test/Regression/Transforms/ADCE/basictest2.ll
+++ b/llvm/test/Regression/Transforms/ADCE/basictest2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis	
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/ADCE/dce_pure_call.ll b/llvm/test/Regression/Transforms/ADCE/dce_pure_call.ll
index dad2912702de6cb7d16000d99881ef824ce7213e..79a360c26803252200f866492c52dc7c61b3de19 100644
--- a/llvm/test/Regression/Transforms/ADCE/dce_pure_call.ll
+++ b/llvm/test/Regression/Transforms/ADCE/dce_pure_call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep call
 
 declare int %strlen(sbyte*)
 
diff --git a/llvm/test/Regression/Transforms/ADCE/dce_pure_invoke.ll b/llvm/test/Regression/Transforms/ADCE/dce_pure_invoke.ll
index 608c6554129a41f3054dc4fbbf0d0a9a7238580e..9604defb3bb6e23f20252131c97119ee8829c3bc 100644
--- a/llvm/test/Regression/Transforms/ADCE/dce_pure_invoke.ll
+++ b/llvm/test/Regression/Transforms/ADCE/dce_pure_invoke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep null
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep null
 
 declare int %strlen(sbyte*)
 
diff --git a/llvm/test/Regression/Transforms/ADCE/dead-phi-edge.ll b/llvm/test/Regression/Transforms/ADCE/dead-phi-edge.ll
index b4a10b2699ffcd632c078aee0ba406a3900647a9..a0c0705f3339efe70982c5a700b2065d96a2de14 100644
--- a/llvm/test/Regression/Transforms/ADCE/dead-phi-edge.ll
+++ b/llvm/test/Regression/Transforms/ADCE/dead-phi-edge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep call
 
 ; The call is not live just because the PHI uses the call retval!
 
diff --git a/llvm/test/Regression/Transforms/ADCE/unreachable-function.ll b/llvm/test/Regression/Transforms/ADCE/unreachable-function.ll
index 353276fe2fefa16dd5f9b88cbeef087c1d475721..0c10253300807e3846decafeafe22092e021d080 100644
--- a/llvm/test/Regression/Transforms/ADCE/unreachable-function.ll
+++ b/llvm/test/Regression/Transforms/ADCE/unreachable-function.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output
 
 void %test() {
 	unreachable
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/aggregate-promote.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/aggregate-promote.ll
index b43b168b7bed4cde48719b280a8ba171b8dc2fc5..19cbb6df2d44a76027cc2747275c5ac2bba9f96d 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/aggregate-promote.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/aggregate-promote.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion -instcombine | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -instcombine | not grep load
 
 %QuadTy = type {int, int, int, int}
 
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/basictest.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/basictest.ll
index dd7a785d7dfe7ed38d7ba8866808c904baf48491..474202727a392181eb2590f01ea794702fa92f28 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/basictest.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -mem2reg | llvm-dis | not grep alloca
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/chained.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/chained.ll
index 3adfbf9d84973ecd6254dd9b1e23971e7fa1b580..d6055e2768f18bfc0da9ecfbfb59ddb5377d08ed 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/chained.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/chained.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion -instcombine | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -instcombine | llvm-dis | not grep load
 
 %G1 = constant int 0
 %G2 = constant int* %G1
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow.ll
index 3907ed0f78c9d68c5be3dfebe6971781bcacc827..bff9153a43b6ac7c3eb0a9837cc6fd6208cde212 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | not grep 'load int\* null'
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | not grep 'load int\* null'
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow2.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow2.ll
index d68d207725e758f7b4be7b6f561fca23bdee28f7..ba777768ed9cec5d487294f4a7df9c3da994a2b4 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow2.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/control-flow2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | grep 'load int\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep 'load int\* %A'
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/ArgumentPromotion/recursion.ll b/llvm/test/Regression/Transforms/ArgumentPromotion/recursion.ll
index ca07d3ab08912081983e8c6242e3676dabc52a07..306b969a5dc5bdf9bfcef846014d2edda739e39b 100644
--- a/llvm/test/Regression/Transforms/ArgumentPromotion/recursion.ll
+++ b/llvm/test/Regression/Transforms/ArgumentPromotion/recursion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | grep x.val
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep x.val
 ; XFAIL: *
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/Transforms/BlockPlacement/basictest.ll b/llvm/test/Regression/Transforms/BlockPlacement/basictest.ll
index 34db1eeb06668271700a5f4ae9be207e78c18960..4dafa4f0955ece041fd210217b152c87bbcbe980 100644
--- a/llvm/test/Regression/Transforms/BlockPlacement/basictest.ll
+++ b/llvm/test/Regression/Transforms/BlockPlacement/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -block-placement -disable-output -print
+; RUN: llvm-upgrade < %s | llvm-as | opt -block-placement -disable-output -print
 
 int %test() {
 
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll
index 7e9007912dd0d27540e47c004fef1eaae061e3e4..3100d649ba84867527e68fd009ce414838287574 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 
 void %solve() {
 entry:
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll
index 5dffe4b5adfb851e69ae41f0c9d2123f07bc1732..186466dc9b2334f0ede03546ef8b359e783a02bf 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 ; This testcase is failing the loop extractor because not all exit blocks 
 ; are dominated by all of the live-outs.
 
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll
index 71445557f43167aab2aebbf299914fa9fdfef928..3efcea56acc3078c9a479406c8588c0ee072a3f0 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract-single -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract-single -disable-output
 
 void %ab() {
 entry:
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll
index 3c65f9d70d15bd26e2405be4205c9fb5355efe3a..67756b5ab54cb2b770b71766c847d9fe1e734ae1 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 
 void %sendMTFValues() {
 entry:
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll
index ca5cbf120e07dae055e772ef8058e61761c9fdc1..23ca986bc7d47fcb17b0f7fc7e2863a333ea6210 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 
 	%struct.node_t = type { double*, %struct.node_t*, %struct.node_t**, double**, double*, int, int }
 	%struct.table_t = type { [1 x %struct.node_t**], [1 x %struct.node_t**] }
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll
index 3a91e1d40e4b4d3f62d5ae3fc4daacd598269f26..0ff309191ad0f2b67193824a7a1d1862c0247ec8 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 
 
 void %maketree() {
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
index a128dda0149cbcda1becd19018aac97e6bd3bf67..70d1e0aa8c10631a882ff8fbe184dda3d5884a18 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-extract -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll
index 4f695844ee6a443f593269ca8d9383e6f8bd46ef..c9c23d48e525bffe1df25536176551e759772019 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -extract-blocks -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -extract-blocks -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll b/llvm/test/Regression/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
index b654266f07edb96c33fdf8d09c21e0034b5b61de..4ada2aeb2883df72be1582b2ba779447f4dfd663 100644
--- a/llvm/test/Regression/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
+++ b/llvm/test/Regression/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -extract-blocks -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -extract-blocks -disable-output
 int %foo() {
 	br label %EB
 EB:
diff --git a/llvm/test/Regression/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll b/llvm/test/Regression/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
index 698f8100d4c91449b069ef4e9a8c45421294c94f..e0298313904e237f47b2b1a4f3bd32c1273a1122 100644
--- a/llvm/test/Regression/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
+++ b/llvm/test/Regression/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -condprop -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output
 ; PR877
 
 target endian = big
diff --git a/llvm/test/Regression/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll b/llvm/test/Regression/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
index 8d7ea26d536c9422395e92d4de8ec8215d21bdbb..5221319f9a216064b0a801f29b75c1bf6a569269 100644
--- a/llvm/test/Regression/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
+++ b/llvm/test/Regression/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -condprop -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output
 ; PR979
 target datalayout = "e-p:32:32"
 target endian = little
diff --git a/llvm/test/Regression/Transforms/CondProp/basictest.ll b/llvm/test/Regression/Transforms/CondProp/basictest.ll
index 2e33e9e70869f7d97028b770853d4c20a28b3e07..adc16f8cdd75c6743dada16ab4339dcca0330df3 100644
--- a/llvm/test/Regression/Transforms/CondProp/basictest.ll
+++ b/llvm/test/Regression/Transforms/CondProp/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep 'br label'
 
 int %test(bool %C) {
 	br bool %C, label %T1, label %F1
diff --git a/llvm/test/Regression/Transforms/CondProp/phisimplify.ll b/llvm/test/Regression/Transforms/CondProp/phisimplify.ll
index 818bcab40d243a0badad149b6e549a9cfeac010e..a4728eb191d92a8f78047fb3034a0d759ee7990b 100644
--- a/llvm/test/Regression/Transforms/CondProp/phisimplify.ll
+++ b/llvm/test/Regression/Transforms/CondProp/phisimplify.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi
 
 int %test(uint %C, bool %Val) {
         switch uint %C, label %T1 [
diff --git a/llvm/test/Regression/Transforms/CondProp/phisimplify2.ll b/llvm/test/Regression/Transforms/CondProp/phisimplify2.ll
index 177dac540b0c5612cf08046253fe53514d7449a4..4c83fa38a5540c89b91a13f3ff72c73244229bb6 100644
--- a/llvm/test/Regression/Transforms/CondProp/phisimplify2.ll
+++ b/llvm/test/Regression/Transforms/CondProp/phisimplify2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi
 
 declare bool %foo()
 
diff --git a/llvm/test/Regression/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll b/llvm/test/Regression/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
index 85bac18c11584ba0c48b48632b97787e1c20d749..331501adb3e07a2bd45c7c4bb1752561c98a0b04 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
@@ -1,6 +1,6 @@
 ; Make sure that the constant propogator doesn't divide by zero!
 ;
-; RUN: llvm-as < %s | opt -constprop
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop
 ;
 
 int "test"() {
diff --git a/llvm/test/Regression/Transforms/ConstProp/2002-05-03-NotOperator.ll b/llvm/test/Regression/Transforms/ConstProp/2002-05-03-NotOperator.ll
index 91e495d7bc0f20eeac70c554bbb8a3064d691239..d028dfbadc3264686baef87a1895324ae40d4555 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2002-05-03-NotOperator.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -constprop | llvm-dis | not grep 'int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep 'int 0'
 
 int "test1"() {
 	%R = xor int 123, -1
diff --git a/llvm/test/Regression/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll b/llvm/test/Regression/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
index 1d08e6f2d52e501b39e5ad4f4f19ccbbe7128a67..6b6b340097dc6eda315b7cd2b93dd7acaf25f6dc 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
@@ -1,6 +1,6 @@
 ; SetCC on boolean values was not implemented!
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep 'set'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep 'set'
 
 bool "test1"() {
 	%A = setle bool true, false
diff --git a/llvm/test/Regression/Transforms/ConstProp/2003-05-12-DivideError.ll b/llvm/test/Regression/Transforms/ConstProp/2003-05-12-DivideError.ll
index d926a43465fe5eea2c657686956645396fd9084b..289384bfc5dce16f6f639857fc49e53f7b3280a0 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2003-05-12-DivideError.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2003-05-12-DivideError.ll
@@ -1,6 +1,6 @@
 ; Make sure that the constant propagator doesn't cause a sigfpe
 ;
-; RUN: llvm-as < %s | opt -constprop
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop
 ;
 
 int "test"() {
diff --git a/llvm/test/Regression/Transforms/ConstProp/2005-01-28-SetCCGEP.ll b/llvm/test/Regression/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
index b4984a81727eee903bb05a03f2e574c9047b7924..9a06a458b90d986373b94604b08052d2a6ac7459 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2005-01-28-SetCCGEP.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep 'ret bool false'
 
 %b = external global [2 x {  }] 
 
diff --git a/llvm/test/Regression/Transforms/ConstProp/2006-11-30-vector-cast.ll b/llvm/test/Regression/Transforms/ConstProp/2006-11-30-vector-cast.ll
index ae8d3ab98c4d699a18c24a1664ff53e73912651d..0e7db790021862a863acda75068faf357b5b6430 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2006-11-30-vector-cast.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2006-11-30-vector-cast.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 4294967295 &&
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep zeroinitializer
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 4294967295 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep zeroinitializer
 
 < 4 x uint> %test() {
   %tmp40 = bitcast <2 x long> bitcast (<4 x int> < int 0, int 0, int -1, int 0 > to <2 x long>) to <4 x uint>
diff --git a/llvm/test/Regression/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll b/llvm/test/Regression/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
index c7b2c6fa6d2a71a0d365ad643fe50ec5cf99e950..659900ba8979ed3e333133667089bccd85264a66 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false'
 bool %test() {
   %X = trunc uint 320 to bool
   ret bool %X
diff --git a/llvm/test/Regression/Transforms/ConstProp/2006-12-01-bool-casts.ll b/llvm/test/Regression/Transforms/ConstProp/2006-12-01-bool-casts.ll
index 94dc5c6262fbbbf052d6a40d6c58adaf3b9e7f90..a2d6feb2609e6f2e7a60ba29c1514594e831b697 100644
--- a/llvm/test/Regression/Transforms/ConstProp/2006-12-01-bool-casts.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/2006-12-01-bool-casts.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 'ret int -1' &&
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 'ret uint 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret int -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret uint 1'
 
 int %test1() {
   %A = sext bool true to int
diff --git a/llvm/test/Regression/Transforms/ConstProp/basictest.ll b/llvm/test/Regression/Transforms/ConstProp/basictest.ll
index c75cc51d89e7f78b4e0947657987128d356d5893..178467d83ec6671a20703e0aceabd9bd790603cc 100644
--- a/llvm/test/Regression/Transforms/ConstProp/basictest.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep add
 
 int %test(bool %B) {
 	br bool %B, label %BB1, label %BB2
diff --git a/llvm/test/Regression/Transforms/ConstProp/bswap.ll b/llvm/test/Regression/Transforms/ConstProp/bswap.ll
index 2d7f96449faed246be5379d45219607d101a53f0..d31fa9d7932467fc45b478701ec26bac6907d30e 100644
--- a/llvm/test/Regression/Transforms/ConstProp/bswap.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/bswap.ll
@@ -1,6 +1,6 @@
 ; bswap should be constant folded when it is passed a constant argument
 
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep call
 
 declare ushort %llvm.bswap.i16(ushort)
 declare uint %llvm.bswap.i32(uint)
diff --git a/llvm/test/Regression/Transforms/ConstProp/calls.ll b/llvm/test/Regression/Transforms/ConstProp/calls.ll
index fb924d8b55df03dab4b464a5ae0279dbdb1a7583..35efe8dfed8b741c8a2543ddef4c07f411402554 100644
--- a/llvm/test/Regression/Transforms/ConstProp/calls.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/calls.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep call
 
 declare double %cos(double)
 declare double %sin(double)
diff --git a/llvm/test/Regression/Transforms/ConstProp/float-to-ptr-cast.ll b/llvm/test/Regression/Transforms/ConstProp/float-to-ptr-cast.ll
index 39e0fc7a52b078fa3d2bdfda9a2e6efdca8009d5..dc6c391976bde6c8d8b02dd5b3344701af9eddc3 100644
--- a/llvm/test/Regression/Transforms/ConstProp/float-to-ptr-cast.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/float-to-ptr-cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep -F 'ret int* null' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep -F 'ret int* null' | wc -l | grep 2
 int* %test1() {
   %X = cast float 0.0 to int*
   ret int* %X
diff --git a/llvm/test/Regression/Transforms/ConstProp/logicaltest.ll b/llvm/test/Regression/Transforms/ConstProp/logicaltest.ll
index 082bcaa3dae4274db0452d32e0861dd825fd43e0..dfd45869b2aabedfb853decf764629e6fd89f103 100644
--- a/llvm/test/Regression/Transforms/ConstProp/logicaltest.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/logicaltest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of logical instructions is working correctly.
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not egrep 'and|or|xor'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not egrep 'and|or|xor'
 
 
 int  "test1"() { %R = and int 4,1234          ret int  %R }
diff --git a/llvm/test/Regression/Transforms/ConstProp/nottest.ll b/llvm/test/Regression/Transforms/ConstProp/nottest.ll
index fe9b09480a8435595e0d6417683a5b547d3c4fe7..022a513ae42283d2ac2eed28878b1796b3e321d2 100644
--- a/llvm/test/Regression/Transforms/ConstProp/nottest.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/nottest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propogation of 'not' instructions is working correctly.
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep xor
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep xor
 
 int "test1"() {
 	%R = xor int 4, -1
diff --git a/llvm/test/Regression/Transforms/ConstProp/phi.ll b/llvm/test/Regression/Transforms/ConstProp/phi.ll
index e2c7d5b24df49ca81d4ae86c8456d355194af041..d7624dcacfb4ffd57c7165776b25b092f82978c1 100644
--- a/llvm/test/Regression/Transforms/ConstProp/phi.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/phi.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep phi
 
 int %test(bool %B) {
 BB0:
diff --git a/llvm/test/Regression/Transforms/ConstProp/remtest.ll b/llvm/test/Regression/Transforms/ConstProp/remtest.ll
index e278386dd75e4a31c9a3c944fa41a904d38f3f07..905f4b724f0473c74c2e0df906056f68718dc698 100644
--- a/llvm/test/Regression/Transforms/ConstProp/remtest.ll
+++ b/llvm/test/Regression/Transforms/ConstProp/remtest.ll
@@ -1,6 +1,6 @@
 ; Ensure constant propagation of remainder instructions is working correctly.
 
-; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep rem
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep rem
 
 int %test1() {
 	%R = rem int 4, 3
diff --git a/llvm/test/Regression/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll b/llvm/test/Regression/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
index ce15a43cb8b555c9bce0d0134ae867c2a0a2527a..8d3d434d899cb855c4e246800b89d9fc4d33e877 100644
--- a/llvm/test/Regression/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
+++ b/llvm/test/Regression/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constmerge > /dev/null
+; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge > /dev/null
 
 %foo = internal constant {int} {int 7} 
 %bar = internal constant {int} {int 7} 
diff --git a/llvm/test/Regression/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll b/llvm/test/Regression/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
index 8cad0019b0ba3556bd4681aa14ac386792535e9c..72f8ecf7d1c3d12942b25b893efff05f75e7edc0 100644
--- a/llvm/test/Regression/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
+++ b/llvm/test/Regression/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constmerge | llvm-dis | %prcontext foo 2 | grep bar
+; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | %prcontext foo 2 | grep bar
 
 %foo = constant int 6
 %bar = constant int 6
diff --git a/llvm/test/Regression/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll b/llvm/test/Regression/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll
index d11b783dc47e76ea278a99182fd8fbaed308c116..36786d9262a62f0b15b2b2039fa44705ff9b8e6b 100644
--- a/llvm/test/Regression/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll
+++ b/llvm/test/Regression/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -constmerge | llvm-dis | grep foo
-; RUN: llvm-as < %s | opt -constmerge | llvm-dis | grep bar
+; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | grep foo
+; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | grep bar
 
 ; Don't merge constants in different sections.
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
index 93cdecc0cd806469fe82b69d3b6d7ea20997010d..5873a638a680098793e7a1951223e5e9c780b621 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
index 249680504c4defb082658a332a07e76e6e8eba77..a9d5f0c0167cb7c470c591aa6a22fe25c216a682 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll
@@ -12,7 +12,7 @@
 ;   }
 ; }
 ;
-; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep bb3
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep bb3
 
 implementation
 declare void %bar()
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
index 420373f3bca484bf7de5bb4766699b2f243a61dd..7dd89d4a6476297d59a4a6606aa6e15be7ac961d 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee
 ;
 	%HANDLE = type { int, %HANDLE*, %HANDLE* }
 	%struct.node = type { int, %HANDLE*, %HANDLE* }
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
index 0267f2b3fb7a80dd34970a576e5500bf72706de3..716db54b6a61cd5272812ebf272e60a6d1a8907d 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
index 9d40953ee9bbbb55bcde5472104b1f25e68479eb..f5ce0454e3e94e72bed4ab2cb4558a72f07bdf0d 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee
 ;
 ; This testcase causes an assertion error.
 ;
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
index ee8a6198cfa8c4e375173346adae68ef414e29ce..2f39701adc623ae085dcc89141c5380ebb7c28f5 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll
@@ -1,5 +1,5 @@
 ; Test to make sure that SSA is correctly updated
-; RUN: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee
 ;
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
index de37831e10c4dbd201b2b0d295590094c218c4c8..0348e4011f5103bf82050f0c7c12c3a41d459cc5 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll
@@ -1,5 +1,5 @@
 ; Simple test to make sure dominators are updated properly
-; RUN: llvm-as < %s | opt -cee
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/basictest.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/basictest.ll
index 2f57c6e6bbdb6021b45aba55540879ac649e0959..b403c30c979656169b511becd70f0e106185bc77 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/basictest.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
 
 int %test1(int %A) {
 	%cond = seteq int %A, 40
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/looptest.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/looptest.ll
index c9895d15a5d69d444ae45c8b1b7556e44461ab56..7fe09031c79574cefb92d62d85db14cf735dd0fa 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/looptest.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/looptest.ll
@@ -12,7 +12,7 @@
 ; Note that this is a "feature" test, not a correctness test.
 ;
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep cond213
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep cond213
 ;
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/nullpointer.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/nullpointer.ll
index bec083a093a08157a3f8a0b2c31b3439c1744b60..c6829aaeab9f346895cfea199e107c3572eacb5f 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/nullpointer.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/nullpointer.ll
@@ -2,7 +2,7 @@
 ; Any succeeding uses of the pointer should get this info
 ;
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/switch.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/switch.ll
index 8bf89649201863cc0ce5850ebfbbb7d1a749247d..d8fad3e190d44076b79c8adfc8db4c8ca565365a 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/switch.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/switch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
 
 int %test_case_values_should_propagate(int %A) {
     switch int %A, label %D [
diff --git a/llvm/test/Regression/Transforms/CorrelatedExprs/whet.ll b/llvm/test/Regression/Transforms/CorrelatedExprs/whet.ll
index 8a5339bb35dac689a3b5b3d55f348e9b0e0720f2..ded1e1996a178b7c2410c9ad6f399981316aa4c9 100644
--- a/llvm/test/Regression/Transforms/CorrelatedExprs/whet.ll
+++ b/llvm/test/Regression/Transforms/CorrelatedExprs/whet.ll
@@ -11,7 +11,7 @@
 ;
 ; This should eliminate all BB's except BB0, BB9, BB10
 ;
-; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/arraymerge.ll b/llvm/test/Regression/Transforms/DSAnalysis/arraymerge.ll
index da379ef9ebe77102ba4594ac40d1e36dc4c8aaa2..f1f251e443705b7a78623b1e22e5a3aaecb68a8c 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/arraymerge.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/arraymerge.ll
@@ -2,7 +2,7 @@
 ; folded completely away if possible.  This is a very common case, so it should
 ; be efficient.
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 ;
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/arraytest.ll b/llvm/test/Regression/Transforms/DSAnalysis/arraytest.ll
index 19410efe0b2680b9fd64cb6a7e74d10d035fe7f8..a7a3b4d7d0ccbca8cdd1a4806655772d9dc9d288 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/arraytest.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/arraytest.ll
@@ -1,5 +1,5 @@
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 %crazy = type [2 x { [2 x sbyte], short } ]
 
 implementation
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/badcases.ll b/llvm/test/Regression/Transforms/DSAnalysis/badcases.ll
index 2c0689228b9a25ed3aa73d8a11bbad71f1f70cf5..571107bf5d181130ecd76701a46a1139bc9bd777 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/badcases.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/badcases.ll
@@ -1,6 +1,6 @@
 ; This file contains a list of situations where node folding should happen...
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/basictest.ll b/llvm/test/Regression/Transforms/DSAnalysis/basictest.ll
index 3191441bd8b476efe09c6d4e9b3341ef9543fd04..d2a02a8a7fe24cc5273f7c28c89829f0a62f1e42 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/basictest.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/basictest.ll
@@ -1,6 +1,6 @@
 ; very simple test
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/fieldmerge.ll b/llvm/test/Regression/Transforms/DSAnalysis/fieldmerge.ll
index a95fbdd4321b1949b6f8ea5ac9f4ada756da6b00..dc0c3bc94c819dcb7c9c79ef4f1c389e6f75a072 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/fieldmerge.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/fieldmerge.ll
@@ -1,5 +1,5 @@
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 %str = type { int*, int* }
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/goodcases.ll b/llvm/test/Regression/Transforms/DSAnalysis/goodcases.ll
index 26066056eefd336e71fbb2cc320926a339647744..c7e3a246afc2deb5d4fc07cfdde8b20d97f49adf 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/goodcases.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/goodcases.ll
@@ -1,6 +1,6 @@
 ; This file contains a list of cases where node folding should NOT happen
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 ;
 
 implementation
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/indcalltest.ll b/llvm/test/Regression/Transforms/DSAnalysis/indcalltest.ll
index 71925c0c418b98caad098c1a457bb004b5b6578d..79ed1ae773066c8b94a35fa483a380bede8b6a54 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/indcalltest.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/indcalltest.ll
@@ -1,5 +1,5 @@
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 %G = global int 2		; <int*> [#uses=1]
 %H = global int* null
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/misctests.ll b/llvm/test/Regression/Transforms/DSAnalysis/misctests.ll
index 0e01c6b7d2b4dba7d23ecbe2e5a61180036f1003..0ed847096c1a489eadbbb7059aa805738c93637a 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/misctests.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/misctests.ll
@@ -1,5 +1,5 @@
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 int* %test1(int *%A) {
 	%R = getelementptr int* %A, long 1
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/physicalsubtype.ll b/llvm/test/Regression/Transforms/DSAnalysis/physicalsubtype.ll
index e46dbdd4f4a98eba3d661220deec7fc3cfb6be7f..d16943024a0a4595b0eae515fcc4f21907048e75 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/physicalsubtype.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/physicalsubtype.ll
@@ -1,6 +1,6 @@
 ; A test for "physical subtyping" used in some C programs...
 ;
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 ;
 %ST = type { int, int* }            ; "Subtype"
 %DT = type { int, int*, int }       ; "derived type"
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/recursion.ll b/llvm/test/Regression/Transforms/DSAnalysis/recursion.ll
index 4e686a6f848e76de6ffb15a60960083f54b92f4e..c79183f3b0b0d72d0a310e4ae7f221ef90508a66 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/recursion.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/recursion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/simplest-test.ll b/llvm/test/Regression/Transforms/DSAnalysis/simplest-test.ll
index 47c18b9c935a3daf8e0db80a71d15d3894151175..f28ffe92b225879a8e62a18ad4c0f77ed0ad0529 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/simplest-test.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/simplest-test.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 void %foo(int* %X) {
 	store int 4, int* %X
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/simpletest.ll b/llvm/test/Regression/Transforms/DSAnalysis/simpletest.ll
index 9e6a2c240b15087435d10acb85a90c72b67f771a..c82b38bbe9cbb925f96107198fe043cfea154d63 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/simpletest.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DSAnalysis/structpadding.ll b/llvm/test/Regression/Transforms/DSAnalysis/structpadding.ll
index f776b5c8e08f32146947bec6f3305d1d98122317..8b5cc37d9a51916491f615c8344f5be3379e88ee 100644
--- a/llvm/test/Regression/Transforms/DSAnalysis/structpadding.ll
+++ b/llvm/test/Regression/Transforms/DSAnalysis/structpadding.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -analyze -tddatastructure
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure
 
 %str = type { int, int* }
 
diff --git a/llvm/test/Regression/Transforms/DeadArgElim/2006-06-27-struct-ret.ll b/llvm/test/Regression/Transforms/DeadArgElim/2006-06-27-struct-ret.ll
index 80bbce0c054ad4c41f0081349c32b29777cb30f7..2a7b3a1f0421da23a71136b20380a8afc3e0aedc 100644
--- a/llvm/test/Regression/Transforms/DeadArgElim/2006-06-27-struct-ret.ll
+++ b/llvm/test/Regression/Transforms/DeadArgElim/2006-06-27-struct-ret.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -deadargelim -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DeadArgElim/basictest.ll b/llvm/test/Regression/Transforms/DeadArgElim/basictest.ll
index 424f8e54d3dcf1660d8302382b9b5fe0f2470bee..a3a4235400e942880db8512978d1a0d3acb8b4a5 100644
--- a/llvm/test/Regression/Transforms/DeadArgElim/basictest.ll
+++ b/llvm/test/Regression/Transforms/DeadArgElim/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep DEADARG
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep DEADARG
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DeadArgElim/dead_vaargs.ll b/llvm/test/Regression/Transforms/DeadArgElim/dead_vaargs.ll
index edd3163c61ad26ce7b29200dc481c8873a80e609..c615ed06502ea634ddd9fbc9d1f7e4a60ee379e5 100644
--- a/llvm/test/Regression/Transforms/DeadArgElim/dead_vaargs.ll
+++ b/llvm/test/Regression/Transforms/DeadArgElim/dead_vaargs.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -deadargelim -disable-output &&
-; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep 47 &&
-; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep 1.0
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 47 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 1.0
 
 int %bar(int %A) {
         %tmp4 = tail call int (int, ...)* %foo( int %A, int %A, int %A, int %A, ulong 47, double 1.000000e+00 )
diff --git a/llvm/test/Regression/Transforms/DeadArgElim/deadretval.ll b/llvm/test/Regression/Transforms/DeadArgElim/deadretval.ll
index 33b4bd7cb6be96730b18acb0fc2d064937e1aac4..ccfbc2f7397b4ea4d7d3f642a28310c022edeb55 100644
--- a/llvm/test/Regression/Transforms/DeadArgElim/deadretval.ll
+++ b/llvm/test/Regression/Transforms/DeadArgElim/deadretval.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep DEAD
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/DeadArgElim/deadretval2.ll b/llvm/test/Regression/Transforms/DeadArgElim/deadretval2.ll
index 2596fa66fa2bb80a1c469aa90c84b02c01deb4a0..4f129ab1d061302777b935f59c2fac30a92d1642 100644
--- a/llvm/test/Regression/Transforms/DeadArgElim/deadretval2.ll
+++ b/llvm/test/Regression/Transforms/DeadArgElim/deadretval2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -deadargelim -die | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -die | llvm-dis | not grep DEAD
 
 %P = external global int 
 
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll b/llvm/test/Regression/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
index 31adce14287766668d565b48742d26ff2e753fd4..f963b9aa3911faff05c8756f22176a31e4d17451 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse -scalarrepl -instcombine | llvm-dis | not grep 'ret int undef'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse -scalarrepl -instcombine | llvm-dis | not grep 'ret int undef'
 
 int %test(double %__x) {
 	%__u = alloca { [3 x int] }
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll b/llvm/test/Regression/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
index d9160e5222f785887d303b62b7da562d41e7c501..b78be884dc3734fe651b4231ad5899658c3f0b7f 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | grep 'store int 1234567'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store int 1234567'
 
 ; Do not delete stores that are only partially killed.
 
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll b/llvm/test/Regression/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll
index 4a6ebdf1cf8f791fc368e1fe85fcab526d2b5a25..58b253c9f4a551d87f100b22b18761556927fe4c 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep store
 
 double %foo(sbyte* %X) {
         %X_addr = alloca sbyte*
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll b/llvm/test/Regression/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
index 1d9e8a9eccad5ff5d3427541f88c1e1a550d86c6..1d1be152bf3c26f317b0efb2d94acb5253db2e3a 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -dse -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -dse -disable-output
 target endian = big
 target pointersize = 32
 target triple = "powerpc-apple-darwin8"
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/PartialStore.ll b/llvm/test/Regression/Transforms/DeadStoreElimination/PartialStore.ll
index bc8fd3ab6b28f049cc4c9b151a84adb78c3b2d7f..a9b3366b1a84e400ebe715d8951691d0490caf8f 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/PartialStore.ll
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/PartialStore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep 'store sbyte'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep 'store sbyte'
 ; Ensure that the dead store is deleted in this case.  It is wholely
 ; overwritten by the second store.
 int %test() {
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/alloca.llx b/llvm/test/Regression/Transforms/DeadStoreElimination/alloca.llx
index c75a618d3d4af51913a4537217fa533cb599bdb0..d7aacb5e94b3abadd0d01177115c171bf47e9f30 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/alloca.llx
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/alloca.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD
 
 void %test(int* %Q) {
 	%P = alloca int
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/context-sensitive.llx b/llvm/test/Regression/Transforms/DeadStoreElimination/context-sensitive.llx
index 428030c8e242652264aa7aa7ba25392eb677a481..54396d48ba1a9c9600a7a0242280cbe95b25a5a5 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/context-sensitive.llx
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/context-sensitive.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD
 
 declare void %ext() 
 
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/free.llx b/llvm/test/Regression/Transforms/DeadStoreElimination/free.llx
index afcb5cb641187ad78e13e296c0b40d5b81f982a4..3f0db04f7b9e630806bf39890a5376f3fdbf22c9 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/free.llx
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/free.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD
 
 void %test(int* %Q, int* %P) {
 	%DEAD = load int* %Q
diff --git a/llvm/test/Regression/Transforms/DeadStoreElimination/simple.llx b/llvm/test/Regression/Transforms/DeadStoreElimination/simple.llx
index da1131a4e87bb4907ded9e8efa192e94678de51a..e0ce12d0ac8176ff4dd10f8fa75908b4f60f4df9 100644
--- a/llvm/test/Regression/Transforms/DeadStoreElimination/simple.llx
+++ b/llvm/test/Regression/Transforms/DeadStoreElimination/simple.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD
 
 void %test(int* %Q, int* %P) {
 	%DEAD = load int* %Q
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll b/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
index 129138a49f324e4f9051740d0565685e818ad7f3..e17e9d740f77292b6fac77db17945992cb018ad8 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll b/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
index cdd63494e61a25a077854ac7d6960f6cd3da489a..e9c1d8ce7adf963efeff2139e61994b3f8811f77 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep external
 ;
 
 %X = external global [0 x int]
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll b/llvm/test/Regression/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
index 8be06812f72722cec0098bb07464692753c7cfdf..2ca82686fb6a65e40e6bc0fa99024d9034628d09 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -funcresolve | llvm-dis | not grep declare
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -funcresolve | llvm-dis | not grep declare
 
 declare void %qsortg(sbyte*, int, int)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2002-11-09-ExternFn.ll b/llvm/test/Regression/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
index 8a1723abf0bf05c051a82e928192b95d4f4f35c2..d5eb0ca9b3bedeb8dfc084128e073c7a8dd90993 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
@@ -1,6 +1,6 @@
 ; XFAIL: *
 ;
-; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | not grep '\.\.\.'
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | not grep '\.\.\.'
 
 declare int %foo(...)
 declare int %foo(int)
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
index 1434bb9102e26e40b2a7012ca7721c41fdacab21..663d3eb18f998579e24043995e244624e6e9bb35 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
index 48b5d4690c0f5c5cf61c9b759c9e2cf5e39705f0..b54d595c5f741762d31707c666d0b1c913117502 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output
 
 void %foo(int, int) {
   ret void
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
index d65e89fabdb60dceddd5f48bdf43ac7fbd236005..51b00010232d51c8ce8d5b95479e5e337921ba38 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep declare
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep declare
 
 %Table = constant int(...)* %foo
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
index 9c27d84992a88a541d43ac67900f78dd5d49b3a2..c8d2de6d230a01bd67edfcd7731a5294a5ebd1ee 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | grep declare
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | grep declare
 
 declare void %test(...)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll
index 11e385e14619c8db7d9b7ccd6af1007de8fd73e2..9c22cbfca3be65ae4f7faf337ac11cfe9fdef134 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve | dis | not grep declare
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | dis | not grep declare
 
 declare void %test(int)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
index 353b74fca294c3426a6494eb95374ef4777622b0..e1a29ec28246f1ca5a0eb1a2410b92a1839aa04c 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep foo
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
index 8d89c7d4a4f63b78ec006e2ea971fc7cd24f97a3..4e0a4aff9dbc5950d13b810433d628d3082de75d 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output 2>&1 | not grep WARNING
 
 declare int %foo(int *%X)
 declare int %foo(float *%X)
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
index 8386dfa9a8fde4f8d2e85d577024d92e89d690d5..0865f0d923029a6925b85cbc2cefcd1d7a8cc048 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
@@ -1,7 +1,7 @@
 ; This tests a hack put into place specifically for the C++ libstdc++ library.
 ; It uses an ugly hack which is cleaned up by the funcresolve pass.
 
-; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | grep %X | grep '{'
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | grep %X | grep '{'
 
 %X = external global { int }
 %X = global [ 4 x sbyte ] zeroinitializer
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll b/llvm/test/Regression/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll
index 2736a53a96b9c44cca03969ffeb7664178c57a95..cc481f5143ce5671c712012938a3ec9d69bf8e1f 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output 2>&1 | not grep WARNING
 
 
 void %test() {
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/basictest.ll b/llvm/test/Regression/Transforms/FunctionResolve/basictest.ll
index 7e9468713297f021912f5876cd06ad32a65cc17d..866ae8e54b561dc45d9964fcb1615d8f927c4daf 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/basictest.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare int %foo(...)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch1.ll b/llvm/test/Regression/Transforms/FunctionResolve/retmismatch1.ll
index 6895fb557f0d75f9db481a5b6252b06f1048e4fe..51aeff851c9705adbcc02c521771d7db3a1b715b 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch1.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare int %foo(...)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch2.ll b/llvm/test/Regression/Transforms/FunctionResolve/retmismatch2.ll
index 433f5bb79b58a818945524bb41277f99ed3377b1..749ca40db821040879dd95a76050ce103f7e83b5 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch2.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call
 
 declare void %foo(...)
 
diff --git a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch3.ll b/llvm/test/Regression/Transforms/FunctionResolve/retmismatch3.ll
index d85da646d4f67b1db26cce90ad1c3f914dc75745..f9850d67a7d4230a8a538dbaf161730f6156ef87 100644
--- a/llvm/test/Regression/Transforms/FunctionResolve/retmismatch3.ll
+++ b/llvm/test/Regression/Transforms/FunctionResolve/retmismatch3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -funcresolve
+; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve
 
 declare int %read(...)
 
diff --git a/llvm/test/Regression/Transforms/GCSE/2002-05-21-NoSharedDominator.ll b/llvm/test/Regression/Transforms/GCSE/2002-05-21-NoSharedDominator.ll
index 9d09911ac130b25c0964318711a3738259555224..2c78695e41efa8f537b4793749003af99b3c0985 100644
--- a/llvm/test/Regression/Transforms/GCSE/2002-05-21-NoSharedDominator.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -gcse | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse | llvm-dis
 
 int "test"(int %X, int %Y) {
 	%Z = add int %X, %Y
diff --git a/llvm/test/Regression/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll b/llvm/test/Regression/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll
index 3c3b17da5d527d1964b3e4d2f570f46d89a355a2..4ebb66c37839b9f425b4c00ef4db6420fa402e7b 100644
--- a/llvm/test/Regression/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep load
 
 int %test(int* %P) {
 	store int 5, int* %P
diff --git a/llvm/test/Regression/Transforms/GCSE/gcsetests.ll b/llvm/test/Regression/Transforms/GCSE/gcsetests.ll
index 8ae62d6fed44d7b6f485349adc1d74a762c74810..b866bb7eda7235a73c945f8fe092882c0f5ece3d 100644
--- a/llvm/test/Regression/Transforms/GCSE/gcsetests.ll
+++ b/llvm/test/Regression/Transforms/GCSE/gcsetests.ll
@@ -1,6 +1,6 @@
 ; Various test cases to ensure basic functionality is working for GCSE
 
-; RUN: llvm-as < %s | opt -gcse
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/GCSE/vectorops.ll b/llvm/test/Regression/Transforms/GCSE/vectorops.ll
index 41789605445c1aa74aab3813fc2c437c3182a87d..3804c290d7c200aa33c1968b83d269f5ef5fdac7 100644
--- a/llvm/test/Regression/Transforms/GCSE/vectorops.ll
+++ b/llvm/test/Regression/Transforms/GCSE/vectorops.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -gcse -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine | llvm-dis | not grep sub
 
 uint %test_extractelement(<4 x uint> %V) {
         %R = extractelement <4 x uint> %V, uint 1
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-CastRef.ll b/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-CastRef.ll
index 56d949471f2769e80cf24d1f510dff08e6d2d111..3679d516117548dc92dc2e57e46839de7d729b87 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-CastRef.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-CastRef.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globaldce
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce
 ;
 implementation
 
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll b/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
index 47a8a54cd7a19bb626310f272b86c10fcb1c423f..8bb6da55b9afe6b08ce005e8f34ff97e9fde2e62 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globaldce
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce
 ;
 %X = global void() * %func
 implementation
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll b/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
index cf22be0ee4254de21c882ce2c4f0ec04534224e9..e0af3c2c487801f45a89f285732a27555eab9a76 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -globaldce | llvm-dis | not grep foo
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep foo
 
 %b = internal global int ()* %foo   ;; Unused, kills %foo
 
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll b/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
index cbc783e06de09655e7cb81636cc8011694516d97..493e30c3090f0f462c29212912e5fa5493600865 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -globaldce | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/GlobalDCE/2002-09-12-Redeletion.ll b/llvm/test/Regression/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
index 0f7f075520ab745874f8639b555e102ec9501bd3..bc650d2e89744b347cbd5179a86e176968f624b2 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globaldce
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce
 
 %foo = internal global int 7         ;; Should die when function %foo is killed
 
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2003-07-01-SelfReference.ll b/llvm/test/Regression/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
index e306d9a4aff1d774b4876c716c5873424c378626..afdc1cd12d00c161f363672d479c118eaf36bf95 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
@@ -1,5 +1,5 @@
 ; distilled from 255.vortex
-; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep testfunc
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep testfunc
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll b/llvm/test/Regression/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
index 43ca809abe0957ba06882fcfab44c53a5570f7ac..4c45e7208cd3d036c22bb1d14c3ddbdd398f5467 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
@@ -1,6 +1,6 @@
 ; Weak variables should be preserved by global DCE!
 
-; RUN: llvm-as < %s | opt -globaldce | llvm-dis | grep %A
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | grep %A
 
 
 %A = weak global int 54
diff --git a/llvm/test/Regression/Transforms/GlobalDCE/basicvariabletest.ll b/llvm/test/Regression/Transforms/GlobalDCE/basicvariabletest.ll
index 8990ba37982ae334168e68c51fd35b12de1edbb5..0b5c8b6faee1e4bea3c986ec6f6993839965fe1c 100644
--- a/llvm/test/Regression/Transforms/GlobalDCE/basicvariabletest.ll
+++ b/llvm/test/Regression/Transforms/GlobalDCE/basicvariabletest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep global
 
 %X = uninitialized global int
 %Y = internal global int 7
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx b/llvm/test/Regression/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx
index 67d0dbc266d2734c4262690b1f8554b3910cc92b..8150c52bc7bb45770ef53f764437cfa271486361 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt
 
 %V = global float 12.0
 %G = internal global int* null
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll b/llvm/test/Regression/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
index 1d9b3bf48a7a596b7f9c628f0d9abe7802641a5d..19458c788596f1fa4836398cf1f9ad5b1fd0da97 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output
 ; PR579
 
 %g_40507551 = internal global short 31038		; <short*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/2005-09-27-Crash.ll b/llvm/test/Regression/Transforms/GlobalOpt/2005-09-27-Crash.ll
index 422ddad77d86a434a3e69df70b9fbc346ee6c7a1..948687724f5d518777e14039383b9f11593fae60 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/2005-09-27-Crash.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/2005-09-27-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output
 	%RPyString = type { int, %arraytype.Char }
 	%arraytype.Char = type { int, [0 x sbyte] }
 	%arraytype.Signed = type { int, [0 x int] }
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll b/llvm/test/Regression/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
index bba399a5890c059f0714539e6b9f2d1f3941c971..cd76681a101539a59d97159c433fa9b789e45725 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output
 	%struct._list = type { int*, %struct._list* }
 	%struct._play = type { int, int*, %struct._list*, %struct._play* }
 %nrow = internal global int 0		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/basictest.llx b/llvm/test/Regression/Transforms/GlobalOpt/basictest.llx
index 46fac76433b3320360243caac343a7885614b714..1f97fc03aabb126ae80d9d5b422cd67882bda4f9 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/basictest.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/basictest.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global
 
 %X = internal global int 4
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/ctor-list-opt.ll b/llvm/test/Regression/Transforms/GlobalOpt/ctor-list-opt.ll
index f402fac106c9299bf8083267cb6dbcb51264c34f..8f75deb61b6c5be38c05d5c2412309a2693d2c59 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/ctor-list-opt.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/ctor-list-opt.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -globalopt -disable-output &&
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep CTOR
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep CTOR
 
 %llvm.global_ctors = appending global [10 x { int, void ()* }] [ 
   { int, void ()* } { int 65535, void ()* %CTOR1 },
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/deadglobal-2.llx b/llvm/test/Regression/Transforms/GlobalOpt/deadglobal-2.llx
index d426aff5c6b36cddabc2d2142727079dc0cb6228..5fa98250a4a03979af2ee4c06287d495473039e8 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/deadglobal-2.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/deadglobal-2.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal
 
 ; This is a harder case to delete as the GEP has a variable index.
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/deadglobal.llx b/llvm/test/Regression/Transforms/GlobalOpt/deadglobal.llx
index c0819c0c6480315ab98532f39ec2cfe2b62a7410..a7397bf0fd9c19b48fbfd7dda7631323c1fe40e2 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/deadglobal.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/deadglobal.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal
 
 %G = internal global int 123
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/globalsra-partial.llx b/llvm/test/Regression/Transforms/GlobalOpt/globalsra-partial.llx
index 9b3788e463a34339066dd4394e45268c3797396a..e060565b114e891ba96257bb85ed892a8244c33d 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/globalsra-partial.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/globalsra-partial.llx
@@ -1,6 +1,6 @@
 ; In this case, the global can only be broken up by one level.
 
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep 12345
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep 12345
 
 %G = internal global { int, [4 x float] } zeroinitializer
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/globalsra.llx b/llvm/test/Regression/Transforms/GlobalOpt/globalsra.llx
index 920abb13c7b7d0330e898a6bdb9b95ec4fc7c05e..a87b954988ce3ce0ff8bd81b972b7ca5100c365c 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/globalsra.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/globalsra.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global
 
 %G = internal global { int, float, {double} } { int 1, float 1.0, {double} {double 17.27} }
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/integer-bool.ll b/llvm/test/Regression/Transforms/GlobalOpt/integer-bool.ll
index 2daf9550f6e037a1a72934700d2760d993fac497..4c1fcb6ecef728b97a18dd0dda3e2f893b7d4e25 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/integer-bool.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/integer-bool.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | llvm-dis | grep 'ret bool true'
 
 ;; check that global opt turns integers that only hold 0 or 1 into bools.
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/iterate.llx b/llvm/test/Regression/Transforms/GlobalOpt/iterate.llx
index 1d4680844c1db528b0fd5339d5804bd24d2fe0c8..e4e59c63a4079e7d9806ea58440af901da45c018 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/iterate.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/iterate.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep %G
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep %G
 
 %G = internal global int 0
 %H = internal global { int* } { int* %G }
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/load-store-global.llx b/llvm/test/Regression/Transforms/GlobalOpt/load-store-global.llx
index 2d79dd1ac3452d36247af7e6c441669ddc54cf0d..bf5d3a256ac714e87863f9ac2ea1ca6f1efbc2b8 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/load-store-global.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/load-store-global.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep G
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep G
 
 %G = internal global int 17
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-1.llx b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-1.llx
index 423c51e937165398e284c2c73c0e025955f09d84..068e96fc2c464d8a08dc5b8545302d455fb39f27 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-1.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-1.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global
 
 %G = internal global int* null
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-2.llx b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-2.llx
index f231963f57e37f932947e37efbb7302c008cb630..12d4c6d5bb293f36bfc6f2e6e991ba16a1bd1c9a 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-2.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-2.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep malloc
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep malloc
 
 %G = internal global int* null
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-3.llx b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-3.llx
index f2aad76e2b910cc03f9d7cbac9101d203b0157d1..85ce6bdbc862db6bb1af1e1e9c9471559b8c4ea3 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-3.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/malloc-promote-3.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep malloc
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep malloc
 
 %G = internal global int* null
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
index 1611c8efb4a8f16cda64a3f6754c3b9f7d5efaa1..253aaec63139945b3721b708c1774baf696ebf30 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep 'G1 = internal constant'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'G1 = internal constant'
 
 %G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/memset.ll b/llvm/test/Regression/Transforms/GlobalOpt/memset.ll
index ff6c4219249c71aa3ea295f5a65012af6200b1e0..5159d2861e4fc15d8dc999b673ce543c89f3a093 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/memset.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/memset.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal
 ; both globals are write only, delete them.
 
 %G0 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/phi-select.llx b/llvm/test/Regression/Transforms/GlobalOpt/phi-select.llx
index 29890600def61b8e6bbb1c1d890bfb659d06d56b..2389c0a8bcafdfc67cda7839e3d630a3d8618ca9 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/phi-select.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/phi-select.llx
@@ -1,7 +1,7 @@
 ; Test that PHI nodes and select instructions do not necessarily make stuff
 ; non-constant.
 
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global
 
 %X = internal global int 4
 %Y = internal global int 5
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/storepointer-compare.llx b/llvm/test/Regression/Transforms/GlobalOpt/storepointer-compare.llx
index a6e8ea3d2ee986ef9b3ebd99b4e8e9df8ee59c36..5340feed387ed79d54ba796828b3d057602252ba 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/storepointer-compare.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/storepointer-compare.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep 'call void %Actual'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'call void %Actual'
 
 ; Check that a comparison does not prevent an indirect call from being made 
 ; direct.  The global will still remain, but indirect call elim is still good.
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/storepointer.llx b/llvm/test/Regression/Transforms/GlobalOpt/storepointer.llx
index c10ee7cbf64b9dff45d145d84595e1c316c4246b..a424d255bd710a35085e4ff9aef9b64323bf0d17 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/storepointer.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/storepointer.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global
 
 %G = internal global void ()* null
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/trivialstore.llx b/llvm/test/Regression/Transforms/GlobalOpt/trivialstore.llx
index af2d61287c2759bcd366c08e03cbc7273c3a6e7e..8b1f1ce52504ebf663c4dfaeac7e33433c771f64 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/trivialstore.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/trivialstore.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep G
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep G
 
 %G = internal global int 17
 
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/undef-init.llx b/llvm/test/Regression/Transforms/GlobalOpt/undef-init.llx
index f4e110130e4f31fdbfd19ba8f3b708331ed60c40..2f073c2ff043b8d8e8a7587ddd7f77de6a2e793b 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/undef-init.llx
+++ b/llvm/test/Regression/Transforms/GlobalOpt/undef-init.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep store
 
 %llvm.global_ctors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %_GLOBAL__I__Z3foov } ]		; <[1 x { int, void ()* }]*> [#uses=0]
 %X.0 = internal global int undef		; <int*> [#uses=2]
diff --git a/llvm/test/Regression/Transforms/IPConstantProp/deadarg.ll b/llvm/test/Regression/Transforms/IPConstantProp/deadarg.ll
index e28796acdab8b84c16e661fdf5f39cf0fdcd3141..5e41ade2b63aa85916dc2ad09f825c502a96a593 100644
--- a/llvm/test/Regression/Transforms/IPConstantProp/deadarg.ll
+++ b/llvm/test/Regression/Transforms/IPConstantProp/deadarg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipconstprop -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -disable-output
 implementation
 
 internal void %foo(int %X) {
diff --git a/llvm/test/Regression/Transforms/IPConstantProp/recursion.ll b/llvm/test/Regression/Transforms/IPConstantProp/recursion.ll
index ac36eabcd311eb342e10f7efa756094b994852ec..10f18e591c15ec87c4986c104d3891a8bbbcc4a2 100644
--- a/llvm/test/Regression/Transforms/IPConstantProp/recursion.ll
+++ b/llvm/test/Regression/Transforms/IPConstantProp/recursion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipconstprop -deadargelim | llvm-dis | not grep %X
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -deadargelim | llvm-dis | not grep %X
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/IPConstantProp/return-constant.ll b/llvm/test/Regression/Transforms/IPConstantProp/return-constant.ll
index 50c55d88bfb36b0fef93f9bc02ad7091a09a0ba1..3518a25c16b6bed430e68d7cc23b35e2e76821dd 100644
--- a/llvm/test/Regression/Transforms/IPConstantProp/return-constant.ll
+++ b/llvm/test/Regression/Transforms/IPConstantProp/return-constant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipconstprop -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -instcombine | llvm-dis | grep 'ret bool true'
 implementation
 
 internal int %foo(bool %C) {
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll
index 81a02771a7c0a8acbacc1425542caba73c212e8e..4c80e4851f41f780fb04fb9f8e496bfe2538b636 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -indvars
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars
 ;
 void %test(int %A, uint %S, sbyte* %S) {
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll
index b21e3bbf6c168fdfdf41221dc2e934f6e9d9e672..2f198255ebf3422839a160e20310dd2f56037bfd 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -indvars
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars
 
 %X = global int 7
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
index e5c7874df5ad6821b420f58c530f011bc7a3b4c2..ea1e585490484d313bfadb56600bf8a5b03b7d3a 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar
 
 int %test() {
 	br bool true, label %LoopHead, label %LoopHead
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll
index ccb578737226ed534532352ce7c2e16c8e9e7400..d715f688f1922e5a5a75c108a01c077154a26409 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars  | llvm-dis | %prcontext Loop: 1 | grep %indvar
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars  | llvm-dis | %prcontext Loop: 1 | grep %indvar
 
 ; The indvar simplification code should ensure that the first PHI in the block 
 ; is the canonical one!
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
index 87ed4c59ff1f0da76649f81d57dea74cdc5e85b4..743827df3f1df57204ce5360e12d99e0df911ef5 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
@@ -1,7 +1,7 @@
 ; The induction variable canonicalization pass shouldn't leave dead
 ; instructions laying around!
 ;
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | not grep '#uses=0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | not grep '#uses=0'
 
 int %mul(int %x, int %y) {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx
index 114dff52a081cd381f4853a45484d7edc0732a5d..09d384ebb979e423d5bd03721c1e900639b26b29 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 void %test() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-15-Crash.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-15-Crash.llx
index a74bc8d00a75632bcaa4bac85737c8851c30fcb9..372472811e1805bb540bbd23b2a5e1b971f9c25c 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-15-Crash.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-15-Crash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output 
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output 
 void %_ZN17CoinFactorization7cleanupEv() {
 entry:
 	br bool false, label %loopexit.14, label %cond_continue.3
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
index 7ebd89067eba9f35fe19d23dd91b5bd4eb47632b..26fecf45eeb85b22970dcfe35a2e91e8aa8e5ea5 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar | not grep uint
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar | not grep uint
 
 %G = global long 0
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll
index dda6d9d4d20bd6fc92bcf31dc052d2548dd7f827..88c393ea39732c71fb54447cc2181896412517cd 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx
index 40b1b2be5f9c38e4523b85f4f48690e93ec57825..c0d841024ccaca3a9675e76668d61f9018d8e782 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 	%struct.__false_type = type { ubyte }
 	"struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>" = type { "struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>"*, "struct.llvm::Constant"* }
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
index f4ee707f9ec6d7af7d2e5ea2b506931954903a30..82212d5c720eb55ab9f47b635f3bf5ba1dfd20e8 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 void %.outPlank_21() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll
index df925d14cb9ded4a372c7a7818f4623d109d58ef..92a48308b2ad90a54026d1aedf5cdda6a78d7429 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 void %_ZN5ArrayISt7complexIdEEC2ERK10dim_vector() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll
index 36987cac7dbcfd5db7dece87a5eb6b2fa8fb5b4f..5ba8bdb622f374081c954268772ad0564e8be072 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
index 57f1feeaaa07e359c5d8def7e031c13b9dcd9c00..7bda152b4f6d68be488f1af47c10d945fe8543de 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret int 152'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 152'
 
 int %main() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll
index 0ff77ef33a1542c86abcacc72b9c4d53327885bc..896482c29b2b23316955ee535eb93b074b45376d 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 void %main() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-11-18-Crash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-11-18-Crash.ll
index b7b0fcad5be45d640739fe3505af5b2fbbaeb109..9960e5cdb2b65d30f8c13f9fc3f74e9940c92742 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2005-11-18-Crash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2005-11-18-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 %fixtab = external global [29 x [29 x [2 x uint]]]		; <[29 x [29 x [2 x uint]]]*> [#uses=1]
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
index 540174048044e96cc68d14fb647fd2a5e5f8c91f..30f0c95b9f1e4048b6faf7160094b0318c89fc0c 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret int 27'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 27'
 
 ; Make sure to compute the right exit value based on negative strides.
 ; PR726
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll
index 1f71c4e7d7dcfbfc49ac91fc5b282673a9340118..1fe8026ef43e114bbcb345d4d149b6484ea50b80 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 void %get_block() {
 endif.0:		; preds = %entry
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll
index eb3b6594df2d2161b854b8f4ee2746222adbff82..88872f67c91357bb1d8051166a57854df13f377c 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output
 
 	%struct.p7prior_s = type { int, int, [200 x float], [200 x [7 x float]], int, [200 x float], [200 x [20 x float]], int, [200 x float], [200 x [20 x float]] }
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/complex-scev.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/complex-scev.ll
index 2311f20e68a922142dde6f0cbed9f92787b90767..773d71a20ca5c34a419df02f7c0825ef40faf995 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/complex-scev.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/complex-scev.ll
@@ -1,7 +1,7 @@
 ; The i induction variable looks like a wrap-around, but it really is just
 ; a simple affine IV.  Make sure that indvars eliminates it.
 
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep phi | wc -l | grep 1
 
 void %foo() {
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/exit_value_tests.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/exit_value_tests.llx
index 3f527ca369a55ee8b7840ce6e1a15f2c5dda03f7..7d5d36686406420db4dfc4249d6649d2c137ab61 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/exit_value_tests.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/exit_value_tests.llx
@@ -2,7 +2,7 @@
 ; these loops all have predictable exit values we can replace the use outside
 ; of the loop with a closed-form computation, making the loop dead.
 ;
-; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
 
 int %polynomial_constant() {
         br label %Loop
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/lftr_simple.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/lftr_simple.llx
index 6ffd14835243eb4fafb712cfbb971c7eb3be26d5..2265e57c6a2a6a583544c3aa0c78e9cbd6490e98 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/lftr_simple.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/lftr_simple.llx
@@ -1,6 +1,6 @@
 ; LFTR should eliminate the need for the computation of i*i completely.  It 
 ; is only used to compute the exit value.
-; RUN: llvm-as < %s | opt -indvars -dce | llvm-dis | not grep mul
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -dce | llvm-dis | not grep mul
 
 %A = external global int
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/loop_evaluate_1.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/loop_evaluate_1.ll
index 9fb4d3e5c873839c78fd363f49f8467f07cba5ce..ead9b916a23b59f58fb57ee0baef9269a888ddfb 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/loop_evaluate_1.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/loop_evaluate_1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
 ;
 ; Testcase distilled from 256.bzip2
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/pointer-indvars.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/pointer-indvars.ll
index b5eb106b1007c16c23bccd1cec0326130d38f82e..57f7d2470f1c38c696729046cc19a1d32817100f 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/pointer-indvars.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/pointer-indvars.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar
 
 %G = global int* null
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/subtract.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/subtract.ll
index 49f40891728a2dea5fa36d4c3793ff83ac636d58..9cff198ff5a9cc79c8b0e614273945e298dcdc2c 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/subtract.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/subtract.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar
 
 %G = global long 0
 
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_compute.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_compute.llx
index ae30c15b4e282c26d786c55d78df9822f6a3d674..733fa1d3ef8af9e119866dd56af21b394de60774 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_compute.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_compute.llx
@@ -3,7 +3,7 @@
 ; the exit value of the loop will be for some value, allowing us to substitute
 ; it directly into users outside of the loop, making the loop dead.
 ;
-; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
 
 int %linear_setne() {   ;; for (i = 0; i != 100; ++i)
 entry:
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_infinite.llx b/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_infinite.llx
index 85364c68c79825ebf9a327da3015d738829f7170..d20e85532a128cb0e11d484c8540869ca2390178 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_infinite.llx
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/tripcount_infinite.llx
@@ -1,8 +1,8 @@
 ; These tests have an infinite trip count.  We obviously shouldn't remove the 
 ; loops!  :)
 ;
-; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | grep set | wc -l > %t2
-; RUN: llvm-as < %s | llvm-dis | grep set | wc -l > %t1
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | grep set | wc -l > %t2
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep set | wc -l > %t1
 ; RUN: diff %t1 %t2
 
 int %infinite_linear() {   ;; test for (i = 1; i != 100; i += 2)
diff --git a/llvm/test/Regression/Transforms/IndVarsSimplify/variable-stride-ivs.ll b/llvm/test/Regression/Transforms/IndVarsSimplify/variable-stride-ivs.ll
index d04968d4ea03f314ccc98e4d9fe71c81ed6e9ff9..a8883ffa9f2ed5786c65a1db573bb0d1e0720342 100644
--- a/llvm/test/Regression/Transforms/IndVarsSimplify/variable-stride-ivs.ll
+++ b/llvm/test/Regression/Transforms/IndVarsSimplify/variable-stride-ivs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -instcombine | llvm-dis | grep 'store int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | grep 'store int 0'
 ; Test that -indvars can reduce variable stride IVs.  If it can reduce variable
 ; stride iv's, it will make %iv. and %m.0.0 isomorphic to each other without 
 ; cycles, allowing the tmp.21 subtraction to be eliminated.
diff --git a/llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll b/llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll
index f81b4022967ec5ec1a9721e38d705fd2eeab4f16..48d563366bedb476cc7d20ea0cbbbc86267a6de3 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 declare int %External()
 
diff --git a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll
index d1db941f096c0399ae4b78e65883164dda6cfb94..6e4d1b39e7edf6d6c8f514768be6b03d77a8fb4a 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 implementation
 
 int %main() {
diff --git a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll
index 248f3d8490ed392eb68329ca56cae70d4bb959b5..e73199c29c103d622df96437ea2c7ab833016b51 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll
index 090b7799435271d800775f782c2b0bad6712e7c8..774639b744ee9699d00b6447de53a078ceeae73f 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 implementation   
 
 int %main() {
diff --git a/llvm/test/Regression/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll b/llvm/test/Regression/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll
index 3aa271c7ac916c6c160b9b0dbd2a05a9cfdf6bb5..ca163edc5cc545d541ce66605b82310fcefa06fa 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll b/llvm/test/Regression/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll
index 20b4052f9c1a561144805eb64753686886a0aad3..785a425b12015b1a749464b60e9f63fad684c6ab 100644
--- a/llvm/test/Regression/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll
+++ b/llvm/test/Regression/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll
@@ -2,7 +2,7 @@
 ; node in the exception destination, and the inlined function contains an 
 ; unwind instruction.
 
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/2004-04-15-InlineDeletesCall.ll b/llvm/test/Regression/Transforms/Inline/2004-04-15-InlineDeletesCall.ll
index 8ac123f32cc9b85f5d22ba5786d7d9ccfc5e84b1..e1ecaed83ed09e486f7fe9eab9c11bd512657075 100644
--- a/llvm/test/Regression/Transforms/Inline/2004-04-15-InlineDeletesCall.ll
+++ b/llvm/test/Regression/Transforms/Inline/2004-04-15-InlineDeletesCall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 ; Inlining the first call caused the inliner function to delete the second
 ; call.  Then the inliner tries to inline the second call, which no longer
diff --git a/llvm/test/Regression/Transforms/Inline/2004-04-20-InlineLinkOnce.llx b/llvm/test/Regression/Transforms/Inline/2004-04-20-InlineLinkOnce.llx
index bfd3e1dfba750996ffe60713d4595ee9e6d0ce76..4fab1c99346a424f80ba7f01aaf895dd044f9287 100644
--- a/llvm/test/Regression/Transforms/Inline/2004-04-20-InlineLinkOnce.llx
+++ b/llvm/test/Regression/Transforms/Inline/2004-04-20-InlineLinkOnce.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll b/llvm/test/Regression/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll
index caae0836bd9cad835997f59aee3e526568253293..016fc5a4ab04fc88f54c8ff67de07c010bf9e728 100644
--- a/llvm/test/Regression/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll
+++ b/llvm/test/Regression/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output
 
 int %test() {
 	unwind
diff --git a/llvm/test/Regression/Transforms/Inline/2006-01-14-CallGraphUpdate.ll b/llvm/test/Regression/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
index c40fe6fc8829ac21413c4efe3bfada6b09168edd..cb9241154e3acd99bc51f3e0ed3f8382dd789fa1 100644
--- a/llvm/test/Regression/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
+++ b/llvm/test/Regression/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output
 
  	"struct.std::__codecvt_abstract_base<char,char,__mbstate_t>" = type { "struct.std::locale::facet" }
 	"struct.std::basic_streambuf<wchar_t,std::char_traits<wchar_t> >" = type { int (...)**, int*, int*, int*, int*, int*, int*, "struct.std::locale" }
diff --git a/llvm/test/Regression/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll b/llvm/test/Regression/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
index 2baa6e5096d3dc74920465db9533a8bd5728b23d..8429e7c45aa3fb7613688976695a6b37d9149fda 100644
--- a/llvm/test/Regression/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
+++ b/llvm/test/Regression/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output
 ; PR827
 
 %_ZTV8CRjii = internal global [1 x int (...)*] [ int (...)* %_ZN8CRjii12NlFeeEPN5Jr7sE ]		; <[1 x int (...)*]*> [#uses=0]
diff --git a/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll b/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
index 0dc55474f0b2d19203549b4acd2513d06f56cc67..705961b65b4c617366762be1d9c044ea3118efeb 100644
--- a/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
+++ b/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output
 ; PR993
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate.ll b/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
index d7eb057e3f108124dbe73eafe84e9751abefd831..1b137cf5f020afd6709b996f3079905729b483b0 100644
--- a/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
+++ b/llvm/test/Regression/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output
 ; PR992
 target datalayout = "e-p:32:32"
 target endian = little
diff --git a/llvm/test/Regression/Transforms/Inline/alloca_test.ll b/llvm/test/Regression/Transforms/Inline/alloca_test.ll
index 4b474908ee23b2d7f741fa7c48821e01709e0512..35ded4f0d763c4c33b8c2280f59b9942027bc1da 100644
--- a/llvm/test/Regression/Transforms/Inline/alloca_test.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline | llvm-dis | %prcontext alloca 1 | grep Entry:
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | %prcontext alloca 1 | grep Entry:
 
 int %func(int %i) {
 	%X = alloca int 
diff --git a/llvm/test/Regression/Transforms/Inline/basictest.ll b/llvm/test/Regression/Transforms/Inline/basictest.ll
index e32007839bf0eade977021c22b2e45c2638b1261..30d87b25bc33fbac6855d81c930ab3df686a3dfd 100644
--- a/llvm/test/Regression/Transforms/Inline/basictest.ll
+++ b/llvm/test/Regression/Transforms/Inline/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output -print
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output -print
 
 int %func(int %i) {
 	ret int %i
diff --git a/llvm/test/Regression/Transforms/Inline/casts.ll b/llvm/test/Regression/Transforms/Inline/casts.ll
index 8b597adca0d5f0f3cc7cc014a16d4d71082e0864..c201a457bcc43c473d0963d6ddbf4cc9ed64575a 100644
--- a/llvm/test/Regression/Transforms/Inline/casts.ll
+++ b/llvm/test/Regression/Transforms/Inline/casts.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline | llvm-dis | grep 'ret int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep 'ret int 1'
 ; ModuleID = 'short.opt.bc'
 
 implementation   ; Functions:
diff --git a/llvm/test/Regression/Transforms/Inline/cfg_preserve_test.ll b/llvm/test/Regression/Transforms/Inline/cfg_preserve_test.ll
index 7548b52ddef8911a493fbcdf26afa4632030c0dd..c444f3a2298e73b14c619539eedd51529a8d9cfa 100644
--- a/llvm/test/Regression/Transforms/Inline/cfg_preserve_test.ll
+++ b/llvm/test/Regression/Transforms/Inline/cfg_preserve_test.ll
@@ -1,6 +1,6 @@
 ; This test ensures that inlining an "empty" function does not destroy the CFG
 ;
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep br
 
 int %func(int %i) {
 	ret int %i
diff --git a/llvm/test/Regression/Transforms/Inline/dynamic_alloca_test.ll b/llvm/test/Regression/Transforms/Inline/dynamic_alloca_test.ll
index 27c7d717a1118de6bac024779243d03215a8d867..2b30b30ab76ca162009ecfefe85805323608a4ea 100644
--- a/llvm/test/Regression/Transforms/Inline/dynamic_alloca_test.ll
+++ b/llvm/test/Regression/Transforms/Inline/dynamic_alloca_test.ll
@@ -1,9 +1,9 @@
 ; Test that functions with dynamic allocas get inlined in a case where
 ; naively inlining it would result in a miscompilation.
 
-; RUN: llvm-as < %s | opt -inline &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | grep llvm.stacksave &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep callee
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep llvm.stacksave &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee
 
 declare void %ext(int*)
 implementation
diff --git a/llvm/test/Regression/Transforms/Inline/inline-tail.ll b/llvm/test/Regression/Transforms/Inline/inline-tail.ll
index f5eb62900d8b292afb9132c9a35b0e1d9ea3c783..31e036fe65affc4b403cd07e02e23ac80705eff0 100644
--- a/llvm/test/Regression/Transforms/Inline/inline-tail.ll
+++ b/llvm/test/Regression/Transforms/Inline/inline-tail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep tail
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep tail
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/inline_cleanup.ll b/llvm/test/Regression/Transforms/Inline/inline_cleanup.ll
index a26045061d53639d45934869cae974f4fae3d3f9..f0c153b4ca074b6c0951f2bc4b60820d99928314 100644
--- a/llvm/test/Regression/Transforms/Inline/inline_cleanup.ll
+++ b/llvm/test/Regression/Transforms/Inline/inline_cleanup.ll
@@ -1,9 +1,9 @@
 ; Test that the inliner doesn't leave around dead allocas, and that it folds
 ; uncond branches away after it is done specializing.
 
-; RUN: llvm-as < %s | opt -inline -disable-output &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'alloca.*uses=0' &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'alloca.*uses=0' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'br label'
 
 %A = weak global int 0		; <int*> [#uses=1]
 %B = weak global int 0		; <int*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/Inline/inline_constprop.ll b/llvm/test/Regression/Transforms/Inline/inline_constprop.ll
index edfb0905f917cf2ebc6796093c082e9e2f18b3ff..d76a88be37f524eaecb33ce57bb5719a8fc463fe 100644
--- a/llvm/test/Regression/Transforms/Inline/inline_constprop.ll
+++ b/llvm/test/Regression/Transforms/Inline/inline_constprop.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -inline -disable-output &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep callee &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep div
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep div
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/inline_dce.ll b/llvm/test/Regression/Transforms/Inline/inline_dce.ll
index bcad01c88327feed2d500ce062d0610accf13360..9dc7a774ae67983e0bf9a8c41ec423caa396c9f5 100644
--- a/llvm/test/Regression/Transforms/Inline/inline_dce.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline | llvm-dis | not grep %reallysmall
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep %reallysmall
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/inline_prune.ll b/llvm/test/Regression/Transforms/Inline/inline_prune.ll
index fdbdf8346f9dd69cdb9505ae6f6eb17dffafe774..dff38802e1f58c4cb798182ef41528f7a41343e6 100644
--- a/llvm/test/Regression/Transforms/Inline/inline_prune.ll
+++ b/llvm/test/Regression/Transforms/Inline/inline_prune.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -inline -disable-output &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'callee[12](' &&
-; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep mul
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'callee[12](' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep mul
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Inline/invoke_test-1.ll b/llvm/test/Regression/Transforms/Inline/invoke_test-1.ll
index 023563a98ac5b7a12e7a1e6dcce3a402a1ec7afd..8409a21561b872666d380a66a6a10101e767dd2c 100644
--- a/llvm/test/Regression/Transforms/Inline/invoke_test-1.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline | llvm-dis | not grep 'call[^e]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'call[^e]'
 
 declare void %might_throw()
 
diff --git a/llvm/test/Regression/Transforms/Inline/invoke_test-2.ll b/llvm/test/Regression/Transforms/Inline/invoke_test-2.ll
index 9c2a8548caede09ff85cd1fdd0468726a893e21d..0913f7c24d9d86545a0924743ef949f3fff3351e 100644
--- a/llvm/test/Regression/Transforms/Inline/invoke_test-2.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler
 
 declare void %might_throw()
 
diff --git a/llvm/test/Regression/Transforms/Inline/invoke_test-3.ll b/llvm/test/Regression/Transforms/Inline/invoke_test-3.ll
index 5601a4b90a613a12c9df7d07786856f34d577a32..b471afe2fb5eb9e02e636d8d7be64e24ead66e38 100644
--- a/llvm/test/Regression/Transforms/Inline/invoke_test-3.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -inline | llvm-dis | not grep unwind$
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep unwind$
 
 declare void %might_throw()
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-03-11-InstCombineHang.ll b/llvm/test/Regression/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
index 3bf86482ed974f7dc450952795d4fc06917d93b6..dd683a3d99abc3e6812d6cc2f7f801b995c7419a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2002-03-11-InstCombineHang.ll
@@ -1,6 +1,6 @@
 ; This testcase causes instcombine to hang.
 ;
-; RUN: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll b/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll
index 6f832f2b666a575bacd77aba1c9b42a14aaa0435..1228fd0acaee3b86aa0e5402df3f3213ecd48b51 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep add
 ;
 
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll b/llvm/test/Regression/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll
index 1ebe6c8f1dfca82ff6e226c5e61d52886426f0cd..9c278edc8dc859df78ef8f9dd012abbe09efd8d0 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 ;
 
 %.LC0 = internal global [21 x sbyte] c"hbMakeCodeLengths(1)\00"		; <[21 x sbyte]*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-08-02-CastTest.ll b/llvm/test/Regression/Transforms/InstCombine/2002-08-02-CastTest.ll
index 239c96cfb4a57eadac59c08e2cf3caee633ec6b8..55609f1e7f86e64db816e5d288ed79293981c0d7 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-08-02-CastTest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine | llvm-dis | grep '%c'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c'
 ;
 ulong %test3(ulong %A) {
         %c1 = cast ulong %A to ubyte
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
index db2b504339fa1820721673d431e939f109fbee87..69bec19b2be62b0b555f52c3b55a6752abf7f8c3 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 
 %bob = type { int }
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
index ec29e6bbbd1ac1a29657b8b46796b4eb83cbefe0..6233e5027b6c1e76ff38bf024581fca3efb36f16 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep add
 
 int %test(int %A) {
   %A.neg = sub int 0, %A
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-05-26-CastMiscompile.ll b/llvm/test/Regression/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
index 218a536ef63f111059a504a571c0b891fa40961c..453258980d57b94deed5cd2918c5e45f555220e7 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 4294967295
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 4294967295
 
 ulong %test(ulong %Val) {
         %tmp.3 = cast ulong %Val to uint              ; <uint> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
index 309191cdc4195f5f4ae7b07cf096a740a2624953..6222169e08d427f0a587d37a2fb4f2c9cff92457 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 %X = global int 5
 long %test() {
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll b/llvm/test/Regression/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll
index 3d26024fe8d794bdabacf0ad344b79bb9af40468..ae823d6bf6810f26eaad8ee1800677e2605c490a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 ubyte %test19(bool %c) {
         br bool true, label %True, label %False
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll
index 917c86c5e24a2dcce224eeb775b274200543586e..92a32d5d35bac8c26438b93bad0ab42ffcbc15b6 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 %A = global int 1
 %B = global int 2
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-07-21-ExternalConstant.ll b/llvm/test/Regression/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
index 2fc1b206ac8b126ceb868a9b0941b3fb7c0433c0..c9e3b4c5420c2f21b32063e5e6efdd17f6e1eb20 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-07-21-ExternalConstant.ll
@@ -10,7 +10,7 @@
 ;	should pass through the optimizer without failure.
 ;
 ; Extra code:
-; RUN: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 ;
 
 target endian = little
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll b/llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
index e2b2afd15fe7715e9fe6540f6aab65fd35029ba2..52b778c10d0b7c4942050c895fbe09461622071c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'br '
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll b/llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
index 355087a4cef3d77bfb72f57f87e086a72503923a..adb1474a98c4d29a37503e794545c236d3a7cdb8 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep load
 void %test(int* %P) {
 	%X = volatile load int* %P  ; Dead but not deletable!
 	ret void
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll b/llvm/test/Regression/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
index 72f983bde18916d94b485c334e6109b6c74e30ec..837494f5301dfeca18874ba7d80975f7be4bfcd3 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep false
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep false
 ;
 ; This actually looks like a constant propagation bug
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll b/llvm/test/Regression/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll
index cef129192f82df3346e93b29a755342be84a2f17..07b6dd2db3b5263fa686ccf1faa08c6a2210eb86 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 declare int* %bar()
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll b/llvm/test/Regression/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
index 5bb2fe12b6f9b11fba8fc5c164aa63eca25020ea..a2e28d97a11d20f2ef499b81de8b810e102c3d10 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
@@ -1,5 +1,5 @@
 ; The cast in this testcase is not eliminable on a 32-bit target!
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep inttoptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep inttoptr
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll b/llvm/test/Regression/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
index 04bbab8b5786cf626d1a45ad3d948b19d9021995..d257286d8591434881312b025c050345ba8cf6f5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast
 
 declare void %free(sbyte*)
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll b/llvm/test/Regression/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll
index c33f9e9e33287d27d885722df24e6a8ad1219022..ff90c32dafac1015dc1706663cfb44d7dd829616 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll
@@ -5,7 +5,7 @@
 ; invoke instruction, we really cannot perform this transformation at all at
 ; least without splitting the critical edge.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 declare sbyte* %test()
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll b/llvm/test/Regression/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
index 97020c59c7cab048159ffcd9d142f0fceff565a3..85095bf00574bfec148afac440f66423c46eaa99 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 34
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 34
 
 int %test(int %X) {
 	; Do not fold into shr X, 34, as this uses undefined behavior!
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll b/llvm/test/Regression/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll
index 9e77df948a225750b64c9b0a90f2ba7b50b3aabd..fd7a2e346c98bacb6338ac4e1dc052b3396408e5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll
@@ -1,7 +1,7 @@
 ; This testcase caused the combiner to go into an infinite loop, moving the 
 ; cast back and forth, changing the seteq to operate on int vs uint and back.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 bool %test(uint %A, int %B) {
         %C = sub uint 0, %A
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll b/llvm/test/Regression/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll
index b7bfb29f43450e1a2252b1ed6f7277929f67e9b1..4c6ff1b52bfe5c7dd88efbee13a7dbbba4f399b7 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 int %test() {
 	ret int 0
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll b/llvm/test/Regression/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll
index 6776ff185df3050126b8fa67a5de0d93551fdb77..8e8f019c6618b10e49525186ba5f06e046c42596 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 %Ty = type opaque
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll b/llvm/test/Regression/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll
index aa95320ac1f75184ab400e0e9fbbe435de24cce4..7994d45c9f42577f97221b624353f4f755777a59 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 %p = weak global int 0
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-08-09-RemInfLoop.llx b/llvm/test/Regression/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
index 1ed6054c21b0c9071878649f60b153f87326022b..98b35fe3cba6ae1d02bc73e5fd2fdc569bd8d959 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 
 ; This testcase should not send the instcombiner into an infinite loop!
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx b/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
index 5960135f1bc8843726ce2003235ddb0259a454ac..3fcbb88e2dea0937ba8abf7222204bafe9011959 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1'
 
 ; When propagating the load through the select, make sure that the load is
 ; inserted where the original load was, not where the select is.  Not doing
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx b/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
index 297cf87912cfdf957b4a1c91ad8c582a59f91ad2..83acd702c666efb98fc16d6eaea14ddebb434b18 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \
 ; RUN:   grep -v store | not grep 'int 1'
 
 ; Test to make sure that instcombine does not accidentally propagate the load
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx b/llvm/test/Regression/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx
index eaedc855a4a7dd256969c71f67f962917827ae12..bb55b5c67caa83abb0e7a375e70f234f5e819aa2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep -- -65536
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep -- -65536
 
 bool %test(int %tmp.124) {
         %tmp.125 = shl int %tmp.124, ubyte 8
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll b/llvm/test/Regression/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
index c8a1d527334cdd52b5bd3a70da6d5f7e61c8ceb6..1a741c996fe57e1fe79efce0e1c5f5ba0654141e 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep and
 
 sbyte %test21(sbyte %A) {
         %C = shr sbyte %A, ubyte 7   ;; sign extend
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll b/llvm/test/Regression/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
index 759c619e6db2ca6db65ccbb49ddc19b9d3363adb..17958e198a4230879d425f46e1eee46558598519 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
@@ -9,7 +9,7 @@
 ; be eliminated. In many cases the setCC is also eliminated based on the
 ; constant value and the range of the casted value.
 ;
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | notcast '.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast '.*int'
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll
index 02939c0c3eee619fe0f987b53a02f228d16e97a2..6e241f4e782a50a038369739eb727fe8a0a6b6bc 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | opt -instcombine
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine
 
 	%struct.llvm_java_object_base = type opaque
 	"java/lang/Object" = type { %struct.llvm_java_object_base }
diff --git a/llvm/test/Regression/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll b/llvm/test/Regression/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll
index 7f83fa837de25528e7adff8c4583010ea3efaa77..fb18ea24c105565f5c7213099736d6b014b0a878 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine
 
 int %test(int %X) {
 	%Y = rem int %X, undef
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll b/llvm/test/Regression/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
index 05a43965a42e90f01606b27bb743d763da035d3e..c203bb1c442be3e34f023fa3308e2932acb3262c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'ret bool false'
 bool %test(ulong %tmp.169) {
 	%tmp.1710 = shr ulong %tmp.169, ubyte 1
 	%tmp.1912 = setgt ulong %tmp.1710, 0
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll
index b41dbd5941de9024171d6a4bc8ca9a3f764e58c7..8e523d3faef48254c29a2cce9b11d52aa5939d04 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 uint %test(bool %C, uint %tmp.15) {
 	%tmp.16 = select bool %C, uint 8, uint 1
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll
index 0d4e8cac59469d2bc1f3b10a4e388794ef37c426..fa862fed2a8b8651236e5509172a6e33e0bf91a0 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 int %_Z13func_31585107li(int %l_39521025, int %l_59244666) {
 	%shortcirc_val = select bool false, uint 1, uint 0		; <uint> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll
index fed675e318facc68707327dc989238f78a88fd1e..deb61246cf368ce4b784f2736da1cfbd2b50fe82 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 ; PR577
 
 bool %test() {
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-06-16-RangeCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2005-06-16-RangeCrash.ll
index a586d87cac90aeeb1079be8c84195fe501b3d3a5..ef443012252fa8d446634d2d2125523ae10363d2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-06-16-RangeCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-06-16-RangeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 ; PR585
 bool %test() {
 	%tmp.26 = div int 0, -2147483648		; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll b/llvm/test/Regression/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
index 53470971ef5876a7bd786e3c281f3de05800c9dd..49abb12e6fcbef132145fc2340c1d7afae3e3f0c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool true'
 ; PR586
 
 %g_07918478 = external global uint		; <uint*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll b/llvm/test/Regression/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll
index 29a1d7f7946c267a42786e9b714aa2511cb10d38..be9837dc43ae6bb1f519a7da63c02b1c4f099794 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 ; This example caused instcombine to spin into an infinite loop.
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-02-07-SextZextCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2006-02-07-SextZextCrash.ll
index f3591e663a81f62eea4cfb8dd26218a3822bce9b..e06dca914e098130e1ee31e86bbbb43190722003 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-02-07-SextZextCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-02-07-SextZextCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output	
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output	
 
 	%struct.rtx_const = type { uint, { %union.real_extract } }
 	%struct.rtx_def = type { int, [1 x %union.rtunion_def] }
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll b/llvm/test/Regression/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
index f0703386553c8b6e0c13395ebe5727a248f1f04f..f3457751492019ae8958ff90827b911e2fd0290d 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep undef
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep undef
 
 int %test(sbyte %A) {
 	%B = cast sbyte %A to int
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-02-28-Crash.ll b/llvm/test/Regression/Transforms/InstCombine/2006-02-28-Crash.ll
index 17fc8b668f95dd57d3e3f89e598bb9844357a658..241c254dc4ad7e4f3be9e24b504bfce7398bf0c9 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-02-28-Crash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-02-28-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 int %test() {
         %tmp203 = seteq uint 1, 2               ; <bool> [#uses=1]
         %tmp203 = cast bool %tmp203 to int              ; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-03-30-ExtractElement.ll b/llvm/test/Regression/Transforms/InstCombine/2006-03-30-ExtractElement.ll
index 99ecd35a09ec1de6ed5122280493a238cf31d4ff..314946085f509b702b58d2541f1ca33b1137e400 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-03-30-ExtractElement.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-03-30-ExtractElement.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 float %test(<4 x float> %V) {
 	%V2 = insertelement <4 x float> %V, float 1.0, uint 3
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-04-01-InfLoop.ll b/llvm/test/Regression/Transforms/InstCombine/2006-04-01-InfLoop.ll
index d77b1fb19a6c196797dea9585bf94ca2a31e695f..260b9b3ff4cc048c1249ec4f29ea1e1eccc3c5e0 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-04-01-InfLoop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-04-01-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 	%struct.DecRefPicMarking_s = type { int, int, int, int, int, %struct.DecRefPicMarking_s* }
 	%struct.datapartition = type { %typedef.Bitstream*, %typedef.DecodingEnvironment, int (%struct.syntaxelement*, %struct.img_par*, %struct.inp_par*, %struct.datapartition*)* }
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll b/llvm/test/Regression/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
index 5c38342c84f1bea445e81cf9fb87b56e2618c513..12fc742a5fe949df8f0fc0e11dd25503e9b1caef 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 
 ; This cannot be turned into a sign extending cast!
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll
index 2a6a4412ee149aa3428fcc492c4d3e29f1f20db7..6f95e925c70d528f23270db055e16d916b340b16 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 void %test() {
 bb38.i:
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-05-06-Infloop.ll b/llvm/test/Regression/Transforms/InstCombine/2006-05-06-Infloop.ll
index 633b7b6f984b764b776062d9e14f8ac236e14544..ef05e6b354252a22c5fd845a508a4228b69721d1 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-05-06-Infloop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-05-06-Infloop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 	%struct.gs_matrix = type { float, int, float, int, float, int, float, int, float, int, float, int }
 	%struct.gx_bitmap = type { ubyte*, int, int, int }
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll b/llvm/test/Regression/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll
index c6eb3039f37e1896a2e1515be9931c13e4f6a4b7..8cdaa5841f82907dfec0d134fadcced28452d895 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep undef
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep undef
 ; XFAIL: *
 
 %str = constant [4 x ubyte] c"str\00"
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-06-28-infloop.ll b/llvm/test/Regression/Transforms/InstCombine/2006-06-28-infloop.ll
index 2c48ffb2d90538299b3560f002dd66bfae914867..beb4489946bb917e3b0e4695a0d3846c94844958 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-06-28-infloop.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-06-28-infloop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 target endian = big
 target pointersize = 32
 target triple = "powerpc-apple-darwin8"
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll b/llvm/test/Regression/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll
index 0369307b13fe86c8a3f0da86c6b72066daaa3ec8..a8f9cd41bad92f04a3ac08cb9e53256426c2c56c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 ; PR905
 
 	%RPYTHON_EXCEPTION = type { %RPYTHON_EXCEPTION_VTABLE* }
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-09-15-CastToBool.ll b/llvm/test/Regression/Transforms/InstCombine/2006-09-15-CastToBool.ll
index e649b3eedc58a04ad5cb0fe023656e3ae547c17f..c38b32524ae277fc222d4c196f678464621eb3f8 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-09-15-CastToBool.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-09-15-CastToBool.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and
 ; PR913
 
 int %test(int* %tmp1) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll b/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
index f7925e138d2e44d8227b7f25ea36ac3f5867c92f..d3bfdfa65fc644bf139afdcd2d0b255bc2e110f2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
@@ -1,5 +1,5 @@
 ; The optimizer should be able to remove cast operation here.
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | not grep 'sext.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*int'
 
 bool %eq_signed_to_small_unsigned(sbyte %SB) {
    %Y = cast sbyte %SB to uint         ; <uint> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll b/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
index f23f5fb2297f4861ebde19686b22ad89207a11a5..cab0b940d87e5691969cd22881d187c13097e5a9 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
@@ -1,6 +1,6 @@
 ; This test case is reduced from llvmAsmParser.cpp
 ; The optimizer should not remove the cast here.
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'sext.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*int'
 
 bool %test(short %X) {
     %A = cast short %X to uint
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-10-20-mask.ll b/llvm/test/Regression/Transforms/InstCombine/2006-10-20-mask.ll
index 2596d526329717acd7ef394b855ccb4e8a3e1da2..51855cd9b5d0265ed868d13050c8cd0824e5b6ab 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-10-20-mask.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-10-20-mask.ll
@@ -1,4 +1,4 @@
-;  RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'and'
+;  RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'and'
 ulong %foo(ulong %tmp, ulong %tmp2) {
   %tmp = cast ulong %tmp to uint
   %tmp2 = cast ulong %tmp2 to uint
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/llvm/test/Regression/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
index cf68f63e686148b9c6ddfa8138eca283564a4153..a7172b8a09e758a98d647a58740738ada4185c1e 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2
 
 
 <4 x float> %test(<4 x float> %V) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-11-03-Memmove64.ll b/llvm/test/Regression/Transforms/InstCombine/2006-11-03-Memmove64.ll
index b4c3a534cf369a61587184e46453bb3cdf9ad9bd..e863ab86e89028402116175b1a9a878401b6cf49 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-11-03-Memmove64.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-11-03-Memmove64.ll
@@ -1,4 +1,4 @@
-;RUN: llvm-as < %s | opt -instcombine | llvm-dis |not grep memmove.i32
+;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis |not grep memmove.i32
 ; Instcombine was trying to turn this into a memmove.i32
 
 target datalayout = "e-p:64:64"
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll b/llvm/test/Regression/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
index 85c1f915940064cfabc5f7804434aa1e97e5df77..1809d3ce91732162defe84a369a0c1742386f08c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep lshr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep lshr
 ; Verify this is not turned into -1.
 
 int %test(ubyte %amt) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/2006-11-27-XorBug.ll b/llvm/test/Regression/Transforms/InstCombine/2006-11-27-XorBug.ll
index b1dd1e8ec00c1fd6bb0c1e661bdcae3131be8072..615016682987a078daf6ced98f7bb6fd943a4786 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2006-11-27-XorBug.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2006-11-27-XorBug.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'and.*32' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or.*153'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and.*32' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or.*153'
 ; PR1014
 
 int %test(int %tmp1) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/CPP_min_max.llx b/llvm/test/Regression/Transforms/InstCombine/CPP_min_max.llx
index 0a0baf8588af1bda46665b8f4a32dffaa6b73cb8..e64d0b91887dc671a45397a950cd4524a04fbd56 100644
--- a/llvm/test/Regression/Transforms/InstCombine/CPP_min_max.llx
+++ b/llvm/test/Regression/Transforms/InstCombine/CPP_min_max.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep select | not grep 'int\*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select | not grep 'int\*'
 
 ; This testcase corresponds to PR362, which notices that this horrible code
 ; is generated by the C++ front-end and LLVM optimizers, which has lots of
diff --git a/llvm/test/Regression/Transforms/InstCombine/GEPIdxCanon.ll b/llvm/test/Regression/Transforms/InstCombine/GEPIdxCanon.ll
index 0dcce2d794df00f3865a77531d678cf05c5945cd..afaabc3e2f05baac5d00e1c531220074ca902a29 100644
--- a/llvm/test/Regression/Transforms/InstCombine/GEPIdxCanon.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/GEPIdxCanon.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
 
 bool %test(int* %A) {
 	%B = getelementptr int* %A, int 1
diff --git a/llvm/test/Regression/Transforms/InstCombine/IntPtrCast.ll b/llvm/test/Regression/Transforms/InstCombine/IntPtrCast.ll
index c3cc96728de336df96d0c8a1600655cd11968e8c..9f509b6fbc0ac763e1c960adf1390130f5997521 100644
--- a/llvm/test/Regression/Transforms/InstCombine/IntPtrCast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/IntPtrCast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 target pointersize = 32
 
 int *%test(int *%P) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/JavaCompare.ll b/llvm/test/Regression/Transforms/InstCombine/JavaCompare.ll
index 30208f54993c0c5a01258be3996d884e2d2311ad..cce96097a01b5cf41e2733c81574c5b9384ba1fe 100644
--- a/llvm/test/Regression/Transforms/InstCombine/JavaCompare.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/JavaCompare.ll
@@ -1,7 +1,7 @@
 ; This is the sequence of stuff that the Java front-end expands for a single 
 ; <= comparison.  Check to make sure we turn it into a <= (only)
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v setle | not grep '#uses'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v setle | not grep '#uses'
 
 bool %le(int %A, int %B) {
         %c1 = setgt int %A, %B;
diff --git a/llvm/test/Regression/Transforms/InstCombine/add.ll b/llvm/test/Regression/Transforms/InstCombine/add.ll
index 382596ba87209d88cb0e6dcc1d76a6def4c2941a..55eba647f8aa895a69e30bebb8576e735c1541cc 100644
--- a/llvm/test/Regression/Transforms/InstCombine/add.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/add.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v OK | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v OK | not grep add
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/alloca.ll b/llvm/test/Regression/Transforms/InstCombine/alloca.ll
index 23a52c328d7fc15e9eb557a5307a21aa1711e2bd..c5d7818229799370bb2c9ed99c7e9187722d3fef 100644
--- a/llvm/test/Regression/Transforms/InstCombine/alloca.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/alloca.ll
@@ -1,6 +1,6 @@
 ; Zero byte allocas should be deleted.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep alloca
 
 declare void %use(...)
 void %test() {
diff --git a/llvm/test/Regression/Transforms/InstCombine/and-compare.ll b/llvm/test/Regression/Transforms/InstCombine/and-compare.ll
index 35516a5065b60d5e6082c46104e354ca96e6b315..864b8c25e21bdfe0de941f9f3af8b87b491dfc93 100644
--- a/llvm/test/Regression/Transforms/InstCombine/and-compare.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/and-compare.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
 
 ; Should be optimized to one and.
 bool %test1(uint %a, uint %b) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/and-or-and.ll b/llvm/test/Regression/Transforms/InstCombine/and-or-and.ll
index f497f3fd0ce8782d6b2de82a69bf4a3099abeb45..1c8465c7302e0344816a1ac04ae9432e83f4ef0f 100644
--- a/llvm/test/Regression/Transforms/InstCombine/and-or-and.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/and-or-and.ll
@@ -9,7 +9,7 @@
 ;
 ; Which corresponds to test1.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or '
 
 int %test1(int %X, int %Y) {
 	%A = and int %X, 7
diff --git a/llvm/test/Regression/Transforms/InstCombine/and.ll b/llvm/test/Regression/Transforms/InstCombine/and.ll
index ed6d26b9f73fe17d36674d665ab1d763b86545cc..dc30c564d028d23e2c6165fd6d5f597d48c96d56 100644
--- a/llvm/test/Regression/Transforms/InstCombine/and.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/and.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep and
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/binop-cast.ll b/llvm/test/Regression/Transforms/InstCombine/binop-cast.ll
index 13404df94174866b317558db69bdef9f4dbe3ac4..7ca0151159793dad1104f25768fb877e3ba85d78 100644
--- a/llvm/test/Regression/Transforms/InstCombine/binop-cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/binop-cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 
 uint %testAdd(int %X, int %Y) {
 	%tmp = add int %X, %Y
diff --git a/llvm/test/Regression/Transforms/InstCombine/bit-tracking.ll b/llvm/test/Regression/Transforms/InstCombine/bit-tracking.ll
index c7806ec40f8aa54289e725b2fa2e695a22f7aca6..f6654738d7f1d531d829a10fe598b274b2154448 100644
--- a/llvm/test/Regression/Transforms/InstCombine/bit-tracking.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/bit-tracking.ll
@@ -1,7 +1,7 @@
 ; This file contains various testcases that require tracking whether bits are
 ; set or cleared by various instructions.
-; RUN: llvm-as < %s | opt -instcombine -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine -instcombine | llvm-dis | not grep %ELIM
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis | not grep %ELIM
 
 ; Reduce down to a single XOR
 int %test3(int %B) {
diff --git a/llvm/test/Regression/Transforms/InstCombine/bittest.ll b/llvm/test/Regression/Transforms/InstCombine/bittest.ll
index a4f1d418fa261f43de42537d045113770c665e07..7fb5fdee5777054a5d912565feab26a6f2bcdc17 100644
--- a/llvm/test/Regression/Transforms/InstCombine/bittest.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/bittest.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort'
 
 %b_rec.0 = external global int
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/bswap-fold.ll b/llvm/test/Regression/Transforms/InstCombine/bswap-fold.ll
index eb7539c1dd9ab640e0a38519769719ae4ec7845b..0ee486ad1aa869013ea2d5ab4fe03d830b3a8dfb 100644
--- a/llvm/test/Regression/Transforms/InstCombine/bswap-fold.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/bswap-fold.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*bswap'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*bswap'
 
 bool %test1(ushort %tmp2) {
 	%tmp10 = call ushort %llvm.bswap.i16( ushort %tmp2 )		
diff --git a/llvm/test/Regression/Transforms/InstCombine/bswap.ll b/llvm/test/Regression/Transforms/InstCombine/bswap.ll
index 87caf292527e7f07fbbefd065f4aa7955323cd88..5eed8b372277fefb2f29636dc44a5cb1e469abed 100644
--- a/llvm/test/Regression/Transforms/InstCombine/bswap.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/bswap.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5
 
 uint %test1(uint %i) {
         %tmp1 = shr uint %i, ubyte 24           ; <uint> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/call-cast-target.ll b/llvm/test/Regression/Transforms/InstCombine/call-cast-target.ll
index 77097caf29e0d5777ba73b37be3be758b180fe4a..4a3cb2af2283d0a238d7023cde33a01109b4f043 100644
--- a/llvm/test/Regression/Transforms/InstCombine/call-cast-target.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/call-cast-target.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | not grep bitcast
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/InstCombine/call-intrinsics.ll b/llvm/test/Regression/Transforms/InstCombine/call-intrinsics.ll
index 07435c4a3bdd8d072b2bb6c0804b48bda864b32c..df042022fbf1a5303860563908955df30915b51c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/call-intrinsics.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/call-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis
 
 declare void %llvm.memmove(sbyte*, sbyte*, uint, uint)
 declare void %llvm.memcpy(sbyte*, sbyte*, uint, uint)
diff --git a/llvm/test/Regression/Transforms/InstCombine/call.ll b/llvm/test/Regression/Transforms/InstCombine/call.ll
index f721f3569fa6e00f3c34c4be7fe181c6f962ac07..aa9495e0c279e668220461cfea6cf51ce6b9dce9 100644
--- a/llvm/test/Regression/Transforms/InstCombine/call.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/canonicalize_branch.ll b/llvm/test/Regression/Transforms/InstCombine/canonicalize_branch.ll
index dbf3ab2058a715e9e012d1f6828f03c54ecd3f8b..1434c7bee08768cc6924c8792c937c9302491897 100644
--- a/llvm/test/Regression/Transforms/InstCombine/canonicalize_branch.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/canonicalize_branch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge'
 
 int %test1(uint %X, uint %Y) {
 	%C = setne uint %X, %Y
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-and-cast.ll b/llvm/test/Regression/Transforms/InstCombine/cast-and-cast.ll
index 64647fb5bbd1cbd5761ca21cf25090fadddfa41d..b141974bece66b2c4426d775f88cbb9c43b544e7 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-and-cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-and-cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast
 
 bool %test1(uint %val) {
   %t1 = bitcast uint %val to int 
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-cast-to-and.ll b/llvm/test/Regression/Transforms/InstCombine/cast-cast-to-and.ll
index 0491de93495bae602560db1914e213a0586fd143..8789b98b44be6fb421a22be501c1607a00bb4263 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-cast-to-and.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-cast-to-and.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ubyte
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ubyte
 
 int %test1(uint %X) {
         %Y = cast uint %X to ubyte ;; Turn into an AND
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-load-gep.ll b/llvm/test/Regression/Transforms/InstCombine/cast-load-gep.ll
index 9c997b887fd366ea85b9ccbe682f328385300a27..0a369bce039b6acbb0c7921f6a05211a402f1ec2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-load-gep.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-load-gep.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -globaldce | llvm-dis | not grep Array
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | not grep Array
 
 ; Pulling the cast out of the load allows us to eliminate the load, and then 
 ; the whole array.
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-malloc.ll b/llvm/test/Regression/Transforms/InstCombine/cast-malloc.ll
index 25eb4367c69593135df109d6a213adb5c9074395..2458bf3ea4423a07fd6acfc1b87cebdf03ba4aa2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-malloc.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-malloc.ll
@@ -1,5 +1,5 @@
 ; test that casted mallocs get converted to malloc of the right type
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast
 
 int* %test(uint %size) {
 	%X = malloc long, uint %size
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-propagate.ll b/llvm/test/Regression/Transforms/InstCombine/cast-propagate.ll
index f3b47301238dda32f180491380b8b8356f83976c..d4f07a4d842e7297d389a74790bdbdd5463c60e5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-propagate.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-propagate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep load
 
 int %test1(uint* %P) {
 	%A = alloca uint 
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-set.ll b/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
index a1ac29bc3fba4aeaa733a51d01460b2d7aacc866..801aa1bfc5086832f2e794dfa163dcf65cd0355c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
@@ -1,7 +1,7 @@
 ; This tests for various complex cast elimination cases instcombine should
 ; handle.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 
 bool %test1(int %X) {
 	%A = cast int %X to uint
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast.ll b/llvm/test/Regression/Transforms/InstCombine/cast.ll
index 32b62158bc4a6f580ea29d211809bc65a2093b8d..8c6e37986feb04756ef31bf3b3c7e5c2682899cd 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep '%c' | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c' | notcast
 
 %inbuf = external global [32832 x ubyte]
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast_ptr.ll b/llvm/test/Regression/Transforms/InstCombine/cast_ptr.ll
index 7b572560e4f23f82da07e59b4425cb094efa3f85..19d3ca6f8e8bc6dc43df84c6617a883f6a5b4ef5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast_ptr.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast_ptr.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '\([sz]ext\)\|\(trunc\)'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep '\([sz]ext\)\|\(trunc\)'
 
 target pointersize = 32
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/deadcode.ll b/llvm/test/Regression/Transforms/InstCombine/deadcode.ll
index e738576f5ff63835fdb23d4297976b2c1eea99e6..fbd3c0c2df91ddb7e6c1d72f88ec41cb00be1bd5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/deadcode.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/deadcode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret int %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret int %A'
 
 int %test(int %A) {
   %X = or bool false, false
diff --git a/llvm/test/Regression/Transforms/InstCombine/div.ll b/llvm/test/Regression/Transforms/InstCombine/div.ll
index fdcbd02578050e98d4fbd972aee448b5bfbcbe89..18d93c2a76d687c868c6e41cfb920d8bcf693ec6 100644
--- a/llvm/test/Regression/Transforms/InstCombine/div.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/div.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep div
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep div
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/fpcast.ll b/llvm/test/Regression/Transforms/InstCombine/fpcast.ll
index 31cd47f6194fe621f5e93fb8dc32a7997b77c14e..dedcd13f9bc6f134eedb257c8a7840dc6a30c017 100644
--- a/llvm/test/Regression/Transforms/InstCombine/fpcast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/fpcast.ll
@@ -1,6 +1,6 @@
 ; Test some floating point casting cases
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | notcast
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
 ; RUN:   grep 'ret [us]byte \(-1\)\|\(255\)'
 
 sbyte %test() {
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr-setcc.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr-setcc.ll
index 292e4ae63ac67afcc90c67a1cd19b59bf2deb8ed..4b637f2cfb11e2792cdc3dde0155cb3f867cc017 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr-setcc.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr-setcc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep getelementptr
 
 bool %test1(short* %P, int %I, int %J) {
     %X = getelementptr short* %P, int %I
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
index 1d3efed50ed0143e523a1af7289fff62f6f9cd77..53a2892dc74f3f136551bb29ddca7ffde16ae0e7 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
@@ -1,6 +1,6 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr
 
 %Global = constant [10 x sbyte] c"helloworld"
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr_cast.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr_cast.ll
index b600874e128971f62a5d3f258b35192cc0fc9ede..9d629d3bad35cb1164baf54caffa73f7d1b822b2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr_cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr_cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*'
 %G = external global [3 x sbyte]
 
 implementation
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr_const.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr_const.ll
index a4150dee216677978b2aeeea3ddc4240c5b86e69..9a078c50fd1a38fee71829c86c733cea378dee7e 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr_const.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr_const.ll
@@ -1,5 +1,5 @@
 ; Test folding of constantexpr geps into normal geps.
-; RUN: llvm-as < %s | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
 
 %Array = external global [40 x int]
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr_index.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr_index.ll
index 8346fa5191fb14d6cb84632c1f7fa608829b18a2..c4a7317bdeb244a4fb333a011e248e416a741244 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr_index.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr_index.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep trunc
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep trunc
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/InstCombine/hoist_instr.ll b/llvm/test/Regression/Transforms/InstCombine/hoist_instr.ll
index 1b6caf63dec4a7ea9a2fc2799c5843395f793ce8..4059563dc23a298335fa967d7e39c68722553f3c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/hoist_instr.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/hoist_instr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | %prcontext div 1 | grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep then:
 
 ;; This tests that the div is hoisted into the then block.
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/load.ll b/llvm/test/Regression/Transforms/InstCombine/load.ll
index 6b3f4a68cd8c3facee44388fe4a77c06297b6a0e..58f9894903bee69a4af9323907440922027d8d80 100644
--- a/llvm/test/Regression/Transforms/InstCombine/load.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep load
 
 %X = constant int 42
 %X2 = constant int 47
diff --git a/llvm/test/Regression/Transforms/InstCombine/malloc.ll b/llvm/test/Regression/Transforms/InstCombine/malloc.ll
index ed13f415b3d43eed1ff9de5dcb4cfc0b8eae5f5e..34fdfe862e826d872a45cdf020909f1e0d1af25a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/malloc.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/malloc.ll
@@ -1,5 +1,5 @@
 ; test that malloc's with a constant argument are promoted to array allocations
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep getelementptr
 
 int* %test() {
 	%X = malloc int, uint 4
diff --git a/llvm/test/Regression/Transforms/InstCombine/memmove.ll b/llvm/test/Regression/Transforms/InstCombine/memmove.ll
index 1313d341c0dbe95d3f96e31d1360656aa835ca85..fb20dbc873c3a936d8dd2aef1b83c7be19c21e50 100644
--- a/llvm/test/Regression/Transforms/InstCombine/memmove.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/memmove.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that memmove instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove'
 
 %S = internal constant [33 x sbyte] c"panic: restorelist inconsistency\00"
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/mul.ll b/llvm/test/Regression/Transforms/InstCombine/mul.ll
index f52b0f4251c9d102866a4c55fd651a7b516d3727..ccec6b894a7afa2086ca8f52ee828c3daf35f9e1 100644
--- a/llvm/test/Regression/Transforms/InstCombine/mul.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/mul.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that mul instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep mul
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep mul
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/narrow.ll b/llvm/test/Regression/Transforms/InstCombine/narrow.ll
index 75a78a3f8b75647639d53bdf2ac8f9f1ae5a9ea3..c382575f3f4e059235a71b8fb72af8cd06c77460 100644
--- a/llvm/test/Regression/Transforms/InstCombine/narrow.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/narrow.ll
@@ -1,7 +1,7 @@
 ; This file contains various testcases that check to see that instcombine
 ; is narrowing computations when possible.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false'
 
 ; test1 - Eliminating the casts in this testcase (by narrowing the AND
 ; operation) allows instcombine to realize the function always returns false.
diff --git a/llvm/test/Regression/Transforms/InstCombine/not.ll b/llvm/test/Regression/Transforms/InstCombine/not.ll
index 11718466da0221d50a7f654961af4ee857038343..3e85692500e94a09013d19778ab31bf08f7a7767 100644
--- a/llvm/test/Regression/Transforms/InstCombine/not.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/not.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep xor
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep xor
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/or.ll b/llvm/test/Regression/Transforms/InstCombine/or.ll
index 4b731dfa5c8b356e6a1956f5c6fe6ad313befcd3..933f5f006a4ed5a460183adcf46f07f115103be2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/or.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/or.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v xor | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v xor | not grep 'or '
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/phi.ll b/llvm/test/Regression/Transforms/InstCombine/phi.ll
index 830c44f624b549e4abb287701c518ee6ad226528..296e2e53697c65091300d3bc0b29af89bad4d3f6 100644
--- a/llvm/test/Regression/Transforms/InstCombine/phi.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/phi.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep phi
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/rem.ll b/llvm/test/Regression/Transforms/InstCombine/rem.ll
index da8c20a3df8958a9e299750dbdfd62ffe22328ac..ccb358de4d857c23e5ee16e616eb48098369c2b0 100644
--- a/llvm/test/Regression/Transforms/InstCombine/rem.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/rem.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep rem
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/select.ll b/llvm/test/Regression/Transforms/InstCombine/select.ll
index 617f0f9fe0d13dda142cbac5334a3f98895363ae..a9dd75d9eadff15c94992addca02d1e76d1b13e6 100644
--- a/llvm/test/Regression/Transforms/InstCombine/select.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/select.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select &&
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep select &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/set.ll b/llvm/test/Regression/Transforms/InstCombine/set.ll
index 756ade495215d34d746590b31dddd5840215de71..a9ef2bf5512ee49baff858784628da9ea95d426b 100644
--- a/llvm/test/Regression/Transforms/InstCombine/set.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/set.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep set
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep set
 
 %X = uninitialized global int
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/setcc-cast-cast.ll b/llvm/test/Regression/Transforms/InstCombine/setcc-cast-cast.ll
index e311c523fbbf0233c620367de4b9915074de5867..a25fa0c37d4840171b1ff8423907060239158187 100644
--- a/llvm/test/Regression/Transforms/InstCombine/setcc-cast-cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/setcc-cast-cast.ll
@@ -1,7 +1,7 @@
 ; This test case was reduced from MultiSource/Applications/hbd. It makes sure
 ; that folding doesn't happen in case a zext is applied where a sext should have
 ; been when a setcc is used with two casts.
-; RUN: llvm-as < %s | llc -instcombine | llvm-dis | not grep 'br bool false'
+; RUN: llvm-upgrade < %s | llvm-as | llc -instcombine | llvm-dis | not grep 'br bool false'
 int %bug(ubyte %inbuff) {
 entry:
 	%tmp = bitcast ubyte %inbuff to sbyte   ; <sbyte> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll b/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
index 0c6683c57dc8cb4b90a77534dc673b9643602092..4c86206397cd944a09a5b4c75dc09609a27ed2af 100644
--- a/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -3,7 +3,7 @@
 ; into equivalent setne,eq instructions.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v seteq | grep -v setne | not grep set
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/InstCombine/shift-simplify.ll b/llvm/test/Regression/Transforms/InstCombine/shift-simplify.ll
index b91637f7c4c28ef0a7ca095b76b542361cb026d6..ce19384d16547cd34ba333d03bd87b80674394f9 100644
--- a/llvm/test/Regression/Transforms/InstCombine/shift-simplify.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/shift-simplify.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | egrep 'shl|lshr|ashr' | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | egrep 'shl|lshr|ashr' | wc -l | grep 3
 
 int %test0(int %A, int %B, ubyte %C) {
 	%X = shl int %A, ubyte %C
diff --git a/llvm/test/Regression/Transforms/InstCombine/shift-sra.ll b/llvm/test/Regression/Transforms/InstCombine/shift-sra.ll
index fe1b142b74be03f72b2e68ffb22abbfc314f40d3..43a4ebdfd2c981c4be7f046242e6b4cf422568d3 100644
--- a/llvm/test/Regression/Transforms/InstCombine/shift-sra.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/shift-sra.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'lshr int' | wc -l | grep 2 &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ashr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'lshr int' | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ashr
 
 int %test1(int %X, ubyte %A) {
 	%Y = shr int %X, ubyte %A  ; can be logical shift.
diff --git a/llvm/test/Regression/Transforms/InstCombine/shift.ll b/llvm/test/Regression/Transforms/InstCombine/shift.ll
index 9756880bcc3b5b8e5c9273010189db79ab3e7c66..28c517018e408e780f94037903ac51e554b4191d 100644
--- a/llvm/test/Regression/Transforms/InstCombine/shift.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/shift.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep sh
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep sh
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/signext.ll b/llvm/test/Regression/Transforms/InstCombine/signext.ll
index a3b4982249010e090acd1a509ca4bcfa62fda90b..7dcb466ad6416db724a187aeb5531277db35c61a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/signext.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/signext.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '(and\|xor\|add\|shl\|shr)'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep '(and\|xor\|add\|shl\|shr)'
 
 int %test1(int %x) {
         %tmp.1 = and int %x, 65535              ; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/sink_instruction.ll b/llvm/test/Regression/Transforms/InstCombine/sink_instruction.ll
index 36e0357c28644f0bc2b6266c58a2d81aca80128b..a45c16163f7dddfd35871ea7a16200dc9bb61d64 100644
--- a/llvm/test/Regression/Transforms/InstCombine/sink_instruction.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/sink_instruction.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret
 
 ;; This tests that the instructions in the entry blocks are sunk into each
 ;; arm of the 'if'.
diff --git a/llvm/test/Regression/Transforms/InstCombine/stacksaverestore.ll b/llvm/test/Regression/Transforms/InstCombine/stacksaverestore.ll
index c41a1b1e7fcac46dd1dea2295db78760b1ff12e4..d9633b5c3bea9d654b8c75638f613e8c323186c5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/stacksaverestore.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/stacksaverestore.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep call
 
 ;; Test that llvm.stackrestore is removed when possible.
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/store.ll b/llvm/test/Regression/Transforms/InstCombine/store.ll
index d2442fa95f3e37e681aac6dc7e9b35bf6ddf086f..2102fec100c52f7e7d260b3cf3a335795a1388dc 100644
--- a/llvm/test/Regression/Transforms/InstCombine/store.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/store.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store
 
 void %test1(int* %P) {
 	store int undef, int* %P
diff --git a/llvm/test/Regression/Transforms/InstCombine/sub.ll b/llvm/test/Regression/Transforms/InstCombine/sub.ll
index 7d728055fe6e20176b0271c70b6613ba913df7e6..8ca2e783ca2960ddc9fc55ab325b835c17e515ef 100644
--- a/llvm/test/Regression/Transforms/InstCombine/sub.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/sub.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v 'sub int %Cok, %Bok' | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub int %Cok, %Bok' | not grep sub
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/vec_demanded_elts.ll b/llvm/test/Regression/Transforms/InstCombine/vec_demanded_elts.ll
index 3da22e7554f45eaf1279a6ac00fba91853d51d0e..9642ffda56c0c54090920af2d2be9637c5cb2db5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/vec_demanded_elts.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/vec_demanded_elts.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'sub float' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'mul float' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'sub float' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'mul float' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub'
 
 ushort %Convert_sse(float %f) {
 entry:
diff --git a/llvm/test/Regression/Transforms/InstCombine/vec_insert_to_shuffle.ll b/llvm/test/Regression/Transforms/InstCombine/vec_insert_to_shuffle.ll
index 037920369182224264d2c86a93bb717186342f0c..0611305beeab0b6546fc95d43e5b2986400bf369 100644
--- a/llvm/test/Regression/Transforms/InstCombine/vec_insert_to_shuffle.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/vec_insert_to_shuffle.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep insertelement &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep extractelement
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep insertelement &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep extractelement
 
 <4 x float> %test(<4 x float> %tmp, <4 x float> %tmp1) {
 	%tmp4 = extractelement <4 x float> %tmp, uint 1		; <float> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/InstCombine/vec_narrow.ll b/llvm/test/Regression/Transforms/InstCombine/vec_narrow.ll
index d5c7f854b8db879e7149ba8a5a62340006554421..1ad671c50915e1d5c710cece6b90124a041de977 100644
--- a/llvm/test/Regression/Transforms/InstCombine/vec_narrow.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/vec_narrow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'add float'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'add float'
 
 %V = type <4 x float>
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/vec_shuffle.ll b/llvm/test/Regression/Transforms/InstCombine/vec_shuffle.ll
index 47ce526f62bda431486c4baa1ebaaa4b926be4a4..01c24e76ba93dc0f7ae98466f00cd8710cecc833 100644
--- a/llvm/test/Regression/Transforms/InstCombine/vec_shuffle.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/vec_shuffle.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep vector_shuffle
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep vector_shuffle
 
 %T = type <4 x float>
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/xor.ll b/llvm/test/Regression/Transforms/InstCombine/xor.ll
index e9f4d3fd704586bb90260138fa292bd50bd350a2..ad28660756a0f64e3df4601be7f1e10b70d5f3df 100644
--- a/llvm/test/Regression/Transforms/InstCombine/xor.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/xor.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'xor '
 
 %G1 = global uint 0
 %G2 = global uint 0
diff --git a/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll b/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
index 6c794a3e3f2848aca96011028171d1203647f4a9..e32f4b966cfa88c63534325cedcfe164b8b9871a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'and int %Y, 8'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and int %Y, 8'
 
 int %test1(ubyte %X) {
         %Y = cast ubyte %X to int
diff --git a/llvm/test/Regression/Transforms/InstCombine/zext.ll b/llvm/test/Regression/Transforms/InstCombine/zext.ll
index 27442aab613311e2c5c46a7c13d7d8a67032d666..7835fe690b2de21e899f7938a2ef9b3465b93b3d 100644
--- a/llvm/test/Regression/Transforms/InstCombine/zext.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/zext.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' '%c1.*'
 
 long %test_sext_zext(short %A) {
     %c1 = zext short %A to uint
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
index e2c73f832da6a4aeddcad72ff88042f0cfa8974e..fb36b4b7e3526d1b0793b63d5264d7507b02fdb2 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" &&
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry"
 
 %struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }
 
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
index 83a0f9f3805fd6bc912406c36a0892402d6dc33e..e694ecf1ded20b2d46ac0871c2a2896fb3ad8392 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%X.1.lcssa" &&
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X.1.lcssa" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1"
 
 declare bool %c1()
 declare bool %c2()
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-07-09-NoDominator.ll b/llvm/test/Regression/Transforms/LCSSA/2006-07-09-NoDominator.ll
index 54211390ee3f5da4bcd89ccd280b34fdca4c249b..f90f6644afee5771ec0d65e6a35ac1c289e1c1dd 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-07-09-NoDominator.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-07-09-NoDominator.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lcssa
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa
 
 	%struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }
 
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll b/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
index 55c233a07da40c42d17e5dae8d0cdb7e2de87908..ac40ad5fd63987ff89ba61b3512ea21a1856a530 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lcssa -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output
 ; PR977
 
 declare int %opost_block()
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll b/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
index f70d5c80397fac3c263940ab79bb639e1ab4a895..9178411ece24581e491d3eb26c93d75f82c428b7 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lcssa -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output
 ; PR977
 
 void %process_backlog() {
diff --git a/llvm/test/Regression/Transforms/LCSSA/basictest.ll b/llvm/test/Regression/Transforms/LCSSA/basictest.ll
index e0a8eaeecfa05927f5c71448ce5ac0c4d5f5b619..05a0ad1eb29c5641efd41ad2e277950f00448e68 100644
--- a/llvm/test/Regression/Transforms/LCSSA/basictest.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/basictest.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "X3.lcssa = phi int" &&
-; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%X4 = add int 3, %X3.lcssa"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi int" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add int 3, %X3.lcssa"
 
 void %lcssa(bool %S2) {
 entry:
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll b/llvm/test/Regression/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
index 43430d85734aae7eb2ded2de5869052a08402924..b437034e6dc0ff1a0a91d72fa47dc7e81bdeaaae 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm -disable-output
 
 ;%MoveArray = external global [64 x ulong]
 
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll b/llvm/test/Regression/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
index edc51472ffd62a6345365f4fd83c1dcdaaf2f0dd..d0830bc6d0f1f3a47fef2febb7d427feaf2bd62a 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
@@ -1,6 +1,6 @@
 ; Exit blocks need to be updated for all nested loops...
 
-; RUN: llvm-as < %s | opt -loopsimplify
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll b/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
index c082a596ba93e321e19fc9fa960e5bd69bdbd6cb..224116f89c123744777d72bc3e7c21684444dadd 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -licm
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm
 
 int %main(int %argc, sbyte** %argv) {
 bb0:            ; No predecessors!
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderProblem.ll
index d1a15c70234a028fff24c8c8d012461dbbe2209d..96e11c33375d3ecff46cfd54587d6d0bde1e3893 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-27-PreheaderProblem.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br '
 
 int %main(int %argc) {
         br label %bb5
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll b/llvm/test/Regression/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
index d0ec438dc7eb0d8fcd9d94c9335dbcd73f6b4cde..caf50eb5fadf7bb0cd5fe02c40be93909ce62a28 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
@@ -1,6 +1,6 @@
 ; LICM is adding stores before phi nodes.  bad.
 
-; RUN: llvm-as < %s | opt -licm
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm
 
 bool %test(bool %c) {
 	br bool %c, label %Loop, label %Out
diff --git a/llvm/test/Regression/Transforms/LICM/2003-02-28-PromoteDifferentType.ll b/llvm/test/Regression/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
index 4f7cbeade7196b0c9ce48d5b67f5753f78ec64b4..360871b82f44b5f73372f657ed6d02c52ca5c4ef 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
@@ -1,6 +1,6 @@
 ; Test that hoisting is disabled for pointers of different types...
 ;
-; RUN: llvm-as < %s | opt -licm
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm
 
 void %test(int* %P) {
 	br label %Loop
diff --git a/llvm/test/Regression/Transforms/LICM/2003-05-02-LoadHoist.ll b/llvm/test/Regression/Transforms/LICM/2003-05-02-LoadHoist.ll
index 90a64e834cf710bf4616b89bf25a2bf48684a7e6..ce13e6d57e4ae7b8089855a48e5789823227e13d 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-05-02-LoadHoist.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -licm -load-vn -gcse -instcombine | llvm-dis | grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -load-vn -gcse -instcombine | llvm-dis | grep load
 
 %X = global int 7
 declare void %foo()
diff --git a/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstHoist.ll b/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstHoist.ll
index 2173b76d5ba52909e1d417ebdc0c9185f05da95a..63a4ac0097354d83cf88c956d6bf2127d9553e1e 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstHoist.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -licm | llvm-dis | %prcontext "IfUnEqual" 2 | grep div 
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext "IfUnEqual" 2 | grep div 
 
 %X = global int 0
 declare void %foo()
diff --git a/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll b/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll
index 7e2f233a43fd1c7e3353ade62a7c69aab6bf755b..2c784c00617a298aa8c927312d14d4559411e75d 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -licm | llvm-dis | %prcontext "test" 2 | grep div
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext "test" 2 | grep div
 
 %X = global int 0
 declare void %foo(int)
diff --git a/llvm/test/Regression/Transforms/LICM/2003-12-11-SinkingToPHI.ll b/llvm/test/Regression/Transforms/LICM/2003-12-11-SinkingToPHI.ll
index ecbc130e8739f84b5d75ad86772951ca453b6a71..955e70b8e95345d9ef1bccf523d60cf5a2168ffc 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-12-11-SinkingToPHI.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-12-11-SinkingToPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm | lli
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | lli
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LICM/2003-12-13-VolatilePromote.ll b/llvm/test/Regression/Transforms/LICM/2003-12-13-VolatilePromote.ll
index 66102992a2ebed2c8342ee8e238d8c88914ac425..916a6e383334106e8a1e20f11a5376e7754366fa 100644
--- a/llvm/test/Regression/Transforms/LICM/2003-12-13-VolatilePromote.ll
+++ b/llvm/test/Regression/Transforms/LICM/2003-12-13-VolatilePromote.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext volatile 1 | grep Loop
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext volatile 1 | grep Loop
 
 %X = global int 7
 
diff --git a/llvm/test/Regression/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx b/llvm/test/Regression/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx
index 253a980f89e58aed099e9cecf174f1ce6b7a9197..f4dd108a0e72256f3c5ad387def633ca4a711029 100644
--- a/llvm/test/Regression/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx
+++ b/llvm/test/Regression/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalsmodref-aa -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -licm -disable-output
 
 %PL_regcomp_parse = internal global sbyte* null
 
diff --git a/llvm/test/Regression/Transforms/LICM/2004-11-17-UndefIndexCrash.ll b/llvm/test/Regression/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
index 7bd42588907951edffd0ef7ed329d08f6d57a8c3..848dd46549d14ae7eb2f2e99f418d30b3c29080f 100644
--- a/llvm/test/Regression/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
+++ b/llvm/test/Regression/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output
 
 	%struct.roadlet = type { sbyte*, %struct.vehicle*, [8 x %struct.roadlet*], [8 x %struct.roadlet* (%struct.roadlet*, %struct.vehicle*, int)*] }
 	%struct.vehicle = type { %struct.roadlet*, sbyte*, int, int, %union.._631., int }
diff --git a/llvm/test/Regression/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll b/llvm/test/Regression/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll
index 6c5b1a57e1758c1affe321b9bcbb8082df8c720a..544dee3a283fc60b6f20a3f6765c82223db56efe 100644
--- a/llvm/test/Regression/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll
+++ b/llvm/test/Regression/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output
 
 void %test({int}* %P) {
 	br label %Loop
diff --git a/llvm/test/Regression/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll b/llvm/test/Regression/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
index fe69e5ed090a4c2cad6dbb03803e48d61e64c627..8eca08c793c234365056fc790835f7c57819e2d5 100644
--- a/llvm/test/Regression/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
+++ b/llvm/test/Regression/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output
 ; PR908
 
 	%struct.alloc_chain = type { sbyte*, %struct.alloc_chain* }
diff --git a/llvm/test/Regression/Transforms/LICM/basictest.ll b/llvm/test/Regression/Transforms/LICM/basictest.ll
index 328687da011a705b57c397d485dfdd1013bcf301..6458f035c2e5b4ffa30b04a140218dccf33328b5 100644
--- a/llvm/test/Regression/Transforms/LICM/basictest.ll
+++ b/llvm/test/Regression/Transforms/LICM/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis
 
 void "testfunc"(int %i) {
 
diff --git a/llvm/test/Regression/Transforms/LICM/call_sink_const_function.ll b/llvm/test/Regression/Transforms/LICM/call_sink_const_function.ll
index a81e7c399fc26b38606a76ccf095099a72effe87..a8a4b72d6d6fa7723a3dc86388779cf801f47a2b 100644
--- a/llvm/test/Regression/Transforms/LICM/call_sink_const_function.ll
+++ b/llvm/test/Regression/Transforms/LICM/call_sink_const_function.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -licm | llvm-dis | %prcontext sin 1 | grep Out: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm | llvm-dis | %prcontext sin 1 | grep Out: 
 declare double %sin(double)
 declare void %foo()
 
diff --git a/llvm/test/Regression/Transforms/LICM/call_sink_pure_function.ll b/llvm/test/Regression/Transforms/LICM/call_sink_pure_function.ll
index 80ad8e18fd0f71dcb6a7968eaaa48f4c99359981..e5857a62a6f4722eeea3fd4d625019d29042d03e 100644
--- a/llvm/test/Regression/Transforms/LICM/call_sink_pure_function.ll
+++ b/llvm/test/Regression/Transforms/LICM/call_sink_pure_function.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -basicaa -licm | llvm-dis | %prcontext strlen 1 | grep Out: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm | llvm-dis | %prcontext strlen 1 | grep Out: 
 declare int %strlen(sbyte*)
 declare void %foo()
 
diff --git a/llvm/test/Regression/Transforms/LICM/no-preheader-test.ll b/llvm/test/Regression/Transforms/LICM/no-preheader-test.ll
index 8d2eef993303b06041ce79061e6cbe466e3a4964..954857ae3b1d9c6ae990523df5b8bfc3df9c4152 100644
--- a/llvm/test/Regression/Transforms/LICM/no-preheader-test.ll
+++ b/llvm/test/Regression/Transforms/LICM/no-preheader-test.ll
@@ -1,5 +1,5 @@
 ; Test that LICM works when there is not a loop-preheader
-; RUN: llvm-as < %s | opt -licm | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis
 
 void "testfunc"(int %i, bool %ifcond) {
 	br bool %ifcond, label %Then, label %Else
diff --git a/llvm/test/Regression/Transforms/LICM/scalar_promote.ll b/llvm/test/Regression/Transforms/LICM/scalar_promote.ll
index 02fa57d26bdf67ed079e7ab825c97b6faf6adfe2..219b16bad09f6889df57a73229a5db61b047fe17 100644
--- a/llvm/test/Regression/Transforms/LICM/scalar_promote.ll
+++ b/llvm/test/Regression/Transforms/LICM/scalar_promote.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt  -licm -stats 2>&1 | grep "memory locations promoted to register"
+; RUN: llvm-upgrade < %s | llvm-as | opt  -licm -stats 2>&1 | grep "memory locations promoted to register"
 
 %X = global int 7
 
diff --git a/llvm/test/Regression/Transforms/LICM/sink_critical_edge.ll b/llvm/test/Regression/Transforms/LICM/sink_critical_edge.ll
index 1ed66523d2bad51c9bf795b64debfe94d71192ba..bc8f2b2cf25b30ab5a735f1f9ae0f39306f3fe04 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_critical_edge.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_critical_edge.ll
@@ -1,7 +1,7 @@
 ; This testcase checks to make sure the sinker does not cause problems with
 ; critical edges.
 
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep Exit
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep Exit
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LICM/sink_inst.ll b/llvm/test/Regression/Transforms/LICM/sink_inst.ll
index 0cb2c25d7d683caa71a13a00937bf46200ced9cb..82d93571e7af6cb25b80bb951c07ba71dbf296de 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_inst.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_inst.ll
@@ -2,7 +2,7 @@
 ; the instruction to the exit blocks instead of executing it on every
 ; iteration of the loop.
 ;
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext mul 1 | grep Out: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep Out: 
 
 int %test(int %N) {
 Entry:
diff --git a/llvm/test/Regression/Transforms/LICM/sink_load.ll b/llvm/test/Regression/Transforms/LICM/sink_load.ll
index a0bfc7f9f71babeff27be97bebb16fb59ab197c6..5b19b6ffb76285eeda9566f7ab005875206c143f 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_load.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_load.ll
@@ -2,7 +2,7 @@
 ; result of the load is only used outside of the loop, sink the load instead of
 ; hoisting it!
 ;
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext load 1 | grep Out: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext load 1 | grep Out: 
 
 %X = global int 5
 
diff --git a/llvm/test/Regression/Transforms/LICM/sink_multiple.ll b/llvm/test/Regression/Transforms/LICM/sink_multiple.ll
index a98a17fbd517ec242fffc0326c4ed4cde368ce4a..61cf6909e6c46b3fb9cd91ba77e43a48379266a3 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_multiple.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_multiple.ll
@@ -3,7 +3,7 @@
 ; instructions from the loop.  Instead they got hoisted, which is better than
 ; leaving them in the loop, but increases register pressure pointlessly.
 
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out:
 
 %Ty = type { int, int }
 %X = external global %Ty
diff --git a/llvm/test/Regression/Transforms/LICM/sink_multiple_exits.ll b/llvm/test/Regression/Transforms/LICM/sink_multiple_exits.ll
index d7f1514a4e9f4960473fb31a954c9791a2d97a2b..860d7306d5c57be1a92dddd954aead046713a74c 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_multiple_exits.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_multiple_exits.ll
@@ -1,7 +1,7 @@
 ; This testcase ensures that we can sink instructions from loops with
 ; multiple exits.
 ;
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:'
 
 int %test(int %N, bool %C) {
 Entry:
diff --git a/llvm/test/Regression/Transforms/LICM/sink_only_some_exits.ll b/llvm/test/Regression/Transforms/LICM/sink_only_some_exits.ll
index 6415c8a1f0dd7aa28a53e20a673741376c438b4f..e82166a685ddc2757af4e7aecd747de07ad95921 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_only_some_exits.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_only_some_exits.ll
@@ -2,7 +2,7 @@
 ; some exits out of the loop, and that we can do so without breaking dominator
 ; info.
 ;
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep exit2:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep exit2:
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LICM/sink_phi_node_use.ll b/llvm/test/Regression/Transforms/LICM/sink_phi_node_use.ll
index c1d5844e7ecbf4a796fa610802d15e76c56d6a21..d50f54e47f05b3aed7c7687c17d95e4c0d02626f 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_phi_node_use.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_phi_node_use.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep preheader.loopexit: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep preheader.loopexit: 
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LICM/sink_trapping_inst.ll b/llvm/test/Regression/Transforms/LICM/sink_trapping_inst.ll
index 4842331d23b4d7485d27be045dab53444af8adef..8e67c005f5912fbfdc2524dbfe5778608583f094 100644
--- a/llvm/test/Regression/Transforms/LICM/sink_trapping_inst.ll
+++ b/llvm/test/Regression/Transforms/LICM/sink_trapping_inst.ll
@@ -1,7 +1,7 @@
 ; Potentially trapping instructions may be sunk as long as they are guaranteed
 ; to be executed.
 ;
-; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext div 1 | grep Out: 
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext div 1 | grep Out: 
 
 int %test(int %N) {
 Entry:
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-02-11-ArrayShape.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
index 1bb63dd77816751201925baaad2f993f2a3e67c9..73dfa1f5a19b97904385c99124bfe51427d5f7d4 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-02-11-ArrayShape.ll
@@ -18,7 +18,7 @@
 ; equivelent form.
 ;
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -q -raise > Output/%s.raised.bc
+; RUN: llvm-upgrade < %s | llvm-as | opt -q -raise > Output/%s.raised.bc
 ; RUN: lli -force-interpreter -array-checks < Output/%s.raised.bc
 ;
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-02-14-BadAssertion.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
index 44ccfcc6807fb0ed7ecfe1083e0d89feb52b0cab..546b6544f88317a11a91348d9ae962718b6ac863 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-02-14-BadAssertion.ll
@@ -1,6 +1,6 @@
 ; An invalid assertion killed the level raiser.  Fixed.
 ;
-; RUN: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-03-11-Calls.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-11-Calls.ll
index 26fedff040afa7f5005b7e9ab1909b7af2551048..3e8a58fc36081535e5712204faef509fbd3689af 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-11-Calls.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll
index c740f4b8899fad6d5a757accbb2c598d7f1d5214..895d5ae1109bca198043f73e1717ab7fa4f6929e 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise	
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-BadCodegen.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-BadCodegen.ll
index a6d33eeff3c5bd4446eff9fd9ea2b8ba03139bdf..96961e330cae4907d07fe442021af6ba499364e1 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-BadCodegen.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise  |lli 
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise  |lli 
  
  %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/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-Crash.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-Crash.ll
index bd5c18e32a1a4cdff56e570854a40e9eff0a070d..35f4c8df60eb6d1ca2de415798f410a2afbb4450 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-20-Crash.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
index 5f6250ef33e8075a772e60d404ccc009c0900379..440f9ea5ff76af239265a8f1656b275cafca9c55 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
@@ -2,7 +2,7 @@
 ; LevelRaise should eliminate all cast instructions from this testcase.
 ;
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int }
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
index 4a778ea0e530d19fe3b37ebbe9d73738c593255e..e3b533c2826eefe0fc8835319d77c8961645f38d 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
@@ -3,7 +3,7 @@
 ; prevented reg115 from being able to change.
 ;
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 	
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
index 6379ab5848cf9b0a498b0e168160b3b056db6816..310f34fb81aa0bdb2b2962a7d9e7d68c93c31a7a 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-04-16-MissedRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
index 1fa2fd8253b35c1f7401314c1b1cc8da7ce89008..3fa7320a2077a1460fea38577e642d1b226d8519 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
@@ -6,7 +6,7 @@
 ;   return (int*)malloc(i+j);
 ; }
 
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll
index ef5a30d63d5e0b13965428d13e1f7fd37055c448..444d9d423648bd57bc130f19b431b3d154246fdc 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise -q | lli 
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -q | lli 
 ;
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-MissedRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
index 64000918de14a7677db7a03453b4520fe1074ca0..7335af090defc585124a3fe42352b7290a79ea41 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
@@ -1,6 +1,6 @@
 ; This testcase is not level raised properly...
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 
 	%List = type { int, %List* }
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
index 102b57431fa53ffcd70369ca576102374ff066a6..640415408d061f2c514602285b40701e50af9b66 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise | llvm-dis | not grep 'bitcast uint \*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 'bitcast uint \*'
 
 int "test"(uint * %Ptr) {
 	%P2 = cast uint *%Ptr to int *
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-05-23-MissedRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
index 59a4248d5a8af9235f100c802c2275144c7bb641..cbb77870e3397afa70e4d5faba7f442cb16bc58a 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 
 %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-MissedRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
index a5ed52ccb5430d06c587512490f509b997acb085..456b09fb6ad31a17bc7c6e8dc3229000e0677484 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
+++ b/llvm/test/Regression/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.
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast
 
         %Tree = type %struct.tree*
         %struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree }
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
index 5f528a006d09cb280e8d9a7f8ea20e92645686f3..ad8a1dc67311251061b7b9cc78b3b8e6060942d1 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 	
 	%Tree = type %struct.tree*
 	%struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree }
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
index 6ca0b1343c7839d4f9e35fd206a705f1bb1eb578..9c03684d95017891e1551a0ee65fd469576f9d1a 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll
@@ -1,6 +1,6 @@
 ; This crashes raise, with an cast<> failure
 
-; RUN: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 implementation
 sbyte* %test(int* %ptr) {
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll
index 792a035651f392a75f5a514d649357bc8caff93d..18121634dd9ba71d5f782707c90be8cf10ef732e 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise -raise-start-inst=W
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=W
 
 int **%test(sbyte **%S) {
 BB0:
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
index 91301f051090ac4a5930067cfc0576ffd4d83892..7ab4ea360de7f77791e5436e4dc092eb26b111e2 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
@@ -1,6 +1,6 @@
 ; Looks like we don't raise alloca's like we do mallocs
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
index e165cf6edf468c2ef310c7720a36607c56063818..d875b1e71c0851ba9ce0e72b82bab3fa363861b6 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast271
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=cast271
 
 	%CON_list = type { %CON_list*, %CON_node* }
 	%CON_node = type { %DIS_list*, %DIS_list*, int }
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-09-10-PointerAdds.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
index 64c08a24164dbb03e85b290a1eb5a6915b63024f..6a2bc50ef24e473ae60112bd95a15ec0d14a4bed 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-09-10-PointerAdds.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 int* %test(int* %P, int* %Q) {
 	%P = cast int* %P to ulong
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
index 0e3505899f6fb201727c36e68fa55298dffbf86b..d3b24304b7d2c8a324ea52aa11ac22aa9bcf5e0e 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise | llvm-dis | grep -v uint | not grep 4294967295
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | grep -v uint | not grep 4294967295
 
 %length_code = uninitialized global [256 x ubyte]
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCall.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
index 94ad671fb2a880bb852b12459ea99790243c60ef..6ddcc45c0b0dac2a558611513a651ee7325f3065 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise | llvm-dis | grep call | not grep '\.\.\.'
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | grep call | not grep '\.\.\.'
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll
index b9ebe6322afef77793ced028cd91ca979389ff9c..a7ac87144f38853c12c3fa714222f4d5dbe1e0ce 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2002-11-13-PointerFunction.ll b/llvm/test/Regression/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
index 4d5f08142e37bc260b46c76e7f44bfea0ebd22ee..2d5181150199d0239562b30c85f96ebe4e5cc3e9 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -raise | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 'REMOVE'
 
 int %foo(sbyte * %PF) {
 	%UPF = cast sbyte* %PF to uint()*
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-01-22-GEPProblem.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
index 2dfe07ce0fec3a08f44b3e1fd88df5d37e205f35..540ffa26b90a5dcd84ad884efdaa8e260d17978d 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-01-22-GEPProblem.ll
@@ -1,5 +1,5 @@
 ; Testcase reduced from 197.parser by bugpoint
-; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast455 > /dev/null
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=cast455 > /dev/null
 
 void %conjunction_prune() {
 ; <label>:0             ; No predecessors!
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
index 7720f6bd429b914b1a412f27ce5f1e333e3d2323..18c0900c88a1351187d632802fde65ef980826ff 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast459
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -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/llvm/test/Regression/Transforms/LevelRaise/2003-02-13-CallRaise.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-02-13-CallRaise.ll
index b752b0ff76d3687683d4adc222ee0b736f14c6ba..c52fc5629449eef5f040530ff9a7fc933c3832c5 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-02-13-CallRaise.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-02-13-CallRaise.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise
 
 declare void %foo()
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-05-01-CallCast.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-05-01-CallCast.ll
index ee2a0440de7c30485e453fc1b3a65aa7e732f16f..7ab0f6f17d9a4e93647a03d3f6c7f4dc8b033dd4 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-05-01-CallCast.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-05-01-CallCast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast
 
 void %test(...) { ret void }
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
index 7a294ef46a516545a0f2f26ebf30874649d74fda..141b807362b5c1213b07b464ea4291ab06f042c6 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raise -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise -disable-output
 
 %T = type { [0 x ubyte] }
 
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
index 131ade06a1dfab15f9f44219a38c779e10a7510e..f507e7290963d91489b3a334d9c324a133b2291e 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
@@ -1,6 +1,6 @@
 ; The expr analysis routines were being too aggressive across cast instructions!
 
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 4294967295
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 4294967295
 
 target endian = big
 target pointersize = 64
diff --git a/llvm/test/Regression/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll b/llvm/test/Regression/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll
index 8c1aef7a400cd13d6e40411d4a0513db1474280c..0addb212d72fbe124a7a1ff3e471b5d36880ee0f 100644
--- a/llvm/test/Regression/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll
+++ b/llvm/test/Regression/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll
@@ -1,6 +1,6 @@
 ; The program should not just cast 2143289344 to float and store it!
 ;
-; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 41DFF
+; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 41DFF
 
 void %test() {
        %mem_tmp = alloca float
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2003-04-25-AssertFail.ll b/llvm/test/Regression/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
index 8a07caba572d59c2c490fb350ee3b36fd02f4921..90de721fe0d01bb73b68b483e84d7e2c11c90a8c 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -loopsimplify
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll b/llvm/test/Regression/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
index 4bff954484a48d9ebea3947bf82e7bbc3e2eb385..0880da6f542df3b3cf81789e2f00efae2ec10df4 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -loopsimplify
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify
 
 int %re_match_2() {
 	br label %loopentry.1
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll b/llvm/test/Regression/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
index f7bb283fa3877af031e47e462896e0f4841d7f39..59f49e3771bda32c558c7680ee3913d152003170 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
 
 target endian = little
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll b/llvm/test/Regression/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll
index a65143b9de2a142334bef077ad5d3e30e1d86863..e47112bb9b3a8ace0d605f02ed48a9d05abf0b92 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll
@@ -4,7 +4,7 @@
 ;
 ; This is distilled from a monsterous crafty example.
 
-; RUN: llvm-as < %s | opt -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output
 
 %G = weak global int 0		; <int*> [#uses=13]
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll b/llvm/test/Regression/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll
index 4d26b2cb0ee06b348383c7a98fa4dd1156fa2e15..f25460e5d339c583def5419d0e6716c64d1a2cf0 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify -verify -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -verify -licm -disable-output
 implementation   ; Functions:
 
 void %.subst_48() {
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll b/llvm/test/Regression/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll
index 8e1337993ff9c3e773e21f0da54a50eb9eb0bbf2..607f1fea1fd115bf78203a423d042eab00e1f9c0 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -licm -disable-output
 void %main() {
 entry:
 	br bool false, label %Out, label %loop
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll
index 45648645b18c46b6e78829fb2679c0b9a2a60269..b98431357e384fef404be227b919276d88a35348 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -licm -disable-output
 
 ; This is PR306
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll
index f963780a21fc0d9a2cde2949c7a48fd0a522d6d1..12250b78ebd2317d6e9ada841b4cfde400b8ab49 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -disable-output
 
 implementation   
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll
index 14921c22c985dcf96975cdd51b113861801f5521..7f16400d44ef4d28589fbf548f923644c2194306 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -loopsimplify -licm -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -loopsimplify -licm -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/basictest.ll b/llvm/test/Regression/Transforms/LoopSimplify/basictest.ll
index a8835df64f19b0e2dc24aaba07585db20dfa53b8..2b01b475fc7552f46a006df60e2fba6d90ce7c29 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/basictest.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/hardertest.ll b/llvm/test/Regression/Transforms/LoopSimplify/hardertest.ll
index 04a2739adeb18044774d7000b6eea04a4d2c57cc..a4465b75de52a4cdc4ea9e05446f4e1babf92541 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/hardertest.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/hardertest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loopsimplify
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify
 
 void %foo(bool %C) {
 	br bool %C, label %T, label %F
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/phi-node-simplify.ll b/llvm/test/Regression/Transforms/LoopSimplify/phi-node-simplify.ll
index 52d102390d44f61c53a2090ccc1d28c1b5ac6fa6..aa52d66cf9609016da18c5bf38a2764f369e42b7 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/phi-node-simplify.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/phi-node-simplify.ll
@@ -1,5 +1,5 @@
 ; Loop Simplify should turn phi nodes like X = phi [X, Y]  into just Y, eliminating them.
-; RUN: llvm-as < %s | opt -loopsimplify | llvm-dis | grep phi | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify | llvm-dis | grep phi | wc -l | grep 6
 
 %A = weak global [3000000 x int] zeroinitializer		; <[3000000 x int]*> [#uses=1]
 %B = weak global [20000 x int] zeroinitializer		; <[20000 x int]*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/LoopSimplify/single-backedge.ll b/llvm/test/Regression/Transforms/LoopSimplify/single-backedge.ll
index be3d182fcc9ba0eeda8d7c670d5771fa2fd0dadf..53a6ffbf9823d2f516a265df7f32974db5ee0213 100644
--- a/llvm/test/Regression/Transforms/LoopSimplify/single-backedge.ll
+++ b/llvm/test/Regression/Transforms/LoopSimplify/single-backedge.ll
@@ -2,7 +2,7 @@
 ; for all loops.  This allows the -indvars pass to recognize the %IV 
 ; induction variable in this testcase.
 
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar
 
 int %test(bool %C) {
 	br label %Loop
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll
index 2fcb1cc6df3c14ef787448048e8f8c21b547e659..b2104051c9d100edd5be9d1c64c8618764941947 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 
 void %try_swap() {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll
index 77d118ac111f71012df8fd8171486bffaa8c51db..5724bad72c0f0c1a23fbea21826b9044606532c4 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 
 int %image_to_texture(uint %indvar454) {
 loopentry.1.outer:
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll
index 0a84302d8fd225ff5ecb17277053849c44e318cb..81d3c25128dba69a61290269d49cac4ddf571fb2 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 
 void %main() {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/different-type-ivs.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/different-type-ivs.ll
index b8cda5a807f17d2cf111e04ed45aca36087de5cd..1383fd692f0d5c136b2f76ae15c7c05fab1a7c1e 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/different-type-ivs.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/different-type-ivs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 ; Test to make sure that loop-reduce never crashes on IV's 
 ; with different types but identical strides.
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
index b53ce9571c658f3ea3632a946d4db64e35f4e5e2..b8f318b307f1d9f62a80dca153dc4ae6f16b299e 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'cast uint 1 to uint'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'cast uint 1 to uint'
 ; The setlt wants to use a value that is incremented one more than the dominant
 ; IV.  Don't insert the 1 outside the loop, preventing folding it into the add.
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
index 86fd05edab5cb2cebbdc2d0f81574c3101e82bd3..aecade80d79e8f0c2c8072c019ab07eb2e2405c4 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
@@ -1,5 +1,5 @@
 ; Check that this test makes INDVAR and related stuff dead.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 2
 
 declare bool %pred()
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll
index fcb5fa1cfa834d6f6b6fc3d8d08fcfc23f178faa..2c679800a7aeeac593f8598b777676539a6205d5 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll
@@ -1,7 +1,7 @@
 ; Don't reduce the byte access to P[i], at least not on targets that 
 ; support an efficient 'mem[r1+r2]' addressing mode.
 
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 
 declare bool %pred(int)
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/exit_compare_live_range.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
index 4599de5f9ed4e012c55b9b685686764098b6a2f8..3976f5d04a9805a4ed03e636fa37a98c0db15395 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
@@ -2,7 +2,7 @@
 ; having overlapping live ranges that result in copies.  We want the setcc instruction
 ; immediately before the conditional branch.
 ;
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | %prcontext 'br bool' 1 | grep set
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | %prcontext 'br bool' 1 | grep set
 
 void %foo(float* %D, uint %E) {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first.ll
index 8f16210c7ab7218f1514dcd22613edc57fc7f276..5e05e7555083cdac47fc4271b7dd90e5eeea879f 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first.ll
@@ -1,5 +1,5 @@
 ; Check that the index of 'P[outer]' is pulled out of the loop.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
 
 declare bool %pred()
 declare int %foo()
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
index 7bbd8dae664f73662c9e0507ec09fa0ef89831d7..0289badddc418fdb314edb53bcb8377674fb34be 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
@@ -1,5 +1,5 @@
 ; Check that the index of 'P[outer]' is pulled out of the loop.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
 
 declare bool %pred()
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/nested-reduce.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/nested-reduce.ll
index ebef2f0fdf24deb4c899e7afeca4ebd79774e3ca..3caa366b066236615f4de032be92c411daef4286 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/nested-reduce.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/nested-reduce.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -loop-reduce &&
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep mul
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep mul
 
 ; Make sure we don't get a multiply by 6 in this loop.
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/ops_after_indvar.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/ops_after_indvar.ll
index b4bda7e5374f6aab6199e62b07f09c6ae6c59596..59da48b9e57f9d8b4c638cb83a72122e93071ab2 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/ops_after_indvar.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/ops_after_indvar.ll
@@ -1,7 +1,7 @@
 ; Check that this test makes INDVAR and related stuff dead, because P[indvar]
 ; gets reduced, making INDVAR dead.
 
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep INDVAR
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep INDVAR
 
 declare bool %pred()
 declare int %getidx()
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll
index bf2346113db3813e11ae350d4e481c8fdd9066c0..cd0afe1936b527c3cf96858566b05b4c31815454 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output
 ; LSR should not crash on this.
 
 fastcc void %loadloop() {
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/related_indvars.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/related_indvars.ll
index f2470d943480c032e4a8adce826d61c05d69f6d2..783433663b05d0071715c2aa3d0fbb299f5f9ad8 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/related_indvars.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/related_indvars.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
 
 ; This should only result in one PHI node!
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/remove_indvar.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/remove_indvar.ll
index 646776af05ff23f8684c91e6a4a316430a77ef99..517180b7f025c8daea57f7e3750d2de52805e688 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/remove_indvar.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/remove_indvar.ll
@@ -1,5 +1,5 @@
 ; Check that this test makes INDVAR and related stuff dead.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep INDVAR
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep INDVAR
 
 declare bool %pred()
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/share_code_in_preheader.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
index 532fe820ac4fb6d305b7b1a9fd2bb83ee7796861..ba897c401f154d4c843946a017ed85c466f373b1 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1
 ; LSR should not make two copies of the Q*L expression in the preheader!
 
 sbyte %test(sbyte* %A, sbyte* %B, int %L, int %Q, int %N) {
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/share_ivs.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/share_ivs.ll
index d44cf0f1e7d80ac5a4e7b0dddae5d553527dd92b..76bfe1d529c923d0bbb0e0d805a62671c2261e1e 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/share_ivs.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/share_ivs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
 
 ; This testcase should have ONE stride 18 indvar, the other use should have a
 ; loop invariant value (B) added to it inside of the loop, instead of having
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
index 13f4701f4bbfafd47183a8e298b8dd76347ea055..4a6e9b2a13db70798cdb1e9aa23e79db2201fc9b 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep 'add uint %iv.*inc, 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep 'add uint %iv.*inc, 1'
 ;
 ; Make sure that the use of the IV outside of the loop (the store) uses the 
 ; post incremented value of the IV, not the preincremented value.  This 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
index 4f619cd65ff7bd9bf2a460024a51a11f1e449c8d..7b4f022aa38737e2f9d3e1298186b8720d56c090 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
@@ -1,10 +1,10 @@
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis &&
 
 ; Base should not be i*3, it should be i*2.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'mul.*%i, 3' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul.*%i, 3' &&
 
 ; Indvar should not start at zero:
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'phi uint .* 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'phi uint .* 0'
 
 ; mul uint %i, 3
 
diff --git a/llvm/test/Regression/Transforms/LoopStrengthReduce/variable_stride.ll b/llvm/test/Regression/Transforms/LoopStrengthReduce/variable_stride.ll
index 25103bff1a04179a2be8ec4638c9cef04dc421b8..83aeaa6a9c6c8a62db8e12a22e0d059f8d161e08 100644
--- a/llvm/test/Regression/Transforms/LoopStrengthReduce/variable_stride.ll
+++ b/llvm/test/Regression/Transforms/LoopStrengthReduce/variable_stride.ll
@@ -1,5 +1,5 @@
 ; Check that variable strides are reduced to adds instead of multiplies.
-; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'mul'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul'
 
 declare bool %pred(int)
 
diff --git a/llvm/test/Regression/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll b/llvm/test/Regression/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
index 6edf281283681a3a7e8f403dbade6bedd205aa42..8c3e697c89ae282dae1098b39407394b071bd026 100644
--- a/llvm/test/Regression/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
+++ b/llvm/test/Regression/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unroll -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -disable-output
 
 int %main() {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll b/llvm/test/Regression/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
index b587259ec69cd0cb1d0441649c52291a268d368e..1681506acbdf47a7486764f458ce2ac683058bec 100644
--- a/llvm/test/Regression/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
+++ b/llvm/test/Regression/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unroll -loopsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -loopsimplify -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll b/llvm/test/Regression/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
index b2f2ae6af696f37d9e825a974829623a3af0c303..c21ae484db013548e100e962081a33416b99291b 100644
--- a/llvm/test/Regression/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
+++ b/llvm/test/Regression/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unroll | llvm-dis | grep "bb72.2"
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll | llvm-dis | grep "bb72.2"
 
 void %vorbis_encode_noisebias_setup() {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll b/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
index 1d1cd6d29203eb9f15d9eadc5d08e36f58826625..ac0b798094026e1cbcd68e4c93b827d785d93dee 100644
--- a/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
+++ b/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll b/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll
index 7b028874a6a6081c9aa61e8d847f013c0e6497df..469c6d755a5d4ef161d1f677bdb6d6115b1674ec 100644
--- a/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll
+++ b/llvm/test/Regression/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output
 
 void %sort_Eq(int * %S2) {
 entry:
diff --git a/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll b/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll
index 6523f65da9ac946daf6e3222e8f01435bff93fae..072ad20967d09fcdc68e5a76c68a3c0134dac85a 100644
--- a/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll
+++ b/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output
 
 	%struct.BLEND_MAP = type { short, short, short, int, %struct.BLEND_MAP_ENTRY* }
 	%struct.BLEND_MAP_ENTRY = type { float, ubyte, { [5 x float], [4 x ubyte] } }
diff --git a/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll b/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll
index b7c6df83a0561e844221c5fe031b317c3fa1c909..0d5a452da20db51cf729343229c18413fd64102b 100644
--- a/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll
+++ b/llvm/test/Regression/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output
 implementation   ; Functions:
 
 void %init_caller_save() {
diff --git a/llvm/test/Regression/Transforms/LoopUnswitch/basictest.ll b/llvm/test/Regression/Transforms/LoopUnswitch/basictest.ll
index 12fef813b8c6f6db54beb348b2f402a57878d873..c0c14b95007a2ad312bc87ba93f4e7adbbf0ecc5 100644
--- a/llvm/test/Regression/Transforms/LoopUnswitch/basictest.ll
+++ b/llvm/test/Regression/Transforms/LoopUnswitch/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output
 implementation   ; Functions:
 
 int %test(int* %A, bool %C) {
diff --git a/llvm/test/Regression/Transforms/LowerInvoke/2003-12-10-Crash.llx b/llvm/test/Regression/Transforms/LowerInvoke/2003-12-10-Crash.llx
index f068ae1317cb7fe084511028a22b0e98db42d3d6..495099ae9449dd7bef6ea1b94cd2c61c915d4dd2 100644
--- a/llvm/test/Regression/Transforms/LowerInvoke/2003-12-10-Crash.llx
+++ b/llvm/test/Regression/Transforms/LowerInvoke/2003-12-10-Crash.llx
@@ -1,6 +1,6 @@
 ; This testcase was reduced from Shootout-C++/reversefile.cpp by bugpoint
 
-; RUN: llvm-as < %s | opt -lowerinvoke -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output
 
 declare void %baz()
 
diff --git a/llvm/test/Regression/Transforms/LowerInvoke/2004-02-29-PHICrash.llx b/llvm/test/Regression/Transforms/LowerInvoke/2004-02-29-PHICrash.llx
index 5454eae5f9fa30b9bd435f9a48002d3c9eaa723b..90182574e0bbcfe730b246be65a1f0603e47b628 100644
--- a/llvm/test/Regression/Transforms/LowerInvoke/2004-02-29-PHICrash.llx
+++ b/llvm/test/Regression/Transforms/LowerInvoke/2004-02-29-PHICrash.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output
 
 void %_ZNKSt11__use_cacheISt16__numpunct_cacheIcEEclERKSt6locale() {
 entry:
diff --git a/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll b/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll
index a0d21860ca1c19a5d4677bf32247f83bfdd0a2e6..51f3fb2a029b7d93876ec50fa699ea82ebfa33dc 100644
--- a/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll
+++ b/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll b/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll
index 22bfa0f0fb3d67e3fa5eeb5477c8aa2557b26282..636625743a53993db148b2e360488e360ac8882d 100644
--- a/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll
+++ b/llvm/test/Regression/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output
 
 declare fastcc int %ll_listnext__listiterPtr()
 
diff --git a/llvm/test/Regression/Transforms/LowerInvoke/basictest.ll b/llvm/test/Regression/Transforms/LowerInvoke/basictest.ll
index 93022f5b31627ef788c7c4b3dd43e02a47140930..4150ad3efbd1719f39a2d7c86d83dfb39adadccb 100644
--- a/llvm/test/Regression/Transforms/LowerInvoke/basictest.ll
+++ b/llvm/test/Regression/Transforms/LowerInvoke/basictest.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -lowerinvoke -disable-output &&
-; RUN: llvm-as < %s | opt -lowerinvoke -disable-output -enable-correct-eh-support
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output -enable-correct-eh-support
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll b/llvm/test/Regression/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
index aa1e4d4fefbb345ba7d13cd3541b44511b7da225..4eb21336287639edd2be3a12782ffda348051b2f 100644
--- a/llvm/test/Regression/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
+++ b/llvm/test/Regression/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowersetjmp -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp -disable-output
 	%struct.jmpenv = type { int, sbyte }
 
 implementation
diff --git a/llvm/test/Regression/Transforms/LowerSetJmp/2005-05-05-OldUses.ll b/llvm/test/Regression/Transforms/LowerSetJmp/2005-05-05-OldUses.ll
index 72b756c566fceebad86dcac42b3748bbd551fe46..efbf1ddeb3d5dd36b85c58f8fc1860bf0d30cd6f 100644
--- a/llvm/test/Regression/Transforms/LowerSetJmp/2005-05-05-OldUses.ll
+++ b/llvm/test/Regression/Transforms/LowerSetJmp/2005-05-05-OldUses.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowersetjmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp
 	%lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, {  }* }
 %d.compile_unit = external global %lldb.compile_unit		; <%lldb.compile_unit*> [#uses=1]
 
diff --git a/llvm/test/Regression/Transforms/LowerSetJmp/simpletest.ll b/llvm/test/Regression/Transforms/LowerSetJmp/simpletest.ll
index 94a607a23e02fc3519159df73bb94cf0f883c8e6..d749d5ff13458b4be24c6d96a8e8d2f58fedae54 100644
--- a/llvm/test/Regression/Transforms/LowerSetJmp/simpletest.ll
+++ b/llvm/test/Regression/Transforms/LowerSetJmp/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowersetjmp | llvm-dis | grep invoke
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp | llvm-dis | grep invoke
 
 %JmpBuf = type int
 %.str_1 = internal constant [13 x sbyte] c"returned %d\0A\00"
diff --git a/llvm/test/Regression/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll b/llvm/test/Regression/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
index c17f8ce542557a08fce281ff3ba71e1bd5eb442f..0ff1f5c6d50df1ff1d46886f0dd66b438ca23129 100644
--- a/llvm/test/Regression/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
+++ b/llvm/test/Regression/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerswitch
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch
 
 void %child(int %ct.1) {
 entry:          ; No predecessors!
diff --git a/llvm/test/Regression/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll b/llvm/test/Regression/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
index e858f34d436ff9b13cb3a8d804578eb775211c6c..a193cd4645ee281114f949c9660919a9711668c1 100644
--- a/llvm/test/Regression/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
+++ b/llvm/test/Regression/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerswitch
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch
 
 void %test() {
 	switch uint 0, label %Next []
diff --git a/llvm/test/Regression/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll b/llvm/test/Regression/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll
index 4c412aaa4416cc5a5a8191d884e616d2b617a4a9..1cbe85355712c89a1b87cedd5e70aad595604cdc 100644
--- a/llvm/test/Regression/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll
+++ b/llvm/test/Regression/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -lowerswitch -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch -disable-output
 
 void %solve() {
 entry:
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll b/llvm/test/Regression/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
index 9f401b3e35459b8f3b2f6391148801c06c256a3e..b2776592a9ca77f24e8b478cc41a80aacef4a536 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll
@@ -1,6 +1,6 @@
 ; Uninitialized values are not handled correctly.
 ;
-; RUN: llvm-as < %s | opt -mem2reg
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg
 ;
 
 implementation
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll b/llvm/test/Regression/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll
index c51d09522b6f91ce41ad47791ebf02ffc2d66410..c3d803c34fb91a75e9197749db36abd21a49a920 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -mem2reg
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg
 
 
 implementation
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll b/llvm/test/Regression/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
index 05990b1b458e66ce2873e42efe81999e220c09cf..918431adf1d80d7b4a21e6fb66dab605a706d268 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -mem2reg
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll b/llvm/test/Regression/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
index bdf155a4d49d983e881d4bf72fe821da17a1c387..d6f1b779e194f39dac2e05872553cbbef63deb6d 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll
@@ -1,5 +1,5 @@
 ; This testcases makes sure that mem2reg can handle unreachable blocks.
-; RUN: llvm-as < %s | opt -mem2reg
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg
 
 int %test() {
 	%X = alloca int
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll b/llvm/test/Regression/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll
index 9e23466df9a2e71b48335ffba6c553c5dd7ddc27..7cd38c2f0c661a24fab5342fc673f7daede901ea 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -mem2reg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -disable-output
 
 int %test(bool %c1, bool %c2) {
 	%X = alloca int
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll b/llvm/test/Regression/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
index 3b63efa4464c134fdca8c8f8a3fc2667ed3c6bce..ce274fa327e92926ecc3ec13dd75cacf90ebfc07 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll
@@ -1,5 +1,5 @@
 ; Promoting some values allows promotion of other values.
-; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep alloca
 
 int %test2() {
         %result = alloca int             ; ty=int*
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll b/llvm/test/Regression/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll
index a9b87fd1f475ef998fc1e9da2de4c42cce999ad4..ab4b6619dc8ac516892fc45301676e542d4f91dd 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll
@@ -1,7 +1,7 @@
 ; Mem2reg should not insert dead PHI nodes!  The naive algorithm inserts a PHI
 ;  node in L3, even though there is no load of %A in anything dominated by L3.
 
-; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep phi
 
 void %test(int %B, bool %C) {
 	%A = alloca int
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll b/llvm/test/Regression/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll
index a6d46967d428421adf1437164dd54cf4213cb7da..c64d848a61b083308bd75eed9ef34c41045d1a8c 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -mem2reg -instcombine | llvm-dis | grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -instcombine | llvm-dis | grep store
 ; PR590
 
 void %zero(sbyte* %p, int %n) {
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/2005-11-28-Crash.ll b/llvm/test/Regression/Transforms/Mem2Reg/2005-11-28-Crash.ll
index 1facf21dc7fc28e0a0a3c6f50725e3ee26d1a7de..01e8b851be3a19eeb442eda761d82675f9e743bb 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/2005-11-28-Crash.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/2005-11-28-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -mem2reg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -disable-output
 ; PR670
 
 void %printk(int, ...) {
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/DifferingTypes.ll b/llvm/test/Regression/Transforms/Mem2Reg/DifferingTypes.ll
index 8cf793c85e62da8d1f399ce301978d4c198eb342..f859808c2fb96bab903b7be1bdac89ff6ea7d1a5 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/DifferingTypes.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/DifferingTypes.ll
@@ -2,7 +2,7 @@
 ; generated code should perform the appropriate masking operations required 
 ; depending on the endianness of the target...
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca'
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep 'alloca'
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/PromoteMemToRegister.ll b/llvm/test/Regression/Transforms/Mem2Reg/PromoteMemToRegister.ll
index b540a291cea7718355cc02c25be2d1ecb044871a..49de1b6bceed2431a864fa9ce7c52d5fd1c9d218 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/PromoteMemToRegister.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/PromoteMemToRegister.ll
@@ -1,5 +1,5 @@
 ; Simple sanity check testcase.  Both alloca's should be eliminated.
-; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca'
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep 'alloca'
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/Mem2Reg/UndefValuesMerge.ll b/llvm/test/Regression/Transforms/Mem2Reg/UndefValuesMerge.ll
index 2da7013cd5e8a91a6f70f612104ddf054293f5b4..dc2f011e240fba58f08ffb830425a513525f6b8d 100644
--- a/llvm/test/Regression/Transforms/Mem2Reg/UndefValuesMerge.ll
+++ b/llvm/test/Regression/Transforms/Mem2Reg/UndefValuesMerge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep phi
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-02-Switch.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-02-Switch.ll
index 97f2a5a5f6aea6da931b9314a918abb139a5c46c..1d19516f0e2756a77d5ed7ba0e4fa137a66ed15d 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-02-Switch.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-02-Switch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 fastcc void %_ov_splice(int %n1, int %n2, int %ch2) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll
index 244fe79ee4521565d31f3da4ca7192ff40a41acb..1322b90f4860f3f700b6394c6442a2dded27fa29 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 void %safe_strcpy(uint %size1) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll
index 6b456b9502d6d1393750a09bc66b11ae1d3f6e95..83e5eacceda81c326ed8c194a9fbc4616f42fa81 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 void %gs_image_next() {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
index 67bc715c9189e823a9e653e6fadbc6b17aa495c8..8f2fdbd79adb9631d070c4f0d0d9d444c64399ed 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify | llvm-dis | grep br | grep return.i.bb8_crit_edge | grep false
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify | llvm-dis | grep br | grep return.i.bb8_crit_edge | grep false
 
 %str = external global [4 x sbyte]		; <[4 x sbyte]*> [#uses=1]
 
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
index 1af33655e8b22d786d31d9d55ca35286786adb51..0cdd58085b76fd5eebfc780a8edfdecd922248b0 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 3
 
 int %test1(int %x, int %y) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
index 503d327cac591e288f4bc9b6da347ae125779a10..5c5a4a48d46a8d7f1c1da0abb35b3d77ca641b04 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 2
 
 int %test(int %x, int %y) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll
index c401bfe256a098383452f592ab4ac80150b032f7..32ed49554f29f4479d08460371af1d0fc6ce1297 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 void %readMotionInfoFromNAL() {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll
index f3c17c38cf355c624bd0c35a483b8e5f91551e8f..74daa7e82b5aa64e4c8bd35b65d5b8189ec40a3b 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 int %test_wp_B_slice(int %select_method) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll
index 5aaf503dd1d3a4285046b9fb63b4585b4318eaee..fccc6db6cad24375a1776c0dcc1cb0d6d305046f 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 void %diff(int %N) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll
index d260ae35d7121f3904fa5aec521926b6b9896afb..cf748cd9200d8eca7fdf6d17a5853a955354e46d 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 	%struct.cube_struct = type { int, int, int, int*, int*, int*, int*, int*, uint*, uint*, uint**, uint**, uint*, uint*, uint, int, int*, int, int }
 %cube = external global %struct.cube_struct		; <%struct.cube_struct*> [#uses=2]
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll
index 134dd0fb1b1b8c15cb9f389c0f24e3eb57c5bbf4..5f143ed4a8b7f8610a0135cf32af9ac897985b1b 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 ; ModuleID = 'b.bc'
 target datalayout = "e-p:32:32"
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.ll
index af6cd155a8e09b3664b43e34bb9c7577c72065ba..efe28d184ab92cf27fe9b1678f4af52ecd088595 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
-; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 4
 
 void %test1(int %x) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg1.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg1.ll
index a7fd4cabedda97742b1b2d9cd8789d4f9fdcdccd..caa41b32803d620440c43aad05bc6ae5f17f8783 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg1.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg1.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -verify
 
 void %dgefa() {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg2.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg2.ll
index a5e77aa9e41b659de751925c1a37cef478a2ca6a..e7593fa7ba12e47016e9e4e8b325d8ae7e4dc2b4 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg2.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -verify
 
 ; ModuleID = 'bugpoint-reduced-simplified.bc'
 target endian = little
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg3.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg3.ll
index facf336fa1334df7821b1014d8b07e4f756a8eee..82e48b744ab482806b1ced94cf97c97055f8fe10 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg3.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -simplifycfg | llvm-dis | grep pass
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -simplifycfg | llvm-dis | grep pass
 
 void %regtest(int %x) {
 entry:
diff --git a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg4.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg4.ll
index ebf58ca72e71baaf2d182776c4dd01f378b1397f..3817e87cde94d4cfa414237230f49390ee14e1d3 100644
--- a/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg4.ll
+++ b/llvm/test/Regression/Transforms/PredicateSimplifier/predsimplify.reg4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output
 
 ; ModuleID = '<stdin>'
 target endian = little
diff --git a/llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx b/llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx
index c42ddd228c4de0adc222cacdd9e22417d9f7c6ee..0ca05d6e423075b313f3036f7b943ea2d0ad755b 100644
--- a/llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx
+++ b/llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | grep invoke
+; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | grep invoke
 
 declare void %External()
 
diff --git a/llvm/test/Regression/Transforms/PruneEH/2003-11-21-PHIUpdate.llx b/llvm/test/Regression/Transforms/PruneEH/2003-11-21-PHIUpdate.llx
index d71259c181d41c93883d410d1e309e805fd52a51..3b272fce3f5a51f4fd23539f09f2753fdfe15eeb 100644
--- a/llvm/test/Regression/Transforms/PruneEH/2003-11-21-PHIUpdate.llx
+++ b/llvm/test/Regression/Transforms/PruneEH/2003-11-21-PHIUpdate.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -prune-eh -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/PruneEH/recursivetest.llx b/llvm/test/Regression/Transforms/PruneEH/recursivetest.llx
index fc2b952de02160458683bddf608cb99a65fbecbd..0ef33b54eb28e1cf117a5329f04a909e80776a8f 100644
--- a/llvm/test/Regression/Transforms/PruneEH/recursivetest.llx
+++ b/llvm/test/Regression/Transforms/PruneEH/recursivetest.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke
+; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep invoke
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/PruneEH/simplenoreturntest.ll b/llvm/test/Regression/Transforms/PruneEH/simplenoreturntest.ll
index 29cf9e5c82f40bdd33d74dc46aee817562860698..cc3a86d985c6ae908d73675b854e4828eb14330e 100644
--- a/llvm/test/Regression/Transforms/PruneEH/simplenoreturntest.ll
+++ b/llvm/test/Regression/Transforms/PruneEH/simplenoreturntest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep 'ret int'
+; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep 'ret int'
 
 void %noreturn() {
 	unwind
diff --git a/llvm/test/Regression/Transforms/PruneEH/simpletest.llx b/llvm/test/Regression/Transforms/PruneEH/simpletest.llx
index 4c6f8bad54436aac2d601de99af4933d78321f68..c368534eda81b969dc197585e9e1efea76c68c65 100644
--- a/llvm/test/Regression/Transforms/PruneEH/simpletest.llx
+++ b/llvm/test/Regression/Transforms/PruneEH/simpletest.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke
+; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep invoke
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll b/llvm/test/Regression/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll
index 0e229c69a953d3b04eea42d70ebce6ffd2a037bd..389047edc460632a559e500b6f0279920e247fea 100644
--- a/llvm/test/Regression/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll
+++ b/llvm/test/Regression/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -raiseallocs -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -raiseallocs -disable-output
 implementation   ; Functions:
 
 void %main() {
diff --git a/llvm/test/Regression/Transforms/RaiseAllocations/FreeCastConstantExpr.ll b/llvm/test/Regression/Transforms/RaiseAllocations/FreeCastConstantExpr.ll
index 3b700ffd45743804bf16eb47cdbb4de5f36e8cf2..008aea4fe200c5bc5511e91c83521e9686dbc73f 100644
--- a/llvm/test/Regression/Transforms/RaiseAllocations/FreeCastConstantExpr.ll
+++ b/llvm/test/Regression/Transforms/RaiseAllocations/FreeCastConstantExpr.ll
@@ -1,6 +1,6 @@
 ; This situation can occur due to the funcresolve pass.
 ;
-; RUN: llvm-as < %s | opt -raiseallocs | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -raiseallocs | llvm-dis | not grep call
 
 declare void %free(sbyte*)
 
diff --git a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
index 0a176be6e3b32ce9c5e62ff0e40b12246fa21c29..a7b0df1e8bef1c6316a7b3ca2164aed139c3d7bc 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -dce | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine -constprop -dce | llvm-dis | not grep add
 
 int %test(int %A) {
 	%X = add int %A, 1
diff --git a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-MissedTree.ll b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-MissedTree.ll
index fce2cdec0ee3e011bf3e6d83ac168b058d995cc4..176948a7f9b7ae03b542d5b832b47d226585eedb 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-MissedTree.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-MissedTree.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -die | llvm-dis | not grep 5
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine -constprop -die | llvm-dis | not grep 5
 
 int %test(int %A, int %B) {
         %W = add int %B, -5
diff --git a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate.ll b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate.ll
index f3e6bfa785b561ed86305f7d9f528dfc7e258db5..be204e92142d8dd65889d8e134af3d475c02fa52 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate all of the constants.
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -dce | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -dce | llvm-dis | not grep add
 
 int %test(int %A, int %B) {
 	%W = add int 5, %B
diff --git a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate2.ll b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
index 85e746bfe1ad42a26659e4f3eba3699dbb8d9ee8..c46cc2ebb1caef207cb90adb7666eeb2194a4909 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2002-05-15-SubReassociate2.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate the two 12 constants.
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -dce | llvm-dis | not grep 12
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/Reassociate/2002-07-09-DominanceProblem.ll b/llvm/test/Regression/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
index 3829148699265c4d916ae4fac3dcf2a64d676ced..6a0ef53279aa458256d91d9e380f82a0ede27ad4 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
@@ -1,6 +1,6 @@
 ; The reassociate pass is not preserving dominance properties correctly
 ;
-; RUN: llvm-as < %s | opt -reassociate
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate
 
 int %compute_dist(int %i, int %j) {
         %reg119 = sub int %j, %i
diff --git a/llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll b/llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
index 59e482d95ea98c2abe7eb3ef555cd0cd291dcc1f..a84297b8b454229283d023e32a045ddf6bb7b1c2 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/Reassociate/2005-08-24-Crash.ll b/llvm/test/Regression/Transforms/Reassociate/2005-08-24-Crash.ll
index c1d5259ed510cccb60e05da149bcd6ecf8eb41ec..7e8e5d5a3f6654c191ae8b5955a57d305a37565e 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2005-08-24-Crash.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2005-08-24-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output
 
 void %test(int %a, int %b, int %c, int %d) {
 	%tmp.2 = xor int %a, %b		; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll b/llvm/test/Regression/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
index 958f9797a2612eef70ba1fc7132ae553e4af50d9..e51c8cc1ec884fb11a6f40baa325a83e4ea18536 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'ret int 0'
 
 int %f(int %a0, int %a1, int %a2, int %a3, int %a4) {
 	%tmp.2 = add int %a4, %a3		; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/Reassociate/2006-04-27-ReassociateVector.ll b/llvm/test/Regression/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
index 30c8426b4d817b7519e3c95c8707f25d7c7beed0..2a5b5cd9819fd96452559d5b1902c31b78580d6c 100644
--- a/llvm/test/Regression/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output
 
 void %foo() {
 	%tmp162 = sub <4 x float> zeroinitializer, zeroinitializer
diff --git a/llvm/test/Regression/Transforms/Reassociate/basictest.ll b/llvm/test/Regression/Transforms/Reassociate/basictest.ll
index 6372d988c334e0f78fb0c7f294fb913088caa104..a7ff84a65e6a8cfdc58a4249ea1c2e05531825d2 100644
--- a/llvm/test/Regression/Transforms/Reassociate/basictest.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/basictest.ll
@@ -1,6 +1,6 @@
 ; With reassociation, constant folding can eliminate the 12 and -12 constants.
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep add
 
 int %test(int %arg) {
 	%tmp1 = sub int -12, %arg
diff --git a/llvm/test/Regression/Transforms/Reassociate/basictest2.ll b/llvm/test/Regression/Transforms/Reassociate/basictest2.ll
index c7a3687642c2313d08968fa7cb470e18a8a47944..7efa3cca81aefbcb730b5558645b391fcc088eef 100644
--- a/llvm/test/Regression/Transforms/Reassociate/basictest2.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/basictest2.ll
@@ -1,6 +1,6 @@
 ; With reassociation, constant folding can eliminate the +/- 30 constants.
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 30
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/Reassociate/basictest3.ll b/llvm/test/Regression/Transforms/Reassociate/basictest3.ll
index c82b0176aba39409e9cb24826d67fd6281eb39c1..a3da5a0400a622a60ac9bcc75391bbaa310157fb 100644
--- a/llvm/test/Regression/Transforms/Reassociate/basictest3.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/basictest3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6
 ; Each of these functions should turn into two adds each.
 
 %e = external global int
diff --git a/llvm/test/Regression/Transforms/Reassociate/basictest4.ll b/llvm/test/Regression/Transforms/Reassociate/basictest4.ll
index 4f75e167c6eebfe5fcbfc360639c46b30cd4a7ca..dcf7a55bcd96fe830d74775f3a65f68e38d1c7ef 100644
--- a/llvm/test/Regression/Transforms/Reassociate/basictest4.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/basictest4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -gcse -instcombine | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse -instcombine | llvm-dis | not grep add
 
 %a = weak global int 0
 %b = weak global int 0
diff --git a/llvm/test/Regression/Transforms/Reassociate/inverses.ll b/llvm/test/Regression/Transforms/Reassociate/inverses.ll
index 0ce704698a2fbe7e778fdba0a1b337d41139ad6a..eff3e6b34bf56e75da8f6b7e7c6e3ee7eef482a4 100644
--- a/llvm/test/Regression/Transforms/Reassociate/inverses.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/inverses.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -dce | llvm-dis | not grep '\(and\|sub\)'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -dce | llvm-dis | not grep '\(and\|sub\)'
 
 int %test1(int %a, int %b) {
         %tmp.2 = and int %b, %a
diff --git a/llvm/test/Regression/Transforms/Reassociate/looptest.ll b/llvm/test/Regression/Transforms/Reassociate/looptest.ll
index aa7000f9fa16ca2af52fc3c410c87de48e479587..97127bb95094be99be4c51e9b420bb8f4424c2c7 100644
--- a/llvm/test/Regression/Transforms/Reassociate/looptest.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -reassociate | llvm-dis | grep 115 | not grep 117
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/Reassociate/mul-factor3.ll b/llvm/test/Regression/Transforms/Reassociate/mul-factor3.ll
index 773569e3dfb807528c82add732f2ad433d9b7aaa..5e06fbca84731973e99a1728196f9a7f7ce39110 100644
--- a/llvm/test/Regression/Transforms/Reassociate/mul-factor3.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/mul-factor3.ll
@@ -1,7 +1,7 @@
 ; This should be one add and two multiplies.
 
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 &&
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
 
 int %test(int %A, int %B, int %C) {
 	%aa = mul int %A, %A
diff --git a/llvm/test/Regression/Transforms/Reassociate/mul-neg-add.ll b/llvm/test/Regression/Transforms/Reassociate/mul-neg-add.ll
index 79eeb198ac7a85bc6ccbb6b9a8d1a0d110a5e0d8..d7c39a5808eb55dd9ade15469bcdc4fc23a9a951 100644
--- a/llvm/test/Regression/Transforms/Reassociate/mul-neg-add.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/mul-neg-add.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | not grep 'sub int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | not grep 'sub int 0'
 
 int %test(int %X, int %Y, int %Z) {
 	%A = sub int 0, %X
diff --git a/llvm/test/Regression/Transforms/Reassociate/mulfactor.ll b/llvm/test/Regression/Transforms/Reassociate/mulfactor.ll
index 76db242128fe521dbd5e450282e9d3187c3a25be..bb7efc3f7a28d16d309160b3f18e7418e9bccc5e 100644
--- a/llvm/test/Regression/Transforms/Reassociate/mulfactor.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/mulfactor.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2
 
 ; This should have exactly 2 multiplies when we're done.
 
diff --git a/llvm/test/Regression/Transforms/Reassociate/mulfactor2.ll b/llvm/test/Regression/Transforms/Reassociate/mulfactor2.ll
index 20a28a45a03fc9862351925aa6a38d90beb33d9e..062e3af4f5008c91c27c1c0938c357764b480d36 100644
--- a/llvm/test/Regression/Transforms/Reassociate/mulfactor2.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/mulfactor2.ll
@@ -1,7 +1,7 @@
 ; This should turn into one multiply and one add.
 
-; RUN: llvm-as < %s | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 &&
-; RUN: llvm-as < %s | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
 int %main(int %t) {
         %tmp.3 = mul int %t, 12         ; <int> [#uses=1]
         %tmp.4 = add int %tmp.3, 5              ; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/Reassociate/negation.ll b/llvm/test/Regression/Transforms/Reassociate/negation.ll
index ba7fe6fbeb3b29e44404023dcd34c9c2d8e13e8c..56e087a1fc75354a5d526680de6ea68e12e0bccf 100644
--- a/llvm/test/Regression/Transforms/Reassociate/negation.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/negation.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | not grep sub
 
 ; Test that we can turn things like X*-(Y*Z) -> X*-1*Y*Z.
 
diff --git a/llvm/test/Regression/Transforms/Reassociate/otherops.ll b/llvm/test/Regression/Transforms/Reassociate/otherops.ll
index 0a205e32ca9cdd7ae1c7ee83b383bbc5905f75ee..9e99d2c858910865d840ba6889ac8562a6fcb72b 100644
--- a/llvm/test/Regression/Transforms/Reassociate/otherops.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/otherops.ll
@@ -1,6 +1,6 @@
 ; Reassociation should apply to Add, Mul, And, Or, & Xor
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
 
 int "test_mul"(int %arg) {
         %tmp1 = mul int 12, %arg
diff --git a/llvm/test/Regression/Transforms/Reassociate/shift-factor.ll b/llvm/test/Regression/Transforms/Reassociate/shift-factor.ll
index b0499f5cb250f29e4f6698dcd867f260b158e305..51513c28956a52bb93b877adf4b863c35d725f87 100644
--- a/llvm/test/Regression/Transforms/Reassociate/shift-factor.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/shift-factor.ll
@@ -1,6 +1,6 @@
 ; There should be exactly one shift and one add left.
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 &&
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
 
 int %test(int %X, int %Y) {
         %tmp.2 = shl int %X, ubyte 1            ; <int> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/Reassociate/shifttest.ll b/llvm/test/Regression/Transforms/Reassociate/shifttest.ll
index 6ca6622467ff92e698cca1cb8347839a04dae13d..6a65aafb186c3bbfc1d5e0f29105358d767db10d 100644
--- a/llvm/test/Regression/Transforms/Reassociate/shifttest.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/shifttest.ll
@@ -1,6 +1,6 @@
 ; With shl->mul reassociation, we can see that this is (shl A, 9) * A
 ;
-; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, ubyte 9'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, ubyte 9'
 
 int %test(int %A, int %B) {
 	%X = shl int %A, ubyte 5
diff --git a/llvm/test/Regression/Transforms/Reassociate/subtest.ll b/llvm/test/Regression/Transforms/Reassociate/subtest.ll
index fe2d46f910c89286017c23bb4a4c99dba8d5cee5..097c355aaa4e6dae8130d7aeb5c5221f87ccf7e0 100644
--- a/llvm/test/Regression/Transforms/Reassociate/subtest.ll
+++ b/llvm/test/Regression/Transforms/Reassociate/subtest.ll
@@ -1,6 +1,6 @@
 ; With sub reassociation, constant folding can eliminate the 12 and -12 constants.
 ;
-; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12
 
 int "test"(int %A, int %B) {
 	%X = add int -12, %A
diff --git a/llvm/test/Regression/Transforms/SCCP/2002-05-02-EdgeFailure.ll b/llvm/test/Regression/Transforms/SCCP/2002-05-02-EdgeFailure.ll
index 9eeca701236d0115ecc2e3b0d94b4b5dfe8c5fd7..2136ca644c8116d594a39f10f5bf6acd63628810 100644
--- a/llvm/test/Regression/Transforms/SCCP/2002-05-02-EdgeFailure.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2002-05-02-EdgeFailure.ll
@@ -5,7 +5,7 @@
 ; real benchmark (mst from Olden benchmark, MakeGraph function).  When SCCP is
 ; fixed, this should be eliminated by a single SCCP application.
 ;
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep loop
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep loop
 
 int* %test() {
 bb1:
diff --git a/llvm/test/Regression/Transforms/SCCP/2002-05-02-MissSecondInst.ll b/llvm/test/Regression/Transforms/SCCP/2002-05-02-MissSecondInst.ll
index 183e5bc4d794189b9bee79b6f8eb4ba32a6f1cb2..24e99b19e39b03f806619069cdbc747d012a459d 100644
--- a/llvm/test/Regression/Transforms/SCCP/2002-05-02-MissSecondInst.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2002-05-02-MissSecondInst.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep sub
 
 void %test3(int, int) {
 	add int 0, 0
diff --git a/llvm/test/Regression/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll b/llvm/test/Regression/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
index 448d1b52e13db2c1f77d86faa734dc310d967099..c851efdb0e1a6cb2559a5f7c52de14958f070909 100644
--- a/llvm/test/Regression/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
@@ -1,7 +1,7 @@
 ; This test shows a case where SCCP is incorrectly eliminating the PHI node
 ; because it thinks it has a constant 0 value, when it really doesn't.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep phi
 
 int "test"(int %A, bool %c) {
 bb1:
diff --git a/llvm/test/Regression/Transforms/SCCP/2002-05-21-InvalidSimplify.ll b/llvm/test/Regression/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
index 6b0f369e2c7ac4cd932ea65a8b9ddbaea32ae750..c31a421d0e5e67fe8a25e13c6811298eb01144c4 100644
--- a/llvm/test/Regression/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
@@ -2,7 +2,7 @@
 ; this is in fact NOT the case, so the return should still be alive in the code
 ; after sccp and CFG simplification have been performed.
 ;
-; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | grep ret
 
 
 void "old_main"() {
diff --git a/llvm/test/Regression/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/llvm/test/Regression/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
index 1d1b1f702deb2983df98a077a0d70b549943316a..dad9c7e70d6e22e983c250c68175b3e4a6bbfe59 100644
--- a/llvm/test/Regression/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep '%X'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep '%X'
 
 %G = uninitialized global [40x int]
 
diff --git a/llvm/test/Regression/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll b/llvm/test/Regression/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
index f554b000ce781e3dcf344458b4968aa486975952..bf33950e34d80bd5742066fb35f904d993e201ad 100644
--- a/llvm/test/Regression/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | not grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | not grep then:
 
 void %cprop_test11(int* %data.1) {
 entry:		; No predecessors!
diff --git a/llvm/test/Regression/Transforms/SCCP/2003-08-26-InvokeHandling.ll b/llvm/test/Regression/Transforms/SCCP/2003-08-26-InvokeHandling.ll
index 14c41d75584fc1c1472b7097fd14fdd82eaacc14..36bfba4a404cdc903f9137b795ec24b06576d941 100644
--- a/llvm/test/Regression/Transforms/SCCP/2003-08-26-InvokeHandling.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2003-08-26-InvokeHandling.ll
@@ -1,5 +1,5 @@
 ; The PHI cannot be eliminated from this testcase, SCCP is mishandling invoke's!
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep phi
 
 declare void %foo()
 int %test(bool %cond) {
diff --git a/llvm/test/Regression/Transforms/SCCP/2004-11-16-DeadInvoke.ll b/llvm/test/Regression/Transforms/SCCP/2004-11-16-DeadInvoke.ll
index 7ca86536bde6122ea90d03d8b9dbc8d0afe5d15f..544edc0b3c53011c0894f5a169b24e1d09ace696 100644
--- a/llvm/test/Regression/Transforms/SCCP/2004-11-16-DeadInvoke.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2004-11-16-DeadInvoke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/llvm/test/Regression/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
index be6944ce0029c88ab273923e4603e5b136043cde..9d08137df19da9ec22fbbacdb292a2c9f26870aa 100644
--- a/llvm/test/Regression/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 1'
 
 ; This function definitely returns 1, even if we don't know the direction
 ; of the branch.
diff --git a/llvm/test/Regression/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll b/llvm/test/Regression/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
index 34a0a76370b7c62a9e66896d6ae6b6abcb71057f..edfbe016c40a63b76867b96d31f72a6c11150fea 100644
--- a/llvm/test/Regression/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
+++ b/llvm/test/Regression/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/SCCP/basictest.ll b/llvm/test/Regression/Transforms/SCCP/basictest.ll
index 0825d0dbd81df16bd9c9b05ad62c9813868d9e6e..417f847e64a6720aefa13c005bb205e0a09715fb 100644
--- a/llvm/test/Regression/Transforms/SCCP/basictest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep add
 
 int %test(bool %B) {
 	br bool %B, label %BB1, label %BB2
diff --git a/llvm/test/Regression/Transforms/SCCP/calltest.ll b/llvm/test/Regression/Transforms/SCCP/calltest.ll
index e88914d8dc8f6dc021a02a6ec1a4e41fb465ab7b..2e46b691832295ad02fc215c7d5ce6acd68b2b16 100644
--- a/llvm/test/Regression/Transforms/SCCP/calltest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/calltest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
 
 ; No matter how hard you try, sqrt(1.0) is always 1.0.  This allows the
 ; optimizer to delete this loop.
diff --git a/llvm/test/Regression/Transforms/SCCP/ipsccp-basic.ll b/llvm/test/Regression/Transforms/SCCP/ipsccp-basic.ll
index a5736bea52f57f35ef0157f4470f74930e6036dc..18bfd8ec027e14d8d3bab2c917367c60a4589fa5 100644
--- a/llvm/test/Regression/Transforms/SCCP/ipsccp-basic.ll
+++ b/llvm/test/Regression/Transforms/SCCP/ipsccp-basic.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret int 17' | grep -v 'ret int undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 17' | grep -v 'ret int undef' | not grep ret
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/SCCP/ipsccp-conditional.ll b/llvm/test/Regression/Transforms/SCCP/ipsccp-conditional.ll
index 27fdf05a8855fb09b11c03e1d69a82deb45086d1..fceb31e132146d019b6d12851af8ddeeb30a6731 100644
--- a/llvm/test/Regression/Transforms/SCCP/ipsccp-conditional.ll
+++ b/llvm/test/Regression/Transforms/SCCP/ipsccp-conditional.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret int 0' | grep -v 'ret int undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 0' | grep -v 'ret int undef' | not grep ret
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/SCCP/ipsccp-gvar.ll b/llvm/test/Regression/Transforms/SCCP/ipsccp-gvar.ll
index add1ee66637c16aba845f3dbec389a3d8c067559..d76b4810cb057a98376e2b168021e63c1ad37953 100644
--- a/llvm/test/Regression/Transforms/SCCP/ipsccp-gvar.ll
+++ b/llvm/test/Regression/Transforms/SCCP/ipsccp-gvar.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep global
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | not grep global
 
 %G = internal global int undef
 
diff --git a/llvm/test/Regression/Transforms/SCCP/loadtest.ll b/llvm/test/Regression/Transforms/SCCP/loadtest.ll
index c663627c3d140a056be645d1ef5939b51f806478..99da7285cf216be977f552163d2da76d9135c190 100644
--- a/llvm/test/Regression/Transforms/SCCP/loadtest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/loadtest.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly constant propagated.
 ;
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | 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/llvm/test/Regression/Transforms/SCCP/logical-nuke.ll b/llvm/test/Regression/Transforms/SCCP/logical-nuke.ll
index 5b4f84260048ab3501b6e0bc5cba201fe8137ada..446e99e0391699265e6dd4639e30c5c73f6a0a88 100644
--- a/llvm/test/Regression/Transforms/SCCP/logical-nuke.ll
+++ b/llvm/test/Regression/Transforms/SCCP/logical-nuke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 0'
 
 ; Test that SCCP has basic knowledge of when and/or nuke overdefined values.
 
diff --git a/llvm/test/Regression/Transforms/SCCP/phitest.ll b/llvm/test/Regression/Transforms/SCCP/phitest.ll
index 18f862a1a2338d0ec8c2a8eb155548772ae6c878..cdbdb2ce08a131032120d4325f60d8dcf1efe57b 100644
--- a/llvm/test/Regression/Transforms/SCCP/phitest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/phitest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp -dce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -dce -simplifycfg | llvm-dis | not grep br
 
 int %test(int %param) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SCCP/sccptest.ll b/llvm/test/Regression/Transforms/SCCP/sccptest.ll
index f2f87f9760017bcc0aeff352faac37310d388129..6fae7ce957d168d0d09702fc261f48da909c03b8 100644
--- a/llvm/test/Regression/Transforms/SCCP/sccptest.ll
+++ b/llvm/test/Regression/Transforms/SCCP/sccptest.ll
@@ -1,7 +1,7 @@
 ; This is the test case taken from appel's book that illustrates a hard case
 ; that SCCP gets right. BB3 should be completely eliminated.
 ;
-; RUN: llvm-as < %s | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3
 
 int %testfunction(int %i0, int %j0) {
 BB1:
diff --git a/llvm/test/Regression/Transforms/SCCP/select.ll b/llvm/test/Regression/Transforms/SCCP/select.ll
index 6b5446805e1659080d7042018e3e61a8a2bbf0ee..0209681c7876ce5bec4c422c5c79e3c3859f13c6 100644
--- a/llvm/test/Regression/Transforms/SCCP/select.ll
+++ b/llvm/test/Regression/Transforms/SCCP/select.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -sccp -disable-output &&
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep select
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep select
 
 int %test1(bool %C) {
 	%X = select bool %C, int 0, int 0
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
index e964dc8bffffb5ec217c6ef1101f7d79896198e7..fb6b1dad4ef7c6ddc74c8e312de639bbc46fe1d9 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep alloca | grep '4 x'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep alloca | grep '4 x'
 
 ; Test that an array is not incorrectly deconstructed...
 
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
index cda4403b9b9ed619314e61e51f46d826f56a08a4..a66e575e88a5d29a96239dfd40f4fb6323f42808 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl
+; RUN: llvm-upgrade < %s | llvm-as | 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/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
index afba5683deb5ece87bca8fefc72e2350b1d6e1ec..20beadc502e7f73cd9974c38f643d6c22672e42d 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl
 
 int %test() {
   %X = alloca { [ 4 x int] }
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll b/llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
index a8965b5652539428f30972ea4d5aaafebfa4a594..5bf1c5358b62ff68d565662f5aa35bdbcd27c008 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
@@ -1,6 +1,6 @@
 ; Scalar replacement was incorrectly promoting this alloca!!
 ;
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | sed 's/;.*//g' | grep '\['
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | sed 's/;.*//g' | grep '\['
 
 sbyte *%test() {
 	%A = alloca [30 x sbyte]
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/llvm/test/Regression/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index cfeff456b2d4297ad9189797e93d150371bae71f..742db46f29801e61b3283656672d616dca86ab86 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep alloca | grep '{'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep alloca | grep '{'
 implementation   ; Functions:
 
 declare int %.callback_1(sbyte*)
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll b/llvm/test/Regression/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll
index 647311bae40843e577d0f642f5e006489d6b1bfb..f7f15932480af36e2952f1f1185e9a8e4703b29d 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
 target endian = big
 target pointersize = 32
 	%struct.rtx_def = type { [2 x ubyte], int, [1 x %union.rtunion_def] }
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll b/llvm/test/Regression/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll
index 58f7c04e054dbb6f27812053f3affe2eb15c0a89..d9749319411e16274f16c8c5588633a892c3048b 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll b/llvm/test/Regression/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll
index 812e021321d97758bdb9cb5bb504a1e1e69c43af..a4d39334fa2dcc62496f6b0ff0346c77ab29399e 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
 
 void %output_toc() {
 entry:
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll b/llvm/test/Regression/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll
index 4b4298d56a4f24031c758c9acf5fc2e43695ef4c..9fcf16d4ee827b5a20d7d133a8bab746d454d722 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
 
 target datalayout = "e-p:32:32"
 target endian = little
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll b/llvm/test/Regression/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
index 6bcfebafcec7ff32e1c64e007f9f680a554fbd59..ae795858a806b082464e0e3af0b9fcf0bbb67541 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis &&
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x int>]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x int>]'
 
 int %func(<4 x float> %v0, <4 x float> %v1) {
 	%vsiidx = alloca [2 x <4 x int>], align 16		; <[2 x <4 x int>]*> [#uses=3]
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/AggregatePromote.ll b/llvm/test/Regression/Transforms/ScalarRepl/AggregatePromote.ll
index 93011fdd64401b62ff052c596e87fa9e07e622e2..ea16b5e5eeaf56ca769ac1efd9924303779b899c 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/AggregatePromote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/AggregatePromote.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca &&
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/arraytest.ll b/llvm/test/Regression/Transforms/ScalarRepl/arraytest.ll
index b923e192ababc8ab7fcb0650b7468de46338d736..e6fe1a63793725872074388eb531a45ad042a32e 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/arraytest.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/arraytest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
 
 int %test() {
   %X = alloca [ 4 x int ]
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/badarray.ll b/llvm/test/Regression/Transforms/ScalarRepl/badarray.ll
index fa3156b883b3ccc2cb387599fcc3b655e43cefaa..f525255b41fb4ec2e6ffa27ced33f5a8a8ca4957 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/badarray.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/badarray.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | grep alloca
 
 int %test() {
   %X = alloca [ 4 x int ]
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/basictest.ll b/llvm/test/Regression/Transforms/ScalarRepl/basictest.ll
index 53d60c99aeb483289a4a80ed6e6cbde5ee169ec1..b7e0a295e380a2626fc1ac7cebc61bed26374200 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/basictest.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca
 
 int %test() {
   %X = alloca { int, float }
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/phinodepromote.ll b/llvm/test/Regression/Transforms/ScalarRepl/phinodepromote.ll
index 573cab2b43cc24d3aa685391d9193b9e72710bbe..4dc70233e0712af9222cd1dea169ce2aaecba650 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/phinodepromote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/phinodepromote.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -instcombine -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine -mem2reg | llvm-dis | not grep alloca
 ;
 ; This tests to see if mem2reg can promote alloca instructions whose addresses
 ; are used by PHI nodes that are immediately loaded.  The LLVM C++ front-end
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/select_promote.ll b/llvm/test/Regression/Transforms/ScalarRepl/select_promote.ll
index 11902cfd33908a37ecbbf93fca79ab5cbfb1133c..a7a325cdd9c1b9dc1cb9ca01762dda20f9caae21 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/select_promote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/select_promote.ll
@@ -1,7 +1,7 @@
 ; Test promotion of loads that use the result of a select instruction.  This
 ; should be simplified by the instcombine pass.
 
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep alloca
 
 int %main() {
         %mem_tmp.0 = alloca int         ; <int*> [#uses=3]
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/sroa_two.ll b/llvm/test/Regression/Transforms/ScalarRepl/sroa_two.ll
index 2d8e7c6db78f5a02da167bb31fe251f27f7ad9ec..fa044922e8ba1199f60f0d0003bfb8fe59e1911f 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/sroa_two.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/sroa_two.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/union-pointer.ll b/llvm/test/Regression/Transforms/ScalarRepl/union-pointer.ll
index f54704cd499d5e9b5a9b73efa03db9cd49531a54..0207ab976d17271ae206957ef6a31602c6d8ea16 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/union-pointer.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/union-pointer.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca &&
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep 'ret sbyte'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'ret sbyte'
 
 ; PR892
 
diff --git a/llvm/test/Regression/Transforms/ScalarRepl/vector_promote.ll b/llvm/test/Regression/Transforms/ScalarRepl/vector_promote.ll
index 1387183dec2dff28a0ed8ab77809c442f7e61196..2e9bce7740281e9a4aa3195879862d342dbfb995 100644
--- a/llvm/test/Regression/Transforms/ScalarRepl/vector_promote.ll
+++ b/llvm/test/Regression/Transforms/ScalarRepl/vector_promote.ll
@@ -1,6 +1,6 @@
 
-; RUN: llvm-as < %s | opt -scalarrepl -disable-output &&
-; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca
 
 void %test(<4 x float>* %F, float %f) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
index 054135355c552fc0072ffc11fb91f7acd30208e6..9d2fe54cbafabbbd8b810de39555e3deb26734c6 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br label'
 ;
 declare void %foo()
 implementation
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
index 7baea2e48d8a1a839918eadbb21fa4c6f29deed4..1ef659384c048a02340903faeeb9b7f9875d925a 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll
@@ -4,7 +4,7 @@
 ;
 ; Which is not valid SSA
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis
 
 void "test"() {
 	br bool true, label %end, label %Loop
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index 4c0cbbc9807b422974e834822d7d20fe2fd0f715..a669a3ffc73be59b4f8a52e7729bec5791574ba9 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 int %main(int %argc) {
         br label %InlinedFunctionReturnNode
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
index b3c94859ef8ffc639d588cde3c2f2d4702de22a2..f1674b7ffb59bf6c755757d66307d5b73531a229 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg
 
 int %test(int %A, int %B, bool %cond) {
 J:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
index 6b75c5fa27e7860a8c5e62f750bb58e37dfae67e..312e514cf243a94e43268ac448ac815d650befdd 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
index b6638ee519dae572349f52b0ba4e8f9edda6914b..6c791d2e85df4afd5817c30db277a630c2464a7e 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 int %test() {
 	%A = invoke int %test() to label %Ret except label %Ret
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
index 179ef72d6c98d14ead49906e06eda5d5b0676d1c..ff549adbaed7cea36cf038a7f57fe84dcb1bd004 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll
@@ -1,6 +1,6 @@
 ; Do not remove the invoke!
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep invoke
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep invoke
 
 int %test() {
 	invoke int %test() to label %Ret except label %Ret
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
index 55199ab2a19e0065bc6359a7b2e938af477cbb2e..523205b8b938117271876211563689f7a5838205 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
 
 declare void %noop()
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
index b96a4a6bb12a9d63ca6b631af1b778b68d2d042c..1fafe77ed26df0752c2e106fe7abc91c881715c4 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
 
 declare void %noop()
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
index c5b0058925db136e2e9c94b14f0fa391f3621d65..91cb68b77e3e04d6d28d63fe8fd354e3006dcec7 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep switch
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep switch
 
 int %test1() {   ; Test normal folding
 	switch uint 5, label %Default [
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
index 7b449965496510b35f52cb40ff97b3e9448442cb..44c89d67b32fae9b605021095ffd27afbc951e51 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 implementation   ; Functions:
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
index 33457d8d471b59b1975303e72861c1d458704cca..6c53029ea655f75d3a0de42975df8a0848fda8ec 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 ; PR584
 
 %g_38098584 = external global uint		; <uint*> [#uses=1]
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
index 71c0149f5bd592c7cf3eb816376639fa810ddf0b..9271ac209e06796b6e730ff6f463026ffc029e29 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 void %main() {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
index e844c08af1a28d8c125fa347033fd3412511e211..3f3951ac7c5703219d7e8352ba7b5b7c6021fae2 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 	%arraytype.1.Char = type { int, [0 x sbyte] }
 	%arraytype.4.Signed = type { int, [0 x int] }
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
index 3a29cb8318bcc1729b7342404d4795240990699d..c3b4194e1e72eec4940d2c2a7823ae43766e277c 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 bool %foo() {
 	%X = invoke bool %foo() to label %N unwind label %F
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
index 18cbc17652675d0593cf54b163d0079117d904a4..eabedf97937fe9a89addad6eac7d852dc19fdcc3 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
@@ -1,6 +1,6 @@
 ; Make sure this doesn't turn into an infinite loop
 
-; RUN: llvm-as < %s | opt -simplifycfg -constprop -simplifycfg | llvm-dis | grep bb86
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -constprop -simplifycfg | llvm-dis | grep bb86
 
 	%struct.anon = type { uint, int, int, int, [1024 x sbyte] }
 %_zero_ = external global %struct.anon*		; <%struct.anon**> [#uses=2]
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
index 16af017c4d0c0b4835f973335d75e78c3de77984..8b443da1c86e12594a06e8fb971f5de4f1f3c535 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 void %polnel_() {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
index d6e2551637ceae1d86528a4029827bb42cf8cbaf..c9b1858bd482d28f0792ed4640e724a8e1a64b98 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 void %main(int %c) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll
index 6280453d4d69eed2548c494d36a268e380160989..b796dee8034790b372184a355ff3ebf4aa6eadc8 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -load-vn -gcse -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -simplifycfg -disable-output
 ; PR867
 
 target endian = big
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
index b8946dcf989abdb7a3f3f22c1b53116c3ba6daa9..8e583e880d7ac201a0eac650c9deb8141134e8d0 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output &&
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep select
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select
 
 ; PR957
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
index 200419acc96d631c41844b8bf4a680dd3f9a6fe0..ca48041f67b4ddcef2eb2902defa1d3c9148fd2f 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 	%struct..4._102 = type { %struct.QVectorData* }
 	%struct..5._125 = type { %struct.QMapData* }
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll b/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll
index 64264175ae9974761c87ecfe07c5f1d23d6dce45..94008b0d0f3acae9a8b5083e5a5224c0215d805e 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll
@@ -1,4 +1,4 @@
-;RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br label'
+;RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label'
 void %test(bool %C) {
 	br bool %C, label %A, label %B
 A:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll b/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll
index 70ccfc8c13bbab6cc3ee48c8e18f1cb5a47add23..b180700d4f14107b05aa99b7614c379a54dec5f0 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep seteq
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep seteq
 
 ; Check that simplifycfg deletes a dead 'seteq' instruction when it
 ; folds a conditional branch into a switch instruction.
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
index 09e7024474876f5e6fd557275e4f44b0e9a5987b..4b643c6a175f161427ce56545515de9da465e8cb 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks with phi nodes.
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a) {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll b/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll
index db397a7e64dd8b9e8dd221102c62e9490f5ad433..b81747716139e3d0a622746f8738c42507f64ff0 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 void %foo(bool %C, int* %P) {
 	br bool %C, label %T, label %F
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll
index 73dc3cfb153e3f6dd9420eab618918ed46fdc0da..cbce416d66ffb9a1927776a68f0c9bdafb2dc069 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll
@@ -3,7 +3,7 @@
 
 ; If this test is successful, the function should be reduced to 'call; ret'
 
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not egrep 'invoke|br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not egrep 'invoke|br'
 
 declare void %bar()
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll
index 0537722ad9e5bf3abf303f70cf136299ccb8c3a8..881944fd9d0effd98ebf06de56f60c1ff8357f80 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll
@@ -1,6 +1,6 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll
index 083e45e016c49b4377359ca5806368e43b1b3a0b..7e80677bc795181618e6a7f7a8dd017f9a04188e 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll
+++ b/llvm/test/Regression/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: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll
index 0ca60e3364fe2bd89f6edea90c9280269f67ca69..9411b33f7b38652ff16944ce2af0b61a6ceabf80 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll
@@ -3,7 +3,7 @@
 ; nodes away allows the branches to be eliminated, performing a simple form of
 ; 'if conversion'.
 
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis > %t.xform
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis > %t.xform
 ; RUN: not grep phi %t.xform && grep ret %t.xform
 
 declare void %use(bool)
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll
index e93d2939d8bfdc487b49b7f29457dbfb6697cd99..fb00a1342bda47e59d68a26c1cb3a972399aea87 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 int %test(bool %C, int %V1, int %V2) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll
index 6e7c9f5e7823adb27fc23b3295e8b497e24d5696..1eb07b32f16d4f348ea6c167138a49287707cdeb 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep select
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select
 
 ;; The PHI node in this example should not be turned into a select, as we are
 ;; not able to ifcvt the entire block.  As such, converting to a select just 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll b/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll
index 6e943f35fb1e0c86ea1af6adc5164ca2b60f342a..a3ed678c1beefc2afd27c9d7462ca227970b3686 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll
@@ -2,7 +2,7 @@
 ; a PHI node and a return.  Make sure the simplify cfg can straighten out this
 ; important case.  This is basically the most trivial form of tail-duplication.
 
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label'
 
 int %test(bool %B, int %A, int %B) {
 	br bool %B, label %T, label %F
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll
index 09c41a90dcf2f2006c648c76795f09b188c9a4e1..22cd3d4685c8b8276efd14e593209df6ffa7f252 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep unreachable
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep unreachable
 
 void %test1(bool %C, bool* %BP) {
 	br bool %C, label %T, label %F
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll b/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll
index 9dac7c05ab61ce65e536917c2395c69ddbd5e9e3..18fa8978ca12fd764a011567b7616fdc76b7acf3 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll
@@ -1,6 +1,6 @@
 ; Test CFG simplify removal of branch instructions...
 ;
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 
 void "test1"() {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll
index 55cf4b8cc22483ca4ad3d1a424f544087285c322..ca5f3e4ab44ae7d4598419dd398b0ea0ec9e0489 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call
 
 declare void %bar()
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll
index 6ea548c3beb904b12746a0375035bd9d24750da0..10270c29fc5d19f1435df0e9865968402386c637 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep call
 
 declare void %bar()
 
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll
index bb6c5fed3bb2d4b7ba506e48c55917738d578cb7..3bbb101ef47f96c717fdbe8b88e2fe1c3511c74d 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll
@@ -1,7 +1,7 @@
 ; This test ensures that the simplifycfg pass continues to constant fold
 ; terminator instructions.
 
-; RUN: llvm-as < %s | opt -simplifycfg | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | not grep br
 
 int %test(int %A, int %B) {
 J:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll
index 8bd137cc663ee637da9a58d11b2a603396e0ac62..bf35c2a4eaa5e48d25c08350471cf9e1ef60f75f 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep 'br bool' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br bool' | wc -l | grep 1
 
 void %test(int* %P, int* %Q, bool %A, bool %B) {
 	br bool %A, label %a, label %b   ;; fold the two branches into one
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll
index 491bb0eefac948a548a23ab5190c14d4e950ce1a..3b8d1885443656b5899a05893589b6cc2eeab77f 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -simplifycfg -adce | llvm-dis | not grep 'call void %f1' &&
-; RUN: llvm-as < %s | opt -simplifycfg -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce | llvm-dis | not grep 'call void %f1' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce -disable-output
 declare void %f1()
 declare void %f2()
 declare void %f3()
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll b/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll
index 80a5446e6dc44b15dd4bbcb253db14fa0071bb49..b19eac98d6da2b0e2830c4d64985f0beae900aba 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br'
 declare void %bar(int)
 
 void %test(bool %P, int* %Q) {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll
index 51144f0be2bce5580eff7f5be989b5421c8f3c8c..cbcfddbd944d84269343051c029cb554e78a0f03 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 int %test1(bool %C) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll
index 0f9410482719b461734c8c6b2c9f22403f9e5401..096f2aeb813eadc74b71f2d4cc22da4dc8630c7b 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
 
 
 void %NewExtractNames() {
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll
index ba1b7d65dc2f4fc5518cdf626fc4f36b8cca2962..2d722918b9d797c4a9bac4f9fc8bb09e4c973176 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 
 declare void %foo1()
 declare void %foo2()
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll
index 60169fe92d5996a9eba0f874f0ded5585aaae497..e13f2399e839b59421c13fe653e1182bd9e17d08 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br'
 
 bool %_ZN4llvm11SetCondInst7classofEPKNS_11InstructionE({uint, uint}* %I) {
 entry:
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll
index cafd7d7e0842d529c2badcd7681ba41021a9e01a..8bc5b8d2e65ad1e9141e0cbcb4e41ab4381cd38c 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep switch | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep switch | wc -l | grep 1
 
 ; Test that a switch going to a switch on the same value can be merged.   All 
 ; three switches in this example can be merged into one big one.
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll
index 5eee2c7a7aeac0d5628e639ebd5ad0dc32f81c3c..60b045ff89a152658a6c1c51deb91ad0768d2f59 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll
+++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'call void %DEAD'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'call void %DEAD'
 
 ; Test that we can thread a simple known condition through switch statements.
 
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
index 3c00c74ff3909e3021d8c4064825824f31e583f7..5b4fde870d5db07f212ccbee7012504188b16f43 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output
 
 %G = constant [3 x sbyte] c"%s\00"
 
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/ExitInMain.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/ExitInMain.ll
index 29f69d198a3cb361f245f00feb4e6d258e65da59..944e39d2e594a67bdc0c71a1e522e1cf0054f822 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/ExitInMain.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/ExitInMain.ll
@@ -1,5 +1,5 @@
 ; Test that the ExitInMainOptimization pass works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1
 
 declare void %exit(int)
 declare void %exitonly(int)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/FFS.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/FFS.ll
index ccaaf3d350d54fd9c1d85532d74218a7652ef6f3..335274ac45dda19225e881979bc30aa719d489c8 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/FFS.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/FFS.ll
@@ -1,5 +1,5 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*%ffs'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%ffs'
 
 declare int %ffs(int)
 declare int %ffsl(int)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/FPrintF.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/FPrintF.ll
index 760eb7f5ff62e8f9815e7c1374a36fd7c0181716..040052708e43408682a1fd25f7126de9efc554f2 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/FPrintF.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/FPrintF.ll
@@ -1,5 +1,5 @@
 ; Test that the FPrintFOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*fprintf'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fprintf'
 ;
 
 %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] }
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/IsDigit.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/IsDigit.ll
index 9837fa08f0547b425af32017de58da42afe6e81a..1386c14eadba4294504a5cf6f0338ee2ceab9567 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/IsDigit.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/IsDigit.ll
@@ -1,5 +1,5 @@
 ; Test that the IsDigitOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call' 
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call' 
 
 declare int %isdigit(int)
 declare int %isascii(int)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemCpy.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemCpy.ll
index 265be73c0e703f83c3a88e3673264b4be0b0ce65..a127fd329f0a5cc96bf86bbc643502b39f13f662 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemCpy.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemCpy.ll
@@ -1,6 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -constprop -simplify-libcalls -disable-output &&
-; RUN: llvm-as < %s | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memcpy'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memcpy'
 
 declare sbyte* %llvm.memcpy(sbyte*,sbyte*,int,int)
 %h = constant [2 x sbyte] c"h\00"
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemMove.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemMove.ll
index 47ed43242c1c46e89f30a3f821785ed87438270c..a114438921f4a598da9153c91a4374f1b3e9582c 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemMove.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemMove.ll
@@ -1,6 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -constprop -simplify-libcalls -disable-output &&
-; RUN: llvm-as < %s | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memmove'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memmove'
 
 declare sbyte* %llvm.memmove(sbyte*,sbyte*,int,int)
 %h = constant [2 x sbyte] c"h\00"
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemSet.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemSet.ll
index 4bd358df8995be90f532b79d961ad965e56db6b0..d31a36ae3c6c0d14582cf2285603e2b4793652c4 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/MemSet.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/MemSet.ll
@@ -1,5 +1,5 @@
 ; Test that the LLVMMemSetOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memset'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memset'
 
 declare void %llvm.memset(sbyte*,ubyte,uint,uint)
 
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/Pow.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/Pow.ll
index 3b9e48c68e30223145a9afb1ba0af0aa7e7a4e04..df7d46004af587f87155ba072952b206d81a4bba 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/Pow.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/Pow.ll
@@ -1,8 +1,8 @@
 ; Testcase for calls to the standard C "pow" function
 ;
 ; Equivalent to: http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01786.html
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call double .pow'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call double .pow'
 
 declare double %pow(double, double)
 
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/Puts.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/Puts.ll
index b3b5434ddf74adf01941cef46f5b3057c88a4008..4011a82fa9f4919fd5e574bbd2a3157d52c5097c 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/Puts.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/Puts.ll
@@ -1,5 +1,5 @@
 ; Test that the PutsCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*fputs'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fputs'
 ;
 %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] }
 %struct._IO_marker = type { %struct._IO_marker*, %struct._IO_FILE*, int }
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/SPrintF.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/SPrintF.ll
index 8b3ca2924642315f9a0f56728c4a6901fa5e9d62..48b76b194ecd67cf0e763acedc150cca7251c966 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/SPrintF.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/SPrintF.ll
@@ -1,6 +1,6 @@
 ; Test that the SPrintFOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*sprintf'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*sprintf'
 
 declare int %sprintf(sbyte*,sbyte*,...)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCat.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCat.ll
index 992837fc5ccd27fa1500ce48aa8b23a52e4b3394..6532a637c1934fff7aa24c889c1039ae8268fe82 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCat.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCat.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcat'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcat'
 
 declare sbyte* %strcat(sbyte*,sbyte*)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrChr.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrChr.ll
index 2d4f5f2dac266912bb6df59955c9b8fa130bead8..b8e0de27339b46f51fd10654ed3ada47add84df1 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrChr.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrChr.ll
@@ -1,5 +1,5 @@
 ; Test that the StrChrOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*%strchr'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%strchr'
 
 declare sbyte* %strchr(sbyte*,int)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCmp.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCmp.ll
index 96a5dc895e07baaf7900230e3248296d8cde8c5f..1ab075de46b03033a1369132e2f3230a982d2ebf 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCmp.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCmp.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcmp'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcmp'
 
 declare int %strcmp(sbyte*,sbyte*)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCpy.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCpy.ll
index ea94dc2d9767d4907ce6a00730736abe7e448993..f75238bad4a608044f0baea2902c61fbbab7b1d9 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCpy.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrCpy.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCpyOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcpy'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcpy'
 
 declare sbyte* %strcpy(sbyte*,sbyte*)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrLen.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrLen.ll
index 8e5962a10a4ff0b34502575c204d268d7ecdaaba..20aa7a8dca3112e80a533c5d73a50123d1335522 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrLen.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrLen.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen'
 
 declare uint %strlen(sbyte*)
 %hello      = constant [6 x sbyte] c"hello\00"
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrNCmp.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrNCmp.ll
index 6fdb8cb6c002cbbf76aed4c482b853541b099243..278861a9acda518f81bf0c72e3859baaab622c64 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/StrNCmp.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/StrNCmp.ll
@@ -1,5 +1,5 @@
 ; Test that the StrNCmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strncmp'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strncmp'
 
 declare int %strncmp(sbyte*,sbyte*,int)
 declare int %puts(sbyte*)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/ToAscii.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/ToAscii.ll
index cb7d06c701f638dbf58c1190335feb860d305873..e9580c6254161e917467d68a2fa676773418ca0b 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/ToAscii.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/ToAscii.ll
@@ -1,5 +1,5 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*toascii'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*toascii'
 
 declare int %toascii(int)
 
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/floor.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/floor.ll
index 8748169be43f33ee8e21264f9b9f60249126683f..d1c6548822881613a6a9eee664df1e5bf9753887 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/floor.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/floor.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*floor(' &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*floorf('
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*ceil(' &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*ceilf('
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*nearbyint(' &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*nearbyintf('
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*floor(' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*floorf('
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*ceil(' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*ceilf('
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*nearbyint(' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*nearbyintf('
 ; XFAIL: sparc
 
 declare double %floor(double)
diff --git a/llvm/test/Regression/Transforms/SimplifyLibCalls/memcmp.ll b/llvm/test/Regression/Transforms/SimplifyLibCalls/memcmp.ll
index d2c660a093cd8fb15389bcb82d33e0cecc431505..3ccf00265acf8b8477b0b8fd047e2ad16e4ed934 100644
--- a/llvm/test/Regression/Transforms/SimplifyLibCalls/memcmp.ll
+++ b/llvm/test/Regression/Transforms/SimplifyLibCalls/memcmp.ll
@@ -1,6 +1,6 @@
 ; Test that the memcmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*memcmp' &&
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*memcmp' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output
 
 declare int %memcmp(sbyte*,sbyte*,int)
 %h = constant [2 x sbyte] c"h\00"
diff --git a/llvm/test/Regression/Transforms/TailCallElim/accum_recursion.ll b/llvm/test/Regression/Transforms/TailCallElim/accum_recursion.ll
index ceef503a29edae26bb1a8a10947c9de2b10039dd..d82d963b9d70231d2e6dcb6947c22ebbbf57de3a 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/accum_recursion.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/accum_recursion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %factorial(int %x) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/accum_recursion_constant_arg.ll b/llvm/test/Regression/Transforms/TailCallElim/accum_recursion_constant_arg.ll
index 6bc6469f349f242b91a156744e3922c9d114fa0a..b103d897ea94a3a6b7159bd3b7b0bb6d941b60f9 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/accum_recursion_constant_arg.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/accum_recursion_constant_arg.ll
@@ -3,7 +3,7 @@
 ; go out to the anonymous users of the demo script for "suggesting" 
 ; optimizations that should be done.  :)
 
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %mul(int %x, int %y) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/ackermann.ll b/llvm/test/Regression/Transforms/TailCallElim/ackermann.ll
index fb71e88dd136ddd2dcecdef9030370beae40a6ea..eed684b946a493f4908a05273d40512472d51cd8 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/ackermann.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/ackermann.ll
@@ -1,5 +1,5 @@
 ; This function contains two tail calls, which should be eliminated
-; RUN: llvm-as < %s | opt -tailcallelim -stats -disable-output 2>&1 | grep '2 tailcallelim'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim -stats -disable-output 2>&1 | grep '2 tailcallelim'
 
 int %Ack(int %M.1, int %N.1) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/dont-tce-tail-marked-call.ll b/llvm/test/Regression/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
index d038d8271722c470bd99a8e2c189af3b73398521..198e5aedb7944ae5984eccccdf098c4929df5373 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep 'call int %foo'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'call int %foo'
 
 declare void %bar(int*)
 int %foo(uint %N) {
diff --git a/llvm/test/Regression/Transforms/TailCallElim/intervening-inst.ll b/llvm/test/Regression/Transforms/TailCallElim/intervening-inst.ll
index 92873b8a2dc77beb27e8f3b9e641b35809cda166..a480e3b4dbf29625a924ec9ad8f7faad3f4d0800 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/intervening-inst.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/intervening-inst.ll
@@ -1,5 +1,5 @@
 ; This function contains intervening instructions which should be moved out of the way
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %Test(int %X) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/move_alloca_for_tail_call.ll b/llvm/test/Regression/Transforms/TailCallElim/move_alloca_for_tail_call.ll
index 1428e052705319019fd689207f8a4c3100e3b02f..33b02df46ee9d1263bfcd1b1a08227c585756bb7 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/move_alloca_for_tail_call.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/move_alloca_for_tail_call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'int %foo'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'int %foo'
 
 declare void %bar(int*)
 int %foo() {
diff --git a/llvm/test/Regression/Transforms/TailCallElim/return-undef.ll b/llvm/test/Regression/Transforms/TailCallElim/return-undef.ll
index 116d451c639e7cb2922df6dc9d44f55353b3562c..e721447e6f37649613aec6b1b8eecd3b5f769763 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/return-undef.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/return-undef.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep sub &&
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep sub &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %test(int %X) {
 	%Y = sub int %X, 1
diff --git a/llvm/test/Regression/Transforms/TailCallElim/return_constant.ll b/llvm/test/Regression/Transforms/TailCallElim/return_constant.ll
index daa7d3a373f02054c59cc536ade10aabf174ea8b..58020248cbcaf3de0230439334698b8bc03d6a13 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/return_constant.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/return_constant.ll
@@ -1,7 +1,7 @@
 ; Though this case seems to be fairly unlikely to occur in the wild, someone
 ; plunked it into the demo script, so maybe they care about it.
 ;
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %aaa(int %c) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/tail_call_with_branch.ll b/llvm/test/Regression/Transforms/TailCallElim/tail_call_with_branch.ll
index 00d771d252fc6e408cfe5ea66cd76ee574cc6863..b373455eabbdbc9bef1ddeadd42a9ff2b62d8c32 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/tail_call_with_branch.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/tail_call_with_branch.ll
@@ -2,7 +2,7 @@
 ; instruction into the terminating blocks because there was other code
 ; optimized out of the function after the taildup happened.
 ; XFAIL: *
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
 
 int %t4(int %a) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailCallElim/trivial_codegen_tailcall.ll b/llvm/test/Regression/Transforms/TailCallElim/trivial_codegen_tailcall.ll
index d27b9dcc04c731a9bb335e5566a36ba3d4f6a8a4..6fb574e561813b22d1db0542324014656a39132a 100644
--- a/llvm/test/Regression/Transforms/TailCallElim/trivial_codegen_tailcall.ll
+++ b/llvm/test/Regression/Transforms/TailCallElim/trivial_codegen_tailcall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep 'tail call void %foo'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'tail call void %foo'
 
 declare void %foo()
 
diff --git a/llvm/test/Regression/Transforms/TailDup/2003-06-24-Simpleloop.ll b/llvm/test/Regression/Transforms/TailDup/2003-06-24-Simpleloop.ll
index 3047fe6ddc2690f5bba0578ef8edf41acfc1060f..e2b979cb003c01980efc9edef3fa3d28e94b00c3 100644
--- a/llvm/test/Regression/Transforms/TailDup/2003-06-24-Simpleloop.ll
+++ b/llvm/test/Regression/Transforms/TailDup/2003-06-24-Simpleloop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 void %motion_result7() {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailDup/2003-07-22-InfiniteLoop.ll b/llvm/test/Regression/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
index c7233395bcc8ab2044d934a5b1e6ec796b17d49d..4d650696baa48b01c3dec301acd65bfa30bab3a2 100644
--- a/llvm/test/Regression/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
+++ b/llvm/test/Regression/Transforms/TailDup/2003-07-22-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll b/llvm/test/Regression/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
index 4b986754217eb4392684f00f7542778ca2aad160..72e03e10c568fa6aba00cb3173360ff6404ff733 100644
--- a/llvm/test/Regression/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
+++ b/llvm/test/Regression/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll b/llvm/test/Regression/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll
index fc020cc0f82ce1e763371a8a858dbefc1d741502..416a5df8085f54c827f019707f6b12d732913f37 100644
--- a/llvm/test/Regression/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll
+++ b/llvm/test/Regression/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 int %foo() {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx b/llvm/test/Regression/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx
index 21a3ffa0e6387f45288b0da2ea7d5964a9efe25a..4ea84909e5d4d79ec7658a8ba3b5930457cfc643 100644
--- a/llvm/test/Regression/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx
+++ b/llvm/test/Regression/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 void %interpret() {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailDup/MergeTest.ll b/llvm/test/Regression/Transforms/TailDup/MergeTest.ll
index ef6fe0729ee08d915a40eea4d53667b6eac6c8e0..c11d735f1d3d917addd87a84477f9fb7f35e2cde 100644
--- a/llvm/test/Regression/Transforms/TailDup/MergeTest.ll
+++ b/llvm/test/Regression/Transforms/TailDup/MergeTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate  | llvm-dis | grep add | not grep uses=1
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate  | llvm-dis | grep add | not grep uses=1
 
 int %test1(bool %C, int %A, int* %P) {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailDup/PHIUpdateTest.ll b/llvm/test/Regression/Transforms/TailDup/PHIUpdateTest.ll
index 433b078025b0f8a8844c4f8787081d4dee1926d4..ae591a00be50e671e68b435cdef0b069bf19ce39 100644
--- a/llvm/test/Regression/Transforms/TailDup/PHIUpdateTest.ll
+++ b/llvm/test/Regression/Transforms/TailDup/PHIUpdateTest.ll
@@ -1,6 +1,6 @@
 ; This test checks to make sure phi nodes are updated properly
 ;
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 
 
diff --git a/llvm/test/Regression/Transforms/TailDup/basictest.ll b/llvm/test/Regression/Transforms/TailDup/basictest.ll
index f20896d68a8ca5e16e7f5be9715a9d4470d2e5b7..085acf5577d94528b9c7334e1d945cdcb99b3289 100644
--- a/llvm/test/Regression/Transforms/TailDup/basictest.ll
+++ b/llvm/test/Regression/Transforms/TailDup/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 declare void %__main()
 
diff --git a/llvm/test/Regression/Transforms/TailDup/basictest2.ll b/llvm/test/Regression/Transforms/TailDup/basictest2.ll
index 06fa071e76541d5c9886e97d31bea8d0696376b4..c67b3d53f0d98560f4d3e597dea2df03b1929eb9 100644
--- a/llvm/test/Regression/Transforms/TailDup/basictest2.ll
+++ b/llvm/test/Regression/Transforms/TailDup/basictest2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -tailduplicate -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output
 
 void %ab() {
 entry:
diff --git a/llvm/test/Regression/Transforms/TailDup/if-tail-dup.ll b/llvm/test/Regression/Transforms/TailDup/if-tail-dup.ll
index 69205ec1d5e78a85fa7c03c5f9f72013c9ea500a..6a02ac51a37d57bdcae2fcbba427cd3b8e467300 100644
--- a/llvm/test/Regression/Transforms/TailDup/if-tail-dup.ll
+++ b/llvm/test/Regression/Transforms/TailDup/if-tail-dup.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -tailduplicate | llc -march=x86 | grep 'je ' &&
-; RUN: llvm-as < %s | opt -tailduplicate | llc -march=x86 | not grep jmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | grep 'je ' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | not grep jmp
 ; This should have no unconditional jumps in it.  The C source is:
 
 ;void foo(int c, int* P) {
@@ -9,6 +9,7 @@
 ;  if (c & 8)  P[3] = 1;
 ;}
 
+implementation
 
 void %foo(int %c, int* %P) {
 entry: