For PR1319:

Upgrade to use new Tcl exec based test harness. This exposes 3 bugs that
were previously not being reported:
test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
test/Transforms/GlobalOpt/memset.ll
test/Transforms/IndVarsSimplify/exit_value_tests.llx

llvm-svn: 36065

29 files changed, 29 insertions, 37 deletions

diff --git a/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll b/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
index c31a421d0e5..231bdb95cd7 100644
--- a/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
@@ -2,7 +2,8 @@
 ; this is in fact NOT the case, so the return should still be alive in the code
 ; after sccp and CFG simplification have been performed.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | \
+; RUN:   grep ret
 
 
 void "old_main"() {
diff --git a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
index dad9c7e70d6..1577685717b 100644
--- a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
+++ b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep '%X'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep %X
 
 %G = uninitialized global [40x int]
 
diff --git a/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll b/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
index bf33950e34d..fd4713a31ed 100644
--- a/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
+++ b/llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | not grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | \
+; RUN:   not grep then:
 
 void %cprop_test11(int* %data.1) {
 entry:		; No predecessors!
diff --git a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
index 52cda01e165..c662e0f711b 100644
--- a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
+++ b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret i32 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep {ret i32 1}
 
 ; This function definitely returns 1, even if we don't know the direction
 ; of the branch.
diff --git a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
index 579276cbd65..4868c30783e 100644
--- a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
@@ -2,6 +2,7 @@
 ; SCCP ignores VectorTypes until PR 1034 is fixed
 ;
 ; RUN: llvm-upgrade < %s | llvm-as | opt -sccp 
+; END.
 target datalayout = "E-p:32:32"
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
index e991818b6c9..3cc61f716b4 100644
--- a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | \
-; RUN:   grep 'ret i1 false'
+; RUN:   grep {ret i1 false}
 
 bool %foo() {
 	%X = and bool false, undef
diff --git a/llvm/test/Transforms/SCCP/apint-array.ll b/llvm/test/Transforms/SCCP/apint-array.ll
index b9fe68cb6e8..ead3f6ab9a6 100644
--- a/llvm/test/Transforms/SCCP/apint-array.ll
+++ b/llvm/test/Transforms/SCCP/apint-array.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret i101 12'
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i101 12}
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,i101 
 -123456789000000, i101 0,i101 9123456789000000]
diff --git a/llvm/test/Transforms/SCCP/apint-basictest.ll b/llvm/test/Transforms/SCCP/apint-basictest.ll
index eaffc1daa3b..12f8326a737 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest.ll
@@ -1,7 +1,6 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
 
 define i128 @test(i1 %B) {
diff --git a/llvm/test/Transforms/SCCP/apint-basictest2.ll b/llvm/test/Transforms/SCCP/apint-basictest2.ll
index 7b6890b90ba..7db4e362eb4 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest2.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest2.ll
@@ -1,7 +1,6 @@
 ; This is a basic sanity check for constant propogation.  The add instruction 
 ; and phi instruction should be eliminated.
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep phi
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add
 
diff --git a/llvm/test/Transforms/SCCP/apint-basictest3.ll b/llvm/test/Transforms/SCCP/apint-basictest3.ll
index 144f646fe08..6e86764bf2c 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest3.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest3.ll
@@ -2,7 +2,6 @@
 ; arithmatic operations.
 
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep mul
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep umod
 
@@ -16,7 +15,7 @@ BB1:
 BB2:
         %f1 = udiv i128 -1, 1
         %f2 = add i128 %f1, 1
-        %f3 = umod i128 %f2, 2121
+        %f3 = urem i128 %f2, 2121
 	br label %BB3
 BB3:
 	%Ret = phi i128 [%t3, %BB1], [%f3, %BB2]
diff --git a/llvm/test/Transforms/SCCP/apint-basictest4.ll b/llvm/test/Transforms/SCCP/apint-basictest4.ll
index e6139c5e094..a90bd7d7315 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest4.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest4.ll
@@ -2,10 +2,9 @@
 ; logic operations.
 
 
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep and
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep trunc
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep "ret i100 -1"
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep {ret i100 -1}
 
 define i100 @test(i133 %A) {
         %B = and i133 0, %A
diff --git a/llvm/test/Transforms/SCCP/apint-bigarray.ll b/llvm/test/Transforms/SCCP/apint-bigarray.ll
index b7c6d995860..5cd1107a7a4 100644
--- a/llvm/test/Transforms/SCCP/apint-bigarray.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigarray.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
-; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep '%X'
+; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep %X
 
 @G =  global [1000000 x i10000] zeroinitializer
 
diff --git a/llvm/test/Transforms/SCCP/apint-bigint.ll b/llvm/test/Transforms/SCCP/apint-bigint.ll
index 163138c6c1b..ebb0d0760f2 100644
--- a/llvm/test/Transforms/SCCP/apint-bigint.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigint.ll
@@ -1,4 +1,3 @@
-; RUN:  llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN:  llvm-as < %s | opt -sccp | llvm-dis | not grep xor
 
 define i11129 @test1() {
diff --git a/llvm/test/Transforms/SCCP/apint-bigint2.ll b/llvm/test/Transforms/SCCP/apint-bigint2.ll
index 73d3b546ffb..e95e9d0abb1 100644
--- a/llvm/test/Transforms/SCCP/apint-bigint2.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigint2.ll
@@ -1,4 +1,3 @@
-; RUN:  llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN:  llvm-as < %s | opt -sccp | llvm-dis | not grep load
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
index 348725e9058..59cfa3f7a2f 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret i512 undef' | grep 'ret i8 2'
+; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v {ret i512 undef} | \
+; RUN:   grep {ret i8 2}
 
 define internal i512 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
index 77fb6968258..65e5ee7e89e 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
@@ -1,7 +1,5 @@
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis -o /dev/null -f &&
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret i101 0' | \
-; RUN:    grep -v 'ret i101 undef' | not grep ret
-
+; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v {ret i101 0} | \
+; RUN:    grep -v {ret i101 undef} | not grep ret
 
 
 define internal i101 @bar(i101 %A) {
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp3.ll b/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
index eef5fa83c96..c07a54f8f6f 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
@@ -1,4 +1,3 @@
-; RUN:  llvm-as < %s | opt -ipsccp | llvm-dis -o /dev/null -f &&
 ; RUN:  llvm-as < %s | opt -ipsccp | llvm-dis | not grep global
 
 @G = internal global i66 undef
diff --git a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
index 67d99e4c34d..de355d1d50e 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
@@ -1,7 +1,5 @@
 ; This test makes sure that these instructions are properly constant propagated.
-;
 
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep load
 ; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep add
 ; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep phi
diff --git a/llvm/test/Transforms/SCCP/apint-load.ll b/llvm/test/Transforms/SCCP/apint-load.ll
index b9432362056..b353a0b09ab 100644
--- a/llvm/test/Transforms/SCCP/apint-load.ll
+++ b/llvm/test/Transforms/SCCP/apint-load.ll
@@ -1,7 +1,5 @@
 ; This test makes sure that these instructions are properly constant propagated.
-;
 
-; RUN: llvm-as < %s | opt -ipsccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep load
 ; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep fdiv
 
diff --git a/llvm/test/Transforms/SCCP/apint-phi.ll b/llvm/test/Transforms/SCCP/apint-phi.ll
index 899d8a92bae..77f6bc86926 100644
--- a/llvm/test/Transforms/SCCP/apint-phi.ll
+++ b/llvm/test/Transforms/SCCP/apint-phi.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep phi
 
 define i999 @test(i999%A, i1 %c) {
diff --git a/llvm/test/Transforms/SCCP/apint-select.ll b/llvm/test/Transforms/SCCP/apint-select.ll
index 25c39ceeab3..c856896be9f 100644
--- a/llvm/test/Transforms/SCCP/apint-select.ll
+++ b/llvm/test/Transforms/SCCP/apint-select.ll
@@ -1,4 +1,3 @@
-; RUN:  llvm-as < %s | opt -sccp | llvm-dis -o /dev/null -f &&
 ; RUN:  llvm-as < %s | opt -sccp | llvm-dis | not grep select
 
 @A = constant i32 10
diff --git a/llvm/test/Transforms/SCCP/calltest.ll b/llvm/test/Transforms/SCCP/calltest.ll
index 2e46b691832..43df00c6940 100644
--- a/llvm/test/Transforms/SCCP/calltest.ll
+++ b/llvm/test/Transforms/SCCP/calltest.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | \
+; RUN:   not grep br
 
 ; No matter how hard you try, sqrt(1.0) is always 1.0.  This allows the
 ; optimizer to delete this loop.
diff --git a/llvm/test/Transforms/SCCP/dg.exp b/llvm/test/Transforms/SCCP/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/llvm/test/Transforms/SCCP/dg.exp
+++ b/llvm/test/Transforms/SCCP/dg.exp
@@ -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}]]
diff --git a/llvm/test/Transforms/SCCP/ipsccp-basic.ll b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
index 2c42dface54..2390d619ae6 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret i32 17' | grep -v 'ret i32 undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | \
+; RUN:   grep -v {ret i32 17} | grep -v {ret i32 undef} | not grep ret
 
 implementation
 
diff --git a/llvm/test/Transforms/SCCP/ipsccp-conditional.ll b/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
index 5f06df3e8e1..db36228e9cd 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-conditional.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret i32 0' | grep -v 'ret i32 undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | \
+; RUN:   grep -v {ret i32 0} | grep -v {ret i32 undef} | not grep ret
 
 implementation
 
diff --git a/llvm/test/Transforms/SCCP/logical-nuke.ll b/llvm/test/Transforms/SCCP/logical-nuke.ll
index c0a555a3002..02c3ac0e36f 100644
--- a/llvm/test/Transforms/SCCP/logical-nuke.ll
+++ b/llvm/test/Transforms/SCCP/logical-nuke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep {ret i32 0}
 
 ; Test that SCCP has basic knowledge of when and/or nuke overdefined values.
 
diff --git a/llvm/test/Transforms/SCCP/phitest.ll b/llvm/test/Transforms/SCCP/phitest.ll
index cdbdb2ce08a..b44a3189fe1 100644
--- a/llvm/test/Transforms/SCCP/phitest.ll
+++ b/llvm/test/Transforms/SCCP/phitest.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -dce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -dce -simplifycfg | llvm-dis | \
+; RUN:   not grep br
 
 int %test(int %param) {
 entry:
diff --git a/llvm/test/Transforms/SCCP/sccptest.ll b/llvm/test/Transforms/SCCP/sccptest.ll
index 6fae7ce957d..f0a8244ecfa 100644
--- a/llvm/test/Transforms/SCCP/sccptest.ll
+++ b/llvm/test/Transforms/SCCP/sccptest.ll
@@ -1,7 +1,8 @@
 ; This is the test case taken from appel's book that illustrates a hard case
 ; that SCCP gets right. BB3 should be completely eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -constprop -dce -simplifycfg | \
+; RUN:   llvm-dis | not grep BB3
 
 int %testfunction(int %i0, int %j0) {
 BB1:
diff --git a/llvm/test/Transforms/SCCP/select.ll b/llvm/test/Transforms/SCCP/select.ll
index 0209681c787..cd488e3f02c 100644
--- a/llvm/test/Transforms/SCCP/select.ll
+++ b/llvm/test/Transforms/SCCP/select.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep select
 
 int %test1(bool %C) {