For PR1319: Upgrade to use new test harness

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36076 91177308-0d34-0410-b5e6-96231b3b80d8

39 files changed, 178 insertions, 152 deletions

diff --git a/test/CodeGen/ARM/2007-03-06-AddR7.ll b/test/CodeGen/ARM/2007-03-06-AddR7.ll
index 4c6648f30a..5e136ddb8d 100644
--- a/test/CodeGen/ARM/2007-03-06-AddR7.ll
+++ b/test/CodeGen/ARM/2007-03-06-AddR7.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | llc -march=thumb &&
-; RUN: llvm-as < %s | llc -mtriple=thumb-apple-darwin -relocation-model=pic -mattr=+v6,+vfp2 | not grep 'add r., r7, #2 \* 4'
+; RUN: llvm-as < %s | llc -march=thumb
+; RUN: llvm-as < %s | llc -mtriple=thumb-apple-darwin -relocation-model=pic \
+; RUN:   -mattr=+v6,+vfp2 | not grep {add r., r7, #2 \\* 4}
 
 	%struct.__fooAllocator = type opaque
 	%struct.__fooY = type { %struct.fooXBase, %struct.__fooString*, %struct.__fooU*, %struct.__fooV*, i8** }
diff --git a/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll b/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll
index 27fb440fa8..b5bc6f0be3 100644
--- a/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll
+++ b/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-apple-darwin8 -stats 2>&1 | not grep 'register spills' 
+; RUN: llvm-as < %s | llc -march=thumb
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-apple-darwin8 -stats |& \
+; RUN:   not grep {register spills}
 
 ;; Must talk to evan about this.
 ; XFAIL: *
diff --git a/test/CodeGen/ARM/align.ll b/test/CodeGen/ARM/align.ll
index 60dd90e83f..457d883a3c 100644
--- a/test/CodeGen/ARM/align.ll
+++ b/test/CodeGen/ARM/align.ll
@@ -1,8 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep align.*1 | wc | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | grep align.*2 | wc | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | grep align.*3 | wc | grep 2
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | grep align.*2 | wc | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep align.*1 | wc | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \
+; RUN:   grep align.*2 | wc | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \
+; RUN:   grep align.*3 | wc | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN:   grep align.*2 | wc | grep 4
 
 %a = global bool true
 %b = global sbyte 1
diff --git a/test/CodeGen/ARM/arm-negative-stride.ll b/test/CodeGen/ARM/arm-negative-stride.ll
index a37be7659d..1048fb7ad6 100644
--- a/test/CodeGen/ARM/arm-negative-stride.ll
+++ b/test/CodeGen/ARM/arm-negative-stride.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm | grep "str r1, \[r.*, -r.*, lsl #2]"
+; RUN: llvm-as < %s | llc -march=arm | grep {str r1, \\\[r.*, -r.*, lsl #2\}
 
 define void @test(i32* %P, i32 %A, i32 %i) {
 entry:
diff --git a/test/CodeGen/ARM/call.ll b/test/CodeGen/ARM/call.ll
index d75814039f..c270d7e53b 100644
--- a/test/CodeGen/ARM/call.ll
+++ b/test/CodeGen/ARM/call.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep 'mov lr, pc' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep 'blx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep {mov lr, pc}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep blx
 
 %t = weak global int ()* null
 declare void %g(int, int, int, int)
diff --git a/test/CodeGen/ARM/ctors_dtors.ll b/test/CodeGen/ARM/ctors_dtors.ll
index 709fb2bb32..cf58ca467f 100644
--- a/test/CodeGen/ARM/ctors_dtors.ll
+++ b/test/CodeGen/ARM/ctors_dtors.ll
@@ -1,10 +1,15 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | grep '\.mod_init_func' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | grep '\.mod_term_func' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | grep '\.section \.ctors,"aw",.progbits' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | grep '\.section \.dtors,"aw",.progbits' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | grep '\.section \.init_array,"aw",.init_array' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi  | grep '\.section \.fini_array,"aw",.fini_array'
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN:   grep {\\.mod_init_func}
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN:   grep {\\.mod_term_func} 
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | \
+; RUN:   grep {\\.section \\.ctors,"aw",.progbits}
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | \
+; RUN:   grep {\\.section \\.dtors,"aw",.progbits}
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN:   grep {\\.section \\.init_array,"aw",.init_array}
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN:   grep {\\.section \\.fini_array,"aw",.fini_array}
 
 %llvm.global_ctors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %__mf_init } ]		; <[1 x { int, void ()* }]*> [#uses=0]
 %llvm.global_dtors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %__mf_fini } ]		; <[1 x { int, void ()* }]*> [#uses=0]
diff --git a/test/CodeGen/ARM/dg.exp b/test/CodeGen/ARM/dg.exp
index ff34508c3c..879685ca87 100644
--- a/test/CodeGen/ARM/dg.exp
+++ b/test/CodeGen/ARM/dg.exp
@@ -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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/ARM/fp.ll b/test/CodeGen/ARM/fp.ll
index f85c17a46a..b235fb215b 100644
--- a/test/CodeGen/ARM/fp.ll
+++ b/test/CodeGen/ARM/fp.ll
@@ -1,16 +1,21 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmsr  | wc -l | grep 4 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fsitos &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmrs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fsitod &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmrrd | wc -l | grep 5 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmdrr | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fldd &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep flds &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fuitod &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fuitos &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep 1065353216
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fmsr | wc -l | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fsitos
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fmrs
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fsitod
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fmrrd | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fmdrr | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fldd
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep flds
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fuitod
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fuitos
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep 1065353216
 
 float %f(int %a) {
 entry:
diff --git a/test/CodeGen/ARM/large-stack.ll b/test/CodeGen/ARM/large-stack.ll
index 3ba0f06437..5f85ec098a 100644
--- a/test/CodeGen/ARM/large-stack.ll
+++ b/test/CodeGen/ARM/large-stack.ll
@@ -1,7 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=thumb &&
-; RUN: llvm-as < %s | llc -march=thumb | \
-; RUN:    grep 'ldr.*LCP' | wc -l | grep 5
+; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-as < %s | llc -march=thumb | grep {ldr.*LCP} | wc -l | grep 5
 
 define void @test1() {
     %tmp = alloca [ 64 x i32 ] , align 4
diff --git a/test/CodeGen/ARM/ldr.ll b/test/CodeGen/ARM/ldr.ll
index 379dfbb1c2..3a9ab813da 100644
--- a/test/CodeGen/ARM/ldr.ll
+++ b/test/CodeGen/ARM/ldr.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr r0" | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {ldr r0} | wc -l | grep 3
 
 int %f1(int* %v) {
 entry:
diff --git a/test/CodeGen/ARM/ldr_post.ll b/test/CodeGen/ARM/ldr_post.ll
index ee0a3d242c..78b31352ba 100644
--- a/test/CodeGen/ARM/ldr_post.ll
+++ b/test/CodeGen/ARM/ldr_post.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr.*\[.*]," | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {ldr.*\\\[.*\],} | wc -l | grep 1
 
 int %test(int %a, int %b, int %c) {
 	%tmp1 = mul int %a, %b
diff --git a/test/CodeGen/ARM/load-global.ll b/test/CodeGen/ARM/load-global.ll
index 45f4148ab2..3c287d473a 100644
--- a/test/CodeGen/ARM/load-global.ll
+++ b/test/CodeGen/ARM/load-global.ll
@@ -1,6 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin -relocation-model=dynamic-no-pic | grep "L_G$non_lazy_ptr" | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin -relocation-model=pic | grep "ldr.*pc" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -mtriple=arm-apple-darwin -relocation-model=dynamic-no-pic | \
+; RUN:   grep {L_G\$non_lazy_ptr} | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -mtriple=arm-apple-darwin -relocation-model=pic | \
+; RUN:   grep {ldr.*pc} | wc -l | grep 1
 
 %G = external global int
 
diff --git a/test/CodeGen/ARM/long.ll b/test/CodeGen/ARM/long.ll
index c00e9a213c..2384aff2bf 100644
--- a/test/CodeGen/ARM/long.ll
+++ b/test/CodeGen/ARM/long.ll
@@ -1,17 +1,21 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "\-2147483648" | wc -l | grep 3 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mvn" | wc -l | grep 3 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adds" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adc" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "subs " | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "sbc" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "smull" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "umull" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep "mvn" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep "adc" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep "sbc" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep "__muldi3"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep -- {-2147483648} | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adds | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adc | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep subs | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep sbc | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep smull | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep umull | wc -l | grep 1 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
+; RUN:   grep mvn | wc -l | grep 1 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
+; RUN:   grep adc | wc -l | grep 1 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
+; RUN:   grep sbc | wc -l | grep 1 
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep __muldi3
 
 long %f1() {
 entry:
diff --git a/test/CodeGen/ARM/lsr-scale-addr-mode.ll b/test/CodeGen/ARM/lsr-scale-addr-mode.ll
index f1678244f9..230cf3e5e7 100644
--- a/test/CodeGen/ARM/lsr-scale-addr-mode.ll
+++ b/test/CodeGen/ARM/lsr-scale-addr-mode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm | grep -F 'str r2, [r0, +r3, lsl #2]'
+; RUN: llvm-as < %s | llc -march=arm | grep -F {str r2, \[r0, +r3, lsl #2\]}
 ; Should use scaled addressing mode.
 
 define void @sintzero(i32* %a) {
diff --git a/test/CodeGen/ARM/mem.ll b/test/CodeGen/ARM/mem.ll
index 6a0f0e1716..d598d47f9d 100644
--- a/test/CodeGen/ARM/mem.ll
+++ b/test/CodeGen/ARM/mem.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strb &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strb
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strh
 
 void %f1() {
diff --git a/test/CodeGen/ARM/mul.ll b/test/CodeGen/ARM/mul.ll
index 95be43632b..7a2c43b3fc 100644
--- a/test/CodeGen/ARM/mul.ll
+++ b/test/CodeGen/ARM/mul.ll
@@ -1,7 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep mul | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=arm | grep lsl | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep mul | wc -l | grep 3 &&
+; RUN: llvm-as < %s | llc -march=arm | grep mul | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm | grep lsl | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=thumb | grep mul | wc -l | grep 3
 ; RUN: llvm-as < %s | llc -march=thumb | grep lsl | wc -l | grep 1
 
 define i32 @f1(i32 %u) {
diff --git a/test/CodeGen/ARM/mulhi.ll b/test/CodeGen/ARM/mulhi.ll
index 2e8a65fc8c..9367258ef5 100644
--- a/test/CodeGen/ARM/mulhi.ll
+++ b/test/CodeGen/ARM/mulhi.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep smmul | wc -l | grep 1 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
+; RUN:   grep smmul | wc -l | grep 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep umull | wc -l | grep 1
 
 int %smulhi(int %x, int %y) {
diff --git a/test/CodeGen/ARM/mvn.ll b/test/CodeGen/ARM/mvn.ll
index d891441502..3f4a6f71d6 100644
--- a/test/CodeGen/ARM/mvn.ll
+++ b/test/CodeGen/ARM/mvn.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | wc -l | grep 8
+; END.
 
 int %f1() {
 entry:
diff --git a/test/CodeGen/ARM/pack.ll b/test/CodeGen/ARM/pack.ll
index 66f30fd713..680f55e5e9 100644
--- a/test/CodeGen/ARM/pack.ll
+++ b/test/CodeGen/ARM/pack.ll
@@ -1,6 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep pkhbt | wc -l | grep 5 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep pkhtb | wc -l | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
+; RUN:   grep pkhbt | wc -l | grep 5 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
+; RUN:   grep pkhtb | wc -l | grep 4
+; END.
+
 implementation   ; Functions:
 
 int %test1(int %X, int %Y) {
diff --git a/test/CodeGen/ARM/rev.ll b/test/CodeGen/ARM/rev.ll
index fba519de02..0072daef59 100644
--- a/test/CodeGen/ARM/rev.ll
+++ b/test/CodeGen/ARM/rev.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep rev16 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep rev16
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep revsh
 
 int %test1(uint %X) {
diff --git a/test/CodeGen/ARM/section.ll b/test/CodeGen/ARM/section.ll
index 9e1a31f690..e863acd2b6 100644
--- a/test/CodeGen/ARM/section.ll
+++ b/test/CodeGen/ARM/section.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | grep "__DTOR_END__:" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux
 ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \
-; RUN:    grep '.section .dtors,"aw",.progbits'
+; RUN:   grep {__DTOR_END__:}
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \
+; RUN:   grep {.section .dtors,"aw",.progbits}
 
 %__DTOR_END__ = internal global [1 x int] zeroinitializer, section ".dtors"
diff --git a/test/CodeGen/ARM/select.ll b/test/CodeGen/ARM/select.ll
index 84757ef484..7758a8d2e7 100644
--- a/test/CodeGen/ARM/select.ll
+++ b/test/CodeGen/ARM/select.ll
@@ -1,17 +1,17 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | grep fcpydmi | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep beq | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep bgt | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep blt | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep ble | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep bls | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep bhi | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 3
+; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1 
+; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fcpydmi | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep beq | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bgt | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep blt | wc -l | grep 3
+; RUN: llvm-as < %s | llc -march=thumb | grep ble | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bls | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bhi | wc -l | grep 1
 ; RUN: llvm-as < %s | llc -march=thumb | grep __ltdf2
 
 define i32 @f1(i32 %a.s) {
diff --git a/test/CodeGen/ARM/shifter_operand.ll b/test/CodeGen/ARM/shifter_operand.ll
index 5f8f507a25..313caed763 100644
--- a/test/CodeGen/ARM/shifter_operand.ll
+++ b/test/CodeGen/ARM/shifter_operand.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep add | grep lsl &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep add | grep lsl
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bic | grep asr
 
 int %test1(int %X, int %Y, ubyte %sh) {
diff --git a/test/CodeGen/ARM/smul.ll b/test/CodeGen/ARM/smul.ll
index b3e8be4870..4ea61f386c 100644
--- a/test/CodeGen/ARM/smul.ll
+++ b/test/CodeGen/ARM/smul.ll
@@ -1,8 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | grep "smulbt" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | grep "smultt" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | grep "smlabt" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
+; RUN:   grep smulbt | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
+; RUN:   grep smultt | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
+; RUN:   grep smlabt | wc -l | grep 1
 
 %x = weak global short 0
 %y = weak global short 0
diff --git a/test/CodeGen/ARM/stack-frame.ll b/test/CodeGen/ARM/stack-frame.ll
index 7606c0fe5f..fc34785ded 100644
--- a/test/CodeGen/ARM/stack-frame.ll
+++ b/test/CodeGen/ARM/stack-frame.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep add | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb &&
+; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-as < %s | llc -march=arm | grep add | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb
 ; RUN: llvm-as < %s | llc -march=thumb | grep add | wc -l | grep 1
 
 define void @f1() {
diff --git a/test/CodeGen/ARM/str_post.ll b/test/CodeGen/ARM/str_post.ll
index 366c9f8735..a388f54d67 100644
--- a/test/CodeGen/ARM/str_post.ll
+++ b/test/CodeGen/ARM/str_post.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "strh .*\[.*], #-4"  | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "str .*\[.*],"  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {strh .*\\\[.*\], #-4}  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {str .*\\\[.*\],}  | wc -l | grep 1
 
 short %test1(int *%X, short *%A) {
         %Y = load int* %X
diff --git a/test/CodeGen/ARM/str_pre.ll b/test/CodeGen/ARM/str_pre.ll
index ad085b690c..69f9928df5 100644
--- a/test/CodeGen/ARM/str_pre.ll
+++ b/test/CodeGen/ARM/str_pre.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "str.*\!"  | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {str.*\\!}  | wc -l | grep 2
 
 void %test1(int *%X, int *%A, int **%dest) {
         %B = load int* %A
diff --git a/test/CodeGen/ARM/str_trunc.ll b/test/CodeGen/ARM/str_trunc.ll
index cad69c4b6e..5a1b961194 100644
--- a/test/CodeGen/ARM/str_trunc.ll
+++ b/test/CodeGen/ARM/str_trunc.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "strb"  | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "strh"  | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep strb | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep strh | wc -l | grep 1
 
 void %test1(int %v, short* %ptr) {
         %tmp = cast int %v to short
diff --git a/test/CodeGen/ARM/sxt_rot.ll b/test/CodeGen/ARM/sxt_rot.ll
index f865ac131a..bf62d08066 100644
--- a/test/CodeGen/ARM/sxt_rot.ll
+++ b/test/CodeGen/ARM/sxt_rot.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "sxtb"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "sxtab" | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | \
+; RUN:   grep sxtb  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | \
+; RUN:   grep sxtab | wc -l | grep 1
 
 define i8 @test1(i32 %A) sext {
 	%B = lshr i32 %A, 8
diff --git a/test/CodeGen/ARM/thumb-imm.ll b/test/CodeGen/ARM/thumb-imm.ll
index 0f36496949..2be393a95c 100644
--- a/test/CodeGen/ARM/thumb-imm.ll
+++ b/test/CodeGen/ARM/thumb-imm.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | llc -march=thumb &&
 ; RUN: llvm-as < %s | llc -march=thumb | not grep CPI
 
 
diff --git a/test/CodeGen/ARM/trunc_ldr.ll b/test/CodeGen/ARM/trunc_ldr.ll
index 0ddab7413e..bb13ac9e2b 100644
--- a/test/CodeGen/ARM/trunc_ldr.ll
+++ b/test/CodeGen/ARM/trunc_ldr.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrb.*7" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrsb.*7" | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrb.*7  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsb.*7 | wc -l | grep 1
 
 	%struct.A = type { i8, i8, i8, i8, i16, i8, i8, %struct.B** }
 	%struct.B = type { float, float, i32, i32, i32, [0 x i8] }
diff --git a/test/CodeGen/ARM/tst_teq.ll b/test/CodeGen/ARM/tst_teq.ll
index fb2f73be14..e5aa029d2c 100644
--- a/test/CodeGen/ARM/tst_teq.ll
+++ b/test/CodeGen/ARM/tst_teq.ll
@@ -1,8 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=thumb &&
-; RUN: llvm-as < %s | llc -march=arm | grep "tst" &&
-; RUN: llvm-as < %s | llc -march=arm | grep "teq" &&
-; RUN: llvm-as < %s | llc -march=thumb | grep "tst"
+; RUN: llvm-as < %s | llc -march=arm | grep tst
+; RUN: llvm-as < %s | llc -march=arm | grep teq
+; RUN: llvm-as < %s | llc -march=thumb | grep tst
 
 define i32 @f(i32 %a) {
 entry:
diff --git a/test/CodeGen/ARM/unord.ll b/test/CodeGen/ARM/unord.ll
index 4d918c8f41..ce587f06e9 100644
--- a/test/CodeGen/ARM/unord.ll
+++ b/test/CodeGen/ARM/unord.ll
@@ -1,8 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep movne | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb &&
-; RUN: llvm-as < %s | llc -march=thumb | grep bne | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movne | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bne | wc -l | grep 1
 ; RUN: llvm-as < %s | llc -march=thumb | grep beq | wc -l | grep 1
 
 define i32 @f1(float %X, float %Y) {
diff --git a/test/CodeGen/ARM/uxt_rot.ll b/test/CodeGen/ARM/uxt_rot.ll
index d03ca736d4..d15c6503c7 100644
--- a/test/CodeGen/ARM/uxt_rot.ll
+++ b/test/CodeGen/ARM/uxt_rot.ll
@@ -1,8 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "uxtb"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "uxtab" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "uxth"  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtb  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtab | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxth  | wc -l | grep 1
 
 define i8 @test1(i32 %A.u) zext {
     %B.u = trunc i32 %A.u to i8
diff --git a/test/CodeGen/ARM/uxtb.ll b/test/CodeGen/ARM/uxtb.ll
index fcd0a23fe7..86c99da625 100644
--- a/test/CodeGen/ARM/uxtb.ll
+++ b/test/CodeGen/ARM/uxtb.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | grep uxt | wc -l | grep 10
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
+; RUN:   grep uxt | wc -l | grep 10
+; END.
 
 uint %test1(uint %x) {
 	%tmp1 = and uint %x, 16711935		; <uint> [#uses=1]
diff --git a/test/CodeGen/ARM/vargs2.ll b/test/CodeGen/ARM/vargs2.ll
index dd127e3bb3..a58516f582 100644
--- a/test/CodeGen/ARM/vargs2.ll
+++ b/test/CodeGen/ARM/vargs2.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm %%
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep pop | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
+; RUN:   grep pop | wc -l | grep 2
 
 %str = internal constant [4 x sbyte] c"%d\0A\00"		; <[4 x sbyte]*> [#uses=1]
 
diff --git a/test/CodeGen/ARM/vargs_align.ll b/test/CodeGen/ARM/vargs_align.ll
index 15d49d8b33..8d49e19f9d 100644
--- a/test/CodeGen/ARM/vargs_align.ll
+++ b/test/CodeGen/ARM/vargs_align.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | grep "add sp, sp, #16" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnu | grep "add sp, sp, #12" | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | \
+; RUN:   grep {add sp, sp, #16} | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnu | \
+; RUN:   grep {add sp, sp, #12} | wc -l | grep 2
 
 define i32 @f(i32 %a, ...) {
 entry:
diff --git a/test/CodeGen/ARM/vfp.ll b/test/CodeGen/ARM/vfp.ll
index f58b55ec39..49c484adf8 100644
--- a/test/CodeGen/ARM/vfp.ll
+++ b/test/CodeGen/ARM/vfp.ll
@@ -1,12 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fabs | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmscs | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcvt | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fuito | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fto.i | wc -l | grep 4 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep bmi | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep bgt | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcmpezs | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fabs | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fmscs | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fcvt | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fuito | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fto.i | wc -l | grep 4 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep bmi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep bgt | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep fcmpezs | wc -l | grep 1
 
 void %test(float *%P, double* %D) {
   %A = load float* %P
diff --git a/test/CodeGen/ARM/weak.ll b/test/CodeGen/ARM/weak.ll
index 049b1ebbe7..f1294d8295 100644
--- a/test/CodeGen/ARM/weak.ll
+++ b/test/CodeGen/ARM/weak.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep .weak.*f &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep .weak.*f
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep .weak.*h
 
 implementation   ; Functions: