Mon Apr 16 10:38:17 PDT 2007

Changes in directory llvm/test/CodeGen/X86:

2006-10-19-SwitchUnnecessaryBranching.ll updated: 1.5 -> 1.6
bitcast.ll updated: 1.2 -> 1.3
bswap.ll updated: 1.5 -> 1.6
cmp-test.ll updated: 1.2 -> 1.3
compare-add.ll updated: 1.2 -> 1.3
compare_folding.llx updated: 1.5 -> 1.6
fp-stack-ret.ll updated: 1.4 -> 1.5
long-setcc.ll updated: 1.2 -> 1.3
mul-shift-reassoc.ll updated: 1.3 -> 1.4
packed_struct.ll updated: 1.4 -> 1.5
rdtsc.ll updated: 1.5 -> 1.6
scalar_sse_minmax.ll updated: 1.3 -> 1.4
select.ll updated: 1.6 -> 1.7
store-fp-constant.ll updated: 1.3 -> 1.4
test-hidden.ll updated: 1.4 -> 1.5
test-pic-1.ll updated: 1.3 -> 1.4
test-pic-2.ll updated: 1.2 -> 1.3
test-pic-3.ll updated: 1.2 -> 1.3
test-pic-4.ll updated: 1.3 -> 1.4
test-pic-5.ll updated: 1.2 -> 1.3
test-pic-6.ll updated: 1.2 -> 1.3
test-pic-cpool.ll updated: 1.3 -> 1.4
test-pic-jtbl.ll updated: 1.2 -> 1.3
vec_clear.ll updated: 1.3 -> 1.4
vec_extract.ll updated: 1.5 -> 1.6
vec_ins_extract.ll updated: 1.4 -> 1.5
vec_insert.ll updated: 1.3 -> 1.4
vec_set-2.ll updated: 1.3 -> 1.4
vec_set-3.ll updated: 1.4 -> 1.5
vec_set-5.ll updated: 1.2 -> 1.3
vec_set-6.ll updated: 1.2 -> 1.3
vec_shuffle-2.ll updated: 1.4 -> 1.5
vec_shuffle-3.ll updated: 1.3 -> 1.4
vec_shuffle-4.ll updated: 1.5 -> 1.6
vec_shuffle-5.ll updated: 1.3 -> 1.4
vec_shuffle-6.ll updated: 1.5 -> 1.6
vec_shuffle-7.ll updated: 1.2 -> 1.3
vec_shuffle-8.ll updated: 1.2 -> 1.3
vec_shuffle-9.ll updated: 1.2 -> 1.3
vec_shuffle.ll updated: 1.9 -> 1.10
vec_splat.ll updated: 1.7 -> 1.8
vec_ss_load_fold.ll updated: 1.3 -> 1.4
x86-64-mem.ll updated: 1.3 -> 1.4
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Remove && from the end of the lines to prevent tests from throwing run
lines into the background. Also, clean up places where the same command
is run multiple times by using a temporary file.


---
Diffs of the changes:  (+128 -112)

 2006-10-19-SwitchUnnecessaryBranching.ll |    3 ++-
 bitcast.ll                               |    3 +--
 bswap.ll                                 |    3 ++-
 cmp-test.ll                              |    3 +--
 compare-add.ll                           |    1 -
 compare_folding.llx                      |    6 ++++--
 fp-stack-ret.ll                          |    2 +-
 long-setcc.ll                            |    5 ++---
 mul-shift-reassoc.ll                     |    2 +-
 packed_struct.ll                         |   10 +++++-----
 rdtsc.ll                                 |    2 +-
 scalar_sse_minmax.ll                     |    6 ++++--
 select.ll                                |    2 +-
 store-fp-constant.ll                     |    2 +-
 test-hidden.ll                           |    7 ++++---
 test-pic-1.ll                            |    2 +-
 test-pic-2.ll                            |    9 +++++----
 test-pic-3.ll                            |    9 +++++----
 test-pic-4.ll                            |    4 ++--
 test-pic-5.ll                            |    9 +++++----
 test-pic-6.ll                            |    9 +++++----
 test-pic-cpool.ll                        |   11 ++++++-----
 test-pic-jtbl.ll                         |   13 +++++++------
 vec_clear.ll                             |    1 -
 vec_extract.ll                           |    9 +++++----
 vec_ins_extract.ll                       |    2 --
 vec_insert.ll                            |    5 +++--
 vec_set-2.ll                             |    2 +-
 vec_set-3.ll                             |    7 +++----
 vec_set-5.ll                             |    7 ++++---
 vec_set-6.ll                             |    5 +++--
 vec_shuffle-2.ll                         |    7 ++++---
 vec_shuffle-3.ll                         |    5 +++--
 vec_shuffle-4.ll                         |    6 +++---
 vec_shuffle-5.ll                         |    5 +++--
 vec_shuffle-6.ll                         |    8 ++++----
 vec_shuffle-7.ll                         |    6 +++---
 vec_shuffle-8.ll                         |    4 ++--
 vec_shuffle-9.ll                         |    6 +++---
 vec_shuffle.ll                           |    7 ++++---
 vec_splat.ll                             |    2 +-
 vec_ss_load_fold.ll                      |    5 +++--
 x86-64-mem.ll                            |   18 ++++++++++--------
 43 files changed, 128 insertions(+), 112 deletions(-)


Index: llvm/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
diff -u llvm/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll:1.5 llvm/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll:1.6

--- llvm/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll:1.5	Fri Feb 16 18:44:34 2007
+++ llvm/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | grep "BB1_1:"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | \
+; RUN:   grep BB1_1:
 
 %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]


Index: llvm/test/CodeGen/X86/bitcast.ll
diff -u llvm/test/CodeGen/X86/bitcast.ll:1.2 llvm/test/CodeGen/X86/bitcast.ll:1.3
--- llvm/test/CodeGen/X86/bitcast.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/CodeGen/X86/bitcast.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64
 ; PR1033
 


Index: llvm/test/CodeGen/X86/bswap.ll
diff -u llvm/test/CodeGen/X86/bswap.ll:1.5 llvm/test/CodeGen/X86/bswap.ll:1.6
--- llvm/test/CodeGen/X86/bswap.ll:1.5	Sun Apr  1 20:09:19 2007
+++ llvm/test/CodeGen/X86/bswap.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
 ; bswap should be constant folded when it is passed a constant argument
 
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep bswapl | wc -l | grep 3 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN:   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)


