Changes in directory llvm/test/CodeGen/Alpha:
add.ll updated: 1.8 -> 1.9 bic.ll updated: 1.3 -> 1.4 bsr.ll updated: 1.4 -> 1.5 ctlz.ll updated: 1.6 -> 1.7 ctlz_e.ll updated: 1.2 -> 1.3 ctpop.ll updated: 1.7 -> 1.8 dg.exp updated: 1.3 -> 1.4 eqv.ll updated: 1.3 -> 1.4 i32_sub_1.ll updated: 1.6 -> 1.7 jmp_table.ll updated: 1.6 -> 1.7 mul5.ll updated: 1.5 -> 1.6 neg1.ll updated: 1.4 -> 1.5 not.ll updated: 1.3 -> 1.4 ornot.ll updated: 1.3 -> 1.4 srl_and.ll updated: 1.2 -> 1.3 zapnot.ll updated: 1.6 -> 1.7 zapnot2.ll updated: 1.4 -> 1.5 --- Log message: For PR1319: http://llvm.org/PR1319 : Upgrade to use new test harness --- Diffs of the changes: (+54 -50) add.ll | 28 ++++++++++++++-------------- bic.ll | 2 +- bsr.ll | 2 +- ctlz.ll | 20 +++++++++----------- ctlz_e.ll | 2 +- ctpop.ll | 15 +++++++++------ dg.exp | 4 ++-- eqv.ll | 2 +- i32_sub_1.ll | 2 +- jmp_table.ll | 12 +++++++----- mul5.ll | 3 ++- neg1.ll | 2 +- not.ll | 2 +- ornot.ll | 2 +- srl_and.ll | 2 +- zapnot.ll | 2 +- zapnot2.ll | 2 +- 17 files changed, 54 insertions(+), 50 deletions(-) Index: llvm/test/CodeGen/Alpha/add.ll diff -u llvm/test/CodeGen/Alpha/add.ll:1.8 llvm/test/CodeGen/Alpha/add.ll:1.9 --- llvm/test/CodeGen/Alpha/add.ll:1.8 Tue Mar 27 21:38:26 2007 +++ llvm/test/CodeGen/Alpha/add.ll Sun Apr 15 13:40:57 2007 @@ -1,21 +1,21 @@ ;test all the shifted and signextending adds and subs with and without consts ; -; RUN: llvm-as < %s | llc -march=alpha -o %t.s -f && -; RUN: grep ' addl' %t.s | wc -l | grep 2 && -; RUN: grep ' addq' %t.s | wc -l | grep 2 && -; RUN: grep ' subl' %t.s | wc -l | grep 2 && -; RUN: grep ' subq' %t.s | wc -l | grep 1 && +; RUN: llvm-as < %s | llc -march=alpha -o %t.s -f +; RUN: grep { addl} %t.s | wc -l | grep 2 +; RUN: grep { addq} %t.s | wc -l | grep 2 +; RUN: grep { subl} %t.s | wc -l | grep 2 +; RUN: grep { subq} %t.s | wc -l | grep 1 ; -; RUN: grep 'lda $0,-100($16)' %t.s | wc -l | grep 1 && -; RUN: grep 's4addl' %t.s | wc -l | grep 2 && -; RUN: grep 's8addl' %t.s | wc -l | grep 2 && -; RUN: grep 's4addq' %t.s | wc -l | grep 2 && -; RUN: grep 's8addq' %t.s | wc -l | grep 2 && +; RUN: grep {lda \$0,-100(\$16)} %t.s | wc -l | grep 1 +; RUN: grep {s4addl} %t.s | wc -l | grep 2 +; RUN: grep {s8addl} %t.s | wc -l | grep 2 +; RUN: grep {s4addq} %t.s | wc -l | grep 2 +; RUN: grep {s8addq} %t.s | wc -l | grep 2 ; -; RUN: grep 's4subl' %t.s | wc -l | grep 2 && -; RUN: grep 's8subl' %t.s | wc -l | grep 2 && -; RUN: grep 's4subq' %t.s | wc -l | grep 2 && -; RUN: grep 's8subq' %t.s | wc -l | grep 2 +; RUN: grep {s4subl} %t.s | wc -l | grep 2 +; RUN: grep {s8subl} %t.s | wc -l | grep 2 +; RUN: grep {s4subq} %t.s | wc -l | grep 2 +; RUN: grep {s8subq} %t.s | wc -l | grep 2 define i32 @al(i32 sext %x.s, i32 sext %y.s) sext { Index: llvm/test/CodeGen/Alpha/bic.ll diff -u llvm/test/CodeGen/Alpha/bic.ll:1.3 llvm/test/CodeGen/Alpha/bic.ll:1.4 --- llvm/test/CodeGen/Alpha/bic.ll:1.3 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/bic.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the bic instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bic' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep {bic} implementation ; Functions: Index: llvm/test/CodeGen/Alpha/bsr.ll diff -u llvm/test/CodeGen/Alpha/bsr.ll:1.4 llvm/test/CodeGen/Alpha/bsr.ll:1.5 --- llvm/test/CodeGen/Alpha/bsr.ll:1.4 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/bsr.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens the bsr instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bsr' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep bsr implementation Index: llvm/test/CodeGen/Alpha/ctlz.ll diff -u llvm/test/CodeGen/Alpha/ctlz.ll:1.6 llvm/test/CodeGen/Alpha/ctlz.ll:1.7 --- llvm/test/CodeGen/Alpha/ctlz.ll:1.6 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/ctlz.ll Sun Apr 15 13:40:57 2007 @@ -1,16 +1,14 @@ ; Make sure this testcase codegens to the ctlz instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctlz' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctlz' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctlz' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctlz' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctlz' +; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev67 | grep -i ctlz +; RUN: llvm-as < %s | llc -march=alpha -mattr=+CIX | grep -i ctlz +; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev6 | not grep -i ctlz +; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev56 | not grep -i ctlz +; RUN: llvm-as < %s | llc -march=alpha -mattr=-CIX | not grep -i ctlz -declare ubyte %llvm.ctlz(ubyte) +declare i32 @llvm.ctlz.i8(i8) -implementation ; Functions: - -ubyte %bar(ubyte %x) { +define i32 @bar(i8 %x) { entry: - %tmp.1 = call ubyte %llvm.ctlz( ubyte %x ) - ret ubyte %tmp.1 + %tmp.1 = call i32 @llvm.ctlz.i8( i8 %x ) + ret i32 %tmp.1 } Index: llvm/test/CodeGen/Alpha/ctlz_e.ll diff -u llvm/test/CodeGen/Alpha/ctlz_e.ll:1.2 llvm/test/CodeGen/Alpha/ctlz_e.ll:1.3 --- llvm/test/CodeGen/Alpha/ctlz_e.ll:1.2 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/ctlz_e.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase does not use ctpop -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'ctpop' |wc -l |grep 0 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | not grep -i ctpop declare ulong %llvm.ctlz(ulong) Index: llvm/test/CodeGen/Alpha/ctpop.ll diff -u llvm/test/CodeGen/Alpha/ctpop.ll:1.7 llvm/test/CodeGen/Alpha/ctpop.ll:1.8 --- llvm/test/CodeGen/Alpha/ctpop.ll:1.7 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/ctpop.ll Sun Apr 15 13:40:57 2007 @@ -1,10 +1,13 @@ ; Make sure this testcase codegens to the ctpop instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctpop' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctpop' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctpop' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctpop' -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctpop' - +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i ctpop +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | \ +; RUN: grep -i ctpop +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | \ +; RUN: not grep -i ctpop +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | \ +; RUN: not grep -i ctpop +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | \ +; RUN: not grep -i 'ctpop' declare long %llvm.ctpop(long) Index: llvm/test/CodeGen/Alpha/dg.exp diff -u llvm/test/CodeGen/Alpha/dg.exp:1.3 llvm/test/CodeGen/Alpha/dg.exp:1.4 --- llvm/test/CodeGen/Alpha/dg.exp:1.3 Wed Apr 11 14:56:57 2007 +++ llvm/test/CodeGen/Alpha/dg.exp Sun Apr 15 13:40:57 2007 @@ -1,3 +1,3 @@ -load_lib llvm-dg.exp +load_lib llvm.exp -llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] +RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] Index: llvm/test/CodeGen/Alpha/eqv.ll diff -u llvm/test/CodeGen/Alpha/eqv.ll:1.3 llvm/test/CodeGen/Alpha/eqv.ll:1.4 --- llvm/test/CodeGen/Alpha/eqv.ll:1.3 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/eqv.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the eqv instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep eqv implementation ; Functions: Index: llvm/test/CodeGen/Alpha/i32_sub_1.ll diff -u llvm/test/CodeGen/Alpha/i32_sub_1.ll:1.6 llvm/test/CodeGen/Alpha/i32_sub_1.ll:1.7 --- llvm/test/CodeGen/Alpha/i32_sub_1.ll:1.6 Tue Mar 27 21:38:26 2007 +++ llvm/test/CodeGen/Alpha/i32_sub_1.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ctpop instruction -; RUN: llvm-as < %s | llc -march=alpha | grep -i 'subl $16,1,$0' +; RUN: llvm-as < %s | llc -march=alpha | grep -i {subl \$16,1,\$0} define i32 @foo(i32 sext %x) sext { Index: llvm/test/CodeGen/Alpha/jmp_table.ll diff -u llvm/test/CodeGen/Alpha/jmp_table.ll:1.6 llvm/test/CodeGen/Alpha/jmp_table.ll:1.7 --- llvm/test/CodeGen/Alpha/jmp_table.ll:1.6 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/jmp_table.ll Sun Apr 15 13:40:57 2007 @@ -1,8 +1,10 @@ -; try to check that we have the most important instructions, which shouldn't appear otherwise -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'jmp' && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'gprel32' && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ldl' && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'rodata' +; try to check that we have the most important instructions, which shouldn't +; appear otherwise +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep jmp +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep gprel32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ldl +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep rodata +; END. target endian = little target pointersize = 64 Index: llvm/test/CodeGen/Alpha/mul5.ll diff -u llvm/test/CodeGen/Alpha/mul5.ll:1.5 llvm/test/CodeGen/Alpha/mul5.ll:1.6 --- llvm/test/CodeGen/Alpha/mul5.ll:1.5 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/mul5.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,6 @@ ; Make sure this testcase does not use mulq -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'mul' |wc -l |grep 0 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | \ +; RUN: not grep -i mul implementation ; Functions: Index: llvm/test/CodeGen/Alpha/neg1.ll diff -u llvm/test/CodeGen/Alpha/neg1.ll:1.4 llvm/test/CodeGen/Alpha/neg1.ll:1.5 --- llvm/test/CodeGen/Alpha/neg1.ll:1.4 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/neg1.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the lda -1 instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '\-1' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep {\\-1} implementation ; Functions: Index: llvm/test/CodeGen/Alpha/not.ll diff -u llvm/test/CodeGen/Alpha/not.ll:1.3 llvm/test/CodeGen/Alpha/not.ll:1.4 --- llvm/test/CodeGen/Alpha/not.ll:1.3 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/not.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ornot instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep eqv implementation ; Functions: Index: llvm/test/CodeGen/Alpha/ornot.ll diff -u llvm/test/CodeGen/Alpha/ornot.ll:1.3 llvm/test/CodeGen/Alpha/ornot.ll:1.4 --- llvm/test/CodeGen/Alpha/ornot.ll:1.3 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/ornot.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ornot instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ornot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ornot implementation ; Functions: Index: llvm/test/CodeGen/Alpha/srl_and.ll diff -u llvm/test/CodeGen/Alpha/srl_and.ll:1.2 llvm/test/CodeGen/Alpha/srl_and.ll:1.3 --- llvm/test/CodeGen/Alpha/srl_and.ll:1.2 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/srl_and.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the zapnot instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot ulong %foo(ulong %y) { entry: Index: llvm/test/CodeGen/Alpha/zapnot.ll diff -u llvm/test/CodeGen/Alpha/zapnot.ll:1.6 llvm/test/CodeGen/Alpha/zapnot.ll:1.7 --- llvm/test/CodeGen/Alpha/zapnot.ll:1.6 Tue Mar 27 21:38:26 2007 +++ llvm/test/CodeGen/Alpha/zapnot.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the bic instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot' +; RUN: llvm-as < %s | llc -march=alpha | grep zapnot define i16 @foo(i64 %y) zext { Index: llvm/test/CodeGen/Alpha/zapnot2.ll diff -u llvm/test/CodeGen/Alpha/zapnot2.ll:1.4 llvm/test/CodeGen/Alpha/zapnot2.ll:1.5 --- llvm/test/CodeGen/Alpha/zapnot2.ll:1.4 Fri Dec 1 22:23:08 2006 +++ llvm/test/CodeGen/Alpha/zapnot2.ll Sun Apr 15 13:40:57 2007 @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the zapnot instruction -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot implementation ; Functions: _______________________________________________ llvm-commits mailing list [EMAIL PROTECTED] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits