Mon Apr 16 10:38:17 PDT 2007

Changes in directory llvm/test/CodeGen/PowerPC:

2006-08-11-RetVector.ll updated: 1.2 -> 1.3
2006-10-13-Miscompile.ll updated: 1.2 -> 1.3
2006-12-07-LargeAlloca.ll updated: 1.2 -> 1.3
2006-12-07-SelectCrash.ll updated: 1.2 -> 1.3
2007-01-04-ArgExtension.ll updated: 1.3 -> 1.4
2007-01-29-lbrx-asm.ll updated: 1.2 -> 1.3
2007-01-31-InlineAsmAddrMode.ll updated: 1.2 -> 1.3
addc.ll updated: 1.3 -> 1.4
addi-reassoc.ll updated: 1.2 -> 1.3
align.ll updated: 1.2 -> 1.3
and-branch.ll updated: 1.2 -> 1.3
and-elim.ll updated: 1.7 -> 1.8
and_add.ll updated: 1.2 -> 1.3
and_sext.ll updated: 1.8 -> 1.9
buildvec_canonicalize.ll updated: 1.3 -> 1.4
cmp-cmp.ll updated: 1.2 -> 1.3
div-2.ll updated: 1.5 -> 1.6
eqv-andc-orc-nor.ll updated: 1.5 -> 1.6
fold-li.ll updated: 1.2 -> 1.3
fp-int-fp.ll updated: 1.2 -> 1.3
fpcopy.ll updated: 1.2 -> 1.3
inlineasm-copy.ll updated: 1.2 -> 1.3
inverted-bool-compares.ll updated: 1.2 -> 1.3
load-constant-addr.ll updated: 1.2 -> 1.3
mem_update.ll updated: 1.5 -> 1.6
mul-neg-power-2.ll updated: 1.2 -> 1.3
mulhs.ll updated: 1.3 -> 1.4
or-addressing-mode.ll updated: 1.2 -> 1.3
reg-coalesce-simple.ll updated: 1.2 -> 1.3
rlwimi.ll updated: 1.5 -> 1.6
rlwimi2.ll updated: 1.3 -> 1.4
rlwinm.ll updated: 1.5 -> 1.6
rlwinm2.ll updated: 1.3 -> 1.4
rotl-2.ll updated: 1.1 -> 1.2
rotl.ll updated: 1.6 -> 1.7
stfiwx.ll updated: 1.3 -> 1.4
store-load-fwd.ll updated: 1.2 -> 1.3
subc.ll updated: 1.3 -> 1.4
unsafe-math.ll updated: 1.2 -> 1.3
vec_br_cmp.ll updated: 1.2 -> 1.3
vec_constants.ll updated: 1.6 -> 1.7
vec_mul.ll updated: 1.3 -> 1.4
vec_perf_shuffle.ll updated: 1.2 -> 1.3
vec_shuffle.ll updated: 1.8 -> 1.9
vec_spat.ll updated: 1.6 -> 1.7
vec_vrsave.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:  (+117 -104)

 2006-08-11-RetVector.ll         |    2 +-
 2006-10-13-Miscompile.ll        |    1 -
 2006-12-07-LargeAlloca.ll       |    4 ++--
 2006-12-07-SelectCrash.ll       |    4 ++--
 2007-01-04-ArgExtension.ll      |    2 +-
 2007-01-29-lbrx-asm.ll          |    2 +-
 2007-01-31-InlineAsmAddrMode.ll |    2 +-
 addc.ll                         |   11 ++++++-----
 addi-reassoc.ll                 |    1 -
 align.ll                        |    9 ++++++---
 and-branch.ll                   |    1 -
 and-elim.ll                     |    1 -
 and_add.ll                      |    7 ++++---
 and_sext.ll                     |    3 +--
 buildvec_canonicalize.ll        |    8 ++++++--
 cmp-cmp.ll                      |    1 -
 div-2.ll                        |    2 +-
 eqv-andc-orc-nor.ll             |   15 ++++++++++-----
 fold-li.ll                      |    4 ++--
 fp-int-fp.ll                    |    1 -
 fpcopy.ll                       |    1 -
 inlineasm-copy.ll               |    1 -
 inverted-bool-compares.ll       |    3 +--
 load-constant-addr.ll           |    2 +-
 mem_update.ll                   |    8 ++++----
 mul-neg-power-2.ll              |    1 -
 mulhs.ll                        |    9 +++++----
 or-addressing-mode.ll           |    3 +--
 reg-coalesce-simple.ll          |    1 -
 rlwimi.ll                       |    2 +-
 rlwimi2.ll                      |    7 ++++---
 rlwinm.ll                       |   11 ++++++-----
 rlwinm2.ll                      |   13 +++++++------
 rotl-2.ll                       |    4 ++--
 rotl.ll                         |    3 +--
 stfiwx.ll                       |   13 +++++++++----
 store-load-fwd.ll               |    1 -
 subc.ll                         |   11 ++++++-----
 unsafe-math.ll                  |    5 +++--
 vec_br_cmp.ll                   |    5 +++--
 vec_constants.ll                |    1 -
 vec_mul.ll                      |    3 +--
 vec_perf_shuffle.ll             |    1 -
 vec_shuffle.ll                  |   14 ++++++++------
 vec_spat.ll                     |   10 ++++++----
 vec_vrsave.ll                   |    7 ++++---
 46 files changed, 117 insertions(+), 104 deletions(-)


Index: llvm/test/CodeGen/PowerPC/2006-08-11-RetVector.ll
diff -u llvm/test/CodeGen/PowerPC/2006-08-11-RetVector.ll:1.2 llvm/test/CodeGen/PowerPC/2006-08-11-RetVector.ll:1.3

--- llvm/test/CodeGen/PowerPC/2006-08-11-RetVector.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/2006-08-11-RetVector.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsldoi &&
+; 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) {


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


Index: llvm/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll
diff -u llvm/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll:1.2 llvm/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll:1.3
--- llvm/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 ; RUN: llvm-upgrade < %s | llvm-as | llc 
 
 void %bitap() {


Index: llvm/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll
diff -u llvm/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll:1.2 llvm/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll:1.3
--- llvm/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll:1.2	Mon Dec 18 20:03:04 2006
+++ llvm/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
 ; RUN: llvm-upgrade < %s | llvm-as | llc
 
 %qsz.b = external global bool		; <bool*> [#uses=1]


Index: llvm/test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll
diff -u llvm/test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll:1.3 llvm/test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll:1.4
--- llvm/test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll:1.3	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep extsb &&
+; RUN: llvm-as < %s | llc -march=ppc32 | grep extsb
 ; RUN: llvm-as < %s | llc -march=ppc32 | grep extsh
 
 define i32 @p1(i8 %c, i16 %s) {


Index: llvm/test/CodeGen/PowerPC/2007-01-29-lbrx-asm.ll
diff -u llvm/test/CodeGen/PowerPC/2007-01-29-lbrx-asm.ll:1.2 llvm/test/CodeGen/PowerPC/2007-01-29-lbrx-asm.ll:1.3
--- llvm/test/CodeGen/PowerPC/2007-01-29-lbrx-asm.ll:1.2	Tue Jan 30 00:32:25 2007
+++ llvm/test/CodeGen/PowerPC/2007-01-29-lbrx-asm.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
+; RUN: llvm-as < %s | llc -march=ppc32
 ; RUN: llvm-as < %s | llc -march=ppc64
 
 define i16 @test(i8* %d1, i16* %d2) {


Index: llvm/test/CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll
diff -u llvm/test/CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll:1.2 llvm/test/CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll:1.3
--- llvm/test/CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
+; RUN: llvm-as < %s | llc -march=ppc32
 ; RUN: llvm-as < %s | llc -march=ppc64
 
 ; Test two things: 1) that a frameidx can be rewritten in an inline asm


Index: llvm/test/CodeGen/PowerPC/addc.ll
diff -u llvm/test/CodeGen/PowerPC/addc.ll:1.3 llvm/test/CodeGen/PowerPC/addc.ll:1.4
--- llvm/test/CodeGen/PowerPC/addc.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/addc.ll	Mon Apr 16 12:36:06 2007
@@ -1,9 +1,10 @@
 ; All of these should be codegen'd without loading immediates
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: grep addc %t | wc -l | grep 1
+; RUN: grep adde %t | wc -l | grep 1
+; RUN: grep addze %t | wc -l | grep 1
+; RUN: grep addme %t | wc -l | grep 1
+; RUN: grep addic %t | wc -l | grep 2
 
 implementation   ; Functions:
 


Index: llvm/test/CodeGen/PowerPC/addi-reassoc.ll
diff -u llvm/test/CodeGen/PowerPC/addi-reassoc.ll:1.2 llvm/test/CodeGen/PowerPC/addi-reassoc.ll:1.3
--- llvm/test/CodeGen/PowerPC/addi-reassoc.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/addi-reassoc.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; 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] }


Index: llvm/test/CodeGen/PowerPC/align.ll
diff -u llvm/test/CodeGen/PowerPC/align.ll:1.2 llvm/test/CodeGen/PowerPC/align.ll:1.3
--- llvm/test/CodeGen/PowerPC/align.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/align.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,9 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep align.4 | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep align.2 | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep align.3 | wc -l | grep 1
 
 
 %A = global <4 x uint> < uint 10, uint 20, uint 30, uint 40 >


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


Index: llvm/test/CodeGen/PowerPC/and-elim.ll
diff -u llvm/test/CodeGen/PowerPC/and-elim.ll:1.7 llvm/test/CodeGen/PowerPC/and-elim.ll:1.8
--- llvm/test/CodeGen/PowerPC/and-elim.ll:1.7	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/PowerPC/and-elim.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwin
 
 define void @test(i8* %P) {


Index: llvm/test/CodeGen/PowerPC/and_add.ll
diff -u llvm/test/CodeGen/PowerPC/and_add.ll:1.2 llvm/test/CodeGen/PowerPC/and_add.ll:1.3
--- llvm/test/CodeGen/PowerPC/and_add.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/and_add.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: grep slwi %t
+; RUN: not grep addi %t
+; RUN: not grep rlwinm %t
 
 int %test(int %A) {
   %B = mul int %A, 8  ;; shift


Index: llvm/test/CodeGen/PowerPC/and_sext.ll
diff -u llvm/test/CodeGen/PowerPC/and_sext.ll:1.8 llvm/test/CodeGen/PowerPC/and_sext.ll:1.9
--- llvm/test/CodeGen/PowerPC/and_sext.ll:1.8	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/PowerPC/and_sext.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,5 @@
 ; 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 extsh
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb
 
 define i32 @test1(i32 %mode.0.i.0) {


Index: llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll
diff -u llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll:1.3 llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll:1.4
--- llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,12 @@
 ; There should be exactly one vxor here.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vxor | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | \
+; RUN:   grep vxor | wc -l | grep 1
 
 ; There should be exactly one vsplti here.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vsplti | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | \
+; RUN:   grep vsplti | wc -l | grep 1
 
 
 void %VXOR(<4 x float>* %P1, <4 x int>* %P2, <4 x float>* %P3) {


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


Index: llvm/test/CodeGen/PowerPC/div-2.ll
diff -u llvm/test/CodeGen/PowerPC/div-2.ll:1.5 llvm/test/CodeGen/PowerPC/div-2.ll:1.6
--- llvm/test/CodeGen/PowerPC/div-2.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/div-2.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi &&
+; 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) {


Index: llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll
diff -u llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll:1.5 llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll:1.6
--- llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,13 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep eqv | wc -l  | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | \
+; RUN:   grep andc | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep orc | wc -l  | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | \
+; RUN:   grep nor | wc -l  | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep nand | wc -l  | grep 1
 
 int %EQV1(int %X, int %Y) {
 	%A = xor int %X, %Y


Index: llvm/test/CodeGen/PowerPC/fold-li.ll
diff -u llvm/test/CodeGen/PowerPC/fold-li.ll:1.2 llvm/test/CodeGen/PowerPC/fold-li.ll:1.3
--- llvm/test/CodeGen/PowerPC/fold-li.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/fold-li.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep -v align | not grep li
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \
+; RUN:   grep -v align | not grep li
 
 ;; Test that immediates are folded into these instructions correctly.
 


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


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


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


Index: llvm/test/CodeGen/PowerPC/inverted-bool-compares.ll
diff -u llvm/test/CodeGen/PowerPC/inverted-bool-compares.ll:1.2 llvm/test/CodeGen/PowerPC/inverted-bool-compares.ll:1.3
--- llvm/test/CodeGen/PowerPC/inverted-bool-compares.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/inverted-bool-compares.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep xori &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep xori
 
 int %test(bool %B, int* %P) {
    br bool %B, label %T, label %F


Index: llvm/test/CodeGen/PowerPC/load-constant-addr.ll
diff -u llvm/test/CodeGen/PowerPC/load-constant-addr.ll:1.2 llvm/test/CodeGen/PowerPC/load-constant-addr.ll:1.3
--- llvm/test/CodeGen/PowerPC/load-constant-addr.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/load-constant-addr.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
 ; Should fold the ori into the lfs.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lfs &&
+; 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() {


Index: llvm/test/CodeGen/PowerPC/mem_update.ll
diff -u llvm/test/CodeGen/PowerPC/mem_update.ll:1.5 llvm/test/CodeGen/PowerPC/mem_update.ll:1.6
--- llvm/test/CodeGen/PowerPC/mem_update.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/mem_update.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -enable-ppc-preinc | \
+; RUN:   not grep addi
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -enable-ppc-preinc | \
+; RUN:   not grep addi
 %Glob = global ulong 4
 
 int *%test0(int *%X,  int *%dest) {


Index: llvm/test/CodeGen/PowerPC/mul-neg-power-2.ll
diff -u llvm/test/CodeGen/PowerPC/mul-neg-power-2.ll:1.2 llvm/test/CodeGen/PowerPC/mul-neg-power-2.ll:1.3
--- llvm/test/CodeGen/PowerPC/mul-neg-power-2.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/mul-neg-power-2.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; 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) {


Index: llvm/test/CodeGen/PowerPC/mulhs.ll
diff -u llvm/test/CodeGen/PowerPC/mulhs.ll:1.3 llvm/test/CodeGen/PowerPC/mulhs.ll:1.4
--- llvm/test/CodeGen/PowerPC/mulhs.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/mulhs.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,9 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: not grep mulhwu %t
+; RUN: not grep srawi %t 
+; RUN: not grep add %t 
+; RUN: grep mulhw %t | wc -l | grep 1
 
 implementation   ; Functions:
 


Index: llvm/test/CodeGen/PowerPC/or-addressing-mode.ll
diff -u llvm/test/CodeGen/PowerPC/or-addressing-mode.ll:1.2 llvm/test/CodeGen/PowerPC/or-addressing-mode.ll:1.3
--- llvm/test/CodeGen/PowerPC/or-addressing-mode.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/or-addressing-mode.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,4 @@
-; 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 ori
 ; RUN: llvm-upgrade < %s | llvm-as | llc | not grep rlwimi
 
 int %test1(sbyte* %P) {  ;; or -> lwzx


Index: llvm/test/CodeGen/PowerPC/reg-coalesce-simple.ll
diff -u llvm/test/CodeGen/PowerPC/reg-coalesce-simple.ll:1.2 llvm/test/CodeGen/PowerPC/reg-coalesce-simple.ll:1.3
--- llvm/test/CodeGen/PowerPC/reg-coalesce-simple.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/reg-coalesce-simple.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; 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] }


Index: llvm/test/CodeGen/PowerPC/rlwimi.ll
diff -u llvm/test/CodeGen/PowerPC/rlwimi.ll:1.5 llvm/test/CodeGen/PowerPC/rlwimi.ll:1.6
--- llvm/test/CodeGen/PowerPC/rlwimi.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/rlwimi.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,5 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && 
+; 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:


Index: llvm/test/CodeGen/PowerPC/rlwimi2.ll
diff -u llvm/test/CodeGen/PowerPC/rlwimi2.ll:1.3 llvm/test/CodeGen/PowerPC/rlwimi2.ll:1.4
--- llvm/test/CodeGen/PowerPC/rlwimi2.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/rlwimi2.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,8 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: grep rlwimi %t | wc -l | grep 3
+; RUN: grep srwi   %t | wc -l | grep 1
+; RUN: not grep slwi %t
 
 implementation   ; Functions:
 


Index: llvm/test/CodeGen/PowerPC/rlwinm.ll
diff -u llvm/test/CodeGen/PowerPC/rlwinm.ll:1.5 llvm/test/CodeGen/PowerPC/rlwinm.ll:1.6
--- llvm/test/CodeGen/PowerPC/rlwinm.ll:1.5	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/rlwinm.ll	Mon Apr 16 12:36:07 2007
@@ -1,9 +1,10 @@
 ; All of these ands and shifts should be folded into rlwimi's
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: not grep and %t 
+; RUN: not grep srawi %t 
+; RUN: not grep srwi %t 
+; RUN: not grep slwi %t 
+; RUN: grep rlwinm %t | wc -l | grep 8
 
 implementation   ; Functions:
 


Index: llvm/test/CodeGen/PowerPC/rlwinm2.ll
diff -u llvm/test/CodeGen/PowerPC/rlwinm2.ll:1.3 llvm/test/CodeGen/PowerPC/rlwinm2.ll:1.4
--- llvm/test/CodeGen/PowerPC/rlwinm2.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/PowerPC/rlwinm2.ll	Mon Apr 16 12:36:07 2007
@@ -1,10 +1,11 @@
 ; 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-as < %s | llc -march=ppc32 -o %t -f
+; RUN: not grep and %t
+; RUN: not grep srawi %t 
+; RUN: not grep srwi %t 
+; RUN: not grep slwi %t 
+; RUN: grep rlwnm %t | wc -l | grep 1
+; RUN: grep rlwinm %t | wc -l | grep 1
 
 define i32 @test1(i32 %X, i32 %Y) {
 entry:


Index: llvm/test/CodeGen/PowerPC/rotl-2.ll
diff -u llvm/test/CodeGen/PowerPC/rotl-2.ll:1.1 llvm/test/CodeGen/PowerPC/rotl-2.ll:1.2
--- llvm/test/CodeGen/PowerPC/rotl-2.ll:1.1	Mon Apr  2 17:08:54 2007
+++ llvm/test/CodeGen/PowerPC/rotl-2.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 4 &&
-; 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 4 
+; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep or
 
 define i32 @rotl32(i32 %A, i8 %Amt) {


Index: llvm/test/CodeGen/PowerPC/rotl.ll
diff -u llvm/test/CodeGen/PowerPC/rotl.ll:1.6 llvm/test/CodeGen/PowerPC/rotl.ll:1.7
--- llvm/test/CodeGen/PowerPC/rotl.ll:1.6	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/PowerPC/rotl.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,4 @@
-; 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 rlwnm  | wc -l | grep 2
 ; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 2
 
 define i32 @rotlw(i32 %x, i32 %sh) {


Index: llvm/test/CodeGen/PowerPC/stfiwx.ll
diff -u llvm/test/CodeGen/PowerPC/stfiwx.ll:1.3 llvm/test/CodeGen/PowerPC/stfiwx.ll:1.4
--- llvm/test/CodeGen/PowerPC/stfiwx.ll:1.3	Wed Dec 20 18:01:42 2006
+++ llvm/test/CodeGen/PowerPC/stfiwx.ll	Mon Apr 16 12:36:07 2007
@@ -1,7 +1,12 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=stfiwx | grep stfiwx &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=stfiwx | not grep r1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=-stfiwx | not grep stfiwx &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=-stfiwx | grep r1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=stfiwx -o %t1 -f
+; RUN: grep stfiwx %t1
+; RUN: not grep r1 %t1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=-stfiwx \
+; RUN:   -o %t2 -f
+; RUN: not grep stfiwx %t2
+; RUN: grep r1 %t2
 
 void %test(float %a, int* %b) {
         %tmp.2 = cast float %a to int


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


Index: llvm/test/CodeGen/PowerPC/subc.ll
diff -u llvm/test/CodeGen/PowerPC/subc.ll:1.3 llvm/test/CodeGen/PowerPC/subc.ll:1.4
--- llvm/test/CodeGen/PowerPC/subc.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/subc.ll	Mon Apr 16 12:36:07 2007
@@ -1,9 +1,10 @@
 ; All of these should be codegen'd without loading immediates
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f
+; RUN: grep subfc %t | wc -l | grep 1
+; RUN: grep subfe %t | wc -l | grep 1
+; RUN: grep subfze %t | wc -l | grep 1
+; RUN: grep subfme %t | wc -l | grep 1
+; RUN: grep subfic %t | wc -l | grep 2
 implementation   ; Functions:
 
 long %sub_ll(long %a, long %b) {


Index: llvm/test/CodeGen/PowerPC/unsafe-math.ll
diff -u llvm/test/CodeGen/PowerPC/unsafe-math.ll:1.2 llvm/test/CodeGen/PowerPC/unsafe-math.ll:1.3
--- llvm/test/CodeGen/PowerPC/unsafe-math.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/PowerPC/unsafe-math.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 | grep fmul | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -enable-unsafe-fp-math | grep fmul | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=ppc32 | grep fmul | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=ppc32 -enable-unsafe-fp-math | \
+; RUN:   grep fmul | wc -l | grep 1
 
 define double @foo(double %X) {
         %tmp1 = mul double %X, 1.23


Index: llvm/test/CodeGen/PowerPC/vec_br_cmp.ll
diff -u llvm/test/CodeGen/PowerPC/vec_br_cmp.ll:1.2 llvm/test/CodeGen/PowerPC/vec_br_cmp.ll:1.3
--- llvm/test/CodeGen/PowerPC/vec_br_cmp.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/vec_br_cmp.ll	Mon Apr 16 12:36:07 2007
@@ -1,5 +1,6 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 -o %t -f
+; RUN: grep vcmpeqfp. %t
+; RUN: not grep mfcr %t
 
 ; A predicate compare used immediately by a branch should not generate an mfcr.
 


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


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


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


Index: llvm/test/CodeGen/PowerPC/vec_shuffle.ll
diff -u llvm/test/CodeGen/PowerPC/vec_shuffle.ll:1.8 llvm/test/CodeGen/PowerPC/vec_shuffle.ll:1.9
--- llvm/test/CodeGen/PowerPC/vec_shuffle.ll:1.8	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/vec_shuffle.ll	Mon Apr 16 12:36:07 2007
@@ -1,9 +1,11 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | \
+; RUN:   llc -march=ppc32 -mcpu=g5 | not grep vperm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 > %t 
+; RUN: grep vsldoi  %t | wc -l | grep 2
+; RUN: grep vmrgh   %t | wc -l | grep 7
+; RUN: grep vmrgl   %t | wc -l | grep 6
+; RUN: grep vpkuhum %t | wc -l | grep 1
+; RUN: grep vpkuwum %t | wc -l | grep 1
 
 void %VSLDOI_xy(<8 x short>* %A, <8 x short>* %B) {
 entry:


Index: llvm/test/CodeGen/PowerPC/vec_spat.ll
diff -u llvm/test/CodeGen/PowerPC/vec_spat.ll:1.6 llvm/test/CodeGen/PowerPC/vec_spat.ll:1.7
--- llvm/test/CodeGen/PowerPC/vec_spat.ll:1.6	Sun Dec 31 00:01:59 2006
+++ llvm/test/CodeGen/PowerPC/vec_spat.ll	Mon Apr 16 12:36:07 2007
@@ -1,8 +1,10 @@
 ; Test that vectors are scalarized/lowered correctly.
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 | \
+; RUN:    grep stfs | wc -l | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 -o %t -f
+; RUN: grep vspltw %t | wc -l | grep 2
+; RUN: grep vsplti %t | wc -l | grep 3
+; RUN: grep vsplth %t | wc -l | grep 1
 
 %f4 = type <4 x float>
 %i4 = type <4 x int>


Index: llvm/test/CodeGen/PowerPC/vec_vrsave.ll
diff -u llvm/test/CodeGen/PowerPC/vec_vrsave.ll:1.3 llvm/test/CodeGen/PowerPC/vec_vrsave.ll:1.4
--- llvm/test/CodeGen/PowerPC/vec_vrsave.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/PowerPC/vec_vrsave.ll	Mon Apr 16 12:36:07 2007
@@ -1,6 +1,7 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 -o %t -f
+; RUN: grep vrlw %t
+; RUN: not grep spr %t
+; RUN: not grep vrsave %t
 
 <4 x int> %test_rol() {
         ret <4 x int> < int -11534337, int -11534337, int -11534337, int -11534337 >