Index: llvm/test/CodeGen/X86/cmp-test.ll
diff -u llvm/test/CodeGen/X86/cmp-test.ll:1.2 llvm/test/CodeGen/X86/cmp-test.ll:1.3
--- llvm/test/CodeGen/X86/cmp-test.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/cmp-test.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,4 @@
-; 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 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) {


Index: llvm/test/CodeGen/X86/compare-add.ll
diff -u llvm/test/CodeGen/X86/compare-add.ll:1.2 llvm/test/CodeGen/X86/compare-add.ll:1.3
--- llvm/test/CodeGen/X86/compare-add.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/compare-add.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,3 @@
-; 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


Index: llvm/test/CodeGen/X86/compare_folding.llx
diff -u llvm/test/CodeGen/X86/compare_folding.llx:1.5 llvm/test/CodeGen/X86/compare_folding.llx:1.6
--- llvm/test/CodeGen/X86/compare_folding.llx:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/compare_folding.llx	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | \
+; RUN:   grep movsd | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | \
+; RUN:   grep ucomisd
 declare bool %llvm.isunordered.f64(double,double)
 
 bool %test1(double %X, double %Y) {  ;; Returns isunordered(X,Y)


Index: llvm/test/CodeGen/X86/fp-stack-ret.ll
diff -u llvm/test/CodeGen/X86/fp-stack-ret.ll:1.4 llvm/test/CodeGen/X86/fp-stack-ret.ll:1.5
--- llvm/test/CodeGen/X86/fp-stack-ret.ll:1.4	Mon Apr 16 09:17:04 2007
+++ llvm/test/CodeGen/X86/fp-stack-ret.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=i686-apple-darwin8 -mcpu=yonah -march=x86 > %t
 ; RUN: grep fldl %t | wc -l | grep 1
-; RUN: not grep xmm %t &&
+; RUN: not grep xmm %t
 ; RUN: grep {sub.*esp} %t | wc -l | grep 1
 
 ; These testcases shouldn't require loading into an XMM register then storing 


Index: llvm/test/CodeGen/X86/long-setcc.ll
diff -u llvm/test/CodeGen/X86/long-setcc.ll:1.2 llvm/test/CodeGen/X86/long-setcc.ll:1.3
--- llvm/test/CodeGen/X86/long-setcc.ll:1.2	Wed Apr 11 11:10:48 2007
+++ llvm/test/CodeGen/X86/long-setcc.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,5 @@
-; 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 shr | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=x86 | grep shr | wc -l | grep 1
 ; RUN: llvm-as < %s | llc -march=x86 | grep xor | wc -l | grep 1
 
 define i1 @t1(i64 %x) {


Index: llvm/test/CodeGen/X86/mul-shift-reassoc.ll
diff -u llvm/test/CodeGen/X86/mul-shift-reassoc.ll:1.3 llvm/test/CodeGen/X86/mul-shift-reassoc.ll:1.4
--- llvm/test/CodeGen/X86/mul-shift-reassoc.ll:1.3	Wed Mar 28 13:03:14 2007
+++ llvm/test/CodeGen/X86/mul-shift-reassoc.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep lea &&
+; 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) {


Index: llvm/test/CodeGen/X86/packed_struct.ll
diff -u llvm/test/CodeGen/X86/packed_struct.ll:1.4 llvm/test/CodeGen/X86/packed_struct.ll:1.5
--- llvm/test/CodeGen/X86/packed_struct.ll:1.4	Fri Jan  5 12:35:20 2007
+++ llvm/test/CodeGen/X86/packed_struct.ll	Mon Apr 16 12:36:07 2007
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+5" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+1" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+9" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+19" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+4"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep foos+5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep foos+1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep foos+9
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep bara+19
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep bara+4
 
 ; make sure we compute the correct offset for a packed structure
 


Index: llvm/test/CodeGen/X86/rdtsc.ll
diff -u llvm/test/CodeGen/X86/rdtsc.ll:1.5 llvm/test/CodeGen/X86/rdtsc.ll:1.6
--- llvm/test/CodeGen/X86/rdtsc.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/rdtsc.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | 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()


Index: llvm/test/CodeGen/X86/scalar_sse_minmax.ll
diff -u llvm/test/CodeGen/X86/scalar_sse_minmax.ll:1.3 llvm/test/CodeGen/X86/scalar_sse_minmax.ll:1.4
--- llvm/test/CodeGen/X86/scalar_sse_minmax.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/scalar_sse_minmax.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | \
+; RUN:   grep mins | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | \
+; RUN:   grep maxs | wc -l | grep 2
 
 declare bool %llvm.isunordered.f64( double %x, double %y )
 declare bool %llvm.isunordered.f32( float %x, float %y )


Index: llvm/test/CodeGen/X86/select.ll
diff -u llvm/test/CodeGen/X86/select.ll:1.6 llvm/test/CodeGen/X86/select.ll:1.7
--- llvm/test/CodeGen/X86/select.ll:1.6	Tue Jan 30 10:16:01 2007
+++ llvm/test/CodeGen/X86/select.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah &&
+; 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) {


Index: llvm/test/CodeGen/X86/store-fp-constant.ll
diff -u llvm/test/CodeGen/X86/store-fp-constant.ll:1.3 llvm/test/CodeGen/X86/store-fp-constant.ll:1.4
--- llvm/test/CodeGen/X86/store-fp-constant.ll:1.3	Mon Dec 11 21:59:46 2006
+++ llvm/test/CodeGen/X86/store-fp-constant.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep rodata &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep rodata
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep literal
 ;
 ; Check that no FP constants in this testcase ends up in the 


Index: llvm/test/CodeGen/X86/test-hidden.ll
diff -u llvm/test/CodeGen/X86/test-hidden.ll:1.4 llvm/test/CodeGen/X86/test-hidden.ll:1.5
--- llvm/test/CodeGen/X86/test-hidden.ll:1.4	Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/X86/test-hidden.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu | grep ".hidden" | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8.8.0 | grep ".private_extern" | wc -l | grep 2 
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu | \
+; RUN:   grep .hidden | wc -l | grep 2
+; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8.8.0 | \
+; RUN:   grep .private_extern | wc -l | grep 2 
 
 %struct.Person = type { i32 }
 @a = hidden global i32 0


Index: llvm/test/CodeGen/X86/test-pic-1.ll
diff -u llvm/test/CodeGen/X86/test-pic-1.ll:1.3 llvm/test/CodeGen/X86/test-pic-1.ll:1.4
--- llvm/test/CodeGen/X86/test-pic-1.ll:1.3	Sun Apr 15 17:16:46 2007
+++ llvm/test/CodeGen/X86/test-pic-1.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | \
-; RUN:   llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f 
+; RUN:   llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f
 ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
 ; RUN: grep piclabel %t | wc -l | grep 3
 ; RUN: grep GOT %t | wc -l | grep 3


Index: llvm/test/CodeGen/X86/test-pic-2.ll
diff -u llvm/test/CodeGen/X86/test-pic-2.ll:1.2 llvm/test/CodeGen/X86/test-pic-2.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-2.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-2.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 4
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep GOTOFF %t | wc -l | grep 4
 
 @ptr = internal global i32* null
 @dst = internal global i32 0


Index: llvm/test/CodeGen/X86/test-pic-3.ll
diff -u llvm/test/CodeGen/X86/test-pic-3.ll:1.2 llvm/test/CodeGen/X86/test-pic-3.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-3.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-3.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 1
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep PLT %t | wc -l | grep 1
 
 define void @bar() {
 entry:


Index: llvm/test/CodeGen/X86/test-pic-4.ll
diff -u llvm/test/CodeGen/X86/test-pic-4.ll:1.3 llvm/test/CodeGen/X86/test-pic-4.ll:1.4
--- llvm/test/CodeGen/X86/test-pic-4.ll:1.3	Sun Apr 15 17:16:46 2007
+++ llvm/test/CodeGen/X86/test-pic-4.ll	Mon Apr 16 12:36:07 2007
@@ -3,8 +3,8 @@
 ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
 ; RUN: grep piclabel %t | wc -l | grep 3
 ; RUN: grep PLT %t | wc -l | grep 1
-; RUN: grep "GOT" %t | wc -l | grep 1
-; RUN: not grep "GOTOFF" %t
+; RUN: grep GOT %t | wc -l | grep 1
+; RUN: not grep GOTOFF %t
 
 @pfoo = external global void(...)* 
 


Index: llvm/test/CodeGen/X86/test-pic-5.ll
diff -u llvm/test/CodeGen/X86/test-pic-5.ll:1.2 llvm/test/CodeGen/X86/test-pic-5.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-5.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-5.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 1
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep PLT %t | wc -l | grep 1
 
 @ptr = external global i32* 
 


Index: llvm/test/CodeGen/X86/test-pic-6.ll
diff -u llvm/test/CodeGen/X86/test-pic-6.ll:1.2 llvm/test/CodeGen/X86/test-pic-6.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-6.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-6.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOT | wc -l | grep 3
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN:  grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep GOT %t | wc -l | grep 3
 
 @ptr = global i32* null
 @dst = global i32 0


Index: llvm/test/CodeGen/X86/test-pic-cpool.ll
diff -u llvm/test/CodeGen/X86/test-pic-cpool.ll:1.3 llvm/test/CodeGen/X86/test-pic-cpool.ll:1.4
--- llvm/test/CodeGen/X86/test-pic-cpool.ll:1.3	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-cpool.ll	Mon Apr 16 12:36:07 2007
@@ -1,8 +1,9 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep CPI | wc -l | grep 4
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3 
+; RUN: grep GOTOFF %t | wc -l | grep 2 
+; RUN: grep CPI %t | wc -l | grep 4
 
 define double @foo(i32 %a.u) {
 entry:


Index: llvm/test/CodeGen/X86/test-pic-jtbl.ll
diff -u llvm/test/CodeGen/X86/test-pic-jtbl.ll:1.2 llvm/test/CodeGen/X86/test-pic-jtbl.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-jtbl.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-jtbl.ll	Mon Apr 16 12:36:07 2007
@@ -1,9 +1,10 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 13 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep JTI | wc -l | grep 15
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
+; RUN:   -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3 
+; RUN: grep PLT %t | wc -l | grep 13 
+; RUN: grep GOTOFF %t | wc -l | grep 1 
+; RUN: grep JTI %t | wc -l | grep 15
 
 define void @bar(i32 %n.u) {
 entry:


Index: llvm/test/CodeGen/X86/vec_clear.ll
diff -u llvm/test/CodeGen/X86/vec_clear.ll:1.3 llvm/test/CodeGen/X86/vec_clear.ll:1.4
--- llvm/test/CodeGen/X86/vec_clear.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_clear.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,3 @@
-; 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


Index: llvm/test/CodeGen/X86/vec_extract.ll
diff -u llvm/test/CodeGen/X86/vec_extract.ll:1.5 llvm/test/CodeGen/X86/vec_extract.ll:1.6
--- llvm/test/CodeGen/X86/vec_extract.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_extract.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep movss    %t | wc -l | grep 3 
+; RUN: grep movhlps  %t | wc -l | grep 1 
+; RUN: grep pshufd   %t | wc -l | grep 1 
+; RUN: grep unpckhpd %t | wc -l | grep 1
 
 void %test1(<4 x float>* %F, float* %f) {
 	%tmp = load <4 x float>* %F


Index: llvm/test/CodeGen/X86/vec_ins_extract.ll
diff -u llvm/test/CodeGen/X86/vec_ins_extract.ll:1.4 llvm/test/CodeGen/X86/vec_ins_extract.ll:1.5
--- llvm/test/CodeGen/X86/vec_ins_extract.ll:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/CodeGen/X86/vec_ins_extract.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,4 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -instcombine | \
-; RUN:   llc -march=x86 -mcpu=yonah &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -instcombine | \
 ; RUN:   llc -march=x86 -mcpu=yonah | not grep sub.*esp
 
 ; This checks that various insert/extract idiom work without going to the 


Index: llvm/test/CodeGen/X86/vec_insert.ll
diff -u llvm/test/CodeGen/X86/vec_insert.ll:1.3 llvm/test/CodeGen/X86/vec_insert.ll:1.4
--- llvm/test/CodeGen/X86/vec_insert.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_insert.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep movss  %t | wc -l | grep 1
+; RUN: grep pinsrw %t | wc -l | grep 2
 
 void %test(<4 x float>* %F, int %I) {
 	%tmp = load <4 x float>* %F


Index: llvm/test/CodeGen/X86/vec_set-2.ll
diff -u llvm/test/CodeGen/X86/vec_set-2.ll:1.3 llvm/test/CodeGen/X86/vec_set-2.ll:1.4
--- llvm/test/CodeGen/X86/vec_set-2.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_set-2.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; 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 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) {


Index: llvm/test/CodeGen/X86/vec_set-3.ll
diff -u llvm/test/CodeGen/X86/vec_set-3.ll:1.4 llvm/test/CodeGen/X86/vec_set-3.ll:1.5
--- llvm/test/CodeGen/X86/vec_set-3.ll:1.4	Tue Jan 30 10:16:01 2007
+++ llvm/test/CodeGen/X86/vec_set-3.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
-; RUN:    grep shufps | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
-; RUN:    grep pshufd | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep shufps %t | wc -l | grep 1
+; RUN: grep pshufd %t | wc -l | grep 1
 
 <4 x float> %test(float %a) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1


Index: llvm/test/CodeGen/X86/vec_set-5.ll
diff -u llvm/test/CodeGen/X86/vec_set-5.ll:1.2 llvm/test/CodeGen/X86/vec_set-5.ll:1.3
--- llvm/test/CodeGen/X86/vec_set-5.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_set-5.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep movlhps   %t | wc -l | grep 2 
+; RUN: grep unpcklps  %t | wc -l | grep 1 
+; RUN: grep punpckldq %t | wc -l | grep 1
 
 <4 x float> %test1(float %a, float %b) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0


Index: llvm/test/CodeGen/X86/vec_set-6.ll
diff -u llvm/test/CodeGen/X86/vec_set-6.ll:1.2 llvm/test/CodeGen/X86/vec_set-6.ll:1.3
--- llvm/test/CodeGen/X86/vec_set-6.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_set-6.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep unpcklps %t | wc -l | grep 1 
+; RUN: grep shufps   %t | wc -l | grep 1
 
 <4 x float> %test(float %a, float %b, float %c) {
 	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1


Index: llvm/test/CodeGen/X86/vec_shuffle-2.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-2.ll:1.4 llvm/test/CodeGen/X86/vec_shuffle-2.ll:1.5
--- llvm/test/CodeGen/X86/vec_shuffle-2.ll:1.4	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-2.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep pshufhw %t | wc -l | grep 1
+; RUN: grep pshuflw %t | wc -l | grep 1
+; RUN: grep movhps  %t | wc -l | grep 1
 
 void %test1(<2 x long>* %res, <2 x long>* %A) {
 	%tmp = load <2 x long>* %A


Index: llvm/test/CodeGen/X86/vec_shuffle-3.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-3.ll:1.3 llvm/test/CodeGen/X86/vec_shuffle-3.ll:1.4
--- llvm/test/CodeGen/X86/vec_shuffle-3.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-3.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep movlhps %t | wc -l | grep 1 
+; RUN: grep movhlps %t | wc -l | grep 1
 
 <4 x float> %test1(<4 x float>* %x, <4 x float>* %y) {
 	%tmp = load <4 x float>* %y


Index: llvm/test/CodeGen/X86/vec_shuffle-4.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-4.ll:1.5 llvm/test/CodeGen/X86/vec_shuffle-4.ll:1.6
--- llvm/test/CodeGen/X86/vec_shuffle-4.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-4.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 > %t
+; RUN: grep shuf %t | wc -l | grep 2
+; RUN: not grep unpck %t
 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


Index: llvm/test/CodeGen/X86/vec_shuffle-5.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-5.ll:1.3 llvm/test/CodeGen/X86/vec_shuffle-5.ll:1.4
--- llvm/test/CodeGen/X86/vec_shuffle-5.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-5.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t  -f
+; RUN: grep movhlps %t | wc -l | grep 1
+; RUN: grep shufps  %t | wc -l | grep 1
 
 void %test() {
 	%tmp1 = load <4 x float>* null


Index: llvm/test/CodeGen/X86/vec_shuffle-6.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-6.ll:1.5 llvm/test/CodeGen/X86/vec_shuffle-6.ll:1.6
--- llvm/test/CodeGen/X86/vec_shuffle-6.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-6.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep movapd %t | wc -l | grep 1 
+; RUN: grep movaps %t | wc -l | grep 1 
+; RUN: grep movups %t | wc -l | grep 2
 
 target triple = "i686-apple-darwin"
 


Index: llvm/test/CodeGen/X86/vec_shuffle-7.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-7.ll:1.2 llvm/test/CodeGen/X86/vec_shuffle-7.ll:1.3
--- llvm/test/CodeGen/X86/vec_shuffle-7.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-7.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t  -f
+; RUN: grep xorps %t | wc -l | grep 1
+; RUN: not grep shufps %t
 
 void %test() {
 	cast <4 x int> zeroinitializer to <4 x float>


Index: llvm/test/CodeGen/X86/vec_shuffle-8.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-8.ll:1.2 llvm/test/CodeGen/X86/vec_shuffle-8.ll:1.3
--- llvm/test/CodeGen/X86/vec_shuffle-8.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-8.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,5 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN:   not grep shufps
 
 void %test(<4 x float>* %res, <4 x float>* %A) {
 	%tmp1 = load <4 x float>* %A


Index: llvm/test/CodeGen/X86/vec_shuffle-9.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle-9.ll:1.2 llvm/test/CodeGen/X86/vec_shuffle-9.ll:1.3
--- llvm/test/CodeGen/X86/vec_shuffle-9.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle-9.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep punpck %t | wc -l | grep 2
+; RUN: not grep pextrw %t
 
 <4 x int> %test(sbyte** %ptr) {
 entry:


Index: llvm/test/CodeGen/X86/vec_shuffle.ll
diff -u llvm/test/CodeGen/X86/vec_shuffle.ll:1.9 llvm/test/CodeGen/X86/vec_shuffle.ll:1.10
--- llvm/test/CodeGen/X86/vec_shuffle.ll:1.9	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_shuffle.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f
+; RUN: grep shufp   %t | wc -l | grep 1 
+; RUN: grep movups  %t | wc -l | grep 1 
+; RUN: grep pshufhw %t | 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


Index: llvm/test/CodeGen/X86/vec_splat.ll
diff -u llvm/test/CodeGen/X86/vec_splat.ll:1.7 llvm/test/CodeGen/X86/vec_splat.ll:1.8
--- llvm/test/CodeGen/X86/vec_splat.ll:1.7	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_splat.ll	Mon Apr 16 12:36:07 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps &&
+; 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) {


Index: llvm/test/CodeGen/X86/vec_ss_load_fold.ll
diff -u llvm/test/CodeGen/X86/vec_ss_load_fold.ll:1.3 llvm/test/CodeGen/X86/vec_ss_load_fold.ll:1.4
--- llvm/test/CodeGen/X86/vec_ss_load_fold.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_ss_load_fold.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 -o %t -f
+; RUN: grep minss %t | grep CPI | wc -l | grep 2
+; RUN: grep CPI   %t | not grep movss
 
 target endian = little
 target pointersize = 32


Index: llvm/test/CodeGen/X86/x86-64-mem.ll
diff -u llvm/test/CodeGen/X86/x86-64-mem.ll:1.3 llvm/test/CodeGen/X86/x86-64-mem.ll:1.4
--- llvm/test/CodeGen/X86/x86-64-mem.ll:1.3	Mon Dec  4 12:06:24 2006
+++ llvm/test/CodeGen/X86/x86-64-mem.ll	Mon Apr 16 12:36:07 2007
@@ -1,11 +1,13 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin | grep GOTPCREL | wc -l | grep 4 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin | grep rip | wc -l | grep 6 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin | grep movq | wc -l | grep 6 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin | grep leaq | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin -relocation-model=static | grep rip | wc -l | grep 4 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin -relocation-model=static | grep movl | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin -relocation-model=static | grep movq | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin -o %t1 -f
+; RUN: grep GOTPCREL %t1 | wc -l | grep 4 
+; RUN: grep rip      %t1 | wc -l | grep 6 
+; RUN: grep movq     %t1 | wc -l | grep 6 
+; RUN: grep leaq     %t1 | wc -l | grep 1 
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -mtriple=x86_64-apple-darwin -relocation-model=static -o %t2 -f
+; RUN: grep rip  %t2 | wc -l | grep 4 
+; RUN: grep movl %t2 | wc -l | grep 2 
+; RUN: grep movq %t2 | wc -l | grep 2
 
 %ptr = external global int*
 %src = external global [0 x int]




