Changes in directory llvm/test/Assembler:
2002-04-07-HexFloatConstants.llx updated: 1.5 -> 1.6 2002-04-29-NameBinding.llx updated: 1.5 -> 1.6 2002-07-08-HugePerformanceProblem.llx updated: 1.5 -> 1.6 2003-11-12-ConstantExprCast.llx updated: 1.4 -> 1.5 2004-01-11-getelementptrfolding.llx updated: 1.2 -> 1.3 2004-11-28-InvalidTypeCrash.ll updated: 1.6 -> 1.7 2004-12-05-LocalGlobalSymtabConflict.ll updated: 1.3 -> 1.4 2004-12-06-ConstantFloatRange.ll updated: 1.5 -> 1.6 2005-01-03-FPConstantDisassembly.ll updated: 1.2 -> 1.3 2005-01-31-CallingAggregateFunction.ll updated: 1.3 -> 1.4 2006-05-26-VarargsCallEncode.ll updated: 1.3 -> 1.4 2007-01-01-Cast-To-Bool.ll updated: 1.1 -> 1.2 2007-01-12-Varargs-Upgrade.ll updated: 1.2 -> 1.3 2007-01-16-CrashOnBadCast.ll updated: 1.2 -> 1.3 2007-01-16-CrashOnBadCast2.ll updated: 1.2 -> 1.3 2007-01-27-UpgradePointers.ll updated: 1.1 -> 1.2 2007-02-01-UpgradeShift.ll updated: 1.1 -> 1.2 2007-03-14-UpgradeLocalSignless.ll updated: 1.1 -> 1.2 2007-03-19-NegValue.ll updated: 1.1 -> 1.2 dg.exp updated: 1.4 -> 1.5 --- Log message: For PR1319: http://llvm.org/PR1319 : Upgrade to new Tcl exec based test framework. This exposes three regressions in llvm-upgrade: test/Assembler/2002-08-19-BytecodeReader.llx test/Assembler/2003-08-21-ConstantExprCast-Fold.llx test/Assembler/2004-01-11-getelementptrfolding.llx --- Diffs of the changes: (+39 -34) 2002-04-07-HexFloatConstants.llx | 5 +++-- 2002-04-29-NameBinding.llx | 5 +++-- 2002-07-08-HugePerformanceProblem.llx | 3 ++- 2003-11-12-ConstantExprCast.llx | 2 +- 2004-01-11-getelementptrfolding.llx | 3 ++- 2004-11-28-InvalidTypeCrash.ll | 5 +++-- 2004-12-05-LocalGlobalSymtabConflict.ll | 3 ++- 2004-12-06-ConstantFloatRange.ll | 3 ++- 2005-01-03-FPConstantDisassembly.ll | 2 +- 2005-01-31-CallingAggregateFunction.ll | 2 +- 2006-05-26-VarargsCallEncode.ll | 2 +- 2007-01-01-Cast-To-Bool.ll | 2 +- 2007-01-12-Varargs-Upgrade.ll | 3 ++- 2007-01-16-CrashOnBadCast.ll | 3 +-- 2007-01-16-CrashOnBadCast2.ll | 3 +-- 2007-01-27-UpgradePointers.ll | 5 ++--- 2007-02-01-UpgradeShift.ll | 12 ++++++------ 2007-03-14-UpgradeLocalSignless.ll | 4 ++-- 2007-03-19-NegValue.ll | 2 +- dg.exp | 4 ++-- 20 files changed, 39 insertions(+), 34 deletions(-) Index: llvm/test/Assembler/2002-04-07-HexFloatConstants.llx diff -u llvm/test/Assembler/2002-04-07-HexFloatConstants.llx:1.5 llvm/test/Assembler/2002-04-07-HexFloatConstants.llx:1.6 --- llvm/test/Assembler/2002-04-07-HexFloatConstants.llx:1.5 Fri Dec 1 22:23:08 2006 +++ llvm/test/Assembler/2002-04-07-HexFloatConstants.llx Sun Apr 15 05:07:55 2007 @@ -5,8 +5,9 @@ ; of the bug that was causing the Olden Health benchmark to output incorrect ; results! ; -; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1 && \ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \ +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1 +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | \ +; RUN: llvm-dis > %t.2 ; RUN: diff %t.1 %t.2 implementation Index: llvm/test/Assembler/2002-04-29-NameBinding.llx diff -u llvm/test/Assembler/2002-04-29-NameBinding.llx:1.5 llvm/test/Assembler/2002-04-29-NameBinding.llx:1.6 --- llvm/test/Assembler/2002-04-29-NameBinding.llx:1.5 Fri Dec 1 22:23:08 2006 +++ llvm/test/Assembler/2002-04-29-NameBinding.llx Sun Apr 15 05:07:55 2007 @@ -4,14 +4,15 @@ ; Check by running globaldce, which will remove the constant if there are ; no references to it! ; -; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep constant +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | \ +; RUN: not grep constant ; %v1 = internal constant int 5 implementation -int "createtask"() +int "createtask"() begin %v1 = alloca int ;; Alloca should have one use! %reg112 = load int* %v1 ;; This load should not use the global! ret int %reg112 Index: llvm/test/Assembler/2002-07-08-HugePerformanceProblem.llx diff -u llvm/test/Assembler/2002-07-08-HugePerformanceProblem.llx:1.5 llvm/test/Assembler/2002-07-08-HugePerformanceProblem.llx:1.6 --- llvm/test/Assembler/2002-07-08-HugePerformanceProblem.llx:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/Assembler/2002-07-08-HugePerformanceProblem.llx Sun Apr 15 05:07:55 2007 @@ -1,6 +1,7 @@ ; This file takes about 48 __MINUTES__ to assemble using as. This is WAY too ; long. The type resolution code needs to be sped up a lot. -; RUN: ulimit -t 20; llvm-upgrade < %s | llvm-as +; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f +; END. %ALL_INTERSECTIONS_METHOD = type int (%OBJECT*, %RAY*, %ISTACK*)* %BBOX = type { %BBOX_VECT, %BBOX_VECT } Index: llvm/test/Assembler/2003-11-12-ConstantExprCast.llx diff -u llvm/test/Assembler/2003-11-12-ConstantExprCast.llx:1.4 llvm/test/Assembler/2003-11-12-ConstantExprCast.llx:1.5 --- llvm/test/Assembler/2003-11-12-ConstantExprCast.llx:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Assembler/2003-11-12-ConstantExprCast.llx Sun Apr 15 05:07:55 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep ' bitcast (' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep { bitcast (} %.Base64_1 = external constant [4 x sbyte] Index: llvm/test/Assembler/2004-01-11-getelementptrfolding.llx diff -u llvm/test/Assembler/2004-01-11-getelementptrfolding.llx:1.2 llvm/test/Assembler/2004-01-11-getelementptrfolding.llx:1.3 --- llvm/test/Assembler/2004-01-11-getelementptrfolding.llx:1.2 Fri Dec 1 22:23:08 2006 +++ llvm/test/Assembler/2004-01-11-getelementptrfolding.llx Sun Apr 15 05:07:55 2007 @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep 'getelementptr.*getelementptr' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ +; RUN: not grep {getelementptr.*getelementptr} %struct.TUVVertex = type { short, short, short, short } %struct.TTriangleItem = type { sbyte*, sbyte*, [3 x %struct.TUVVertex] } Index: llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll diff -u llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.6 llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.7 --- llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.6 Mon Feb 5 04:17:51 2007 +++ llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,5 @@ -; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \ -; RUN: grep 'Cannot create a null initialized value of this type' ; Test for PR463. This program is erroneous, but should not crash llvm-as. +; RUN: ignore llvm-as < %s -o /dev/null -f |& \ +; RUN: grep {Cannot create a null initialized value of this type} + @.FOO = internal global %struct.none zeroinitializer Index: llvm/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll diff -u llvm/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll:1.3 llvm/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll:1.4 --- llvm/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll:1.3 Fri Dec 1 22:23:08 2006 +++ llvm/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep '%G = alloca int' +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \ +; RUN: not grep {%G = alloca int} ; In this testcase, %bar stores to the global G. Make sure that inlining does ; not cause it to store to the G in main instead. Index: llvm/test/Assembler/2004-12-06-ConstantFloatRange.ll diff -u llvm/test/Assembler/2004-12-06-ConstantFloatRange.ll:1.5 llvm/test/Assembler/2004-12-06-ConstantFloatRange.ll:1.6 --- llvm/test/Assembler/2004-12-06-ConstantFloatRange.ll:1.5 Sat Dec 2 14:34:08 2006 +++ llvm/test/Assembler/2004-12-06-ConstantFloatRange.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "constant invalid for type" +; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f |& \ +; RUN: grep {constant invalid for type} ; XFAIL: * ;; This is a testcase for PR409 Index: llvm/test/Assembler/2005-01-03-FPConstantDisassembly.ll diff -u llvm/test/Assembler/2005-01-03-FPConstantDisassembly.ll:1.2 llvm/test/Assembler/2005-01-03-FPConstantDisassembly.ll:1.3 --- llvm/test/Assembler/2005-01-03-FPConstantDisassembly.ll:1.2 Fri Dec 1 22:23:08 2006 +++ llvm/test/Assembler/2005-01-03-FPConstantDisassembly.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep '1.0' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 1.0 double %test() { ret double 1.0 ;; This should not require hex notation Index: llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll diff -u llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.3 llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.4 --- llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.3 Fri Jan 26 02:25:05 2007 +++ llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \ +; RUN: ignore llvm-as < %s -o /dev/null -f |& \ ; RUN: grep "LLVM functions cannot return aggregate types" define void @test() { Index: llvm/test/Assembler/2006-05-26-VarargsCallEncode.ll diff -u llvm/test/Assembler/2006-05-26-VarargsCallEncode.ll:1.3 llvm/test/Assembler/2006-05-26-VarargsCallEncode.ll:1.4 --- llvm/test/Assembler/2006-05-26-VarargsCallEncode.ll:1.3 Sun Jan 28 23:40:02 2007 +++ llvm/test/Assembler/2006-05-26-VarargsCallEncode.ll Sun Apr 15 05:07:55 2007 @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep 'tail call void ({ }\* sret' +; RUN: grep {tail call void (\{ \}\\* sret} declare csretcc void %foo({}*, ...) Index: llvm/test/Assembler/2007-01-01-Cast-To-Bool.ll diff -u llvm/test/Assembler/2007-01-01-Cast-To-Bool.ll:1.1 llvm/test/Assembler/2007-01-01-Cast-To-Bool.ll:1.2 --- llvm/test/Assembler/2007-01-01-Cast-To-Bool.ll:1.1 Mon Jan 1 23:48:32 2007 +++ llvm/test/Assembler/2007-01-01-Cast-To-Bool.ll Sun Apr 15 05:07:55 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'icmp ne' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep {icmp ne} bool %main(int %X) { %res = cast bool true to bool ret bool %res Index: llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll diff -u llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.2 llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.3 --- llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.2 Fri Jan 26 02:25:05 2007 +++ llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll Sun Apr 15 05:07:55 2007 @@ -1,7 +1,8 @@ ; For PR1093: This test checks that llvm-upgrade correctly translates ; the llvm.va_* intrinsics to their cannonical argument form (i8*). ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep ' bitcast' | wc -l | grep 5 +; RUN: grep { bitcast} | wc -l | grep 5 + %str = internal constant [7 x ubyte] c"%d %d\0A\00" ; <[7 x ubyte]*> [#uses=1] implementation ; Functions: Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.2 llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.3 --- llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.2 Fri Jan 26 02:25:05 2007 +++ llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll Sun Apr 15 05:07:55 2007 @@ -1,6 +1,5 @@ ; PR1117 -; RUN: llvm-as < %s 2>&1 > /dev/null | \ -; RUN: grep "invalid cast opcode for cast from" +; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from" define i8* @nada(i64 %X) { %result = trunc i64 %X to i8* Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.2 llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.3 --- llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.2 Fri Jan 26 02:25:05 2007 +++ llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll Sun Apr 15 05:07:55 2007 @@ -1,5 +1,4 @@ ; PR1117 -; RUN: llvm-as < %s 2>&1 > /dev/null | \ -; RUN: grep "invalid cast opcode for cast from" +; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from" @X = constant i8* trunc (i64 0 to i8*) Index: llvm/test/Assembler/2007-01-27-UpgradePointers.ll diff -u llvm/test/Assembler/2007-01-27-UpgradePointers.ll:1.1 llvm/test/Assembler/2007-01-27-UpgradePointers.ll:1.2 --- llvm/test/Assembler/2007-01-27-UpgradePointers.ll:1.1 Sat Jan 27 18:45:28 2007 +++ llvm/test/Assembler/2007-01-27-UpgradePointers.ll Sun Apr 15 05:07:55 2007 @@ -1,7 +1,6 @@ ; PR1137 -; RUN: llvm-upgrade < %s && -; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f && -; RUN: llvm-upgrade < %s | grep 'tmp = alloca' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f +; RUN: llvm-upgrade < %s | grep {tmp = alloca} | wc -l | grep 1 ; target datalayout = "e-p:32:32" target endian = little Index: llvm/test/Assembler/2007-02-01-UpgradeShift.ll diff -u llvm/test/Assembler/2007-02-01-UpgradeShift.ll:1.1 llvm/test/Assembler/2007-02-01-UpgradeShift.ll:1.2 --- llvm/test/Assembler/2007-02-01-UpgradeShift.ll:1.1 Thu Feb 1 20:16:22 2007 +++ llvm/test/Assembler/2007-02-01-UpgradeShift.ll Sun Apr 15 05:07:55 2007 @@ -1,11 +1,11 @@ ; Test that upgrading shift instructions and constant expressions works ; correctly. -; RUN: llvm-upgrade < %s | grep 'ashr i32 .X, 2' && -; RUN: llvm-upgrade < %s | grep 'lshr i32 .X, 2' && -; RUN: llvm-upgrade < %s | grep 'shl i32 .X, 2' && -; RUN: llvm-upgrade < %s | grep 'ashr i32 .X, 6' && -; RUN: llvm-upgrade < %s | grep 'lshr i32 .X, 1' && -; RUN: llvm-upgrade < %s | grep 'shl i32 .X, 1' +; RUN: llvm-upgrade < %s | grep {ashr i32 .X, 2} +; RUN: llvm-upgrade < %s | grep {lshr i32 .X, 2} +; RUN: llvm-upgrade < %s | grep {shl i32 .X, 2} +; RUN: llvm-upgrade < %s | grep {ashr i32 .X, 6} +; RUN: llvm-upgrade < %s | grep {lshr i32 .X, 1} +; RUN: llvm-upgrade < %s | grep {shl i32 .X, 1} void %test(int %X) { %A = ashr int %X, ubyte 2 Index: llvm/test/Assembler/2007-03-14-UpgradeLocalSignless.ll diff -u llvm/test/Assembler/2007-03-14-UpgradeLocalSignless.ll:1.1 llvm/test/Assembler/2007-03-14-UpgradeLocalSignless.ll:1.2 --- llvm/test/Assembler/2007-03-14-UpgradeLocalSignless.ll:1.1 Wed Mar 14 18:07:24 2007 +++ llvm/test/Assembler/2007-03-14-UpgradeLocalSignless.ll Sun Apr 15 05:07:55 2007 @@ -1,6 +1,6 @@ ; PR1256 -; RUN: llvm-upgrade < %s | grep 'call void @f( i32 .tmp )' -; RUN: llvm-upgrade < %s | grep 'call void @g( i8 .tmp\.upgrd\.2 )' +; RUN: llvm-upgrade < %s | grep {call void @f( i32 .tmp )} +; RUN: llvm-upgrade < %s | grep {call void @g( i8 .tmp\.upgrd\.2 )} target datalayout = "e-p:32:32" target endian = little Index: llvm/test/Assembler/2007-03-19-NegValue.ll diff -u llvm/test/Assembler/2007-03-19-NegValue.ll:1.1 llvm/test/Assembler/2007-03-19-NegValue.ll:1.2 --- llvm/test/Assembler/2007-03-19-NegValue.ll:1.1 Mon Mar 19 15:35:26 2007 +++ llvm/test/Assembler/2007-03-19-NegValue.ll Sun Apr 15 05:07:55 2007 @@ -1,5 +1,5 @@ ; Test whether negative values > 64 bits retain their negativeness. -; RUN: llvm-as < %s | llvm-dis | grep 'add i65.*, -1' +; RUN: llvm-as < %s | llvm-dis | grep {add i65.*, -1} define i65 @testConsts(i65 %N) { %a = add i65 %N, -1 Index: llvm/test/Assembler/dg.exp diff -u llvm/test/Assembler/dg.exp:1.4 llvm/test/Assembler/dg.exp:1.5 --- llvm/test/Assembler/dg.exp:1.4 Wed Apr 11 14:56:57 2007 +++ llvm/test/Assembler/dg.exp Sun Apr 15 05:07:55 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}]] _______________________________________________ llvm-commits mailing list [EMAIL PROTECTED] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits