Sun Apr 15 02:22:33 PDT 2007

Changes in directory llvm/test/Transforms/SCCP:

2002-05-21-InvalidSimplify.ll updated: 1.3 -> 1.4
2002-08-30-GetElementPtrTest.ll updated: 1.4 -> 1.5
2003-06-24-OverdefinedPHIValue.ll updated: 1.4 -> 1.5
2004-12-10-UndefBranchBug.ll updated: 1.3 -> 1.4
2006-12-04-PackedType.ll updated: 1.3 -> 1.4
2006-12-19-UndefBug.ll updated: 1.3 -> 1.4
apint-array.ll updated: 1.1 -> 1.2
apint-basictest.ll updated: 1.1 -> 1.2
apint-basictest2.ll updated: 1.1 -> 1.2
apint-basictest3.ll updated: 1.1 -> 1.2
apint-basictest4.ll updated: 1.1 -> 1.2
apint-bigarray.ll updated: 1.1 -> 1.2
apint-bigint.ll updated: 1.1 -> 1.2
apint-bigint2.ll updated: 1.1 -> 1.2
apint-ipsccp1.ll updated: 1.1 -> 1.2
apint-ipsccp2.ll updated: 1.1 -> 1.2
apint-ipsccp3.ll updated: 1.1 -> 1.2
apint-ipsccp4.ll updated: 1.1 -> 1.2
apint-load.ll updated: 1.1 -> 1.2
apint-phi.ll updated: 1.1 -> 1.2
apint-select.ll updated: 1.1 -> 1.2
calltest.ll updated: 1.2 -> 1.3
dg.exp updated: 1.4 -> 1.5
ipsccp-basic.ll updated: 1.4 -> 1.5
ipsccp-conditional.ll updated: 1.4 -> 1.5
logical-nuke.ll updated: 1.3 -> 1.4
phitest.ll updated: 1.2 -> 1.3
sccptest.ll updated: 1.7 -> 1.8
select.ll updated: 1.2 -> 1.3
---
Log message:

For PR1319: http://llvm.org/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


---
Diffs of the changes:  (+29 -37)

 2002-05-21-InvalidSimplify.ll     |    3 ++-
 2002-08-30-GetElementPtrTest.ll   |    2 +-
 2003-06-24-OverdefinedPHIValue.ll |    3 ++-
 2004-12-10-UndefBranchBug.ll      |    2 +-
 2006-12-04-PackedType.ll          |    1 +
 2006-12-19-UndefBug.ll            |    2 +-
 apint-array.ll                    |    2 +-
 apint-basictest.ll                |    1 -
 apint-basictest2.ll               |    1 -
 apint-basictest3.ll               |    3 +--
 apint-basictest4.ll               |    3 +--
 apint-bigarray.ll                 |    3 +--
 apint-bigint.ll                   |    1 -
 apint-bigint2.ll                  |    1 -
 apint-ipsccp1.ll                  |    3 ++-
 apint-ipsccp2.ll                  |    6 ++----
 apint-ipsccp3.ll                  |    1 -
 apint-ipsccp4.ll                  |    2 --
 apint-load.ll                     |    2 --
 apint-phi.ll                      |    1 -
 apint-select.ll                   |    1 -
 calltest.ll                       |    3 ++-
 dg.exp                            |    4 ++--
 ipsccp-basic.ll                   |    3 ++-
 ipsccp-conditional.ll             |    3 ++-
 logical-nuke.ll                   |    2 +-
 phitest.ll                        |    3 ++-
 sccptest.ll                       |    3 ++-
 select.ll                         |    1 -
 29 files changed, 29 insertions(+), 37 deletions(-)


Index: llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll
diff -u llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll:1.3 llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll:1.4

--- llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll:1.3	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll	Sun Apr 15 04:21:47 2007
@@ -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"() {


Index: llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
diff -u llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll:1.4 llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll:1.5
--- llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll	Sun Apr 15 04:21:47 2007
@@ -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]
 


Index: llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll
diff -u llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll:1.4 llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll:1.5
--- llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll	Sun Apr 15 04:21:47 2007
@@ -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!


Index: llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
diff -u llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll:1.3 llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll:1.4
--- llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll:1.3	Sun Dec 31 00:02:00 2006
+++ llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll	Sun Apr 15 04:21:47 2007
@@ -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.


Index: llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
diff -u llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll:1.3 llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll:1.4
--- llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll:1.3	Wed Feb 14 20:26:10 2007
+++ llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
diff -u llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll:1.3 llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll:1.4
--- llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll:1.3	Fri Jan 12 23:06:52 2007
+++ llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/apint-array.ll
diff -u llvm/test/Transforms/SCCP/apint-array.ll:1.1 llvm/test/Transforms/SCCP/apint-array.ll:1.2
--- llvm/test/Transforms/SCCP/apint-array.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-array.ll	Sun Apr 15 04:21:47 2007
@@ -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]


Index: llvm/test/Transforms/SCCP/apint-basictest.ll
diff -u llvm/test/Transforms/SCCP/apint-basictest.ll:1.1 llvm/test/Transforms/SCCP/apint-basictest.ll:1.2
--- llvm/test/Transforms/SCCP/apint-basictest.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-basictest.ll	Sun Apr 15 04:21:47 2007
@@ -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) {


Index: llvm/test/Transforms/SCCP/apint-basictest2.ll
diff -u llvm/test/Transforms/SCCP/apint-basictest2.ll:1.1 llvm/test/Transforms/SCCP/apint-basictest2.ll:1.2
--- llvm/test/Transforms/SCCP/apint-basictest2.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-basictest2.ll	Sun Apr 15 04:21:47 2007
@@ -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
 


Index: llvm/test/Transforms/SCCP/apint-basictest3.ll
diff -u llvm/test/Transforms/SCCP/apint-basictest3.ll:1.1 llvm/test/Transforms/SCCP/apint-basictest3.ll:1.2
--- llvm/test/Transforms/SCCP/apint-basictest3.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-basictest3.ll	Sun Apr 15 04:21:47 2007
@@ -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 @@
 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]


Index: llvm/test/Transforms/SCCP/apint-basictest4.ll
diff -u llvm/test/Transforms/SCCP/apint-basictest4.ll:1.1 llvm/test/Transforms/SCCP/apint-basictest4.ll:1.2
--- llvm/test/Transforms/SCCP/apint-basictest4.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-basictest4.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/apint-bigarray.ll
diff -u llvm/test/Transforms/SCCP/apint-bigarray.ll:1.1 llvm/test/Transforms/SCCP/apint-bigarray.ll:1.2
--- llvm/test/Transforms/SCCP/apint-bigarray.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-bigarray.ll	Sun Apr 15 04:21:47 2007
@@ -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
 


Index: llvm/test/Transforms/SCCP/apint-bigint.ll
diff -u llvm/test/Transforms/SCCP/apint-bigint.ll:1.1 llvm/test/Transforms/SCCP/apint-bigint.ll:1.2
--- llvm/test/Transforms/SCCP/apint-bigint.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-bigint.ll	Sun Apr 15 04:21:47 2007
@@ -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() {


Index: llvm/test/Transforms/SCCP/apint-bigint2.ll
diff -u llvm/test/Transforms/SCCP/apint-bigint2.ll:1.1 llvm/test/Transforms/SCCP/apint-bigint2.ll:1.2
--- llvm/test/Transforms/SCCP/apint-bigint2.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-bigint2.ll	Sun Apr 15 04:21:47 2007
@@ -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,


Index: llvm/test/Transforms/SCCP/apint-ipsccp1.ll
diff -u llvm/test/Transforms/SCCP/apint-ipsccp1.ll:1.1 llvm/test/Transforms/SCCP/apint-ipsccp1.ll:1.2
--- llvm/test/Transforms/SCCP/apint-ipsccp1.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-ipsccp1.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/apint-ipsccp2.ll
diff -u llvm/test/Transforms/SCCP/apint-ipsccp2.ll:1.1 llvm/test/Transforms/SCCP/apint-ipsccp2.ll:1.2
--- llvm/test/Transforms/SCCP/apint-ipsccp2.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-ipsccp2.ll	Sun Apr 15 04:21:47 2007
@@ -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) {


Index: llvm/test/Transforms/SCCP/apint-ipsccp3.ll
diff -u llvm/test/Transforms/SCCP/apint-ipsccp3.ll:1.1 llvm/test/Transforms/SCCP/apint-ipsccp3.ll:1.2
--- llvm/test/Transforms/SCCP/apint-ipsccp3.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-ipsccp3.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/apint-ipsccp4.ll
diff -u llvm/test/Transforms/SCCP/apint-ipsccp4.ll:1.1 llvm/test/Transforms/SCCP/apint-ipsccp4.ll:1.2
--- llvm/test/Transforms/SCCP/apint-ipsccp4.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-ipsccp4.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/apint-load.ll
diff -u llvm/test/Transforms/SCCP/apint-load.ll:1.1 llvm/test/Transforms/SCCP/apint-load.ll:1.2
--- llvm/test/Transforms/SCCP/apint-load.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-load.ll	Sun Apr 15 04:21:47 2007
@@ -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
 


Index: llvm/test/Transforms/SCCP/apint-phi.ll
diff -u llvm/test/Transforms/SCCP/apint-phi.ll:1.1 llvm/test/Transforms/SCCP/apint-phi.ll:1.2
--- llvm/test/Transforms/SCCP/apint-phi.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-phi.ll	Sun Apr 15 04:21:47 2007
@@ -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) {


Index: llvm/test/Transforms/SCCP/apint-select.ll
diff -u llvm/test/Transforms/SCCP/apint-select.ll:1.1 llvm/test/Transforms/SCCP/apint-select.ll:1.2
--- llvm/test/Transforms/SCCP/apint-select.ll:1.1	Fri Apr 13 17:33:10 2007
+++ llvm/test/Transforms/SCCP/apint-select.ll	Sun Apr 15 04:21:47 2007
@@ -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


Index: llvm/test/Transforms/SCCP/calltest.ll
diff -u llvm/test/Transforms/SCCP/calltest.ll:1.2 llvm/test/Transforms/SCCP/calltest.ll:1.3
--- llvm/test/Transforms/SCCP/calltest.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/calltest.ll	Sun Apr 15 04:21:47 2007
@@ -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.


Index: llvm/test/Transforms/SCCP/dg.exp
diff -u llvm/test/Transforms/SCCP/dg.exp:1.4 llvm/test/Transforms/SCCP/dg.exp:1.5
--- llvm/test/Transforms/SCCP/dg.exp:1.4	Wed Apr 11 14:56:59 2007
+++ llvm/test/Transforms/SCCP/dg.exp	Sun Apr 15 04:21:47 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/Transforms/SCCP/ipsccp-basic.ll
diff -u llvm/test/Transforms/SCCP/ipsccp-basic.ll:1.4 llvm/test/Transforms/SCCP/ipsccp-basic.ll:1.5
--- llvm/test/Transforms/SCCP/ipsccp-basic.ll:1.4	Sun Dec 31 00:02:00 2006
+++ llvm/test/Transforms/SCCP/ipsccp-basic.ll	Sun Apr 15 04:21:47 2007
@@ -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
 


Index: llvm/test/Transforms/SCCP/ipsccp-conditional.ll
diff -u llvm/test/Transforms/SCCP/ipsccp-conditional.ll:1.4 llvm/test/Transforms/SCCP/ipsccp-conditional.ll:1.5
--- llvm/test/Transforms/SCCP/ipsccp-conditional.ll:1.4	Sun Dec 31 00:02:00 2006
+++ llvm/test/Transforms/SCCP/ipsccp-conditional.ll	Sun Apr 15 04:21:47 2007
@@ -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
 


Index: llvm/test/Transforms/SCCP/logical-nuke.ll
diff -u llvm/test/Transforms/SCCP/logical-nuke.ll:1.3 llvm/test/Transforms/SCCP/logical-nuke.ll:1.4
--- llvm/test/Transforms/SCCP/logical-nuke.ll:1.3	Sun Dec 31 00:02:00 2006
+++ llvm/test/Transforms/SCCP/logical-nuke.ll	Sun Apr 15 04:21:47 2007
@@ -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.
 


Index: llvm/test/Transforms/SCCP/phitest.ll
diff -u llvm/test/Transforms/SCCP/phitest.ll:1.2 llvm/test/Transforms/SCCP/phitest.ll:1.3
--- llvm/test/Transforms/SCCP/phitest.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/phitest.ll	Sun Apr 15 04:21:47 2007
@@ -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:


Index: llvm/test/Transforms/SCCP/sccptest.ll
diff -u llvm/test/Transforms/SCCP/sccptest.ll:1.7 llvm/test/Transforms/SCCP/sccptest.ll:1.8
--- llvm/test/Transforms/SCCP/sccptest.ll:1.7	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/sccptest.ll	Sun Apr 15 04:21:47 2007
@@ -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:


Index: llvm/test/Transforms/SCCP/select.ll
diff -u llvm/test/Transforms/SCCP/select.ll:1.2 llvm/test/Transforms/SCCP/select.ll:1.3
--- llvm/test/Transforms/SCCP/select.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SCCP/select.ll	Sun Apr 15 04:21:47 2007
@@ -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) {




