[llvm-commits] CVS: llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll 2007-03-15-GEP-Idx-Sink.ll align.ll arm-negative-stride.ll call.ll ctors_dtors.ll dg.exp fp.ll large-stack.ll ldr.ll ldr_post.ll load-global.ll long.ll lsr-scale-addr-mode.ll mem.ll mul.ll mulhi.ll mvn.ll pack.ll rev.ll section.ll select.ll shifter_operand.ll smul.ll stack-frame.ll str_post.ll str_pre.ll str_trunc.ll sxt_rot.ll thumb-imm.ll trunc_ldr.ll tst_teq.ll unord.ll uxt_rot.ll uxtb.ll vargs2.ll vargs_align.ll vfp.ll weak.ll

Reid Spencer reid at x10sys.com
Sun Apr 15 12:12:16 PDT 2007



Changes in directory llvm/test/CodeGen/ARM:

2007-03-06-AddR7.ll updated: 1.2 -> 1.3
2007-03-15-GEP-Idx-Sink.ll updated: 1.3 -> 1.4
align.ll updated: 1.2 -> 1.3
arm-negative-stride.ll updated: 1.2 -> 1.3
call.ll updated: 1.6 -> 1.7
ctors_dtors.ll updated: 1.3 -> 1.4
dg.exp updated: 1.2 -> 1.3
fp.ll updated: 1.14 -> 1.15
large-stack.ll updated: 1.6 -> 1.7
ldr.ll updated: 1.4 -> 1.5
ldr_post.ll updated: 1.1 -> 1.2
load-global.ll updated: 1.1 -> 1.2
long.ll updated: 1.13 -> 1.14
lsr-scale-addr-mode.ll updated: 1.1 -> 1.2
mem.ll updated: 1.2 -> 1.3
mul.ll updated: 1.6 -> 1.7
mulhi.ll updated: 1.1 -> 1.2
mvn.ll updated: 1.5 -> 1.6
pack.ll updated: 1.1 -> 1.2
rev.ll updated: 1.1 -> 1.2
section.ll updated: 1.8 -> 1.9
select.ll updated: 1.13 -> 1.14
shifter_operand.ll updated: 1.2 -> 1.3
smul.ll updated: 1.1 -> 1.2
stack-frame.ll updated: 1.2 -> 1.3
str_post.ll updated: 1.1 -> 1.2
str_pre.ll updated: 1.1 -> 1.2
str_trunc.ll updated: 1.1 -> 1.2
sxt_rot.ll updated: 1.3 -> 1.4
thumb-imm.ll updated: 1.3 -> 1.4
trunc_ldr.ll updated: 1.3 -> 1.4
tst_teq.ll updated: 1.1 -> 1.2
unord.ll updated: 1.3 -> 1.4
uxt_rot.ll updated: 1.3 -> 1.4
uxtb.ll updated: 1.1 -> 1.2
vargs2.ll updated: 1.7 -> 1.8
vargs_align.ll updated: 1.2 -> 1.3
vfp.ll updated: 1.1 -> 1.2
weak.ll updated: 1.2 -> 1.3
---
Log message:

For PR1319: http://llvm.org/PR1319 : Upgrade to use new test harness

---
Diffs of the changes:  (+178 -152)

 2007-03-06-AddR7.ll        |    5 +++--
 2007-03-15-GEP-Idx-Sink.ll |    5 +++--
 align.ll                   |   13 ++++++++-----
 arm-negative-stride.ll     |    2 +-
 call.ll                    |    5 ++---
 ctors_dtors.ll             |   19 ++++++++++++-------
 dg.exp                     |    4 ++--
 fp.ll                      |   31 ++++++++++++++++++-------------
 large-stack.ll             |    6 ++----
 ldr.ll                     |    4 ++--
 ldr_post.ll                |    4 ++--
 load-global.ll             |   10 +++++++---
 long.ll                    |   32 ++++++++++++++++++--------------
 lsr-scale-addr-mode.ll     |    2 +-
 mem.ll                     |    3 +--
 mul.ll                     |    7 +++----
 mulhi.ll                   |    6 +++---
 mvn.ll                     |    2 +-
 pack.ll                    |    9 ++++++---
 rev.ll                     |    3 +--
 section.ll                 |    7 ++++---
 select.ll                  |   28 ++++++++++++++--------------
 shifter_operand.ll         |    2 +-
 smul.ll                    |   13 ++++++++-----
 stack-frame.ll             |    6 +++---
 str_post.ll                |    7 ++++---
 str_pre.ll                 |    4 ++--
 str_trunc.ll               |    7 ++++---
 sxt_rot.ll                 |    8 ++++----
 thumb-imm.ll               |    1 -
 trunc_ldr.ll               |    5 ++---
 tst_teq.ll                 |    8 +++-----
 unord.ll                   |    8 +++-----
 uxt_rot.ll                 |    8 +++-----
 uxtb.ll                    |    5 +++--
 vargs2.ll                  |    6 +++---
 vargs_align.ll             |    7 ++++---
 vfp.ll                     |   25 ++++++++++++++++---------
 weak.ll                    |    3 +--
 39 files changed, 178 insertions(+), 152 deletions(-)


