Change these tests to feed the assembly files to opt directly, instead
of using llvm-as, now that opt supports this.

llvm-svn: 81226
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll b/llvm/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
index 860a6eb..5b7ec09 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output
+; RUN: opt %s -simplify-libcalls -disable-output
 
 @G = constant [3 x i8] c"%s\00"		; <[3 x i8]*> [#uses=1]
 
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll b/llvm/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll
index 5a56d24..b1cf0a5 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll
@@ -1,5 +1,5 @@
 ; PR1307
-; RUN: llvm-as < %s | opt -simplify-libcalls -instcombine | llvm-dis > %t
+; RUN: opt %s -simplify-libcalls -instcombine | llvm-dis > %t
 ; RUN: grep {@str,.*i64 3} %t
 ; RUN: grep {@str1,.*i64 7} %t
 ; RUN: grep {ret i8.*null} %t
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2008-05-19-memcmp.ll b/llvm/test/Transforms/SimplifyLibCalls/2008-05-19-memcmp.ll
index b6c0ffd..2415c87 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2008-05-19-memcmp.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2008-05-19-memcmp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep i32
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep i32
 ; PR2341
 
 @_2E_str = external constant [5 x i8]		; <[5 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
index fcaf12e..52fe146 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis > %t
+; RUN: opt %s -simplify-libcalls | llvm-dis > %t
 ; RUN: grep noalias %t | count 2
 ; RUN: grep nocapture %t | count 3
 ; RUN: grep nounwind %t | count 3
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
index 551a2bb..9fbbb0b 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -simplify-libcalls -functionattrs | \
+; RUN: opt %s -inline -simplify-libcalls -functionattrs | \
 ; RUN:   llvm-dis | grep nocapture | count 2
 ; Check that nocapture attributes are added when run after an SCC pass.
 ; PR3520
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-02-12-StrTo.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-02-12-StrTo.ll
index 4aeff1c..4ed64a8 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-02-12-StrTo.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-02-12-StrTo.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis > %t
+; RUN: opt %s -simplify-libcalls | llvm-dis > %t
 ; RUN: grep nocapture %t | count 2
 ; RUN: grep null %t | grep nocapture | count 1
 ; RUN: grep null %t | grep call | grep readonly | count 1
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll
index f720993..8f9e980 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls -instcombine | llvm-dis | grep {ret i32 -65}
+; RUN: opt %s -simplify-libcalls -instcombine | llvm-dis | grep {ret i32 -65}
 ; PR4284
 
 define i32 @test() nounwind {
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-07-28-Exit.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-07-28-Exit.ll
index e4d9f89..7114fce 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-07-28-Exit.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-07-28-Exit.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output
+; RUN: opt %s -simplify-libcalls -disable-output
 ; PR4641
 
 	%struct.__sFILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, i8*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64, %struct.pthread_mutex*, %struct.pthread*, i32, i32, %union.anon }
diff --git a/llvm/test/Transforms/SimplifyLibCalls/2009-07-29-Exit2.ll b/llvm/test/Transforms/SimplifyLibCalls/2009-07-29-Exit2.ll
index 6fad326..22d817c 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/2009-07-29-Exit2.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/2009-07-29-Exit2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output
+; RUN: opt %s -simplify-libcalls -disable-output
 ; PR4645
 
 define i32 @main() {
diff --git a/llvm/test/Transforms/SimplifyLibCalls/FFS.ll b/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
index d6a504a..8faba9a 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
@@ -1,5 +1,5 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*@ffs}
 
 @non_const = external global i32		; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/FPrintF.ll b/llvm/test/Transforms/SimplifyLibCalls/FPrintF.ll
index 2ac9f14..690c425 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/FPrintF.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/FPrintF.ll
@@ -1,5 +1,5 @@
 ; Test that the FPrintFOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*fprintf}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/IsDigit.ll b/llvm/test/Transforms/SimplifyLibCalls/IsDigit.ll
index a290e01..869a371 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/IsDigit.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/IsDigit.ll
@@ -1,5 +1,5 @@
 ; Test that the IsDigitOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep call
 
 declare i32 @isdigit(i32)
diff --git a/llvm/test/Transforms/SimplifyLibCalls/MemCpy.ll b/llvm/test/Transforms/SimplifyLibCalls/MemCpy.ll
index 4e33b07..98165a1 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/MemCpy.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/MemCpy.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -constprop -instcombine | llvm-dis | not grep {call.*llvm.memcpy.i32}
+; RUN: opt %s -constprop -instcombine | llvm-dis | not grep {call.*llvm.memcpy.i32}
 
 @h = constant [2 x i8] c"h\00"		; <[2 x i8]*> [#uses=1]
 @hel = constant [4 x i8] c"hel\00"		; <[4 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/Printf.ll b/llvm/test/Transforms/SimplifyLibCalls/Printf.ll
index c892f03..f46b339 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/Printf.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/Printf.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep putchar
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep putchar
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*printf}
 
 @str = internal constant [13 x i8] c"hello world\0A\00"         ; <[13 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/Puts.ll b/llvm/test/Transforms/SimplifyLibCalls/Puts.ll
index 6753db8..3e235cd 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/Puts.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/Puts.ll
@@ -1,5 +1,5 @@
 ; Test that the PutsCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*fputs}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/SPrintF.ll b/llvm/test/Transforms/SimplifyLibCalls/SPrintF.ll
index 6b15256..2035594 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/SPrintF.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/SPrintF.ll
@@ -1,5 +1,5 @@
 ; Test that the SPrintFOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*sprintf}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrCat.ll b/llvm/test/Transforms/SimplifyLibCalls/StrCat.ll
index a2e1f3a..b555e12 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrCat.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrCat.ll
@@ -1,8 +1,8 @@
 ; Test that the StrCatOptimizer works correctly
 ; PR3661
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strcat}
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   grep {puts.*%arg1}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll b/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
index 89e846f..b12d8b1 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
@@ -1,5 +1,5 @@
 ; Test that the StrChrOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*@strchr}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrCmp.ll b/llvm/test/Transforms/SimplifyLibCalls/StrCmp.ll
index ae28e4a..149cbf0 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrCmp.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrCmp.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strcmp}
 
 @hello = constant [6 x i8] c"hello\00"		; <[6 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrCpy.ll b/llvm/test/Transforms/SimplifyLibCalls/StrCpy.ll
index 9dc01b3..84b48a5 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrCpy.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrCpy.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCpyOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strcpy}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll b/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
index 521a224..dc2ebe0 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
@@ -1,5 +1,5 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:    not grep {call.*strlen}
 
 target datalayout = "e-p:32:32"
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrNCat.ll b/llvm/test/Transforms/SimplifyLibCalls/StrNCat.ll
index 7ae7097..277dfb6 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrNCat.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrNCat.ll
@@ -1,7 +1,7 @@
 ; Test that the StrNCatOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strncat}
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   grep {puts.*%arg1}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrNCmp.ll b/llvm/test/Transforms/SimplifyLibCalls/StrNCmp.ll
index f85394d..948e844 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrNCmp.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrNCmp.ll
@@ -1,5 +1,5 @@
 ; Test that the StrNCmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strncmp}
 
 @hello = constant [6 x i8] c"hello\00"		; <[6 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrNCpy.ll b/llvm/test/Transforms/SimplifyLibCalls/StrNCpy.ll
index b3b66b0..2a853cb 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrNCpy.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrNCpy.ll
@@ -1,5 +1,5 @@
 ; Test that the StrNCpyOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*strncpy}
 
 ; This transformation requires the pointer size, as it assumes that size_t is
diff --git a/llvm/test/Transforms/SimplifyLibCalls/ToAscii.ll b/llvm/test/Transforms/SimplifyLibCalls/ToAscii.ll
index 9200d2f..3c9f347 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/ToAscii.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/ToAscii.ll
@@ -1,5 +1,5 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN: opt %s -simplify-libcalls | llvm-dis | \
 ; RUN:   not grep {call.*toascii}
 
 declare i32 @toascii(i32)
diff --git a/llvm/test/Transforms/SimplifyLibCalls/abs.ll b/llvm/test/Transforms/SimplifyLibCalls/abs.ll
index 520189b..4f1d92d 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/abs.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/abs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {select i1 %ispos}
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep {select i1 %ispos}
 ; PR2337
 
 define i32 @test(i32 %x) {
diff --git a/llvm/test/Transforms/SimplifyLibCalls/exp2.ll b/llvm/test/Transforms/SimplifyLibCalls/exp2.ll
index dea3df4..09829a8 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/exp2.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/exp2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {call.*ldexp} | count 4
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep {call.*ldexp} | count 4
 ; rdar://5852514
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
diff --git a/llvm/test/Transforms/SimplifyLibCalls/floor.ll b/llvm/test/Transforms/SimplifyLibCalls/floor.ll
index 31eb3f6..7fee585 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/floor.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/floor.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis > %t
+; RUN: opt %s -simplify-libcalls | llvm-dis > %t
 ; RUN: not grep {call.*floor(} %t
 ; RUN: grep {call.*floorf(} %t
 ; RUN: not grep {call.*ceil(} %t
diff --git a/llvm/test/Transforms/SimplifyLibCalls/memcmp.ll b/llvm/test/Transforms/SimplifyLibCalls/memcmp.ll
index 7bdbc8d..0426689 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/memcmp.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/memcmp.ll
@@ -1,5 +1,5 @@
 ; Test that the memcmpOptimizer works correctly
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep {call.*memcmp}
+; RUN: opt %s -simplify-libcalls | llvm-dis | not grep {call.*memcmp}
 
 @h = constant [2 x i8] c"h\00"		; <[2 x i8]*> [#uses=0]
 @hel = constant [4 x i8] c"hel\00"		; <[4 x i8]*> [#uses=0]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/memmove.ll b/llvm/test/Transforms/SimplifyLibCalls/memmove.ll
index d960960..91947ae 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/memmove.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/memmove.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {llvm.memmove}
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep {llvm.memmove}
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
 target triple = "i686-pc-linux-gnu"
 
diff --git a/llvm/test/Transforms/SimplifyLibCalls/memset-64.ll b/llvm/test/Transforms/SimplifyLibCalls/memset-64.ll
index a6a277e..48471ca 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/memset-64.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/memset-64.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {llvm.memset}
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep {llvm.memset}
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/llvm/test/Transforms/SimplifyLibCalls/memset.ll b/llvm/test/Transforms/SimplifyLibCalls/memset.ll
index 0c10915..b709059 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/memset.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/memset.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {llvm.memset}
+; RUN: opt %s -simplify-libcalls | llvm-dis | grep {llvm.memset}
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
 target triple = "i686-pc-linux-gnu"
 
diff --git a/llvm/test/Transforms/SimplifyLibCalls/pow2.ll b/llvm/test/Transforms/SimplifyLibCalls/pow2.ll
index a48abba..3f954e9 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/pow2.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/pow2.ll
@@ -1,6 +1,6 @@
 ; Testcase for calls to the standard C "pow" function
 ;
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep {call .pow}
+; RUN: opt %s -simplify-libcalls | llvm-dis | not grep {call .pow}
 
 
 declare double @pow(double, double)
diff --git a/llvm/test/Transforms/SimplifyLibCalls/weak-symbols.ll b/llvm/test/Transforms/SimplifyLibCalls/weak-symbols.ll
index 970ee0dd..934ec9b3 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/weak-symbols.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/weak-symbols.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | FileCheck %s
+; RUN: opt %s -simplify-libcalls | llvm-dis | FileCheck %s
 ; PR4738
 
 ; SimplifyLibcalls shouldn't assume anything about weak symbols.