Sun Apr 15 02:22:32 PDT 2007

Changes in directory llvm/test/Transforms/SimplifyCFG:

2002-05-05-EmptyBlockMerge.ll updated: 1.5 -> 1.6
2003-08-17-BranchFold.ll updated: 1.3 -> 1.4
2003-08-17-BranchFoldOrdering.ll updated: 1.3 -> 1.4
2003-08-17-FoldSwitch.ll updated: 1.4 -> 1.5
2005-08-03-PHIFactorCrash.ll updated: 1.2 -> 1.3
2005-12-03-IncorrectPHIFold.ll updated: 1.2 -> 1.3
2006-08-03-Crash.ll updated: 1.2 -> 1.3
2006-10-19-UncondDiv.ll updated: 1.2 -> 1.3
2006-12-08-Ptr-ICmp-Branch.ll updated: 1.4 -> 1.5
BrUnwind.ll updated: 1.2 -> 1.3
DeadSetCC.ll updated: 1.3 -> 1.4
EqualPHIEdgeBlockMerge.ll updated: 1.4 -> 1.5
InvokeEliminate.ll updated: 1.4 -> 1.5
PhiBlockMerge.ll updated: 1.4 -> 1.5
PhiBlockMerge2.ll updated: 1.4 -> 1.5
PhiEliminate.ll updated: 1.7 -> 1.8
PhiNoEliminate.ll updated: 1.2 -> 1.3
UncondBranchToReturn.ll updated: 1.2 -> 1.3
branch-cond-merge.ll updated: 1.2 -> 1.3
branch-fold.ll updated: 1.3 -> 1.4
branch-phi-thread.ll updated: 1.4 -> 1.5
dg.exp updated: 1.4 -> 1.5
hoist-common-code.ll updated: 1.2 -> 1.3
switch_formation.ll updated: 1.3 -> 1.4
switch_switch_fold.ll updated: 1.2 -> 1.3
switch_thread.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:  (+49 -28)

 2002-05-05-EmptyBlockMerge.ll    |    3 ++-
 2003-08-17-BranchFold.ll         |    3 ++-
 2003-08-17-BranchFoldOrdering.ll |    3 ++-
 2003-08-17-FoldSwitch.ll         |    3 ++-
 2005-08-03-PHIFactorCrash.ll     |    1 +
 2005-12-03-IncorrectPHIFold.ll   |    4 +++-
 2006-08-03-Crash.ll              |    3 ++-
 2006-10-19-UncondDiv.ll          |    5 ++---
 2006-12-08-Ptr-ICmp-Branch.ll    |    1 +
 BrUnwind.ll                      |    4 +++-
 DeadSetCC.ll                     |    3 ++-
 EqualPHIEdgeBlockMerge.ll        |    2 +-
 InvokeEliminate.ll               |    3 ++-
 PhiBlockMerge.ll                 |    2 +-
 PhiBlockMerge2.ll                |    2 +-
 PhiEliminate.ll                  |    3 ++-
 PhiNoEliminate.ll                |    3 ++-
 UncondBranchToReturn.ll          |    3 ++-
 branch-cond-merge.ll             |    3 ++-
 branch-fold.ll                   |    2 +-
 branch-phi-thread.ll             |    6 ++++--
 dg.exp                           |    4 ++--
 hoist-common-code.ll             |    2 +-
 switch_formation.ll              |    3 ++-
 switch_switch_fold.ll            |    3 ++-
 switch_thread.ll                 |    3 ++-
 26 files changed, 49 insertions(+), 28 deletions(-)


Index: llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
diff -u llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll:1.5 llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll:1.6

--- llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll:1.5	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll	Sun Apr 15 04:21:47 2007
@@ -1,6 +1,7 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   grep {br label}
 ;
 declare void %foo()
 implementation


Index: llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
diff -u llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll:1.3 llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll:1.4
--- llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll:1.3	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll	Sun Apr 15 04:21:47 2007
@@ -1,7 +1,8 @@
 ; This test checks to make sure that 'br X, Dest, Dest' is folded into 
 ; 'br Dest'
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep {br bool %c2}
 
 declare void %noop()
 