Index: llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll
diff -u llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll:1.2 llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll:1.3
--- llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/ARM/2007-03-06-AddR7.ll	Sun Apr 15 14:11:47 2007
@@ -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** }


Index: llvm/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll
diff -u llvm/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll:1.3 llvm/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll:1.4
--- llvm/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll:1.3	Sat Apr 14 18:04:30 2007
+++ llvm/test/CodeGen/ARM/2007-03-15-GEP-Idx-Sink.ll	Sun Apr 15 14:11:47 2007
@@ -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: *


Index: llvm/test/CodeGen/ARM/align.ll
diff -u llvm/test/CodeGen/ARM/align.ll:1.2 llvm/test/CodeGen/ARM/align.ll:1.3
--- llvm/test/CodeGen/ARM/align.ll:1.2	Mon Jan 22 17:18:10 2007
+++ llvm/test/CodeGen/ARM/align.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/arm-negative-stride.ll
diff -u llvm/test/CodeGen/ARM/arm-negative-stride.ll:1.2 llvm/test/CodeGen/ARM/arm-negative-stride.ll:1.3
--- llvm/test/CodeGen/ARM/arm-negative-stride.ll:1.2	Wed Apr  4 02:41:33 2007
+++ llvm/test/CodeGen/ARM/arm-negative-stride.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/call.ll
diff -u llvm/test/CodeGen/ARM/call.ll:1.6 llvm/test/CodeGen/ARM/call.ll:1.7
--- llvm/test/CodeGen/ARM/call.ll:1.6	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/call.ll	Sun Apr 15 14:11:47 2007
@@ -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)


Index: llvm/test/CodeGen/ARM/ctors_dtors.ll
diff -u llvm/test/CodeGen/ARM/ctors_dtors.ll:1.3 llvm/test/CodeGen/ARM/ctors_dtors.ll:1.4
--- llvm/test/CodeGen/ARM/ctors_dtors.ll:1.3	Mon Mar  5 11:59:58 2007
+++ llvm/test/CodeGen/ARM/ctors_dtors.ll	Sun Apr 15 14:11:47 2007
@@ -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]


Index: llvm/test/CodeGen/ARM/dg.exp
diff -u llvm/test/CodeGen/ARM/dg.exp:1.2 llvm/test/CodeGen/ARM/dg.exp:1.3
--- llvm/test/CodeGen/ARM/dg.exp:1.2	Wed Apr 11 14:56:57 2007
+++ llvm/test/CodeGen/ARM/dg.exp	Sun Apr 15 14:11:47 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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]


Index: llvm/test/CodeGen/ARM/fp.ll
diff -u llvm/test/CodeGen/ARM/fp.ll:1.14 llvm/test/CodeGen/ARM/fp.ll:1.15
--- llvm/test/CodeGen/ARM/fp.ll:1.14	Tue Jan 30 10:16:01 2007
+++ llvm/test/CodeGen/ARM/fp.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/large-stack.ll
diff -u llvm/test/CodeGen/ARM/large-stack.ll:1.6 llvm/test/CodeGen/ARM/large-stack.ll:1.7
--- llvm/test/CodeGen/ARM/large-stack.ll:1.6	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/large-stack.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/ldr.ll
diff -u llvm/test/CodeGen/ARM/ldr.ll:1.4 llvm/test/CodeGen/ARM/ldr.ll:1.5
--- llvm/test/CodeGen/ARM/ldr.ll:1.4	Fri Jan 19 16:43:14 2007
+++ llvm/test/CodeGen/ARM/ldr.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/ldr_post.ll
diff -u llvm/test/CodeGen/ARM/ldr_post.ll:1.1 llvm/test/CodeGen/ARM/ldr_post.ll:1.2
--- llvm/test/CodeGen/ARM/ldr_post.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/ldr_post.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/load-global.ll
diff -u llvm/test/CodeGen/ARM/load-global.ll:1.1 llvm/test/CodeGen/ARM/load-global.ll:1.2
--- llvm/test/CodeGen/ARM/load-global.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/load-global.ll	Sun Apr 15 14:11:47 2007
@@ -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
 


