[llvm-commits] CVS: llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll 2003-08-12-AllocaNonNull.ll 2004-08-10-BoolSetCC.ll 2004-09-20-BadLoadCombine.llx 2004-09-20-BadLoadCombine2.llx 2004-11-27-SetCCForCastLargerAndConstant.ll 2005-03-04-ShiftOverflow.ll 2005-06-16-SetCCOrSetCCMiscompile.ll 2006-02-13-DemandedMiscompile.ll 2006-04-28-ShiftShiftLongLong.ll 2006-10-19-SignedToUnsignedCastAndConst-2.ll 2006-10-19-SignedToUnsignedCastAndConst.ll 2006-10-20-mask.ll 2006-10-26-VectorReassoc.ll 2006-11-03-Memmove64.ll 2006-11-27-XorBug.ll 2006-12-01-BadFPVectorXform.ll 2006-12-08-ICmp-Combining.ll 2006-12-08-Phi-ICmp-Op-Fold.ll 2006-12-08-Select-ICmp.ll 2006-12-10-ICmp-GEP-GEP.ll 2006-12-15-Range-Test.ll 2006-12-23-Select-Cmp-Cmp.ll 2007-01-14-FcmpSelf.ll 2007-01-27-AndICmp.ll 2007-02-01-LoadSinkAlloca.ll 2007-02-07-PointerCast.ll 2007-03-13-CompareMerge.ll 2007-03-21-SignedRangeTest.ll 2007-03-25-BadShiftMask.ll 2007-03-26-BadShiftMask.ll 2007-03-27-PR1280.ll 2007-03-31-InfiniteL! oop.ll 2007-04-04-BadFoldBitcastIntoMalloc.ll CPP_min_max.llx GEPIdxCanon.ll JavaCompare.ll alloca.ll and-compare.ll and-or-and.ll and-xor-merge.ll apint-add1.ll apint-add2.ll apint-and-or-and.ll apint-and-xor-merge.ll apint-and1.ll apint-and2.ll apint-cast.ll apint-elim-logicalops.ll apint-or2.ll apint-rem1.ll apint-rem2.ll apint-select.ll apint-shift-simplify.ll apint-shift.ll apint-shl-trunc.ll apint-sub.ll apint-xor1.ll apint-xor2.ll apint-zext1.ll apint-zext2.ll bit-tracking.ll bitcount.ll bittest.ll bswap-fold.ll bswap.ll call-cast-target.ll call.ll canonicalize_branch.ll cast-and-cast.ll cast-cast-to-and.ll cast-load-gep.ll cast-propagate.ll cast.ll cast2.ll cast_ptr.ll deadcode.ll dg.exp getelementptr-setcc.ll getelementptr.ll getelementptr_cast.ll getelementptr_const.ll hoist_instr.ll icmp.ll load.ll malloc-free-delete.ll malloc2.ll memmove.ll mul.ll narrow.ll or.ll or2.ll phi.ll rem.ll select.ll set.ll setcc-cast-cast.ll setcc-strength-reduce.ll shift-simplify.ll ! shift-sra.ll shift.ll signext.ll sink_instruction.ll stacksave! restore.

[Reid Spencer]

Changes in directory llvm/test/Transforms/InstCombine:

2002-08-02-CastTest.ll updated: 1.7 -> 1.8
2003-08-12-AllocaNonNull.ll updated: 1.3 -> 1.4
2004-08-10-BoolSetCC.ll updated: 1.3 -> 1.4
2004-09-20-BadLoadCombine.llx updated: 1.2 -> 1.3
2004-09-20-BadLoadCombine2.llx updated: 1.2 -> 1.3
2004-11-27-SetCCForCastLargerAndConstant.ll updated: 1.8 -> 1.9
2005-03-04-ShiftOverflow.ll updated: 1.2 -> 1.3
2005-06-16-SetCCOrSetCCMiscompile.ll updated: 1.3 -> 1.4
2006-02-13-DemandedMiscompile.ll updated: 1.2 -> 1.3
2006-04-28-ShiftShiftLongLong.ll updated: 1.3 -> 1.4
2006-10-19-SignedToUnsignedCastAndConst-2.ll updated: 1.4 -> 1.5
2006-10-19-SignedToUnsignedCastAndConst.ll updated: 1.4 -> 1.5
2006-10-20-mask.ll updated: 1.2 -> 1.3
2006-10-26-VectorReassoc.ll updated: 1.2 -> 1.3
2006-11-03-Memmove64.ll updated: 1.2 -> 1.3
2006-11-27-XorBug.ll updated: 1.2 -> 1.3
2006-12-01-BadFPVectorXform.ll updated: 1.2 -> 1.3
2006-12-08-ICmp-Combining.ll updated: 1.1 -> 1.2
2006-12-08-Phi-ICmp-Op-Fold.ll updated: 1.3 -> 1.4
2006-12-08-Select-ICmp.ll updated: 1.1 -> 1.2
2006-12-10-ICmp-GEP-GEP.ll updated: 1.1 -> 1.2
2006-12-15-Range-Test.ll updated: 1.2 -> 1.3
2006-12-23-Select-Cmp-Cmp.ll updated: 1.2 -> 1.3
2007-01-14-FcmpSelf.ll updated: 1.2 -> 1.3
2007-01-27-AndICmp.ll updated: 1.1 -> 1.2
2007-02-01-LoadSinkAlloca.ll updated: 1.2 -> 1.3
2007-02-07-PointerCast.ll updated: 1.1 -> 1.2
2007-03-13-CompareMerge.ll updated: 1.1 -> 1.2
2007-03-21-SignedRangeTest.ll updated: 1.2 -> 1.3
2007-03-25-BadShiftMask.ll updated: 1.2 -> 1.3
2007-03-26-BadShiftMask.ll updated: 1.2 -> 1.3
2007-03-27-PR1280.ll updated: 1.1 -> 1.2
2007-03-31-InfiniteLoop.ll updated: 1.1 -> 1.2
2007-04-04-BadFoldBitcastIntoMalloc.ll updated: 1.3 -> 1.4
CPP_min_max.llx updated: 1.2 -> 1.3
GEPIdxCanon.ll updated: 1.2 -> 1.3
JavaCompare.ll updated: 1.5 -> 1.6
alloca.ll updated: 1.3 -> 1.4
and-compare.ll updated: 1.2 -> 1.3
and-or-and.ll updated: 1.2 -> 1.3
and-xor-merge.ll updated: 1.1 -> 1.2
apint-add1.ll updated: 1.3 -> 1.4
apint-add2.ll updated: 1.3 -> 1.4
apint-and-or-and.ll updated: 1.1 -> 1.2
apint-and-xor-merge.ll updated: 1.1 -> 1.2
apint-and1.ll updated: 1.2 -> 1.3
apint-and2.ll updated: 1.2 -> 1.3
apint-cast.ll updated: 1.1 -> 1.2
apint-elim-logicalops.ll updated: 1.1 -> 1.2
apint-or2.ll updated: 1.2 -> 1.3
apint-rem1.ll updated: 1.2 -> 1.3
apint-rem2.ll updated: 1.2 -> 1.3
apint-select.ll updated: 1.2 -> 1.3
apint-shift-simplify.ll updated: 1.1 -> 1.2
apint-shift.ll updated: 1.1 -> 1.2
apint-shl-trunc.ll updated: 1.1 -> 1.2
apint-sub.ll updated: 1.2 -> 1.3
apint-xor1.ll updated: 1.3 -> 1.4
apint-xor2.ll updated: 1.2 -> 1.3
apint-zext1.ll updated: 1.1 -> 1.2
apint-zext2.ll updated: 1.1 -> 1.2
bit-tracking.ll updated: 1.6 -> 1.7
bitcount.ll updated: 1.3 -> 1.4
bittest.ll updated: 1.3 -> 1.4
bswap-fold.ll updated: 1.4 -> 1.5
bswap.ll updated: 1.5 -> 1.6
call-cast-target.ll updated: 1.3 -> 1.4
call.ll updated: 1.7 -> 1.8
canonicalize_branch.ll updated: 1.2 -> 1.3
cast-and-cast.ll updated: 1.4 -> 1.5
cast-cast-to-and.ll updated: 1.2 -> 1.3
cast-load-gep.ll updated: 1.2 -> 1.3
cast-propagate.ll updated: 1.3 -> 1.4
cast.ll updated: 1.36 -> 1.37
cast2.ll updated: 1.2 -> 1.3
cast_ptr.ll updated: 1.5 -> 1.6
deadcode.ll updated: 1.3 -> 1.4
dg.exp updated: 1.4 -> 1.5
getelementptr-setcc.ll updated: 1.3 -> 1.4
getelementptr.ll updated: 1.20 -> 1.21
getelementptr_cast.ll updated: 1.3 -> 1.4
getelementptr_const.ll updated: 1.2 -> 1.3
hoist_instr.ll updated: 1.2 -> 1.3
icmp.ll updated: 1.2 -> 1.3
load.ll updated: 1.14 -> 1.15
malloc-free-delete.ll updated: 1.1 -> 1.2
malloc2.ll updated: 1.1 -> 1.2
memmove.ll updated: 1.2 -> 1.3
mul.ll updated: 1.14 -> 1.15
narrow.ll updated: 1.5 -> 1.6
or.ll updated: 1.33 -> 1.34
or2.ll updated: 1.1 -> 1.2
phi.ll updated: 1.15 -> 1.16
rem.ll updated: 1.14 -> 1.15
select.ll updated: 1.15 -> 1.16
set.ll updated: 1.22 -> 1.23
setcc-cast-cast.ll updated: 1.2 -> 1.3
setcc-strength-reduce.ll updated: 1.8 -> 1.9
shift-simplify.ll updated: 1.3 -> 1.4
shift-sra.ll updated: 1.6 -> 1.7
shift.ll updated: 1.24 -> 1.25
signext.ll updated: 1.3 -> 1.4
sink_instruction.ll updated: 1.2 -> 1.3
stacksaverestore.ll updated: 1.2 -> 1.3
store.ll updated: 1.3 -> 1.4
sub.ll updated: 1.26 -> 1.27
udiv_select_to_select_shift.ll updated: 1.1 -> 1.2
vec_demanded_elts.ll updated: 1.2 -> 1.3
vec_insert_to_shuffle.ll updated: 1.2 -> 1.3
vec_insertelt.ll updated: 1.1 -> 1.2
vec_narrow.ll updated: 1.2 -> 1.3
vec_shuffle.ll updated: 1.10 -> 1.11
xor.ll updated: 1.21 -> 1.22
xor2.ll updated: 1.1 -> 1.2
zeroext-and-reduce.ll updated: 1.5 -> 1.6
zext.ll updated: 1.2 -> 1.3
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Upgrade tests to work with new llvm.exp version of llvm_runtest.


