[llvm-commits] CVS: llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx 2004-02-13-FrameReturnAddress.llx 2004-03-30-Select-Max.llx 2004-04-09-SameValueCoalescing.llx 2006-01-19-ISelFoldingBug.ll 2006-04-27-ISelFoldingBug.ll 2006-05-08-CoalesceSubRegClass.ll 2006-05-11-InstrSched.ll 2006-05-22-FPSetEQ.ll 2006-07-31-SingleRegClass.ll 2006-08-21-ExtraMovInst.ll 2006-11-12-CSRetCC.ll 2006-11-17-IllegalMove.ll 2006-11-28-Memcpy.ll 2007-01-08-InstrSched.ll 2007-02-04-OrAddrMode.ll 2007-03-15-GEP-Idx-Sink.ll 2007-03-24-InlineAsmPModifier.ll 2007-03-24-InlineAsmVectorOp.ll 2007-03-24-InlineAsmXConstraint.ll asm-global-imm.ll commute-two-addr.ll dg.exp fabs.ll fast-cc-callee-pops.ll fast-cc-merge-stack-adj.ll fast-cc-pass-in-regs.ll fastcall-correct-mangling.ll fp-immediate-shorten.ll fp-stack-compare.ll fp_constant_op.llx fp_load_fold.llx i128-ret.ll isel-sink.ll isnan.llx lea-2.ll lea-3.ll loop-hoist.ll loop-strength-reduce.ll overlap-shift.ll regpressure.ll rem.ll rotate.ll shift-coalesce! .ll shift-codegen.ll shift-double.llx shift-folding.ll sse-fcopysign.ll store_op_load_fold.ll store_op_load_fold2.ll test-pic-1.ll test-pic-4.ll vec_call.ll x86-64-arg.ll
Reid Spencer
reid at x10sys.com
Sun Apr 15 15:17:08 PDT 2007
Changes in directory llvm/test/CodeGen/X86:
2003-11-03-GlobalBool.llx updated: 1.2 -> 1.3
2004-02-13-FrameReturnAddress.llx updated: 1.4 -> 1.5
2004-03-30-Select-Max.llx updated: 1.2 -> 1.3
2004-04-09-SameValueCoalescing.llx updated: 1.3 -> 1.4
2006-01-19-ISelFoldingBug.ll updated: 1.2 -> 1.3
2006-04-27-ISelFoldingBug.ll updated: 1.4 -> 1.5
2006-05-08-CoalesceSubRegClass.ll updated: 1.2 -> 1.3
2006-05-11-InstrSched.ll updated: 1.8 -> 1.9
2006-05-22-FPSetEQ.ll updated: 1.2 -> 1.3
2006-07-31-SingleRegClass.ll updated: 1.2 -> 1.3
2006-08-21-ExtraMovInst.ll updated: 1.3 -> 1.4
2006-11-12-CSRetCC.ll updated: 1.3 -> 1.4
2006-11-17-IllegalMove.ll updated: 1.2 -> 1.3
2006-11-28-Memcpy.ll updated: 1.5 -> 1.6
2007-01-08-InstrSched.ll updated: 1.4 -> 1.5
2007-02-04-OrAddrMode.ll updated: 1.2 -> 1.3
2007-03-15-GEP-Idx-Sink.ll updated: 1.3 -> 1.4
2007-03-24-InlineAsmPModifier.ll updated: 1.1 -> 1.2
2007-03-24-InlineAsmVectorOp.ll updated: 1.3 -> 1.4
2007-03-24-InlineAsmXConstraint.ll updated: 1.1 -> 1.2
asm-global-imm.ll updated: 1.2 -> 1.3
commute-two-addr.ll updated: 1.4 -> 1.5
dg.exp updated: 1.4 -> 1.5
fabs.ll updated: 1.11 -> 1.12
fast-cc-callee-pops.ll updated: 1.8 -> 1.9
fast-cc-merge-stack-adj.ll updated: 1.7 -> 1.8
fast-cc-pass-in-regs.ll updated: 1.7 -> 1.8
fastcall-correct-mangling.ll updated: 1.1 -> 1.2
fp-immediate-shorten.ll updated: 1.4 -> 1.5
fp-stack-compare.ll updated: 1.2 -> 1.3
fp_constant_op.llx updated: 1.3 -> 1.4
fp_load_fold.llx updated: 1.3 -> 1.4
i128-ret.ll updated: 1.1 -> 1.2
isel-sink.ll updated: 1.1 -> 1.2
isnan.llx updated: 1.3 -> 1.4
lea-2.ll updated: 1.2 -> 1.3
lea-3.ll updated: 1.2 -> 1.3
loop-hoist.ll updated: 1.6 -> 1.7
loop-strength-reduce.ll updated: 1.4 -> 1.5
overlap-shift.ll updated: 1.6 -> 1.7
regpressure.ll updated: 1.4 -> 1.5
rem.ll updated: 1.2 -> 1.3
rotate.ll updated: 1.4 -> 1.5
shift-coalesce.ll updated: 1.2 -> 1.3
shift-codegen.ll updated: 1.2 -> 1.3
shift-double.llx updated: 1.8 -> 1.9
shift-folding.ll updated: 1.3 -> 1.4
sse-fcopysign.ll updated: 1.4 -> 1.5
store_op_load_fold.ll updated: 1.4 -> 1.5
store_op_load_fold2.ll updated: 1.6 -> 1.7
test-pic-1.ll updated: 1.2 -> 1.3
test-pic-4.ll updated: 1.2 -> 1.3
vec_call.ll updated: 1.2 -> 1.3
x86-64-arg.ll updated: 1.2 -> 1.3
---
Log message:
For PR1319: http://llvm.org/PR1319 : Upgrade to new test harness.
---
Diffs of the changes: (+131 -89)
2003-11-03-GlobalBool.llx | 3 ++-
2004-02-13-FrameReturnAddress.llx | 2 +-
2004-03-30-Select-Max.llx | 2 +-
2004-04-09-SameValueCoalescing.llx | 3 ++-
2006-01-19-ISelFoldingBug.ll | 3 ++-
2006-04-27-ISelFoldingBug.ll | 8 ++++++--
2006-05-08-CoalesceSubRegClass.ll | 3 ++-
2006-05-11-InstrSched.ll | 4 ++--
2006-05-22-FPSetEQ.ll | 6 +++---
2006-07-31-SingleRegClass.ll | 7 ++++---
2006-08-21-ExtraMovInst.ll | 3 ++-
2006-11-12-CSRetCC.ll | 2 +-
2006-11-17-IllegalMove.ll | 7 ++++---
2006-11-28-Memcpy.ll | 9 +++++----
2007-01-08-InstrSched.ll | 4 ++--
2007-02-04-OrAddrMode.ll | 4 ++--
2007-03-15-GEP-Idx-Sink.ll | 4 ++--
2007-03-24-InlineAsmPModifier.ll | 2 +-
2007-03-24-InlineAsmVectorOp.ll | 3 ++-
2007-03-24-InlineAsmXConstraint.ll | 2 +-
asm-global-imm.ll | 6 ++++--
commute-two-addr.ll | 3 ++-
dg.exp | 4 ++--
fabs.ll | 7 +++++--
fast-cc-callee-pops.ll | 3 ++-
fast-cc-merge-stack-adj.ll | 3 ++-
fast-cc-pass-in-regs.ll | 3 ++-
fastcall-correct-mangling.ll | 3 ++-
fp-immediate-shorten.ll | 3 ++-
fp-stack-compare.ll | 3 ++-
fp_constant_op.llx | 3 ++-
fp_load_fold.llx | 3 ++-
i128-ret.ll | 4 ++--
isel-sink.ll | 5 +++--
isnan.llx | 4 ++--
lea-2.ll | 6 ++++--
lea-3.ll | 4 ++--
loop-hoist.ll | 4 ++--
loop-strength-reduce.ll | 3 ++-
overlap-shift.ll | 3 ++-
regpressure.ll | 3 ++-
rem.ll | 1 -
rotate.ll | 3 ++-
shift-coalesce.ll | 6 ++++--
shift-codegen.ll | 3 ++-
shift-double.llx | 3 ++-
shift-folding.ll | 3 ++-
sse-fcopysign.ll | 3 +--
store_op_load_fold.ll | 2 +-
store_op_load_fold2.ll | 3 ++-
test-pic-1.ll | 11 ++++++-----
test-pic-4.ll | 13 +++++++------
vec_call.ll | 6 ++++--
x86-64-arg.ll | 2 +-
54 files changed, 131 insertions(+), 89 deletions(-)
Index: llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx
diff -u llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx:1.2 llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx:1.3
--- llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2003-11-03-GlobalBool.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep '.byte[[:space:]]*true'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: not grep {.byte\[\[:space:\]\]*true}
%X = global bool true
Index: llvm/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx
diff -u llvm/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx:1.4 llvm/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx:1.5
--- llvm/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '(%esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep {(%esp}
declare sbyte* %llvm.returnaddress(uint)
declare sbyte* %llvm.frameaddress(uint)
Index: llvm/test/CodeGen/X86/2004-03-30-Select-Max.llx
diff -u llvm/test/CodeGen/X86/2004-03-30-Select-Max.llx:1.2 llvm/test/CodeGen/X86/2004-03-30-Select-Max.llx:1.3
--- llvm/test/CodeGen/X86/2004-03-30-Select-Max.llx:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2004-03-30-Select-Max.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'j[lgbe]'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep {j\[lgbe\]}
int %max(int %A, int %B) {
%gt = setgt int %A, %B
Index: llvm/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx
diff -u llvm/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx:1.3 llvm/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx:1.4
--- llvm/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx Sun Apr 15 17:16:46 2007
@@ -2,7 +2,8 @@
; overlapping live intervals. When two overlapping intervals have the same
; value, they can be joined though.
;
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=linearscan | not grep 'mov %[A-Z]\{2,3\}, %[A-Z]\{2,3\}'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=linearscan | \
+; RUN: not grep {mov %\[A-Z\]\\\{2,3\\\}, %\[A-Z\]\\\{2,3\\\}}
long %test(long %x) {
entry:
Index: llvm/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
diff -u llvm/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll:1.2 llvm/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll:1.3
--- llvm/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'shld' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: grep shld | wc -l | grep 1
;
; Check that the isel does not fold the shld, which already folds a load
; and has two uses, into a store.
Index: llvm/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
diff -u llvm/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll:1.4 llvm/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll:1.5
--- llvm/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | \
+; RUN: grep {movl _last} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | \
+; RUN: grep {cmpl.*_last} | wc -l | grep 1
%block = external global ubyte* ; <ubyte**> [#uses=1]
%last = external global int ; <int*> [#uses=3]
Index: llvm/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll
diff -u llvm/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll:1.2 llvm/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll:1.3
--- llvm/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll Sun Apr 15 17:16:46 2007
@@ -1,7 +1,8 @@
; Coalescing from R32 to a subset R32_. Once another register coalescer bug is
; fixed, the movb should go away as well.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'movl' | wc -l
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | \
+; RUN: grep movl | wc -l
%B = external global uint
%C = external global ushort*
Index: llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll
diff -u llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll:1.8 llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll:1.9
--- llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll:1.8 Wed Apr 4 02:40:55 2007
+++ llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats 2>&1 |\
-; RUN: grep 'asm-printer' | grep 35
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats |&\
+; RUN: grep {asm-printer} | grep 35
target datalayout = "e-p:32:32"
define void @foo(i32* %mc, i32* %bp, i32* %ms, i32* %xmb, i32* %mpp, i32* %tpmm, i32* %ip, i32* %tpim, i32* %dpp, i32* %tpdm, i32* %bpi, i32 %M) {
Index: llvm/test/CodeGen/X86/2006-05-22-FPSetEQ.ll
diff -u llvm/test/CodeGen/X86/2006-05-22-FPSetEQ.ll:1.2 llvm/test/CodeGen/X86/2006-05-22-FPSetEQ.ll:1.3
--- llvm/test/CodeGen/X86/2006-05-22-FPSetEQ.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-05-22-FPSetEQ.ll Sun Apr 15 17:16:46 2007
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'setnp'
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-unsafe-fp-math | not grep 'setnp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep setnp
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-unsafe-fp-math | \
+; RUN: not grep setnp
uint %test(float %f) {
%tmp = seteq float %f, 0.000000e+00
Index: llvm/test/CodeGen/X86/2006-07-31-SingleRegClass.ll
diff -u llvm/test/CodeGen/X86/2006-07-31-SingleRegClass.ll:1.2 llvm/test/CodeGen/X86/2006-07-31-SingleRegClass.ll:1.3
--- llvm/test/CodeGen/X86/2006-07-31-SingleRegClass.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-07-31-SingleRegClass.ll Sun Apr 15 17:16:46 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 4(%eax),%ebp' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 0(%eax), %ebx'
-
; PR850
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | \
+; RUN: grep {movl 4(%eax),%ebp}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | \
+; RUN: grep {movl 0(%eax), %ebx}
int %foo(int %__s.i.i, int %tmp5.i.i, int %tmp6.i.i, int %tmp7.i.i, int %tmp8.i.i ) {
Index: llvm/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll
diff -u llvm/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll:1.3 llvm/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll:1.4
--- llvm/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | not grep 'movl %eax, %edx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | \
+; RUN: not grep {movl %eax, %edx}
int %foo(int %t, int %C) {
entry:
Index: llvm/test/CodeGen/X86/2006-11-12-CSRetCC.ll
diff -u llvm/test/CodeGen/X86/2006-11-12-CSRetCC.ll:1.3 llvm/test/CodeGen/X86/2006-11-12-CSRetCC.ll:1.4
--- llvm/test/CodeGen/X86/2006-11-12-CSRetCC.ll:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-11-12-CSRetCC.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'subl $4, %esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep {subl \$4, %esp}
target triple = "i686-pc-linux-gnu"
Index: llvm/test/CodeGen/X86/2006-11-17-IllegalMove.ll
diff -u llvm/test/CodeGen/X86/2006-11-17-IllegalMove.ll:1.2 llvm/test/CodeGen/X86/2006-11-17-IllegalMove.ll:1.3
--- llvm/test/CodeGen/X86/2006-11-17-IllegalMove.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/2006-11-17-IllegalMove.ll Sun Apr 15 17:16:46 2007
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | not grep 'movb %sil, %ah' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep 'movzbw %al, %ax'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | \
+; RUN: not grep {movb %sil, %ah}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | \
+; RUN: grep {movzbw %al, %ax}
void %handle_vector_size_attribute() {
entry:
Index: llvm/test/CodeGen/X86/2006-11-28-Memcpy.ll
diff -u llvm/test/CodeGen/X86/2006-11-28-Memcpy.ll:1.5 llvm/test/CodeGen/X86/2006-11-28-Memcpy.ll:1.6
--- llvm/test/CodeGen/X86/2006-11-28-Memcpy.ll:1.5 Mon Dec 4 14:09:02 2006
+++ llvm/test/CodeGen/X86/2006-11-28-Memcpy.ll Sun Apr 15 17:16:46 2007
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 3721182122 | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep -E 'movl _?bytes2' | wc -l | grep 1
-; PR1022, 1023
+; PR1022, PR1023
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: grep 3721182122 | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: grep -E {movl _?bytes2} | wc -l | grep 1
%fmt = constant [4 x sbyte] c"%x\0A\00"
%bytes = constant [4 x sbyte] c"\AA\BB\CC\DD"
Index: llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll
diff -u llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll:1.4 llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll:1.5
--- llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll:1.4 Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll Sun Apr 15 17:16:46 2007
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \
-; RUN: %prcontext 'mulss LCPI1_3' 1 | grep mulss | wc -l | grep 1
; PR1075
+; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \
+; RUN: %prcontext {mulss LCPI1_3} 1 | grep mulss | wc -l | grep 1
define float @foo(float %x) {
%tmp1 = mul float %x, 3.000000e+00
Index: llvm/test/CodeGen/X86/2007-02-04-OrAddrMode.ll
diff -u llvm/test/CodeGen/X86/2007-02-04-OrAddrMode.ll:1.2 llvm/test/CodeGen/X86/2007-02-04-OrAddrMode.ll:1.3
--- llvm/test/CodeGen/X86/2007-02-04-OrAddrMode.ll:1.2 Sun Feb 4 22:00:04 2007
+++ llvm/test/CodeGen/X86/2007-02-04-OrAddrMode.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'orl $1, %eax' &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 'leal 3(,%eax,8)'
+; RUN: llvm-as < %s | llc -march=x86 | grep {orl \$1, %eax}
+; RUN: llvm-as < %s | llc -march=x86 | grep {leal 3(,%eax,8)'
;; This example can't fold the or into an LEA.
define i32 @test(float ** %tmp2, i32 %tmp12) {
Index: llvm/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll
diff -u llvm/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll:1.3 llvm/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll:1.4
--- llvm/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll:1.3 Wed Apr 4 03:49:40 2007
+++ llvm/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-darwin | grep 'addl $12, %esp'
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-darwin | \
+; RUN: grep {addl \$12, %esp}
define void @foo(i8** %buf, i32 %size, i32 %col, i8* %p) {
entry:
Index: llvm/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll
diff -u llvm/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll:1.1 llvm/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll:1.2
--- llvm/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll:1.1 Sat Mar 24 20:44:40 2007
+++ llvm/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'mov %gs:72, %eax'
+; RUN: llvm-as < %s | llc -march=x86 | grep {mov %gs:72, %eax}
target datalayout = "e-p:32:32"
target triple = "i686-apple-darwin9"
Index: llvm/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll
diff -u llvm/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll:1.3 llvm/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll:1.4
--- llvm/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll:1.3 Mon Apr 2 15:39:48 2007
+++ llvm/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -mcpu=yonah -march=x86 | grep 'cmpltsd %xmm0, %xmm0'
+; RUN: llvm-as < %s | llc -mcpu=yonah -march=x86 | \
+; RUN: grep {cmpltsd %xmm0, %xmm0}
target datalayout = "e-p:32:32"
target triple = "i686-apple-darwin9"
Index: llvm/test/CodeGen/X86/2007-03-24-InlineAsmXConstraint.ll
diff -u llvm/test/CodeGen/X86/2007-03-24-InlineAsmXConstraint.ll:1.1 llvm/test/CodeGen/X86/2007-03-24-InlineAsmXConstraint.ll:1.2
--- llvm/test/CodeGen/X86/2007-03-24-InlineAsmXConstraint.ll:1.1 Sat Mar 24 23:35:23 2007
+++ llvm/test/CodeGen/X86/2007-03-24-InlineAsmXConstraint.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'psrlw $8, %xmm0'
+; RUN: llvm-as < %s | llc -march=x86 | grep {psrlw \$8, %xmm0}
target datalayout = "e-p:32:32"
target triple = "i686-apple-darwin9"
Index: llvm/test/CodeGen/X86/asm-global-imm.ll
diff -u llvm/test/CodeGen/X86/asm-global-imm.ll:1.2 llvm/test/CodeGen/X86/asm-global-imm.ll:1.3
--- llvm/test/CodeGen/X86/asm-global-imm.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/asm-global-imm.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test1 $_GV' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test2 _GV'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | \
+; RUN: grep {test1 \$_GV}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | \
+; RUN: grep {test2 _GV}
; PR882
target datalayout = "e-p:32:32"
Index: llvm/test/CodeGen/X86/commute-two-addr.ll
diff -u llvm/test/CodeGen/X86/commute-two-addr.ll:1.4 llvm/test/CodeGen/X86/commute-two-addr.ll:1.5
--- llvm/test/CodeGen/X86/commute-two-addr.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/commute-two-addr.ll Sun Apr 15 17:16:46 2007
@@ -2,7 +2,8 @@
; insertion of register-register copies.
; Make sure there are only 3 mov's for each testcase
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'mov ' | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {mov } | wc -l | grep 6
target triple = "i686-pc-linux-gnu"
Index: llvm/test/CodeGen/X86/dg.exp
diff -u llvm/test/CodeGen/X86/dg.exp:1.4 llvm/test/CodeGen/X86/dg.exp:1.5
--- llvm/test/CodeGen/X86/dg.exp:1.4 Wed Apr 11 14:56:58 2007
+++ llvm/test/CodeGen/X86/dg.exp Sun Apr 15 17:16:46 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/X86/fabs.ll
diff -u llvm/test/CodeGen/X86/fabs.ll:1.11 llvm/test/CodeGen/X86/fabs.ll:1.12
--- llvm/test/CodeGen/X86/fabs.ll:1.11 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/fabs.ll Sun Apr 15 17:16:46 2007
@@ -1,6 +1,9 @@
; Make sure this testcase codegens to the fabs instruction, not a call to fabsf
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep 'fabs$' | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math | grep 'fabs$' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | \
+; RUN: grep fabs\$ | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math | \
+; RUN: grep fabs\$ | wc -l | grep 2
target endian = little
target pointersize = 32
Index: llvm/test/CodeGen/X86/fast-cc-callee-pops.ll
diff -u llvm/test/CodeGen/X86/fast-cc-callee-pops.ll:1.8 llvm/test/CodeGen/X86/fast-cc-callee-pops.ll:1.9
--- llvm/test/CodeGen/X86/fast-cc-callee-pops.ll:1.8 Thu Mar 1 10:29:22 2007
+++ llvm/test/CodeGen/X86/fast-cc-callee-pops.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -mcpu=yonah | grep 'ret 20'
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -march=x86 -x86-asm-syntax=intel -mcpu=yonah | grep {ret 20}
; Check that a fastcc function pops its stack variables before returning.
Index: llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll
diff -u llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll:1.7 llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll:1.8
--- llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll:1.7 Wed Feb 28 12:38:58 2007
+++ llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'add ESP, 8'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {add ESP, 8}
target triple = "i686-pc-linux-gnu"
Index: llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll
diff -u llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll:1.7 llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll:1.8
--- llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll:1.7 Wed Feb 28 12:35:36 2007
+++ llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'mov EDX, 1'
+; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {mov EDX, 1}
; check that fastcc is passing stuff in regs.
declare x86_fastcallcc i64 @callee(i64)
Index: llvm/test/CodeGen/X86/fastcall-correct-mangling.ll
diff -u llvm/test/CodeGen/X86/fastcall-correct-mangling.ll:1.1 llvm/test/CodeGen/X86/fastcall-correct-mangling.ll:1.2
--- llvm/test/CodeGen/X86/fastcall-correct-mangling.ll:1.1 Thu Mar 1 10:29:22 2007
+++ llvm/test/CodeGen/X86/fastcall-correct-mangling.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=mingw32 | grep '@12'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=mingw32 | \
+; RUN: grep {@12}
; Check that a fastcall function gets correct mangling
Index: llvm/test/CodeGen/X86/fp-immediate-shorten.ll
diff -u llvm/test/CodeGen/X86/fp-immediate-shorten.ll:1.4 llvm/test/CodeGen/X86/fp-immediate-shorten.ll:1.5
--- llvm/test/CodeGen/X86/fp-immediate-shorten.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/fp-immediate-shorten.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,6 @@
;; Test that this FP immediate is stored in the constant pool as a float.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep '.long.1123418112'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | \
+; RUN: grep {.long.1123418112}
double %D() { ret double 123.0 }
Index: llvm/test/CodeGen/X86/fp-stack-compare.ll
diff -u llvm/test/CodeGen/X86/fp-stack-compare.ll:1.2 llvm/test/CodeGen/X86/fp-stack-compare.ll:1.3
--- llvm/test/CodeGen/X86/fp-stack-compare.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/fp-stack-compare.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | grep fucomi.*st.[12]
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | \
+; RUN: grep {fucomi.*st.\[12\]}
; PR1012
float %foo(float *%col.2.0) {
Index: llvm/test/CodeGen/X86/fp_constant_op.llx
diff -u llvm/test/CodeGen/X86/fp_constant_op.llx:1.3 llvm/test/CodeGen/X86/fp_constant_op.llx:1.4
--- llvm/test/CodeGen/X86/fp_constant_op.llx:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/fp_constant_op.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep ST | not grep {fadd\\|fsub\\|fdiv\\|fmul}
; Test that the load of the constant is folded into the operation.
Index: llvm/test/CodeGen/X86/fp_load_fold.llx
diff -u llvm/test/CodeGen/X86/fp_load_fold.llx:1.3 llvm/test/CodeGen/X86/fp_load_fold.llx:1.4
--- llvm/test/CodeGen/X86/fp_load_fold.llx:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/fp_load_fold.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep ST | not grep {fadd\\|fsub\\|fdiv\\|fmul}
; Test that the load of the memory location is folded into the operation.
Index: llvm/test/CodeGen/X86/i128-ret.ll
diff -u llvm/test/CodeGen/X86/i128-ret.ll:1.1 llvm/test/CodeGen/X86/i128-ret.ll:1.2
--- llvm/test/CodeGen/X86/i128-ret.ll:1.1 Sun Feb 25 00:06:49 2007
+++ llvm/test/CodeGen/X86/i128-ret.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86-64 | grep 'movq 8(%rdi), %rdx' &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep 'movq (%rdi), %rax'
+; RUN: llvm-as < %s | llc -march=x86-64 | grep {movq 8(%rdi), %rdx}
+; RUN: llvm-as < %s | llc -march=x86-64 | grep {movq (%rdi), %rax}
define i128 @test(i128 *%P) {
%A = load i128* %P
Index: llvm/test/CodeGen/X86/isel-sink.ll
diff -u llvm/test/CodeGen/X86/isel-sink.ll:1.1 llvm/test/CodeGen/X86/isel-sink.ll:1.2
--- llvm/test/CodeGen/X86/isel-sink.ll:1.1 Fri Apr 13 15:28:08 2007
+++ llvm/test/CodeGen/X86/isel-sink.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep lea &&
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 | grep 'movl $4, (%ecx,%eax,4)'
+; RUN: llvm-as < %s | llc -march=x86 | not grep lea
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 | \
+; RUN: grep {movl \$4, (%ecx,%eax,4)}
define i32 @test(i32* %X, i32 %B) {
; This gep should be sunk out of this block into the load/store users.
Index: llvm/test/CodeGen/X86/isnan.llx
diff -u llvm/test/CodeGen/X86/isnan.llx:1.3 llvm/test/CodeGen/X86/isnan.llx:1.4
--- llvm/test/CodeGen/X86/isnan.llx:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/isnan.llx Sun Apr 15 17:16:46 2007
@@ -1,7 +1,7 @@
; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep call
-declare bool %llvm.isunordered(double)
+declare bool %llvm.isunordered.f64(double)
bool %test_isnan(double %X) {
- %R = call bool %llvm.isunordered(double %X, double %X)
+ %R = call bool %llvm.isunordered.f64(double %X, double %X)
ret bool %R
}
Index: llvm/test/CodeGen/X86/lea-2.ll
diff -u llvm/test/CodeGen/X86/lea-2.ll:1.2 llvm/test/CodeGen/X86/lea-2.ll:1.3
--- llvm/test/CodeGen/X86/lea-2.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/lea-2.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'lea EAX, DWORD PTR \[... + 4\*... - 5\]' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep add
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {lea EAX, DWORD PTR \\\[... + 4\\*... - 5\\\]}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: not grep add
int %test1(int %A, int %B) {
%tmp1 = shl int %A, ubyte 2 ; <int> [#uses=1]
Index: llvm/test/CodeGen/X86/lea-3.ll
diff -u llvm/test/CodeGen/X86/lea-3.ll:1.2 llvm/test/CodeGen/X86/lea-3.ll:1.3
--- llvm/test/CodeGen/X86/lea-3.ll:1.2 Wed Mar 28 13:11:17 2007
+++ llvm/test/CodeGen/X86/lea-3.ll Sun Apr 15 17:16:46 2007
@@ -1,11 +1,11 @@
-; RUN: llvm-as < %s | llc -march=x86-64 | grep 'leal (%rdi,%rdi,2), %eax' &&
+; RUN: llvm-as < %s | llc -march=x86-64 | grep {leal (%rdi,%rdi,2), %eax}
define i32 @test(i32 %a) {
%tmp2 = mul i32 %a, 3 ; <i32> [#uses=1]
ret i32 %tmp2
}
-; RUN: llvm-as < %s | llc -march=x86-64 | grep 'leaq (,%rdi,4), %rax'
+; RUN: llvm-as < %s | llc -march=x86-64 | grep {leaq (,%rdi,4), %rax}
define i64 @test2(i64 %a) {
%tmp2 = shl i64 %a, 2
%tmp3 = or i64 %tmp2, %a
Index: llvm/test/CodeGen/X86/loop-hoist.ll
diff -u llvm/test/CodeGen/X86/loop-hoist.ll:1.6 llvm/test/CodeGen/X86/loop-hoist.ll:1.7
--- llvm/test/CodeGen/X86/loop-hoist.ll:1.6 Fri Jan 5 12:34:48 2007
+++ llvm/test/CodeGen/X86/loop-hoist.ll Sun Apr 15 17:16:46 2007
@@ -1,9 +1,9 @@
; RUN: llvm-upgrade < %s | llvm-as | \
; RUN: llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
-; RUN: grep L_Arr.non_lazy_ptr &&
+; RUN: grep L_Arr.non_lazy_ptr
; RUN: llvm-upgrade < %s | llvm-as | \
; RUN: llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
-; RUN: %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)'
+; RUN: %prcontext L_Arr.non_lazy_ptr 1 | grep {4(%esp)}
%Arr = external global [0 x int] ; <[0 x int]*> [#uses=2]
Index: llvm/test/CodeGen/X86/loop-strength-reduce.ll
diff -u llvm/test/CodeGen/X86/loop-strength-reduce.ll:1.4 llvm/test/CodeGen/X86/loop-strength-reduce.ll:1.5
--- llvm/test/CodeGen/X86/loop-strength-reduce.ll:1.4 Sun Dec 31 00:01:59 2006
+++ llvm/test/CodeGen/X86/loop-strength-reduce.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'A(' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: grep {A(} | wc -l | grep 1
;
; Make sure the common loop invariant _A(reg) is hoisted up to preheader.
Index: llvm/test/CodeGen/X86/overlap-shift.ll
diff -u llvm/test/CodeGen/X86/overlap-shift.ll:1.6 llvm/test/CodeGen/X86/overlap-shift.ll:1.7
--- llvm/test/CodeGen/X86/overlap-shift.ll:1.6 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/overlap-shift.ll Sun Apr 15 17:16:46 2007
@@ -6,7 +6,8 @@
; Check that the shift gets turned into an LEA.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: not grep {mov E.X, E.X}
%G = external global int
Index: llvm/test/CodeGen/X86/regpressure.ll
diff -u llvm/test/CodeGen/X86/regpressure.ll:1.4 llvm/test/CodeGen/X86/regpressure.ll:1.5
--- llvm/test/CodeGen/X86/regpressure.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/regpressure.ll Sun Apr 15 17:16:46 2007
@@ -1,7 +1,8 @@
;; Both functions in this testcase should codegen to the same function, and
;; neither of them should require spilling anything to the stack.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep 'Number of register spills'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& \
+; RUN: not grep {Number of register spills}
;; This can be compiled to use three registers if the loads are not
;; folded into the multiplies, 2 registers otherwise.
Index: llvm/test/CodeGen/X86/rem.ll
diff -u llvm/test/CodeGen/X86/rem.ll:1.2 llvm/test/CodeGen/X86/rem.ll:1.3
--- llvm/test/CodeGen/X86/rem.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/rem.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep div
int %test1(int %X) {
Index: llvm/test/CodeGen/X86/rotate.ll
diff -u llvm/test/CodeGen/X86/rotate.ll:1.4 llvm/test/CodeGen/X86/rotate.ll:1.5
--- llvm/test/CodeGen/X86/rotate.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/rotate.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ro[rl] | wc -l | grep 12
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {ro\[rl\]} | wc -l | grep 12
uint %rotl32(uint %A, ubyte %Amt) {
%B = shl uint %A, ubyte %Amt
Index: llvm/test/CodeGen/X86/shift-coalesce.ll
diff -u llvm/test/CodeGen/X86/shift-coalesce.ll:1.2 llvm/test/CodeGen/X86/shift-coalesce.ll:1.3
--- llvm/test/CodeGen/X86/shift-coalesce.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/shift-coalesce.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'shld.*CL' &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov CL, BL'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {shld.*CL}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: not grep {mov CL, BL}
; PR687
Index: llvm/test/CodeGen/X86/shift-codegen.ll
diff -u llvm/test/CodeGen/X86/shift-codegen.ll:1.2 llvm/test/CodeGen/X86/shift-codegen.ll:1.3
--- llvm/test/CodeGen/X86/shift-codegen.ll:1.2 Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/X86/shift-codegen.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -relocation-model=static -march=x86 | grep 'shll $3' | wc -l | grep 2
+; RUN: llvm-as < %s | llc -relocation-model=static -march=x86 | \
+; RUN: grep {shll \$3} | wc -l | grep 2
; This should produce two shll instructions, not any lea's.
Index: llvm/test/CodeGen/X86/shift-double.llx
diff -u llvm/test/CodeGen/X86/shift-double.llx:1.8 llvm/test/CodeGen/X86/shift-double.llx:1.9
--- llvm/test/CodeGen/X86/shift-double.llx:1.8 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/shift-double.llx Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep sh[lr]d | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {sh\[lr\]d} | wc -l | grep 5
long %test1(long %X, ubyte %C) {
%Y = shl long %X, ubyte %C
Index: llvm/test/CodeGen/X86/shift-folding.ll
diff -u llvm/test/CodeGen/X86/shift-folding.ll:1.3 llvm/test/CodeGen/X86/shift-folding.ll:1.4
--- llvm/test/CodeGen/X86/shift-folding.ll:1.3 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/shift-folding.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 's[ah][rl]l' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN: grep {s\[ah\]\[rl\]l} | wc -l | grep 1
int* %test1(int *%P, uint %X) {
%Y = shr uint %X, ubyte 2
Index: llvm/test/CodeGen/X86/sse-fcopysign.ll
diff -u llvm/test/CodeGen/X86/sse-fcopysign.ll:1.4 llvm/test/CodeGen/X86/sse-fcopysign.ll:1.5
--- llvm/test/CodeGen/X86/sse-fcopysign.ll:1.4 Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/sse-fcopysign.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not getp test
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep test
define float @test1(float %a, float %b) {
%tmp = tail call float @copysignf( float %b, float %a )
Index: llvm/test/CodeGen/X86/store_op_load_fold.ll
diff -u llvm/test/CodeGen/X86/store_op_load_fold.ll:1.4 llvm/test/CodeGen/X86/store_op_load_fold.ll:1.5
--- llvm/test/CodeGen/X86/store_op_load_fold.ll:1.4 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/store_op_load_fold.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'mov'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep mov
;
; Test the add and load are folded into the store instruction.
Index: llvm/test/CodeGen/X86/store_op_load_fold2.ll
diff -u llvm/test/CodeGen/X86/store_op_load_fold2.ll:1.6 llvm/test/CodeGen/X86/store_op_load_fold2.ll:1.7
--- llvm/test/CodeGen/X86/store_op_load_fold2.ll:1.6 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/store_op_load_fold2.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'and DWORD PTR' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
+; RUN: grep {and DWORD PTR} | wc -l | grep 2
target endian = little
target pointersize = 32
Index: llvm/test/CodeGen/X86/test-pic-1.ll
diff -u llvm/test/CodeGen/X86/test-pic-1.ll:1.2 llvm/test/CodeGen/X86/test-pic-1.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-1.ll:1.2 Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-1.ll Sun Apr 15 17:16:46 2007
@@ -1,8 +1,9 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOT | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 0
+; RUN: llvm-as < %s | \
+; RUN: llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep GOT %t | wc -l | grep 3
+; RUN: not grep GOTOFF %t | wc -l
@ptr = external global i32*
@dst = external global i32
Index: llvm/test/CodeGen/X86/test-pic-4.ll
diff -u llvm/test/CodeGen/X86/test-pic-4.ll:1.2 llvm/test/CodeGen/X86/test-pic-4.ll:1.3
--- llvm/test/CodeGen/X86/test-pic-4.ll:1.2 Fri Jan 26 02:25:06 2007
+++ llvm/test/CodeGen/X86/test-pic-4.ll Sun Apr 15 17:16:46 2007
@@ -1,9 +1,10 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep _GLOBAL_OFFSET_TABLE_ &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep "GOT" | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep "GOTOFF" | wc -l | grep 0
+; RUN: llvm-as < %s | \
+; RUN: llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f
+; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
+; RUN: grep piclabel %t | wc -l | grep 3
+; RUN: grep PLT %t | wc -l | grep 1
+; RUN: grep "GOT" %t | wc -l | grep 1
+; RUN: not grep "GOTOFF" %t
@pfoo = external global void(...)*
Index: llvm/test/CodeGen/X86/vec_call.ll
diff -u llvm/test/CodeGen/X86/vec_call.ll:1.2 llvm/test/CodeGen/X86/vec_call.ll:1.3
--- llvm/test/CodeGen/X86/vec_call.ll:1.2 Fri Dec 1 22:23:08 2006
+++ llvm/test/CodeGen/X86/vec_call.ll Sun Apr 15 17:16:46 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'subl.*60'
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'movdqa.*32'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN: grep {subl.*60}
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN: grep {movdqa.*32}
void %test() {
tail call void %xx( int 1, int 2, int 3, int 4, int 5, int 6, int 7, <2 x long> cast (<4 x int> < int 4, int 3, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 7, int 6, int 5 > to <2 x long>), <2 x long> cast (<4 x int> < int 6, int 4, int 2, int 0 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 4, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 0, int 1, int 3, int 9 > to <2 x long>) )
Index: llvm/test/CodeGen/X86/x86-64-arg.ll
diff -u llvm/test/CodeGen/X86/x86-64-arg.ll:1.2 llvm/test/CodeGen/X86/x86-64-arg.ll:1.3
--- llvm/test/CodeGen/X86/x86-64-arg.ll:1.2 Tue Mar 27 21:38:26 2007
+++ llvm/test/CodeGen/X86/x86-64-arg.ll Sun Apr 15 17:16:46 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc | grep 'movl %edi, %eax'
+; RUN: llvm-as < %s | llc | grep {movl %edi, %eax}
; The input value is already sign extended, don't re-extend it.
; This testcase corresponds to:
; int test(short X) { return (int)X; }
More information about the llvm-commits
mailing list