[llvm-commits] CVS: llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll dg.exp integer-bool.ll memcpy.ll memset.ll storepointer-compare.llx

[Reid Spencer]

Changes in directory llvm/test/Transforms/GlobalOpt:

constantexpr-dangle.ll updated: 1.1 -> 1.2
dg.exp updated: 1.4 -> 1.5
integer-bool.ll updated: 1.3 -> 1.4
memcpy.ll updated: 1.5 -> 1.6
memset.ll updated: 1.3 -> 1.4
storepointer-compare.llx updated: 1.3 -> 1.4
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Upgrade to use new Tcl exec based test harness.


---
Diffs of the changes:  (+16 -11)

 constantexpr-dangle.ll   |    4 +++-
 dg.exp                   |    4 ++--
 integer-bool.ll          |    2 +-
 memcpy.ll                |    2 +-
 memset.ll                |   12 +++++++-----
 storepointer-compare.llx |    3 ++-
 6 files changed, 16 insertions(+), 11 deletions(-)


Index: llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll
diff -u llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll:1.1 llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll:1.2
--- llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll:1.1	Sun Feb 25 15:04:39 2007
+++ llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll	Sun Apr 15 03:30:32 2007
@@ -1,4 +1,6 @@
-; RUN: llvm-as < %s | opt -instcombine -globalopt | llvm-dis | grep 'internal fastcc float @foo'
+; RUN: llvm-as < %s | opt -instcombine -globalopt | llvm-dis | \
+; RUN:   grep {internal fastcc float @foo}
+
 define internal float @foo() {
         ret float 0.000000e+00
 }


Index: llvm/test/Transforms/GlobalOpt/dg.exp
diff -u llvm/test/Transforms/GlobalOpt/dg.exp:1.4 llvm/test/Transforms/GlobalOpt/dg.exp:1.5
--- llvm/test/Transforms/GlobalOpt/dg.exp:1.4	Wed Apr 11 14:56:58 2007
+++ llvm/test/Transforms/GlobalOpt/dg.exp	Sun Apr 15 03:30:32 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/GlobalOpt/integer-bool.ll
diff -u llvm/test/Transforms/GlobalOpt/integer-bool.ll:1.3 llvm/test/Transforms/GlobalOpt/integer-bool.ll:1.4
--- llvm/test/Transforms/GlobalOpt/integer-bool.ll:1.3	Fri Jan 12 23:06:52 2007
+++ llvm/test/Transforms/GlobalOpt/integer-bool.ll	Sun Apr 15 03:30:32 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | \
-; RUN:    llvm-dis | grep 'ret i1 true'
+; RUN:    llvm-dis | grep {ret i1 true}
 
 ;; check that global opt turns integers that only hold 0 or 1 into bools.
 


Index: llvm/test/Transforms/GlobalOpt/memcpy.ll
diff -u llvm/test/Transforms/GlobalOpt/memcpy.ll:1.5 llvm/test/Transforms/GlobalOpt/memcpy.ll:1.6
--- llvm/test/Transforms/GlobalOpt/memcpy.ll:1.5	Fri Jan  5 12:37:18 2007
+++ llvm/test/Transforms/GlobalOpt/memcpy.ll	Sun Apr 15 03:30:32 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
-; RUN:   grep 'G1 = internal constant'
+; RUN:   grep {G1 = internal constant}
 
 %G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
 


Index: llvm/test/Transforms/GlobalOpt/memset.ll
diff -u llvm/test/Transforms/GlobalOpt/memset.ll:1.3 llvm/test/Transforms/GlobalOpt/memset.ll:1.4
--- llvm/test/Transforms/GlobalOpt/memset.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/GlobalOpt/memset.ll	Sun Apr 15 03:30:32 2007
@@ -1,20 +1,22 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal
 ; both globals are write only, delete them.
 
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
+; RUN:   not grep internal
+
 %G0 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
 
 %G1 = internal global [4 x int] [ int 1, int 2, int 3, int 4]
 
 implementation   ; Functions:
 
-declare void %llvm.memcpy(sbyte*, sbyte*, uint, uint)
-declare void %llvm.memset(sbyte*, ubyte, uint, uint)
+declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint, uint)
+declare void %llvm.memset.i32(sbyte*, ubyte, uint, uint)
 
 void %foo() {
         %Blah = alloca [58 x sbyte]             ; <[58 x sbyte]*> [#uses=2]
         %tmp3 = cast [58 x sbyte]* %Blah to sbyte*
-	call void %llvm.memcpy( sbyte* cast ([4 x int]* %G1 to sbyte*), sbyte* %tmp3, uint 16, uint 1)
- 	call void %llvm.memset( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), uint 17, uint 58, uint 1)
+	call void %llvm.memcpy.i32( sbyte* cast ([4 x int]* %G1 to sbyte*), sbyte* %tmp3, uint 16, uint 1)
+ 	call void %llvm.memset.i32( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), uint 17, uint 58, uint 1)
 	ret void
 }
 


Index: llvm/test/Transforms/GlobalOpt/storepointer-compare.llx
diff -u llvm/test/Transforms/GlobalOpt/storepointer-compare.llx:1.3 llvm/test/Transforms/GlobalOpt/storepointer-compare.llx:1.4
--- llvm/test/Transforms/GlobalOpt/storepointer-compare.llx:1.3	Fri Jan 26 02:25:06 2007
+++ llvm/test/Transforms/GlobalOpt/storepointer-compare.llx	Sun Apr 15 03:30:32 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'call void @Actual'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
+; RUN:   grep {call void @Actual}
 
 ; Check that a comparison does not prevent an indirect call from being made 
 ; direct.  The global will still remain, but indirect call elim is still good.