---
Diffs of the changes:  (+199 -171)

 2002-08-02-CastTest.ll                       |    2 +-
 2003-08-12-AllocaNonNull.ll                  |    3 ++-
 2004-08-10-BoolSetCC.ll                      |    3 ++-
 2004-09-20-BadLoadCombine.llx                |    3 ++-
 2004-09-20-BadLoadCombine2.llx               |    4 ++--
 2004-11-27-SetCCForCastLargerAndConstant.ll  |    3 ++-
 2005-03-04-ShiftOverflow.ll                  |    4 +++-
 2005-06-16-SetCCOrSetCCMiscompile.ll         |    2 +-
 2006-02-13-DemandedMiscompile.ll             |    4 ++--
 2006-04-28-ShiftShiftLongLong.ll             |    2 +-
 2006-10-19-SignedToUnsignedCastAndConst-2.ll |    3 ++-
 2006-10-19-SignedToUnsignedCastAndConst.ll   |    3 ++-
 2006-10-20-mask.ll                           |    3 ++-
 2006-10-26-VectorReassoc.ll                  |    3 ++-
 2006-11-03-Memmove64.ll                      |    3 ++-
 2006-11-27-XorBug.ll                         |    5 +++--
 2006-12-01-BadFPVectorXform.ll               |    2 +-
 2006-12-08-ICmp-Combining.ll                 |    3 ++-
 2006-12-08-Phi-ICmp-Op-Fold.ll               |    5 ++++-
 2006-12-08-Select-ICmp.ll                    |    1 +
 2006-12-10-ICmp-GEP-GEP.ll                   |    3 ++-
 2006-12-15-Range-Test.ll                     |    7 ++++---
 2006-12-23-Select-Cmp-Cmp.ll                 |    1 +
 2007-01-14-FcmpSelf.ll                       |    2 +-
 2007-01-27-AndICmp.ll                        |    2 +-
 2007-02-01-LoadSinkAlloca.ll                 |    6 ++++--
 2007-02-07-PointerCast.ll                    |   12 +++++-------
 2007-03-13-CompareMerge.ll                   |    2 +-
 2007-03-21-SignedRangeTest.ll                |    2 +-
 2007-03-25-BadShiftMask.ll                   |    2 +-
 2007-03-26-BadShiftMask.ll                   |    3 ++-
 2007-03-27-PR1280.ll                         |    2 +-
 2007-03-31-InfiniteLoop.ll                   |    1 +
 2007-04-04-BadFoldBitcastIntoMalloc.ll       |    2 +-
 CPP_min_max.llx                              |    3 ++-
 GEPIdxCanon.ll                               |    3 ++-
 JavaCompare.ll                               |    3 ++-
 alloca.ll                                    |    4 +++-
 and-compare.ll                               |    3 ++-
 and-or-and.ll                                |    3 ++-
 and-xor-merge.ll                             |    2 +-
 apint-add1.ll                                |    1 -
 apint-add2.ll                                |    1 -
 apint-and-or-and.ll                          |    2 +-
 apint-and-xor-merge.ll                       |    2 +-
 apint-and1.ll                                |    3 +--
 apint-and2.ll                                |    3 +--
 apint-cast.ll                                |    1 -
 apint-elim-logicalops.ll                     |    5 ++---
 apint-or2.ll                                 |    2 --
 apint-rem1.ll                                |    1 -
 apint-rem2.ll                                |    1 -
 apint-select.ll                              |    3 +--
 apint-shift-simplify.ll                      |    2 +-
 apint-shift.ll                               |    3 +--
 apint-shl-trunc.ll                           |    2 +-
 apint-sub.ll                                 |    4 ++--
 apint-xor1.ll                                |    3 +--
 apint-xor2.ll                                |    3 +--
 apint-zext1.ll                               |    3 +--
 apint-zext2.ll                               |    3 +--
 bit-tracking.ll                              |    4 ++--
 bitcount.ll                                  |    5 +++--
 bittest.ll                                   |    4 ++--
 bswap-fold.ll                                |    6 ++++--
 bswap.ll                                     |    3 ++-
 call-cast-target.ll                          |    3 ++-
 call.ll                                      |    3 ++-
 canonicalize_branch.ll                       |    3 ++-
 cast-and-cast.ll                             |    3 ++-
 cast-cast-to-and.ll                          |    3 ++-
 cast-load-gep.ll                             |    3 ++-
 cast-propagate.ll                            |    3 ++-
 cast.ll                                      |    4 ++--
 cast2.ll                                     |    1 -
 cast_ptr.ll                                  |    1 -
 deadcode.ll                                  |    3 ++-
 dg.exp                                       |    2 +-
 getelementptr-setcc.ll                       |    3 ++-
 getelementptr.ll                             |    3 ++-
 getelementptr_cast.ll                        |    4 +++-
 getelementptr_const.ll                       |    3 ++-
 hoist_instr.ll                               |    3 ++-
 icmp.ll                                      |    2 +-
 load.ll                                      |    2 +-
 malloc-free-delete.ll                        |    3 +--
 malloc2.ll                                   |    2 +-
 memmove.ll                                   |    4 ++--
 mul.ll                                       |    1 -
 narrow.ll                                    |    3 +--
 or.ll                                        |    5 ++---
 or2.ll                                       |    3 +--
 phi.ll                                       |    2 --
 rem.ll                                       |    1 -
 select.ll                                    |    4 ++--
 set.ll                                       |    2 +-
 setcc-cast-cast.ll                           |    5 ++++-
 setcc-strength-reduce.ll                     |    5 +++--
 shift-simplify.ll                            |    2 +-
 shift-sra.ll                                 |    3 +--
 shift.ll                                     |    3 +--
 signext.ll                                   |    3 +--
 sink_instruction.ll                          |    3 ++-
 stacksaverestore.ll                          |    1 -
 store.ll                                     |    4 ++--
 sub.ll                                       |    3 +--
 udiv_select_to_select_shift.ll               |   10 +++++-----
 vec_demanded_elts.ll                         |   16 +++++++++++-----
 vec_insert_to_shuffle.ll                     |    9 ++++++---
 vec_insertelt.ll                             |    2 +-
 vec_narrow.ll                                |    3 ++-
 vec_shuffle.ll                               |    1 -
 xor.ll                                       |    6 +++---
 xor2.ll                                      |    4 +---
 zeroext-and-reduce.ll                        |    2 +-
 zext.ll                                      |    4 ++--
 116 files changed, 199 insertions(+), 171 deletions(-)