Index: llvm/test/CodeGen/ARM/long.ll
diff -u llvm/test/CodeGen/ARM/long.ll:1.13 llvm/test/CodeGen/ARM/long.ll:1.14
--- llvm/test/CodeGen/ARM/long.ll:1.13	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/long.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll
diff -u llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll:1.1 llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll:1.2
--- llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll:1.1	Mon Apr  2 01:33:10 2007
+++ llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/mem.ll
diff -u llvm/test/CodeGen/ARM/mem.ll:1.2 llvm/test/CodeGen/ARM/mem.ll:1.3
--- llvm/test/CodeGen/ARM/mem.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/ARM/mem.ll	Sun Apr 15 14:11:47 2007
@@ -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() {


Index: llvm/test/CodeGen/ARM/mul.ll
diff -u llvm/test/CodeGen/ARM/mul.ll:1.6 llvm/test/CodeGen/ARM/mul.ll:1.7
--- llvm/test/CodeGen/ARM/mul.ll:1.6	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/mul.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/mulhi.ll
diff -u llvm/test/CodeGen/ARM/mulhi.ll:1.1 llvm/test/CodeGen/ARM/mulhi.ll:1.2
--- llvm/test/CodeGen/ARM/mulhi.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/mulhi.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/mvn.ll
diff -u llvm/test/CodeGen/ARM/mvn.ll:1.5 llvm/test/CodeGen/ARM/mvn.ll:1.6
--- llvm/test/CodeGen/ARM/mvn.ll:1.5	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/mvn.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/pack.ll
diff -u llvm/test/CodeGen/ARM/pack.ll:1.1 llvm/test/CodeGen/ARM/pack.ll:1.2
--- llvm/test/CodeGen/ARM/pack.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/pack.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/rev.ll
diff -u llvm/test/CodeGen/ARM/rev.ll:1.1 llvm/test/CodeGen/ARM/rev.ll:1.2
--- llvm/test/CodeGen/ARM/rev.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/rev.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/section.ll
diff -u llvm/test/CodeGen/ARM/section.ll:1.8 llvm/test/CodeGen/ARM/section.ll:1.9
--- llvm/test/CodeGen/ARM/section.ll:1.8	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/section.ll	Sun Apr 15 14:11:47 2007
@@ -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"


Index: llvm/test/CodeGen/ARM/select.ll
diff -u llvm/test/CodeGen/ARM/select.ll:1.13 llvm/test/CodeGen/ARM/select.ll:1.14
--- llvm/test/CodeGen/ARM/select.ll:1.13	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/select.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/shifter_operand.ll
diff -u llvm/test/CodeGen/ARM/shifter_operand.ll:1.2 llvm/test/CodeGen/ARM/shifter_operand.ll:1.3
--- llvm/test/CodeGen/ARM/shifter_operand.ll:1.2	Tue Feb 27 18:36:33 2007
+++ llvm/test/CodeGen/ARM/shifter_operand.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/smul.ll
diff -u llvm/test/CodeGen/ARM/smul.ll:1.1 llvm/test/CodeGen/ARM/smul.ll:1.2
--- llvm/test/CodeGen/ARM/smul.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/smul.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/stack-frame.ll
diff -u llvm/test/CodeGen/ARM/stack-frame.ll:1.2 llvm/test/CodeGen/ARM/stack-frame.ll:1.3
--- llvm/test/CodeGen/ARM/stack-frame.ll:1.2	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/stack-frame.ll	Sun Apr 15 14:11:47 2007
@@ -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() {


Index: llvm/test/CodeGen/ARM/str_post.ll
diff -u llvm/test/CodeGen/ARM/str_post.ll:1.1 llvm/test/CodeGen/ARM/str_post.ll:1.2
--- llvm/test/CodeGen/ARM/str_post.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/str_post.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/str_pre.ll
diff -u llvm/test/CodeGen/ARM/str_pre.ll:1.1 llvm/test/CodeGen/ARM/str_pre.ll:1.2
--- llvm/test/CodeGen/ARM/str_pre.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/str_pre.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/str_trunc.ll
diff -u llvm/test/CodeGen/ARM/str_trunc.ll:1.1 llvm/test/CodeGen/ARM/str_trunc.ll:1.2
--- llvm/test/CodeGen/ARM/str_trunc.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/str_trunc.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/sxt_rot.ll
diff -u llvm/test/CodeGen/ARM/sxt_rot.ll:1.3 llvm/test/CodeGen/ARM/sxt_rot.ll:1.4
--- llvm/test/CodeGen/ARM/sxt_rot.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/ARM/sxt_rot.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/thumb-imm.ll
diff -u llvm/test/CodeGen/ARM/thumb-imm.ll:1.3 llvm/test/CodeGen/ARM/thumb-imm.ll:1.4
--- llvm/test/CodeGen/ARM/thumb-imm.ll:1.3	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/thumb-imm.ll	Sun Apr 15 14:11:47 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | llc -march=thumb &&
 ; RUN: llvm-as < %s | llc -march=thumb | not grep CPI
 
 


Index: llvm/test/CodeGen/ARM/trunc_ldr.ll
diff -u llvm/test/CodeGen/ARM/trunc_ldr.ll:1.3 llvm/test/CodeGen/ARM/trunc_ldr.ll:1.4
--- llvm/test/CodeGen/ARM/trunc_ldr.ll:1.3	Fri Mar 30 17:03:49 2007
+++ llvm/test/CodeGen/ARM/trunc_ldr.ll	Sun Apr 15 14:11:47 2007
@@ -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] }