Index: llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
diff -u llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll:1.3 llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll:1.4
--- llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll:1.3	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll	Sun Apr 15 04:21:47 2007
@@ -3,7 +3,8 @@
 ; due to the fact that the SimplifyCFG function does not use 
 ; the ConstantFoldTerminator function.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep {br bool %c2}
 
 declare void %noop()
 


Index: llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
diff -u llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll:1.4 llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep switch
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep switch
 
 int %test1() {   ; Test normal folding
 	switch uint 5, label %Default [


Index: llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll
diff -u llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll:1.2 llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
+; END.
 
 	%arraytype.1.Char = type { int, [0 x sbyte] }
 	%arraytype.4.Signed = type { int, [0 x int] }


Index: llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll
diff -u llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll:1.2 llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll	Sun Apr 15 04:21:47 2007
@@ -1,6 +1,8 @@
 ; Make sure this doesn't turn into an infinite loop
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -constprop -simplifycfg | llvm-dis | grep bb86
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -constprop -simplifycfg |\
+; RUN:   llvm-dis | grep bb86
+; END.
 
 	%struct.anon = type { uint, int, int, int, [1024 x sbyte] }
 %_zero_ = external global %struct.anon*		; <%struct.anon**> [#uses=2]


Index: llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll
diff -u llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll:1.2 llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -simplifycfg -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -simplifycfg \
+; RUN:   -disable-output
 ; PR867
 
 target endian = big


Index: llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll
diff -u llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll:1.2 llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll	Sun Apr 15 04:21:47 2007
@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select
-
 ; PR957
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep select
 
 uint %test(uint %tmp) {
 cond_false179:          ; preds = %cond_true


Index: llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
diff -u llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll:1.4 llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll:1.4	Thu Jan  4 10:46:46 2007
+++ llvm/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis
+; END.
 ; ModuleID = 'bugpoint-tooptimize.bc'
 target datalayout = "e-p:32:32"
 target endian = little


Index: llvm/test/Transforms/SimplifyCFG/BrUnwind.ll
diff -u llvm/test/Transforms/SimplifyCFG/BrUnwind.ll:1.2 llvm/test/Transforms/SimplifyCFG/BrUnwind.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/BrUnwind.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/BrUnwind.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,6 @@
-;RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN: not grep {br label}
+
 void %test(bool %C) {
 	br bool %C, label %A, label %B
 A:


Index: llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll
diff -u llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll:1.3 llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll:1.4
--- llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll:1.3	Sat Dec 23 00:05:41 2006
+++ llvm/test/Transforms/SimplifyCFG/DeadSetCC.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'icmp eq'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep {icmp eq}
 
 ; Check that simplifycfg deletes a dead 'seteq' instruction when it
 ; folds a conditional branch into a switch instruction.


Index: llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
diff -u llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll:1.4 llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll	Sun Apr 15 04:21:47 2007
@@ -1,6 +1,6 @@
 ; Test merging of blocks with phi nodes.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep N:
 ;
 
 int %test(bool %a) {


Index: llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll
diff -u llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll:1.4 llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/InvokeEliminate.ll	Sun Apr 15 04:21:47 2007
@@ -3,7 +3,8 @@
 
 ; If this test is successful, the function should be reduced to 'call; ret'
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not egrep 'invoke|br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not egrep {\\(invoke\\)|\\(br\\)}
 
 declare void %bar()
 


Index: llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
diff -u llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll:1.4 llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/PhiBlockMerge.ll	Sun Apr 15 04:21:47 2007
@@ -1,6 +1,6 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep N:
 ;
 
 int %test(bool %a, bool %b) {


Index: llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
diff -u llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll:1.4 llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll	Sun Apr 15 04:21:47 2007
@@ -2,7 +2,7 @@
 ; where the mergedinto block doesn't have any PHI nodes, and is in fact 
 ; dominated by the block-to-be-eliminated
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep N:
 ;
 
 int %test(bool %a, bool %b) {


Index: llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll
diff -u llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll:1.7 llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll:1.8
--- llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll:1.7	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/PhiEliminate.ll	Sun Apr 15 04:21:47 2007
@@ -4,7 +4,8 @@
 ; 'if conversion'.
 
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis > %t.xform
-; RUN: not grep phi %t.xform && grep ret %t.xform
+; RUN:   not grep phi %t.xform 
+; RUN:   grep ret %t.xform
 
 declare void %use(bool)
 declare void %use(int)


Index: llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll
diff -u llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll:1.2 llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/PhiNoEliminate.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep select
 
 ;; The PHI node in this example should not be turned into a select, as we are
 ;; not able to ifcvt the entire block.  As such, converting to a select just 


Index: llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll
diff -u llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll:1.2 llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll	Sun Apr 15 04:21:47 2007
@@ -2,7 +2,8 @@
 ; a PHI node and a return.  Make sure the simplify cfg can straighten out this
 ; important case.  This is basically the most trivial form of tail-duplication.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:    not grep {br label}
 
 int %test(bool %B, int %A, int %B) {
 	br bool %B, label %T, label %F


Index: llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll
diff -u llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll:1.2 llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/branch-cond-merge.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine \
+; RUN:   -simplifycfg | llvm-dis | not grep call
 
 declare void %bar()
 


Index: llvm/test/Transforms/SimplifyCFG/branch-fold.ll
diff -u llvm/test/Transforms/SimplifyCFG/branch-fold.ll:1.3 llvm/test/Transforms/SimplifyCFG/branch-fold.ll:1.4
--- llvm/test/Transforms/SimplifyCFG/branch-fold.ll:1.3	Fri Jan 12 22:36:22 2007
+++ llvm/test/Transforms/SimplifyCFG/branch-fold.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br i1' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep {br i1} | wc -l | grep 1
 
 void %test(int* %P, int* %Q, bool %A, bool %B) {
 	br bool %A, label %a, label %b   ;; fold the two branches into one


Index: llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
diff -u llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll:1.4 llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll:1.5
--- llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll:1.4	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll	Sun Apr 15 04:21:47 2007
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce | llvm-dis | not grep 'call void %f1' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce | llvm-dis | \
+; RUN:   not grep {call void %f1}
+; END.
+
 declare void %f1()
 declare void %f2()
 declare void %f3()


Index: llvm/test/Transforms/SimplifyCFG/dg.exp
diff -u llvm/test/Transforms/SimplifyCFG/dg.exp:1.4 llvm/test/Transforms/SimplifyCFG/dg.exp:1.5
--- llvm/test/Transforms/SimplifyCFG/dg.exp:1.4	Wed Apr 11 14:56:59 2007
+++ llvm/test/Transforms/SimplifyCFG/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/SimplifyCFG/hoist-common-code.ll
diff -u llvm/test/Transforms/SimplifyCFG/hoist-common-code.ll:1.2 llvm/test/Transforms/SimplifyCFG/hoist-common-code.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/hoist-common-code.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/hoist-common-code.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
 declare void %bar(int)
 
 void %test(bool %P, int* %Q) {


Index: llvm/test/Transforms/SimplifyCFG/switch_formation.ll
diff -u llvm/test/Transforms/SimplifyCFG/switch_formation.ll:1.3 llvm/test/Transforms/SimplifyCFG/switch_formation.ll:1.4
--- llvm/test/Transforms/SimplifyCFG/switch_formation.ll:1.3	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/switch_formation.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br
+; END.
 
 bool %_ZN4llvm11SetCondInst7classofEPKNS_11InstructionE({uint, uint}* %I) {
 entry:


Index: llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll
diff -u llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll:1.2 llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep switch | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   grep switch | wc -l | grep 1
 
 ; Test that a switch going to a switch on the same value can be merged.   All 
 ; three switches in this example can be merged into one big one.


Index: llvm/test/Transforms/SimplifyCFG/switch_thread.ll
diff -u llvm/test/Transforms/SimplifyCFG/switch_thread.ll:1.2 llvm/test/Transforms/SimplifyCFG/switch_thread.ll:1.3
--- llvm/test/Transforms/SimplifyCFG/switch_thread.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/SimplifyCFG/switch_thread.ll	Sun Apr 15 04:21:47 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'call void %DEAD'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN:   not grep {call void %DEAD}
 
 ; Test that we can thread a simple known condition through switch statements.
 