Index: llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll
diff -u llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll:1.7 llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll:1.8
--- llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll:1.7	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This testcase is incorrectly getting completely eliminated.  There should be
 ; SOME instruction named %c here, even if it's a bitwise and.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep %c
 ;
 ulong %test3(ulong %A) {
         %c1 = cast ulong %A to ubyte


Index: llvm/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
diff -u llvm/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll:1.3 llvm/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll:1.4
--- llvm/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; This testcase can be simplified by "realizing" that alloca can never return 
 ; null.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | \
+; RUN:    llvm-dis | not grep br
 
 implementation   ; Functions:
 


Index: llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
diff -u llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll:1.3 llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll:1.4
--- llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll:1.3	Fri Jan 12 23:06:52 2007
+++ llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i1 false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {ret i1 false}
 bool %test(bool %V) {
 	%Y = setlt bool %V, false
 	ret bool %Y


Index: llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
diff -u llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx:1.2 llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx:1.3
--- llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:   not grep {int 1}
 
 ; When propagating the load through the select, make sure that the load is
 ; inserted where the original load was, not where the select is.  Not doing


Index: llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
diff -u llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx:1.2 llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx:1.3
--- llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \
-; RUN:   grep -v store | not grep 'int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | \
+; RUN:   llvm-dis | grep -v store | not grep {int 1}
 
 ; Test to make sure that instcombine does not accidentally propagate the load
 ; into the PHI, which would break the program.


Index: llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
diff -u llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll:1.8 llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll:1.9
--- llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll:1.8	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll	Sat Apr 14 15:13:02 2007
@@ -9,7 +9,8 @@
 ; be eliminated. In many cases the setCC is also eliminated based on the
 ; constant value and the range of the casted value.
 ;
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast '.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    notcast .*int
 
 implementation   ; Functions:
 


Index: llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
diff -u llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll:1.2 llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll:1.3
--- llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {ret bool false}
+
 bool %test(ulong %tmp.169) {
 	%tmp.1710 = shr ulong %tmp.169, ubyte 1
 	%tmp.1912 = setgt ulong %tmp.1710, 0


Index: llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
diff -u llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll:1.3 llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll:1.4
--- llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll:1.3	Fri Jan 12 23:06:52 2007
+++ llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'ret i1 true'
+; RUN:   grep {ret i1 true}
 ; PR586
 
 %g_07918478 = external global uint		; <uint*> [#uses=1]


Index: llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
diff -u llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll:1.2 llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep undef
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep undef
 
 int %test(sbyte %A) {
 	%B = cast sbyte %A to int


Index: llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
diff -u llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll:1.3 llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll:1.4
--- llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 
 ; This cannot be turned into a sign extending cast!


Index: llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
diff -u llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll:1.4 llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll:1.5
--- llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,6 @@
 ; The optimizer should be able to remove cast operation here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*i32'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep sext.*i32
 
 bool %eq_signed_to_small_unsigned(sbyte %SB) {
    %Y = cast sbyte %SB to uint         ; <uint> [#uses=1]


Index: llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
diff -u llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll:1.4 llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll:1.5
--- llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; This test case is reduced from llvmAsmParser.cpp
 ; The optimizer should not remove the cast here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*i32'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep sext.*i32
 
 bool %test(short %X) {
     %A = cast short %X to uint


Index: llvm/test/Transforms/InstCombine/2006-10-20-mask.ll
diff -u llvm/test/Transforms/InstCombine/2006-10-20-mask.ll:1.2 llvm/test/Transforms/InstCombine/2006-10-20-mask.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-10-20-mask.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-10-20-mask.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-;  RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'and'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep and
 ulong %foo(ulong %tmp, ulong %tmp2) {
   %tmp = cast ulong %tmp to uint
   %tmp2 = cast ulong %tmp2 to uint


Index: llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
diff -u llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll:1.2 llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep mul | wc -l | grep 2
 
 
 <4 x float> %test(<4 x float> %V) {


Index: llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
diff -u llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll:1.2 llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis |not grep memmove.i32
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep memmove.i32
 ; Instcombine was trying to turn this into a memmove.i32
 
 target datalayout = "e-p:64:64"


Index: llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll
diff -u llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll:1.2 llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and.*32' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or.*153'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and.*32
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep or.*153
 ; PR1014
 
 int %test(int %tmp1) {


Index: llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll:1.2 llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll:1.2	Fri Dec  1 23:02:46 2006
+++ llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep sub &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep sub
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep add
 
 <4 x float> %test(<4 x float> %tmp26, <4 x float> %tmp53) {


Index: llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll:1.1 llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll:1.2
--- llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll:1.1	Fri Dec  8 11:38:55 2006
+++ llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%bothcond ='
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep {%bothcond =}
 bool %Doit_bb(int %i.0) {
 bb:             ; preds = %newFuncRoot
         %tmp = setgt int %i.0, 0             ; <bool> [#uses=1]


Index: llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll:1.3 llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll:1.4
--- llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll:1.3	Wed Apr 11 11:04:04 2007
+++ llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis|grep 'icmp sgt'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {icmp sgt}
+; END.
+
 ; ModuleID = 'visible.bc'
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll:1.1 llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll:1.2
--- llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll:1.1	Fri Dec  8 23:13:01 2006
+++ llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select
+; END.
 target datalayout = "e-p:32:32"
 target endian = little
 target pointersize = 32


Index: llvm/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll:1.1 llvm/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll:1.2
--- llvm/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll:1.1	Sat Dec 23 00:05:41 2006
+++ llvm/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep -v 'icmp ult int'
+; RUN:    grep -v {icmp ult int}
+; END.
 ; ModuleID = 'good.bc'
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll:1.2 llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'icmp' | wc -l | grep 1
+; RUN:   grep icmp | wc -l | grep 1
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'icmp ugt' | wc -l | grep 1
-;
+; RUN:   grep {icmp ugt} | wc -l | grep 1
+; END.
+
 ; ModuleID = 'bugpoint-tooptimize.bc'
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll
diff -u llvm/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll:1.2 llvm/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll:1.3
--- llvm/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; For PR1065. This causes an assertion in instcombine if a select with two cmp
 ; operands is encountered.
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
+; END.
 ; ModuleID = 'PR1065.bc'
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
diff -u llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll:1.2 llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll:1.3
--- llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'fcmp uno.*0.0'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {fcmp uno.*0.0}
 ; PR1111
 define i1 @test(double %X) {
   %tmp = fcmp une double %X, %X


Index: llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
diff -u llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll:1.1 llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll:1.1	Sat Jan 27 17:07:12 2007
+++ llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep "ugt.*, 1"
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ugt.*, 1}
 
 define i1 @test(i32 %tmp1030) {
 	%tmp1037 = icmp ne i32 %tmp1030, 40		; <i1> [#uses=1]


Index: llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
diff -u llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll:1.2 llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll:1.3
--- llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll:1.2	Sat Feb  3 20:11:13 2007
+++ llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | grep '%A = alloca' &&
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep '%B = alloca'
+; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | grep {%A = alloca} 
+; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:    not grep {%B = alloca}
+; END.
 
 ; Ensure that instcombine doesn't sink the loads in entry/cond_true into 
 ; cond_next.  Doing so prevents mem2reg from promoting the B alloca.


Index: llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
diff -u llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll:1.1 llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll:1.1	Wed Feb  7 16:23:47 2007
+++ llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll	Sat Apr 14 15:13:02 2007
@@ -1,11 +1,9 @@
-;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine |llvm-dis |grep zext
+;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep zext
 
-;Make sure the uint isn't removed.
-;instcombine in llvm 1.9 was dropping the uint cast which was causing a sign
-;extend
-;this only affected code with pointers in the high half of memory, so it wasn't
-;noticed much :)
-;compile a kernel though...
+; Make sure the uint isn't removed.  Instcombine in llvm 1.9 was dropping the 
+; uint cast which was causing a sign extend. This only affected code with 
+; pointers in the high half of memory, so it wasn't noticed much
+; compile a kernel though...
 
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll:1.1 llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll:1.1	Tue Mar 13 09:25:35 2007
+++ llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'icmp sle'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {icmp sle}
 ; PR1244
 
 define i1 @test(i32 %c.3.i, i32 %d.292.2.i) {


Index: llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.2 llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.3
--- llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.2	Wed Mar 21 21:53:05 2007
+++ llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
 ; For PR1248
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'ugt i32 .*, 11'
+; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep {ugt i32 .*, 11}
 define i1 @test(i32 %tmp6) {
   %tmp7 = sdiv i32 %tmp6, 12     ; <i32> [#uses=1]
   icmp ne i32 %tmp7, -6           ; <i1>:1 [#uses=1]


Index: llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll:1.2 llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll:1.3
--- llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll:1.2	Mon Mar 26 13:04:38 2007
+++ llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,6 @@
 ; PR1271
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    grep 'icmp eq i32 .tmp.*, 2146435072'
+; RUN:    grep {icmp eq i32 .tmp.*, 2146435072}
 %struct..0anon = type { i32, i32 }
 %struct..1anon = type { double }
 


Index: llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll:1.2 llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll:1.3
--- llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; PR1271
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    grep 'ashr i32 %.mp137, 2'
+; RUN:    grep {ashr i32 %.mp137, 2}
+; END.
 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"
 target triple = "i686-pc-linux-gnu"
 


Index: llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll:1.1 llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll:1.1	Tue Mar 27 20:43:35 2007
+++ llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll	Sat Apr 14 15:13:02 2007
@@ -4,7 +4,7 @@
 ;          is not done. It should be removed when code gen supports "funny"
 ;          bit widths.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'add i49.*-8388608'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {add i49.*-8388608}
 
 define i49 @test5(i49 %x) {
         ;; If we have ADD(XOR(AND(X, 0xFF), 0x80), 0xF..F80), it's a sext.


Index: llvm/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll:1.1 llvm/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll:1.1	Sun Apr  1 00:34:53 2007
+++ llvm/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine -disable-output
+; END.
 
 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"
 target triple = "i686-apple-darwin8"


Index: llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
diff -u llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll:1.3 llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll:1.4
--- llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll:1.3	Wed Apr  4 15:40:44 2007
+++ llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll	Sat Apr 14 15:13:02 2007
@@ -3,7 +3,7 @@
 ; 64-bit targets.
 ;
 ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '= add '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {= add }
 
 target datalayout = "e-p:64:64:64-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"
 target triple = "x86_64-unknown-freebsd6.2"


Index: llvm/test/Transforms/InstCombine/CPP_min_max.llx
diff -u llvm/test/Transforms/InstCombine/CPP_min_max.llx:1.2 llvm/test/Transforms/InstCombine/CPP_min_max.llx:1.3
--- llvm/test/Transforms/InstCombine/CPP_min_max.llx:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/CPP_min_max.llx	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select | not grep 'int\*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep select | not grep {i32\\*}
 
 ; This testcase corresponds to PR362, which notices that this horrible code
 ; is generated by the C++ front-end and LLVM optimizers, which has lots of


Index: llvm/test/Transforms/InstCombine/GEPIdxCanon.ll
diff -u llvm/test/Transforms/InstCombine/GEPIdxCanon.ll:1.2 llvm/test/Transforms/InstCombine/GEPIdxCanon.ll:1.3
--- llvm/test/Transforms/InstCombine/GEPIdxCanon.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/GEPIdxCanon.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | \
+; RUN:    llvm-dis | not grep getelementptr
 
 bool %test(int* %A) {
 	%B = getelementptr int* %A, int 1


Index: llvm/test/Transforms/InstCombine/JavaCompare.ll
diff -u llvm/test/Transforms/InstCombine/JavaCompare.ll:1.5 llvm/test/Transforms/InstCombine/JavaCompare.ll:1.6
--- llvm/test/Transforms/InstCombine/JavaCompare.ll:1.5	Sat Dec 23 00:05:41 2006
+++ llvm/test/Transforms/InstCombine/JavaCompare.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,8 @@
 ; This is the sequence of stuff that the Java front-end expands for a single 
 ; <= comparison.  Check to make sure we turn it into a <= (only)
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'icmp sle'| not grep '#uses'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v {icmp sle} | not grep #uses
 
 bool %le(int %A, int %B) {
         %c1 = setgt int %A, %B;


Index: llvm/test/Transforms/InstCombine/alloca.ll
diff -u llvm/test/Transforms/InstCombine/alloca.ll:1.3 llvm/test/Transforms/InstCombine/alloca.ll:1.4
--- llvm/test/Transforms/InstCombine/alloca.ll:1.3	Mon Jan 15 00:51:25 2007
+++ llvm/test/Transforms/InstCombine/alloca.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,8 @@
 ; Zero byte allocas should be deleted.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep alloca
+; END.
 
 declare void %use(...)
 void %test() {


Index: llvm/test/Transforms/InstCombine/and-compare.ll
diff -u llvm/test/Transforms/InstCombine/and-compare.ll:1.2 llvm/test/Transforms/InstCombine/and-compare.ll:1.3
--- llvm/test/Transforms/InstCombine/and-compare.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/and-compare.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep and | wc -l | grep 1
 
 ; Should be optimized to one and.
 bool %test1(uint %a, uint %b) {


Index: llvm/test/Transforms/InstCombine/and-or-and.ll
diff -u llvm/test/Transforms/InstCombine/and-or-and.ll:1.2 llvm/test/Transforms/InstCombine/and-or-and.ll:1.3
--- llvm/test/Transforms/InstCombine/and-or-and.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/and-or-and.ll	Sat Apr 14 15:13:02 2007
@@ -9,7 +9,8 @@
 ;
 ; Which corresponds to test1.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {or }
 
 int %test1(int %X, int %Y) {
 	%A = and int %X, 7


Index: llvm/test/Transforms/InstCombine/and-xor-merge.ll
diff -u llvm/test/Transforms/InstCombine/and-xor-merge.ll:1.1 llvm/test/Transforms/InstCombine/and-xor-merge.ll:1.2
--- llvm/test/Transforms/InstCombine/and-xor-merge.ll:1.1	Sun Mar 18 17:50:57 2007
+++ llvm/test/Transforms/InstCombine/and-xor-merge.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
 
 ; (x&z) ^ (y&z) -> (x^y)&z


Index: llvm/test/Transforms/InstCombine/apint-add1.ll
diff -u llvm/test/Transforms/InstCombine/apint-add1.ll:1.3 llvm/test/Transforms/InstCombine/apint-add1.ll:1.4
--- llvm/test/Transforms/InstCombine/apint-add1.ll:1.3	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-add1.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 


Index: llvm/test/Transforms/InstCombine/apint-add2.ll
diff -u llvm/test/Transforms/InstCombine/apint-add2.ll:1.3 llvm/test/Transforms/InstCombine/apint-add2.ll:1.4
--- llvm/test/Transforms/InstCombine/apint-add2.ll:1.3	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-add2.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 


Index: llvm/test/Transforms/InstCombine/apint-and-or-and.ll
diff -u llvm/test/Transforms/InstCombine/apint-and-or-and.ll:1.1 llvm/test/Transforms/InstCombine/apint-and-or-and.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-and-or-and.ll:1.1	Fri Mar 23 15:48:33 2007
+++ llvm/test/Transforms/InstCombine/apint-and-or-and.ll	Sat Apr 14 15:13:02 2007
@@ -11,7 +11,7 @@
 ; 
 ; This tests arbitrary precision integers.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {or }
 
 define i17 @test1(i17 %X, i17 %Y) {
 	%A = and i17 %X, 7


Index: llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
diff -u llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll:1.1 llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll:1.1	Fri Mar 23 15:48:33 2007
+++ llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This test case checks that the merge of and/xor can work on arbitrary
 ; precision integers.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
 
 ; (x &z ) ^ (y & z) -> (x ^ y) & z


Index: llvm/test/Transforms/InstCombine/apint-and1.ll
diff -u llvm/test/Transforms/InstCombine/apint-and1.ll:1.2 llvm/test/Transforms/InstCombine/apint-and1.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-and1.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-and1.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {and }
 
 define i39 @test0(i39 %A) {
         %B = and i39 %A, 0 ; zero result


Index: llvm/test/Transforms/InstCombine/apint-and2.ll
diff -u llvm/test/Transforms/InstCombine/apint-and2.ll:1.2 llvm/test/Transforms/InstCombine/apint-and2.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-and2.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-and2.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {and }
 
 
 define i999 @test0(i999 %A) {


Index: llvm/test/Transforms/InstCombine/apint-cast.ll
diff -u llvm/test/Transforms/InstCombine/apint-cast.ll:1.1 llvm/test/Transforms/InstCombine/apint-cast.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-cast.ll:1.1	Fri Mar 23 15:48:34 2007
+++ llvm/test/Transforms/InstCombine/apint-cast.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
 
 define i17 @test1(i17 %a) {


Index: llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll
diff -u llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll:1.1 llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll:1.1	Fri Mar 23 16:57:47 2007
+++ llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll	Sat Apr 14 15:13:02 2007
@@ -1,9 +1,8 @@
 ; Test that elimination of logical operators works with 
 ; arbitrary precision integers.
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    not grep '(and\|xor\|add\|shl\|shr)'
+; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
+; END.
 
 define i33 @test1(i33 %x) {
         %tmp.1 = and i33 %x, 65535           ; <i33> [#uses=1]


Index: llvm/test/Transforms/InstCombine/apint-or2.ll
diff -u llvm/test/Transforms/InstCombine/apint-or2.ll:1.2 llvm/test/Transforms/InstCombine/apint-or2.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-or2.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-or2.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,6 @@
 ; This test makes sure that or instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 ;
-
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/or2.rel &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep or
 
 


Index: llvm/test/Transforms/InstCombine/apint-rem1.ll
diff -u llvm/test/Transforms/InstCombine/apint-rem1.ll:1.2 llvm/test/Transforms/InstCombine/apint-rem1.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-rem1.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-rem1.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
 


Index: llvm/test/Transforms/InstCombine/apint-rem2.ll
diff -u llvm/test/Transforms/InstCombine/apint-rem2.ll:1.2 llvm/test/Transforms/InstCombine/apint-rem2.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-rem2.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-rem2.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
 


Index: llvm/test/Transforms/InstCombine/apint-select.ll
diff -u llvm/test/Transforms/InstCombine/apint-select.ll:1.2 llvm/test/Transforms/InstCombine/apint-select.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-select.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-select.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select &&
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select
 
 
 define i41 @test1(i1 %C) {


Index: llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
diff -u llvm/test/Transforms/InstCombine/apint-shift-simplify.ll:1.1 llvm/test/Transforms/InstCombine/apint-shift-simplify.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-shift-simplify.ll:1.1	Fri Mar 23 16:57:47 2007
+++ llvm/test/Transforms/InstCombine/apint-shift-simplify.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    egrep 'shl|lshr|ashr' | wc -l | grep 3
+; RUN:    egrep {shl|lshr|ashr} | wc -l | grep 3
 
 define i41 @test0(i41 %A, i41 %B, i41 %C) {
 	%X = shl i41 %A, %C


Index: llvm/test/Transforms/InstCombine/apint-shift.ll
diff -u llvm/test/Transforms/InstCombine/apint-shift.ll:1.1 llvm/test/Transforms/InstCombine/apint-shift.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-shift.ll:1.1	Fri Mar 23 16:57:47 2007
+++ llvm/test/Transforms/InstCombine/apint-shift.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that shit instructions are properly eliminated
 ; even with arbitrary precision integers.
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep sh
+; END.
 
 define i47 @test1(i47 %A) {
 	%B = shl i47 %A, 0		; <i47> [#uses=1]


Index: llvm/test/Transforms/InstCombine/apint-shl-trunc.ll
diff -u llvm/test/Transforms/InstCombine/apint-shl-trunc.ll:1.1 llvm/test/Transforms/InstCombine/apint-shl-trunc.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-shl-trunc.ll:1.1	Fri Mar 23 15:48:34 2007
+++ llvm/test/Transforms/InstCombine/apint-shl-trunc.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/sht.rel &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl
+; END.
 
 define i1 @test0(i39 %X, i39 %A) {
 	%B = lshr i39 %X, %A


Index: llvm/test/Transforms/InstCombine/apint-sub.ll
diff -u llvm/test/Transforms/InstCombine/apint-sub.ll:1.2 llvm/test/Transforms/InstCombine/apint-sub.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-sub.ll:1.2	Mon Mar 26 05:59:13 2007
+++ llvm/test/Transforms/InstCombine/apint-sub.ll	Sat Apr 14 15:13:02 2007
@@ -2,8 +2,8 @@
 ; even with arbitrary precision integers.
 ;
 
-; RUN:  llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:   grep -v 'sub i19 %Cok, %Bok' | not grep sub
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+; RUN:   grep -v {sub i19 %Cok, %Bok} | not grep sub
 
 define i23 @test1(i23 %A) {
 	%B = sub i23 %A, %A		; <i23> [#uses=1]


Index: llvm/test/Transforms/InstCombine/apint-xor1.ll
diff -u llvm/test/Transforms/InstCombine/apint-xor1.ll:1.3 llvm/test/Transforms/InstCombine/apint-xor1.ll:1.4
--- llvm/test/Transforms/InstCombine/apint-xor1.ll:1.3	Sun Apr  8 02:52:40 2007
+++ llvm/test/Transforms/InstCombine/apint-xor1.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that xor instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 
 define i47 @test1(i47 %A, i47 %B) {


Index: llvm/test/Transforms/InstCombine/apint-xor2.ll
diff -u llvm/test/Transforms/InstCombine/apint-xor2.ll:1.2 llvm/test/Transforms/InstCombine/apint-xor2.ll:1.3
--- llvm/test/Transforms/InstCombine/apint-xor2.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/apint-xor2.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that xor instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 
 define i447 @test1(i447 %A, i447 %B) {


Index: llvm/test/Transforms/InstCombine/apint-zext1.ll
diff -u llvm/test/Transforms/InstCombine/apint-zext1.ll:1.1 llvm/test/Transforms/InstCombine/apint-zext1.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-zext1.ll:1.1	Fri Mar 23 15:48:34 2007
+++ llvm/test/Transforms/InstCombine/apint-zext1.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast {} {%c1.*}
 
 define i47 @test_sext_zext(i11 %A) {
     %c1 = zext i11 %A to i39


Index: llvm/test/Transforms/InstCombine/apint-zext2.ll
diff -u llvm/test/Transforms/InstCombine/apint-zext2.ll:1.1 llvm/test/Transforms/InstCombine/apint-zext2.ll:1.2
--- llvm/test/Transforms/InstCombine/apint-zext2.ll:1.1	Fri Mar 23 15:48:34 2007
+++ llvm/test/Transforms/InstCombine/apint-zext2.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast {} {%c1.*}
 
 define i1024 @test_sext_zext(i77 %A) {
     %c1 = zext i77 %A to i533


Index: llvm/test/Transforms/InstCombine/bit-tracking.ll
diff -u llvm/test/Transforms/InstCombine/bit-tracking.ll:1.6 llvm/test/Transforms/InstCombine/bit-tracking.ll:1.7
--- llvm/test/Transforms/InstCombine/bit-tracking.ll:1.6	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/bit-tracking.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This file contains various testcases that require tracking whether bits are
 ; set or cleared by various instructions.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis | not grep %ELIM
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis |\
+; RUN:   not grep %ELIM
 
 ; Reduce down to a single XOR
 int %test3(int %B) {


Index: llvm/test/Transforms/InstCombine/bitcount.ll
diff -u llvm/test/Transforms/InstCombine/bitcount.ll:1.3 llvm/test/Transforms/InstCombine/bitcount.ll:1.4
--- llvm/test/Transforms/InstCombine/bitcount.ll:1.3	Mon Apr  2 15:46:28 2007
+++ llvm/test/Transforms/InstCombine/bitcount.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; Tests to make sure bit counts of constants are folded
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 19' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v declare | not grep 'llvm.ct'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 19}
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+; RUN:   grep -v declare | not grep llvm.ct
 
 declare i32 @llvm.ctpop.i31(i31 %val) 
 declare i32 @llvm.cttz.i32(i32 %val) 


Index: llvm/test/Transforms/InstCombine/bittest.ll
diff -u llvm/test/Transforms/InstCombine/bittest.ll:1.3 llvm/test/Transforms/InstCombine/bittest.ll:1.4
--- llvm/test/Transforms/InstCombine/bittest.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/bittest.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis |\
+; RUN:    not grep {call void %abort}
 
 %b_rec.0 = external global int
 


Index: llvm/test/Transforms/InstCombine/bswap-fold.ll
diff -u llvm/test/Transforms/InstCombine/bswap-fold.ll:1.4 llvm/test/Transforms/InstCombine/bswap-fold.ll:1.5
--- llvm/test/Transforms/InstCombine/bswap-fold.ll:1.4	Sun Apr  1 19:51:15 2007
+++ llvm/test/Transforms/InstCombine/bswap-fold.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*bswap'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep ret | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep call.*bswap
 
 bool %test1(ushort %tmp2) {
 	%tmp10 = call ushort %llvm.bswap.i16( ushort %tmp2 )		


Index: llvm/test/Transforms/InstCombine/bswap.ll
diff -u llvm/test/Transforms/InstCombine/bswap.ll:1.5 llvm/test/Transforms/InstCombine/bswap.ll:1.6
--- llvm/test/Transforms/InstCombine/bswap.ll:1.5	Fri Mar  2 20:27:02 2007
+++ llvm/test/Transforms/InstCombine/bswap.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep {call.*llvm.bswap} | wc -l | grep 5
 
 uint %test1(uint %i) {
         %tmp1 = shr uint %i, ubyte 24           ; <uint> [#uses=1]


Index: llvm/test/Transforms/InstCombine/call-cast-target.ll
diff -u llvm/test/Transforms/InstCombine/call-cast-target.ll:1.3 llvm/test/Transforms/InstCombine/call-cast-target.ll:1.4
--- llvm/test/Transforms/InstCombine/call-cast-target.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/call-cast-target.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep call | not grep bitcast
 
 target endian = little
 target pointersize = 32


Index: llvm/test/Transforms/InstCombine/call.ll
diff -u llvm/test/Transforms/InstCombine/call.ll:1.7 llvm/test/Transforms/InstCombine/call.ll:1.8
--- llvm/test/Transforms/InstCombine/call.ll:1.7	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/call.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep call | notcast
 
 implementation
 


Index: llvm/test/Transforms/InstCombine/canonicalize_branch.ll
diff -u llvm/test/Transforms/InstCombine/canonicalize_branch.ll:1.2 llvm/test/Transforms/InstCombine/canonicalize_branch.ll:1.3
--- llvm/test/Transforms/InstCombine/canonicalize_branch.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/canonicalize_branch.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {setne\|setle\|setge}
 
 int %test1(uint %X, uint %Y) {
 	%C = setne uint %X, %Y


Index: llvm/test/Transforms/InstCombine/cast-and-cast.ll
diff -u llvm/test/Transforms/InstCombine/cast-and-cast.ll:1.4 llvm/test/Transforms/InstCombine/cast-and-cast.ll:1.5
--- llvm/test/Transforms/InstCombine/cast-and-cast.ll:1.4	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/cast-and-cast.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep bitcast
 
 bool %test1(uint %val) {
   %t1 = bitcast uint %val to int 


Index: llvm/test/Transforms/InstCombine/cast-cast-to-and.ll
diff -u llvm/test/Transforms/InstCombine/cast-cast-to-and.ll:1.2 llvm/test/Transforms/InstCombine/cast-cast-to-and.ll:1.3
--- llvm/test/Transforms/InstCombine/cast-cast-to-and.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/cast-cast-to-and.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ubyte
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep ubyte
 
 int %test1(uint %X) {
         %Y = cast uint %X to ubyte ;; Turn into an AND


Index: llvm/test/Transforms/InstCombine/cast-load-gep.ll
diff -u llvm/test/Transforms/InstCombine/cast-load-gep.ll:1.2 llvm/test/Transforms/InstCombine/cast-load-gep.ll:1.3
--- llvm/test/Transforms/InstCombine/cast-load-gep.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/cast-load-gep.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | not grep Array
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | \
+; RUN:   not grep Array
 
 ; Pulling the cast out of the load allows us to eliminate the load, and then 
 ; the whole array.


Index: llvm/test/Transforms/InstCombine/cast-propagate.ll
diff -u llvm/test/Transforms/InstCombine/cast-propagate.ll:1.3 llvm/test/Transforms/InstCombine/cast-propagate.ll:1.4
--- llvm/test/Transforms/InstCombine/cast-propagate.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/cast-propagate.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:    not grep load
 
 int %test1(uint* %P) {
 	%A = alloca uint 


Index: llvm/test/Transforms/InstCombine/cast.ll
diff -u llvm/test/Transforms/InstCombine/cast.ll:1.36 llvm/test/Transforms/InstCombine/cast.ll:1.37
--- llvm/test/Transforms/InstCombine/cast.ll:1.36	Sat Dec 23 00:05:41 2006
+++ llvm/test/Transforms/InstCombine/cast.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c' | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep %c | notcast
 
 %inbuf = external global [32832 x ubyte]
 


Index: llvm/test/Transforms/InstCombine/cast2.ll
diff -u llvm/test/Transforms/InstCombine/cast2.ll:1.2 llvm/test/Transforms/InstCombine/cast2.ll:1.3
--- llvm/test/Transforms/InstCombine/cast2.ll:1.2	Sun Mar 25 15:42:40 2007
+++ llvm/test/Transforms/InstCombine/cast2.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
 
 define i16 @test1(i16 %a) {


Index: llvm/test/Transforms/InstCombine/cast_ptr.ll
diff -u llvm/test/Transforms/InstCombine/cast_ptr.ll:1.5 llvm/test/Transforms/InstCombine/cast_ptr.ll:1.6
--- llvm/test/Transforms/InstCombine/cast_ptr.ll:1.5	Fri Feb 23 13:39:24 2007
+++ llvm/test/Transforms/InstCombine/cast_ptr.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 ; XFAIL: *
 


Index: llvm/test/Transforms/InstCombine/deadcode.ll
diff -u llvm/test/Transforms/InstCombine/deadcode.ll:1.3 llvm/test/Transforms/InstCombine/deadcode.ll:1.4
--- llvm/test/Transforms/InstCombine/deadcode.ll:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Transforms/InstCombine/deadcode.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i32 %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {ret i32 %A}
 
 int %test(int %A) {
   %X = or bool false, false


Index: llvm/test/Transforms/InstCombine/dg.exp
diff -u llvm/test/Transforms/InstCombine/dg.exp:1.4 llvm/test/Transforms/InstCombine/dg.exp:1.5
--- llvm/test/Transforms/InstCombine/dg.exp:1.4	Wed Apr 11 14:56:58 2007
+++ llvm/test/Transforms/InstCombine/dg.exp	Sat Apr 14 15:13:02 2007
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
 llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]


Index: llvm/test/Transforms/InstCombine/getelementptr-setcc.ll
diff -u llvm/test/Transforms/InstCombine/getelementptr-setcc.ll:1.3 llvm/test/Transforms/InstCombine/getelementptr-setcc.ll:1.4
--- llvm/test/Transforms/InstCombine/getelementptr-setcc.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/getelementptr-setcc.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep getelementptr
 
 bool %test1(short* %P, int %I, int %J) {
     %X = getelementptr short* %P, int %I


Index: llvm/test/Transforms/InstCombine/getelementptr.ll
diff -u llvm/test/Transforms/InstCombine/getelementptr.ll:1.20 llvm/test/Transforms/InstCombine/getelementptr.ll:1.21
--- llvm/test/Transforms/InstCombine/getelementptr.ll:1.20	Sun Mar 25 15:42:40 2007
+++ llvm/test/Transforms/InstCombine/getelementptr.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,7 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v %B | not grep getelementptr
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep foo1
 
 %Global = constant [10 x sbyte] c"helloworld"


Index: llvm/test/Transforms/InstCombine/getelementptr_cast.ll
diff -u llvm/test/Transforms/InstCombine/getelementptr_cast.ll:1.3 llvm/test/Transforms/InstCombine/getelementptr_cast.ll:1.4
--- llvm/test/Transforms/InstCombine/getelementptr_cast.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/getelementptr_cast.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    notcast {} {getelementptr.*}
+
 %G = external global [3 x sbyte]
 
 implementation


Index: llvm/test/Transforms/InstCombine/getelementptr_const.ll
diff -u llvm/test/Transforms/InstCombine/getelementptr_const.ll:1.2 llvm/test/Transforms/InstCombine/getelementptr_const.ll:1.3
--- llvm/test/Transforms/InstCombine/getelementptr_const.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/getelementptr_const.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,6 @@
 ; Test folding of constantexpr geps into normal geps.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | \
+; RUN:    llvm-dis | not grep getelementptr
 
 %Array = external global [40 x int]
 


Index: llvm/test/Transforms/InstCombine/hoist_instr.ll
diff -u llvm/test/Transforms/InstCombine/hoist_instr.ll:1.2 llvm/test/Transforms/InstCombine/hoist_instr.ll:1.3
--- llvm/test/Transforms/InstCombine/hoist_instr.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/hoist_instr.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   %prcontext div 1 | grep then:
 
 ;; This tests that the div is hoisted into the then block.
 


Index: llvm/test/Transforms/InstCombine/icmp.ll
diff -u llvm/test/Transforms/InstCombine/icmp.ll:1.2 llvm/test/Transforms/InstCombine/icmp.ll:1.3
--- llvm/test/Transforms/InstCombine/icmp.ll:1.2	Wed Apr 11 01:57:54 2007
+++ llvm/test/Transforms/InstCombine/icmp.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep icmp
+; END.
 
 define i32 @test1(i32 %X) {
 entry:


Index: llvm/test/Transforms/InstCombine/load.ll
diff -u llvm/test/Transforms/InstCombine/load.ll:1.14 llvm/test/Transforms/InstCombine/load.ll:1.15
--- llvm/test/Transforms/InstCombine/load.ll:1.14	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/load.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep load
+; END.
 
 %X = constant int 42
 %X2 = constant int 47


Index: llvm/test/Transforms/InstCombine/malloc-free-delete.ll
diff -u llvm/test/Transforms/InstCombine/malloc-free-delete.ll:1.1 llvm/test/Transforms/InstCombine/malloc-free-delete.ll:1.2
--- llvm/test/Transforms/InstCombine/malloc-free-delete.ll:1.1	Fri Apr 13 19:19:36 2007
+++ llvm/test/Transforms/InstCombine/malloc-free-delete.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 0' &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 0}
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep malloc
 ; PR1201
 define i32 @main(i32 %argc, i8** %argv) {
@@ -9,4 +9,3 @@
         free i8* %tmp_207
         ret i32 0
 }
-


Index: llvm/test/Transforms/InstCombine/malloc2.ll
diff -u llvm/test/Transforms/InstCombine/malloc2.ll:1.1 llvm/test/Transforms/InstCombine/malloc2.ll:1.2
--- llvm/test/Transforms/InstCombine/malloc2.ll:1.1	Fri Apr  6 13:56:54 2007
+++ llvm/test/Transforms/InstCombine/malloc2.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 0' &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 0}
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep malloc
 ; PR1313
 


Index: llvm/test/Transforms/InstCombine/memmove.ll
diff -u llvm/test/Transforms/InstCombine/memmove.ll:1.2 llvm/test/Transforms/InstCombine/memmove.ll:1.3
--- llvm/test/Transforms/InstCombine/memmove.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/memmove.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This test makes sure that memmove instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {call void @llvm.memmove}
 
 %S = internal constant [33 x sbyte] c"panic: restorelist inconsistency\00"
 


Index: llvm/test/Transforms/InstCombine/mul.ll
diff -u llvm/test/Transforms/InstCombine/mul.ll:1.14 llvm/test/Transforms/InstCombine/mul.ll:1.15
--- llvm/test/Transforms/InstCombine/mul.ll:1.14	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/mul.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,5 @@
 ; This test makes sure that mul instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep mul
 
 implementation


Index: llvm/test/Transforms/InstCombine/narrow.ll
diff -u llvm/test/Transforms/InstCombine/narrow.ll:1.5 llvm/test/Transforms/InstCombine/narrow.ll:1.6
--- llvm/test/Transforms/InstCombine/narrow.ll:1.5	Fri Jan 12 23:06:52 2007
+++ llvm/test/Transforms/InstCombine/narrow.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This file contains various testcases that check to see that instcombine
 ; is narrowing computations when possible.
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep 'ret i1 false'
+; RUN:    grep {ret i1 false}
 
 ; test1 - Eliminating the casts in this testcase (by narrowing the AND
 ; operation) allows instcombine to realize the function always returns false.


Index: llvm/test/Transforms/InstCombine/or.ll
diff -u llvm/test/Transforms/InstCombine/or.ll:1.33 llvm/test/Transforms/InstCombine/or.ll:1.34
--- llvm/test/Transforms/InstCombine/or.ll:1.33	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/or.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v xor | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v xor | not grep {or }
 
 implementation
 


Index: llvm/test/Transforms/InstCombine/or2.ll
diff -u llvm/test/Transforms/InstCombine/or2.ll:1.1 llvm/test/Transforms/InstCombine/or2.ll:1.2
--- llvm/test/Transforms/InstCombine/or2.ll:1.1	Sun Apr  8 02:45:36 2007
+++ llvm/test/Transforms/InstCombine/or2.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ' or'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep { or}
 
 define i32 @test1(i32 %b, i32 %c, i32 %d) {
         %tmp3 = and i32 %c, %b


Index: llvm/test/Transforms/InstCombine/phi.ll
diff -u llvm/test/Transforms/InstCombine/phi.ll:1.15 llvm/test/Transforms/InstCombine/phi.ll:1.16
--- llvm/test/Transforms/InstCombine/phi.ll:1.15	Mon Jan 15 01:29:29 2007
+++ llvm/test/Transforms/InstCombine/phi.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,5 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep phi
 
 implementation


Index: llvm/test/Transforms/InstCombine/rem.ll
diff -u llvm/test/Transforms/InstCombine/rem.ll:1.14 llvm/test/Transforms/InstCombine/rem.ll:1.15
--- llvm/test/Transforms/InstCombine/rem.ll:1.14	Tue Jan 30 10:16:01 2007
+++ llvm/test/Transforms/InstCombine/rem.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,5 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep rem
 
 implementation


Index: llvm/test/Transforms/InstCombine/select.ll
diff -u llvm/test/Transforms/InstCombine/select.ll:1.15 llvm/test/Transforms/InstCombine/select.ll:1.16
--- llvm/test/Transforms/InstCombine/select.ll:1.15	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/select.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep select &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep select
 
 implementation
 


Index: llvm/test/Transforms/InstCombine/set.ll
diff -u llvm/test/Transforms/InstCombine/set.ll:1.22 llvm/test/Transforms/InstCombine/set.ll:1.23
--- llvm/test/Transforms/InstCombine/set.ll:1.22	Mon Apr  9 18:51:49 2007
+++ llvm/test/Transforms/InstCombine/set.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep icmp
+; END.
 
 %X = uninitialized global int
 


Index: llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
diff -u llvm/test/Transforms/InstCombine/setcc-cast-cast.ll:1.2 llvm/test/Transforms/InstCombine/setcc-cast-cast.ll:1.3
--- llvm/test/Transforms/InstCombine/setcc-cast-cast.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/setcc-cast-cast.ll	Sat Apr 14 15:13:02 2007
@@ -1,7 +1,10 @@
 ; This test case was reduced from MultiSource/Applications/hbd. It makes sure
 ; that folding doesn't happen in case a zext is applied where a sext should have
 ; been when a setcc is used with two casts.
-; RUN: llvm-upgrade < %s | llvm-as | llc -instcombine | llvm-dis | not grep 'br bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {br bool false}
+; END.
+
 int %bug(ubyte %inbuff) {
 entry:
 	%tmp = bitcast ubyte %inbuff to sbyte   ; <sbyte> [#uses=1]


Index: llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll
diff -u llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll:1.8 llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll:1.9
--- llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll:1.8	Sat Dec 23 00:05:41 2006
+++ llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll	Sat Apr 14 15:13:02 2007
@@ -2,8 +2,9 @@
 ; working.  Basically this boils down to converting setlt,gt,le,ge instructions
 ; into equivalent setne,eq instructions.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'icmp eq' | grep -v 'icmp ne' | not grep icmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v {icmp eq} | grep -v {icmp ne} | not grep icmp
+; END.
 
 bool %test1(uint %A) {
 	%B = setge uint %A, 1   ; setne %A, 0


Index: llvm/test/Transforms/InstCombine/shift-simplify.ll
diff -u llvm/test/Transforms/InstCombine/shift-simplify.ll:1.3 llvm/test/Transforms/InstCombine/shift-simplify.ll:1.4
--- llvm/test/Transforms/InstCombine/shift-simplify.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/Transforms/InstCombine/shift-simplify.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    egrep 'shl|lshr|ashr' | wc -l | grep 3
+; RUN:    egrep {shl|lshr|ashr} | wc -l | grep 3
 
 define i32 @test0(i32 %A, i32 %B, i32 %C) {
 	%X = shl i32 %A, %C


Index: llvm/test/Transforms/InstCombine/shift-sra.ll
diff -u llvm/test/Transforms/InstCombine/shift-sra.ll:1.6 llvm/test/Transforms/InstCombine/shift-sra.ll:1.7
--- llvm/test/Transforms/InstCombine/shift-sra.ll:1.6	Thu Feb  1 20:16:22 2007
+++ llvm/test/Transforms/InstCombine/shift-sra.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep 'lshr i32' | wc -l | grep 2 &&
+; RUN:    grep {lshr i32} | wc -l | grep 2
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ashr
 
 int %test1(int %X, ubyte %A) {


Index: llvm/test/Transforms/InstCombine/shift.ll
diff -u llvm/test/Transforms/InstCombine/shift.ll:1.24 llvm/test/Transforms/InstCombine/shift.ll:1.25
--- llvm/test/Transforms/InstCombine/shift.ll:1.24	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/shift.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep sh
+; END.
 
 implementation
 


Index: llvm/test/Transforms/InstCombine/signext.ll
diff -u llvm/test/Transforms/InstCombine/signext.ll:1.3 llvm/test/Transforms/InstCombine/signext.ll:1.4
--- llvm/test/Transforms/InstCombine/signext.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/Transforms/InstCombine/signext.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    not grep '(and\|xor\|add\|shl\|shr)'
+; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
 
 int %test1(int %x) {
         %tmp.1 = and int %x, 65535              ; <int> [#uses=1]


Index: llvm/test/Transforms/InstCombine/sink_instruction.ll
diff -u llvm/test/Transforms/InstCombine/sink_instruction.ll:1.2 llvm/test/Transforms/InstCombine/sink_instruction.ll:1.3
--- llvm/test/Transforms/InstCombine/sink_instruction.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/sink_instruction.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   %prcontext div 1 | grep ret
 
 ;; This tests that the instructions in the entry blocks are sunk into each
 ;; arm of the 'if'.


Index: llvm/test/Transforms/InstCombine/stacksaverestore.ll
diff -u llvm/test/Transforms/InstCombine/stacksaverestore.ll:1.2 llvm/test/Transforms/InstCombine/stacksaverestore.ll:1.3
--- llvm/test/Transforms/InstCombine/stacksaverestore.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/stacksaverestore.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep call
 
 ;; Test that llvm.stackrestore is removed when possible.


Index: llvm/test/Transforms/InstCombine/store.ll
diff -u llvm/test/Transforms/InstCombine/store.ll:1.3 llvm/test/Transforms/InstCombine/store.ll:1.4
--- llvm/test/Transforms/InstCombine/store.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/store.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep -v {store.*,.*null} | not grep store
 
 void %test1(int* %P) {
 	store int undef, int* %P


Index: llvm/test/Transforms/InstCombine/sub.ll
diff -u llvm/test/Transforms/InstCombine/sub.ll:1.26 llvm/test/Transforms/InstCombine/sub.ll:1.27
--- llvm/test/Transforms/InstCombine/sub.ll:1.26	Fri Jan 26 02:25:06 2007
+++ llvm/test/Transforms/InstCombine/sub.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep -v 'sub i32 %Cok, %Bok' | not grep sub
+; RUN:   grep -v {sub i32 %Cok, %Bok} | not grep sub
 
 implementation
 


Index: llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
diff -u llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll:1.1 llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll:1.2
--- llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll:1.1	Mon Mar  5 16:51:08 2007
+++ llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll	Sat Apr 14 15:13:02 2007
@@ -1,10 +1,10 @@
-; This tests that this transform:
+; Test that this transform works:
 ; udiv X, (Select Cond, C1, C2) --> Select Cond, (shr X, C1), (shr X, C2)
 ;
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis -f -o %t && \
-; RUN:   grep select %t | wc -l | grep 1 && \
-; RUN:   grep lshr %t | wc -l | grep 2 && \ 
-; RUN:   grep udiv %t | wc -l | grep 0
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis -f -o %t
+; RUN:   grep select %t | wc -l | grep 1
+; RUN:   grep lshr %t | wc -l | grep 2 
+; RUN:   ignore grep udiv %t | wc -l | grep 0
 
 define i64 @test(i64 %X, i1 %Cond ) {
 entry:


Index: llvm/test/Transforms/InstCombine/vec_demanded_elts.ll
diff -u llvm/test/Transforms/InstCombine/vec_demanded_elts.ll:1.2 llvm/test/Transforms/InstCombine/vec_demanded_elts.ll:1.3
--- llvm/test/Transforms/InstCombine/vec_demanded_elts.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/vec_demanded_elts.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,14 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'sub float' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'mul float' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {sub float}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {mul float}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {insertelement.*0.00}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {call.*llvm.x86.sse.mul}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {call.*llvm.x86.sse.sub}
+; END.
 
 ushort %Convert_sse(float %f) {
 entry:


Index: llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
diff -u llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll:1.2 llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll:1.3
--- llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep insertelement &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep extractelement
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep shufflevec | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep insertelement
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep extractelement
 
 <4 x float> %test(<4 x float> %tmp, <4 x float> %tmp1) {
 	%tmp4 = extractelement <4 x float> %tmp, uint 1		; <float> [#uses=1]


Index: llvm/test/Transforms/InstCombine/vec_insertelt.ll
diff -u llvm/test/Transforms/InstCombine/vec_insertelt.ll:1.1 llvm/test/Transforms/InstCombine/vec_insertelt.ll:1.2
--- llvm/test/Transforms/InstCombine/vec_insertelt.ll:1.1	Sun Apr  8 20:10:13 2007
+++ llvm/test/Transforms/InstCombine/vec_insertelt.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret <4 x i32> %A'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret <4 x i32> %A}
 
 ; PR1286
 define <4 x i32> @test1(<4 x i32> %A) {


Index: llvm/test/Transforms/InstCombine/vec_narrow.ll
diff -u llvm/test/Transforms/InstCombine/vec_narrow.ll:1.2 llvm/test/Transforms/InstCombine/vec_narrow.ll:1.3
--- llvm/test/Transforms/InstCombine/vec_narrow.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/vec_narrow.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'add float'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {add float}
 
 %V = type <4 x float>
 


Index: llvm/test/Transforms/InstCombine/vec_shuffle.ll
diff -u llvm/test/Transforms/InstCombine/vec_shuffle.ll:1.10 llvm/test/Transforms/InstCombine/vec_shuffle.ll:1.11
--- llvm/test/Transforms/InstCombine/vec_shuffle.ll:1.10	Tue Mar 27 21:38:26 2007
+++ llvm/test/Transforms/InstCombine/vec_shuffle.ll	Sat Apr 14 15:13:02 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep vector_shuffle
 
 %T = type <4 x float>


Index: llvm/test/Transforms/InstCombine/xor.ll
diff -u llvm/test/Transforms/InstCombine/xor.ll:1.21 llvm/test/Transforms/InstCombine/xor.ll:1.22
--- llvm/test/Transforms/InstCombine/xor.ll:1.21	Mon Apr  2 00:35:08 2007
+++ llvm/test/Transforms/InstCombine/xor.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {xor }
+; END.
 
 %G1 = global uint 0
 %G2 = global uint 0


Index: llvm/test/Transforms/InstCombine/xor2.ll
diff -u llvm/test/Transforms/InstCombine/xor2.ll:1.1 llvm/test/Transforms/InstCombine/xor2.ll:1.2
--- llvm/test/Transforms/InstCombine/xor2.ll:1.1	Mon Apr  2 20:45:32 2007
+++ llvm/test/Transforms/InstCombine/xor2.ll	Sat Apr 14 15:13:02 2007
@@ -1,8 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 ; PR1253
 define i1 @test0(i32 %A) {


Index: llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll
diff -u llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll:1.5 llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll:1.6
--- llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll:1.5	Fri Jan 26 02:25:06 2007
+++ llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll	Sat Apr 14 15:13:02 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'and i32 %Y, 8'
+; RUN:   grep {and i32 %Y, 8}
 
 int %test1(ubyte %X) {
         %Y = cast ubyte %X to int


Index: llvm/test/Transforms/InstCombine/zext.ll
diff -u llvm/test/Transforms/InstCombine/zext.ll:1.2 llvm/test/Transforms/InstCombine/zext.ll:1.3
--- llvm/test/Transforms/InstCombine/zext.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/InstCombine/zext.ll	Sat Apr 14 15:13:02 2007
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   notcast {} {%c1.*}
 
 long %test_sext_zext(short %A) {
     %c1 = zext short %A to uint