[llvm-commits] CVS: llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll 2007-04-03-UndefinedSymbol.ll alloca.ll arguments.ll bits.ll branch.ll call_nolink.ll clz.ll compare-call.ll constants.ll div.ll dyn-stackalloc.ll fcopysign.ll fp.ll fparith.ll fpcmp.ll fpcmp_ueq.ll fpconv.ll fpmem.ll hello.ll imm.ll insn-sched1.ll ldm.ll ldr_ext.ll ldr_frame.ll ldr_pre.ll load.ll long-setcc.ll long_shift.ll pack.ll section.ll vfp.ll

Reid Spencer reid at x10sys.com
Mon Apr 16 10:38:15 PDT 2007



Changes in directory llvm/test/CodeGen/ARM:

2007-04-03-PEIBug.ll updated: 1.1 -> 1.2
2007-04-03-UndefinedSymbol.ll updated: 1.1 -> 1.2
alloca.ll updated: 1.5 -> 1.6
arguments.ll updated: 1.2 -> 1.3
bits.ll updated: 1.3 -> 1.4
branch.ll updated: 1.5 -> 1.6
call_nolink.ll updated: 1.2 -> 1.3
clz.ll updated: 1.1 -> 1.2
compare-call.ll updated: 1.1 -> 1.2
constants.ll updated: 1.10 -> 1.11
div.ll updated: 1.2 -> 1.3
dyn-stackalloc.ll updated: 1.3 -> 1.4
fcopysign.ll updated: 1.7 -> 1.8
fp.ll updated: 1.15 -> 1.16
fparith.ll updated: 1.7 -> 1.8
fpcmp.ll updated: 1.7 -> 1.8
fpcmp_ueq.ll updated: 1.4 -> 1.5
fpconv.ll updated: 1.6 -> 1.7
fpmem.ll updated: 1.5 -> 1.6
hello.ll updated: 1.7 -> 1.8
imm.ll updated: 1.1 -> 1.2
insn-sched1.ll updated: 1.5 -> 1.6
ldm.ll updated: 1.5 -> 1.6
ldr_ext.ll updated: 1.4 -> 1.5
ldr_frame.ll updated: 1.3 -> 1.4
ldr_pre.ll updated: 1.1 -> 1.2
load.ll updated: 1.2 -> 1.3
long-setcc.ll updated: 1.3 -> 1.4
long_shift.ll updated: 1.4 -> 1.5
pack.ll updated: 1.2 -> 1.3
section.ll updated: 1.9 -> 1.10
vfp.ll updated: 1.2 -> 1.3
---
Log message:

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


---
Diffs of the changes:  (+137 -140)

 2007-04-03-PEIBug.ll          |    2 +-
 2007-04-03-UndefinedSymbol.ll |    3 ++-
 alloca.ll                     |    7 ++++---
 arguments.ll                  |    9 +++++----
 bits.ll                       |   12 ++++++------
 branch.ll                     |   10 +++++-----
 call_nolink.ll                |    4 ++--
 clz.ll                        |    3 +--
 compare-call.ll               |    4 ++--
 constants.ll                  |   22 ++++++++++++++--------
 div.ll                        |   10 +++++-----
 dyn-stackalloc.ll             |    8 ++++----
 fcopysign.ll                  |    7 +++----
 fp.ll                         |   30 ++++++++++++------------------
 fparith.ll                    |   19 +++++++++----------
 fpcmp.ll                      |   16 ++++++++--------
 fpcmp_ueq.ll                  |    3 +--
 fpconv.ll                     |   22 +++++++++++-----------
 fpmem.ll                      |   10 ++++++----
 hello.ll                      |    6 +++---
 imm.ll                        |    1 -
 insn-sched1.ll                |    5 +++--
 ldm.ll                        |   10 ++++++----
 ldr_ext.ll                    |   17 ++++++++---------
 ldr_frame.ll                  |    4 +---
 ldr_pre.ll                    |    4 ++--
 load.ll                       |   10 +++++-----
 long-setcc.ll                 |    4 +---
 long_shift.ll                 |   10 +++++-----
 pack.ll                       |    2 +-
 section.ll                    |    1 -
 vfp.ll                        |    2 +-
 32 files changed, 137 insertions(+), 140 deletions(-)