Index: llvm/test/CodeGen/ARM/tst_teq.ll
diff -u llvm/test/CodeGen/ARM/tst_teq.ll:1.1 llvm/test/CodeGen/ARM/tst_teq.ll:1.2
--- llvm/test/CodeGen/ARM/tst_teq.ll:1.1	Sun Apr  1 20:30:03 2007
+++ llvm/test/CodeGen/ARM/tst_teq.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/unord.ll
diff -u llvm/test/CodeGen/ARM/unord.ll:1.3 llvm/test/CodeGen/ARM/unord.ll:1.4
--- llvm/test/CodeGen/ARM/unord.ll:1.3	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/unord.ll	Sun Apr 15 14:11:47 2007
@@ -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) {


Index: llvm/test/CodeGen/ARM/uxt_rot.ll
diff -u llvm/test/CodeGen/ARM/uxt_rot.ll:1.3 llvm/test/CodeGen/ARM/uxt_rot.ll:1.4
--- llvm/test/CodeGen/ARM/uxt_rot.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/ARM/uxt_rot.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/uxtb.ll
diff -u llvm/test/CodeGen/ARM/uxtb.ll:1.1 llvm/test/CodeGen/ARM/uxtb.ll:1.2
--- llvm/test/CodeGen/ARM/uxtb.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/uxtb.ll	Sun Apr 15 14:11:47 2007
@@ -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]


Index: llvm/test/CodeGen/ARM/vargs2.ll
diff -u llvm/test/CodeGen/ARM/vargs2.ll:1.7 llvm/test/CodeGen/ARM/vargs2.ll:1.8
--- llvm/test/CodeGen/ARM/vargs2.ll:1.7	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/vargs2.ll	Sun Apr 15 14:11:47 2007
@@ -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]
 


Index: llvm/test/CodeGen/ARM/vargs_align.ll
diff -u llvm/test/CodeGen/ARM/vargs_align.ll:1.2 llvm/test/CodeGen/ARM/vargs_align.ll:1.3
--- llvm/test/CodeGen/ARM/vargs_align.ll:1.2	Fri Feb 23 15:53:48 2007
+++ llvm/test/CodeGen/ARM/vargs_align.ll	Sun Apr 15 14:11:47 2007
@@ -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:


Index: llvm/test/CodeGen/ARM/vfp.ll
diff -u llvm/test/CodeGen/ARM/vfp.ll:1.1 llvm/test/CodeGen/ARM/vfp.ll:1.2
--- llvm/test/CodeGen/ARM/vfp.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/vfp.ll	Sun Apr 15 14:11:47 2007
@@ -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


Index: llvm/test/CodeGen/ARM/weak.ll
diff -u llvm/test/CodeGen/ARM/weak.ll:1.2 llvm/test/CodeGen/ARM/weak.ll:1.3
--- llvm/test/CodeGen/ARM/weak.ll:1.2	Wed Dec  6 07:35:10 2006
+++ llvm/test/CodeGen/ARM/weak.ll	Sun Apr 15 14:11:47 2007
@@ -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:






More information about the llvm-commits mailing list