Index: llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll
diff -u llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll:1.1 llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll:1.2
--- llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll:1.1	Tue Apr  3 16:38:03 2007
+++ llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm | not grep "add.*#0"
+; RUN: llvm-as < %s | llc -march=arm | not grep {add.*#0}
 
 define i32 @foo() {
 entry:


Index: llvm/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll
diff -u llvm/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll:1.1 llvm/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll:1.2
--- llvm/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll:1.1	Tue Apr  3 18:40:54 2007
+++ llvm/test/CodeGen/ARM/2007-04-03-UndefinedSymbol.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic | not grep "LPC9"
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic | \
+; RUN:   not grep LPC9
 
 	%struct.B = type { i32 }
 	%struct.anon = type { void (%struct.B*)*, i32 }


Index: llvm/test/CodeGen/ARM/alloca.ll
diff -u llvm/test/CodeGen/ARM/alloca.ll:1.5 llvm/test/CodeGen/ARM/alloca.ll:1.6
--- llvm/test/CodeGen/ARM/alloca.ll:1.5	Fri Feb  2 18:16:21 2007
+++ llvm/test/CodeGen/ARM/alloca.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | grep "mov r11, sp" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | grep "mov sp, r11"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | \
+; RUN:   grep {mov r11, sp}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | \
+; RUN:   grep {mov sp, r11}
 
 void %f(uint %a) {
 entry:


Index: llvm/test/CodeGen/ARM/arguments.ll
diff -u llvm/test/CodeGen/ARM/arguments.ll:1.2 llvm/test/CodeGen/ARM/arguments.ll:1.3
--- llvm/test/CodeGen/ARM/arguments.ll:1.2	Tue Feb 13 13:52:28 2007
+++ llvm/test/CodeGen/ARM/arguments.ll	Mon Apr 16 12:36:06 2007
@@ -1,10 +1,11 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | grep "mov r0, r2" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | grep "mov r0, r1" | wc -l | grep 1
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
+; RUN:   grep {mov r0, r2} | wc -l | grep 1
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | \
+; RUN:   grep {mov r0, r1} | wc -l | grep 1
 
 define i32 @f(i32 %a, i64 %b) {
         %tmp = call i32 @g(i64 %b)
         ret i32 %tmp
 }
 
-declare i32 @g(i64)
\ No newline at end of file
+declare i32 @g(i64)


Index: llvm/test/CodeGen/ARM/bits.ll
diff -u llvm/test/CodeGen/ARM/bits.ll:1.3 llvm/test/CodeGen/ARM/bits.ll:1.4
--- llvm/test/CodeGen/ARM/bits.ll:1.3	Thu Feb  1 20:16:22 2007
+++ llvm/test/CodeGen/ARM/bits.ll	Mon Apr 16 12:36:06 2007
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep and      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep orr      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep eor      | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep mov.*lsl | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep mov.*asr | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm > %t
+; RUN: grep and      %t | wc -l | grep 1
+; RUN: grep orr      %t | wc -l | grep 1
+; RUN: grep eor      %t | wc -l | grep 1
+; RUN: grep mov.*lsl %t | wc -l | grep 1
+; RUN: grep mov.*asr %t | wc -l | grep 1
 
 define i32 @f1(i32 %a, i32 %b) {
 entry:


Index: llvm/test/CodeGen/ARM/branch.ll
diff -u llvm/test/CodeGen/ARM/branch.ll:1.5 llvm/test/CodeGen/ARM/branch.ll:1.6
--- llvm/test/CodeGen/ARM/branch.ll:1.5	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/branch.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bne &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bge &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bhs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep blo
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm > %t 
+; RUN: grep bne %t
+; RUN: grep bge %t
+; RUN: grep bhs %t
+; RUN: grep blo %t
 
 void %f1(int %a, int %b, int* %v) {
 entry:


Index: llvm/test/CodeGen/ARM/call_nolink.ll
diff -u llvm/test/CodeGen/ARM/call_nolink.ll:1.2 llvm/test/CodeGen/ARM/call_nolink.ll:1.3
--- llvm/test/CodeGen/ARM/call_nolink.ll:1.2	Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/ARM/call_nolink.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | not grep "bx lr"
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | \
+; RUN:   not grep {bx lr}
 
 	%struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* }
 @r = external global [14 x i32]		; <[14 x i32]*> [#uses=4]


Index: llvm/test/CodeGen/ARM/clz.ll
diff -u llvm/test/CodeGen/ARM/clz.ll:1.1 llvm/test/CodeGen/ARM/clz.ll:1.2
--- llvm/test/CodeGen/ARM/clz.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/clz.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep "clz"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep clz
 
 declare uint %llvm.ctlz.i32(uint)
 


Index: llvm/test/CodeGen/ARM/compare-call.ll
diff -u llvm/test/CodeGen/ARM/compare-call.ll:1.1 llvm/test/CodeGen/ARM/compare-call.ll:1.2
--- llvm/test/CodeGen/ARM/compare-call.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/compare-call.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6,+vfp2 | grep fcmpes
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6,+vfp2 | \
+; RUN:   grep fcmpes
 
 void %test3(float* %glob, int %X) {
 entry:


Index: llvm/test/CodeGen/ARM/constants.ll
diff -u llvm/test/CodeGen/ARM/constants.ll:1.10 llvm/test/CodeGen/ARM/constants.ll:1.11
--- llvm/test/CodeGen/ARM/constants.ll:1.10	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/constants.ll	Mon Apr 16 12:36:06 2007
@@ -1,11 +1,17 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #255$" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0.*256" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "orr.*256" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, .*-1073741761" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, .*1008" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "cmp r0, #1, 16" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0, #0} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0, #255$} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0.*256} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {orr.*256} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0, .*-1073741761} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0, .*1008} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {cmp r0, #1, 16} | wc -l | grep 1
 
 uint %f1() {
   ret uint 0


Index: llvm/test/CodeGen/ARM/div.ll
diff -u llvm/test/CodeGen/ARM/div.ll:1.2 llvm/test/CodeGen/ARM/div.ll:1.3
--- llvm/test/CodeGen/ARM/div.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/ARM/div.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __divsi3  &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __udivsi3 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __modsi3  &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __umodsi3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm > %t
+; RUN: grep __divsi3  %t
+; RUN: grep __udivsi3 %t
+; RUN: grep __modsi3  %t
+; RUN: grep __umodsi3 %t
 
 int %f1(int %a, int %b) {
 entry:


Index: llvm/test/CodeGen/ARM/dyn-stackalloc.ll
diff -u llvm/test/CodeGen/ARM/dyn-stackalloc.ll:1.3 llvm/test/CodeGen/ARM/dyn-stackalloc.ll:1.4
--- llvm/test/CodeGen/ARM/dyn-stackalloc.ll:1.3	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/dyn-stackalloc.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=thumb &&
-; RUN: llvm-as < %s | llc -march=thumb | not grep "ldr sp" &&
-; RUN: llvm-as < %s | llc -mtriple=thumb-apple-darwin | not grep "sub.*r7" &&
+; RUN: llvm-as < %s | llc -march=arm
+; RUN: llvm-as < %s | llc -march=thumb | not grep {ldr sp}
+; RUN: llvm-as < %s | llc -mtriple=thumb-apple-darwin | \
+; RUN:   not grep {sub.*r7}
 ; RUN: llvm-as < %s | llc -march=thumb | grep 4294967280
 
 	%struct.state = type { i32, %struct.info*, float**, i32, i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i64, i64, i64, i8* }


Index: llvm/test/CodeGen/ARM/fcopysign.ll
diff -u llvm/test/CodeGen/ARM/fcopysign.ll:1.7 llvm/test/CodeGen/ARM/fcopysign.ll:1.8
--- llvm/test/CodeGen/ARM/fcopysign.ll:1.7	Tue Jan 30 10:16:01 2007
+++ llvm/test/CodeGen/ARM/fcopysign.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep bic | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 &&
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | grep fneg | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm | grep bic | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | \
+; RUN:   grep fneg | wc -l | grep 2
 
 define float @test1(float %x, double %y) {
 	%tmp = fpext float %x to double


Index: llvm/test/CodeGen/ARM/fp.ll
diff -u llvm/test/CodeGen/ARM/fp.ll:1.15 llvm/test/CodeGen/ARM/fp.ll:1.16
--- llvm/test/CodeGen/ARM/fp.ll:1.15	Sun Apr 15 14:11:47 2007
+++ llvm/test/CodeGen/ARM/fp.ll	Mon Apr 16 12:36:06 2007
@@ -1,21 +1,15 @@
-; 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
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: grep fmsr %t | wc -l | grep 4
+; RUN: grep fsitos %t
+; RUN: grep fmrs %t
+; RUN: grep fsitod %t
+; RUN: grep fmrrd %t | wc -l | grep 5
+; RUN: grep fmdrr %t | wc -l | grep 2
+; RUN: grep fldd %t
+; RUN: grep flds %t
+; RUN: grep fuitod %t
+; RUN: grep fuitos %t
+; RUN: grep 1065353216 %t
 
 float %f(int %a) {
 entry:


Index: llvm/test/CodeGen/ARM/fparith.ll
diff -u llvm/test/CodeGen/ARM/fparith.ll:1.7 llvm/test/CodeGen/ARM/fparith.ll:1.8
--- llvm/test/CodeGen/ARM/fparith.ll:1.7	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/fparith.ll	Mon Apr 16 12:36:06 2007
@@ -1,13 +1,12 @@
-; 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 fadds &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep faddd &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmuls &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fmuld &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fnegs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fnegd &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fdivs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fdivd
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: grep fadds %t
+; RUN: grep faddd %t
+; RUN: grep fmuls %t
+; RUN: grep fmuld %t
+; RUN: grep fnegs %t
+; RUN: grep fnegd %t
+; RUN: grep fdivs %t
+; RUN: grep fdivd %t
 
 
 float %f1(float %a, float %b) {


Index: llvm/test/CodeGen/ARM/fpcmp.ll
diff -u llvm/test/CodeGen/ARM/fpcmp.ll:1.7 llvm/test/CodeGen/ARM/fpcmp.ll:1.8
--- llvm/test/CodeGen/ARM/fpcmp.ll:1.7	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/fpcmp.ll	Mon Apr 16 12:36:06 2007
@@ -1,11 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep movmi &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep moveq &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep movgt &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep movge &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep movne &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcmped | wc -l | grep 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcmpes | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: grep movmi %t
+; RUN: grep moveq %t
+; RUN: grep movgt %t
+; RUN: grep movge %t
+; RUN: grep movne %t
+; RUN: grep fcmped %t | wc -l | grep 1
+; RUN: grep fcmpes %t | wc -l | grep 6
 
 int %f1(float %a) {
 entry:


Index: llvm/test/CodeGen/ARM/fpcmp_ueq.ll
diff -u llvm/test/CodeGen/ARM/fpcmp_ueq.ll:1.4 llvm/test/CodeGen/ARM/fpcmp_ueq.ll:1.5
--- llvm/test/CodeGen/ARM/fpcmp_ueq.ll:1.4	Fri Jan 26 02:25:05 2007
+++ llvm/test/CodeGen/ARM/fpcmp_ueq.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep moveq &&
+; RUN: llvm-as < %s | llc -march=arm | grep moveq 
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | grep movvs
 
 define i32 @f7(float %a, float %b) {


Index: llvm/test/CodeGen/ARM/fpconv.ll
diff -u llvm/test/CodeGen/ARM/fpconv.ll:1.6 llvm/test/CodeGen/ARM/fpconv.ll:1.7
--- llvm/test/CodeGen/ARM/fpconv.ll:1.6	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/fpconv.ll	Mon Apr 16 12:36:06 2007
@@ -1,14 +1,14 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcvtsd &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep fcvtds &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep ftosizs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep ftouizs &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep ftosizd &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep ftouizd &&
-; 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 fsitod &&
-; 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 fuitod
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: grep fcvtsd %t
+; RUN: grep fcvtds %t
+; RUN: grep ftosizs %t
+; RUN: grep ftouizs %t
+; RUN: grep ftosizd %t
+; RUN: grep ftouizd %t
+; RUN: grep fsitos %t
+; RUN: grep fsitod %t
+; RUN: grep fuitos %t
+; RUN: grep fuitod %t
 
 float %f1(double %x) {
 entry:


Index: llvm/test/CodeGen/ARM/fpmem.ll
diff -u llvm/test/CodeGen/ARM/fpmem.ll:1.5 llvm/test/CodeGen/ARM/fpmem.ll:1.6
--- llvm/test/CodeGen/ARM/fpmem.ll:1.5	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/fpmem.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep "flds.*\[" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | grep "fsts.*\[" | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {mov r0, #0} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep {flds.*\\\[} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
+; RUN:   grep {fsts.*\\\[} | wc -l | grep 1
 
 float %f1(float %a) {
 entry:


Index: llvm/test/CodeGen/ARM/hello.ll
diff -u llvm/test/CodeGen/ARM/hello.ll:1.7 llvm/test/CodeGen/ARM/hello.ll:1.8
--- llvm/test/CodeGen/ARM/hello.ll:1.7	Mon Apr 16 12:08:00 2007
+++ llvm/test/CodeGen/ARM/hello.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm &&
+; RUN: llvm-as < %s | llc -march=arm
 ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | grep mov | wc -l | grep 1
-; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu --disable-fp-elim | grep mov \
-; RUN: | wc -l | grep 3
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu --disable-fp-elim | \
+; RUN:   grep mov | wc -l | grep 3
 ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | grep mov | wc -l | grep 2
 
 @str = internal constant [12 x i8] c"Hello World\00"


Index: llvm/test/CodeGen/ARM/imm.ll
diff -u llvm/test/CodeGen/ARM/imm.ll:1.1 llvm/test/CodeGen/ARM/imm.ll:1.2
--- llvm/test/CodeGen/ARM/imm.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/imm.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | not grep CPI
 
 int %test1(int %A) {


Index: llvm/test/CodeGen/ARM/insn-sched1.ll
diff -u llvm/test/CodeGen/ARM/insn-sched1.ll:1.5 llvm/test/CodeGen/ARM/insn-sched1.ll:1.6
--- llvm/test/CodeGen/ARM/insn-sched1.ll:1.5	Thu Mar  8 13:27:32 2007
+++ llvm/test/CodeGen/ARM/insn-sched1.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin -mattr=+v6 | grep mov | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin -mattr=+v6 |\
+; RUN:   grep mov | wc -l | grep 3
 
 int %test(int %x) {
 	%tmp = cast int %x to short


Index: llvm/test/CodeGen/ARM/ldm.ll
diff -u llvm/test/CodeGen/ARM/ldm.ll:1.5 llvm/test/CodeGen/ARM/ldm.ll:1.6
--- llvm/test/CodeGen/ARM/ldm.ll:1.5	Wed Jan 31 16:27:07 2007
+++ llvm/test/CodeGen/ARM/ldm.ll	Mon Apr 16 12:36:06 2007
@@ -1,7 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldmia" | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldmib" | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | grep "ldmfd sp\!" | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep ldmia | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep ldmib | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN:   grep {ldmfd sp\!} | wc -l | grep 3
 
 %X = external global [0 x int]
 


Index: llvm/test/CodeGen/ARM/ldr_ext.ll
diff -u llvm/test/CodeGen/ARM/ldr_ext.ll:1.4 llvm/test/CodeGen/ARM/ldr_ext.ll:1.5
--- llvm/test/CodeGen/ARM/ldr_ext.ll:1.4	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/ldr_ext.ll	Mon Apr 16 12:36:06 2007
@@ -1,12 +1,11 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrb"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrh"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrsb" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrsh" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep "ldrb"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep "ldrh"  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep "ldrsb" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb | grep "ldrsh" | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrb  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrh  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsb | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsh | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrb  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrh  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrsb | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrsh | wc -l | grep 1
 
 define i32 @test1(i8* %v.pntr.s0.u1) {
     %tmp.u = load i8* %v.pntr.s0.u1


Index: llvm/test/CodeGen/ARM/ldr_frame.ll
diff -u llvm/test/CodeGen/ARM/ldr_frame.ll:1.3 llvm/test/CodeGen/ARM/ldr_frame.ll:1.4
--- llvm/test/CodeGen/ARM/ldr_frame.ll:1.3	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/ldr_frame.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | not grep mov &&
-; RUN: llvm-as < %s | llc -march=thumb &&
+; RUN: llvm-as < %s | llc -march=arm | not grep mov
 ; RUN: llvm-as < %s | llc -march=thumb | grep cpy | wc -l | grep 2
 
 define i32 @f1() {


Index: llvm/test/CodeGen/ARM/ldr_pre.ll
diff -u llvm/test/CodeGen/ARM/ldr_pre.ll:1.1 llvm/test/CodeGen/ARM/ldr_pre.ll:1.2
--- llvm/test/CodeGen/ARM/ldr_pre.ll:1.1	Fri Jan 19 03:20:23 2007
+++ llvm/test/CodeGen/ARM/ldr_pre.ll	Mon Apr 16 12:36:06 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 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN:   grep {ldr.*\\!}  | wc -l | grep 2
 
 int *%test1(int *%X, int *%dest) {
         %Y = getelementptr int* %X, int 4


Index: llvm/test/CodeGen/ARM/load.ll
diff -u llvm/test/CodeGen/ARM/load.ll:1.2 llvm/test/CodeGen/ARM/load.ll:1.3
--- llvm/test/CodeGen/ARM/load.ll:1.2	Fri Dec  1 22:23:08 2006
+++ llvm/test/CodeGen/ARM/load.ll	Mon Apr 16 12:36:06 2007
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsb &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrb &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsh &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrh
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm > %t
+; RUN: grep ldrsb %t
+; RUN: grep ldrb %t
+; RUN: grep ldrsh %t
+; RUN: grep ldrh %t
 
 int %f1(sbyte* %p) {
 entry:


Index: llvm/test/CodeGen/ARM/long-setcc.ll
diff -u llvm/test/CodeGen/ARM/long-setcc.ll:1.3 llvm/test/CodeGen/ARM/long-setcc.ll:1.4
--- llvm/test/CodeGen/ARM/long-setcc.ll:1.3	Wed Apr 11 11:12:27 2007
+++ llvm/test/CodeGen/ARM/long-setcc.ll	Mon Apr 16 12:36:06 2007
@@ -1,6 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep cmp | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=thumb &&
+; RUN: llvm-as < %s | llc -march=arm | grep cmp | wc -l | grep 1
 ; RUN: llvm-as < %s | llc -march=thumb | grep cmp | wc -l | grep 1
 
 


Index: llvm/test/CodeGen/ARM/long_shift.ll
diff -u llvm/test/CodeGen/ARM/long_shift.ll:1.4 llvm/test/CodeGen/ARM/long_shift.ll:1.5
--- llvm/test/CodeGen/ARM/long_shift.ll:1.4	Thu Feb 22 21:15:39 2007
+++ llvm/test/CodeGen/ARM/long_shift.ll	Mon Apr 16 12:36:06 2007
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep rrx | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __ashldi3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __ashrdi3 &&
-; RUN: llvm-as < %s | llc -march=arm | grep __lshrdi3 &&
 ; RUN: llvm-as < %s | llc -march=thumb
+; RUN: llvm-as < %s | llc -march=arm > %t
+; RUN: grep rrx %t | wc -l | grep 1
+; RUN: grep __ashldi3 %t
+; RUN: grep __ashrdi3 %t
+; RUN: grep __lshrdi3 %t
 
 define i64 @f0(i64 %A, i64 %B) {
 	%tmp = bitcast i64 %A to i64


Index: llvm/test/CodeGen/ARM/pack.ll
diff -u llvm/test/CodeGen/ARM/pack.ll:1.2 llvm/test/CodeGen/ARM/pack.ll:1.3
--- llvm/test/CodeGen/ARM/pack.ll:1.2	Sun Apr 15 14:11:47 2007
+++ llvm/test/CodeGen/ARM/pack.ll	Mon Apr 16 12:36:06 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
-; RUN:   grep pkhbt | wc -l | grep 5 &&
+; 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.


Index: llvm/test/CodeGen/ARM/section.ll
diff -u llvm/test/CodeGen/ARM/section.ll:1.9 llvm/test/CodeGen/ARM/section.ll:1.10
--- llvm/test/CodeGen/ARM/section.ll:1.9	Sun Apr 15 14:11:47 2007
+++ llvm/test/CodeGen/ARM/section.ll	Mon Apr 16 12:36:06 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux
 ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \
 ; RUN:   grep {__DTOR_END__:}
 ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux | \


Index: llvm/test/CodeGen/ARM/vfp.ll
diff -u llvm/test/CodeGen/ARM/vfp.ll:1.2 llvm/test/CodeGen/ARM/vfp.ll:1.3
--- llvm/test/CodeGen/ARM/vfp.ll:1.2	Sun Apr 15 14:11:47 2007
+++ llvm/test/CodeGen/ARM/vfp.ll	Mon Apr 16 12:36:06 2007
@@ -7,7 +7,7 @@
 ; 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:   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 | \






More information about the llvm-commits mailing list