For PR761:

Remove "target endian/pointersize" or add "target datalayout" to make
the test parse properly or set the datalayout because defaults changes.

For PR645:
Make global names use the @ prefix.

For llvm-upgrade changes:
Fix test cases or completely remove use of llvm-upgrade for test cases
that cannot survive the new renaming or upgrade capabilities.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33533 91177308-0d34-0410-b5e6-96231b3b80d8

58 files changed, 537 insertions, 550 deletions

diff --git a/test/Integer/2007-01-19-TruncSext.ll b/test/Integer/2007-01-19-TruncSext.ll
index 7b89033cc2c..1df2fc70a0b 100644
--- a/test/Integer/2007-01-19-TruncSext.ll
+++ b/test/Integer/2007-01-19-TruncSext.ll
@@ -3,27 +3,27 @@
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: llvm-as < %s | lli --force-interpreter=true | grep -- '-255'
 
-%ARRAY   = global [ 20 x i17 ] zeroinitializer
-%FORMAT  = constant [ 4 x i8 ] c"%d\0A\00"
+@ARRAY   = global [ 20 x i17 ] zeroinitializer
+@FORMAT  = constant [ 4 x i8 ] c"%d\0A\00"
 
-declare i32 %printf(i8* %format, ...)
+declare i32 @printf(i8* %format, ...)
 
-define void %multiply(i32 %index, i32 %X, i32 %Y) {
+define void @multiply(i32 %index, i32 %X, i32 %Y) {
   %Z = mul i32 %X, %Y
-  %P = getelementptr [20 x i17]* %ARRAY, i32 0, i32 %index
+  %P = getelementptr [20 x i17]* @ARRAY, i32 0, i32 %index
   %Result = trunc i32 %Z to i17
   store i17 %Result, i17* %P
   ret void
 }
 
-define i32 %main(i32 %argc, i8** %argc) {
+define i32 @main(i32 %argc, i8** %argc) {
   %i = bitcast i32 0 to i32
-  call void %multiply(i32 %i, i32 -1, i32 255) 
-  %P = getelementptr [20 x i17]* %ARRAY, i32 0, i32 0
+  call void @multiply(i32 %i, i32 -1, i32 255) 
+  %P = getelementptr [20 x i17]* @ARRAY, i32 0, i32 0
   %X = load i17* %P
   %result = sext i17 %X to i32
-  %fmt = getelementptr [4 x i8]* %FORMAT, i32 0, i32 0
-  call i32 (i8*,...)* %printf(i8* %fmt, i32 %result)
+  %fmt = getelementptr [4 x i8]* @FORMAT, i32 0, i32 0
+  call i32 (i8*,...)* @printf(i8* %fmt, i32 %result)
   ret i32 %result
 }
 
diff --git a/test/Integer/BitArith.ll b/test/Integer/BitArith.ll
index cf5e7e6a01e..e9c2cde30c2 100644
--- a/test/Integer/BitArith.ll
+++ b/test/Integer/BitArith.ll
@@ -3,12 +3,12 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-declare void "foo"(i31 %i, i63 %j, i10 %k)
+declare void @"foo"(i31 %i, i63 %j, i10 %k)
 
 implementation
 
 ; foo test basic arith operations
-define void "foo"(i31 %i, i63 %j, i10 %k)
+define void @"foo"(i31 %i, i63 %j, i10 %k)
 begin
 	%t1 = trunc i63 %j to i31 
         %t2 = add i31 %t1, %i
diff --git a/test/Integer/BitBit.ll b/test/Integer/BitBit.ll
index 02969bc9312..2b01c447d9e 100644
--- a/test/Integer/BitBit.ll
+++ b/test/Integer/BitBit.ll
@@ -2,14 +2,12 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-
-
-declare void "foo"(i31 %i, i17 %j)
+declare void @"foo"(i31 %i, i17 %j)
 
 implementation
 
 ; foo test basic bitwise operations
-define void "foo"(i31 %i, i33 %j)
+define void @"foo"(i31 %i, i33 %j)
 begin
 	%t1 = trunc i33 %j to i31 
         %t2 = and i31 %t1, %i
diff --git a/test/Integer/BitCast.ll b/test/Integer/BitCast.ll
index b1849bbab10..53f66f66305 100644
--- a/test/Integer/BitCast.ll
+++ b/test/Integer/BitCast.ll
@@ -2,13 +2,12 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-
-declare void "foo"(i31 %i, i1280 %j, i1 %k, float %f)
+declare void @"foo"(i31 %i, i1280 %j, i1 %k, float %f)
 
 implementation
 
 ; foo test basic arith operations
-define void "foo"(i31 %i, i1280 %j, i1 %k, float %f)
+define void @"foo"(i31 %i, i1280 %j, i1 %k, float %f)
 begin
 	%t1 = trunc i1280 %j to i31
         %t2 = trunc i31 %t1 to i1
diff --git a/test/Integer/BitIcmp.ll b/test/Integer/BitIcmp.ll
index d4475bf76b2..6c2a79bd7c3 100644
--- a/test/Integer/BitIcmp.ll
+++ b/test/Integer/BitIcmp.ll
@@ -2,11 +2,9 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-
-
 implementation
 
-define i55 "simpleIcmp"(i55 %i0, i55 %j0)
+define i55 @"simpleIcmp"(i55 %i0, i55 %j0)
 begin
 	%t1 = icmp eq i55 %i0, %j0
 	%t2 = icmp ne i55 %i0, %j0
@@ -24,7 +22,7 @@ begin
 	ret i55 %i0
 end
 
-define i31 "phitest"(i12 %i)
+define i31 @"phitest"(i12 %i)
 begin
 
 HasArg:
@@ -37,7 +35,7 @@ Continue:
         br label %Continue
 end
 
-define i18 "select"(i18 %i)
+define i18 @"select"(i18 %i)
 begin
         %t = icmp sgt i18 %i, 100
         %k = select i1 %t, i18 %i, i18 999
diff --git a/test/Integer/BitMem.ll b/test/Integer/BitMem.ll
index 4d55a925667..5e46fb54651 100644
--- a/test/Integer/BitMem.ll
+++ b/test/Integer/BitMem.ll
@@ -2,20 +2,16 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-
-declare void "foo"()
-
+declare void @"foo"()
 
 implementation
 
 ; foo test basic arith operations
-define void "foo"()
-begin
+define void @"foo"() {
 	%t1 = malloc i31, i32 4
         %t2 = malloc i31, i32 7, align 1024
         %t3 = malloc [4 x i15]
 
-
         %idx = getelementptr [4 x i15]* %t3, i64 0, i64 2
         store i15 -123, i15* %idx
 
@@ -31,4 +27,4 @@ begin
 
         free i31* %t5
 	ret void
-end
+}
diff --git a/test/Integer/BitMisc.ll b/test/Integer/BitMisc.ll
index 1aaf62444d0..3bdbee5bb94 100644
--- a/test/Integer/BitMisc.ll
+++ b/test/Integer/BitMisc.ll
@@ -3,23 +3,23 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-%MyVar     = external global i19
-%MyIntList = external global { i39 *, i19 }
+@MyVar     = external global i19
+@MyIntList = external global { i39 *, i19 }
              external global i19      ; i19*:0
 
-%AConst    = constant i19 -123
+@AConst    = constant i19 -123
 
-%AString   = constant [4 x i8] c"test"
+@AString   = constant [4 x i8] c"test"
 
-%ZeroInit  = global { [100 x i19 ], [40 x float ] } { [100 x i19] zeroinitializer,
+@ZeroInit  = global { [100 x i19 ], [40 x float ] } { [100 x i19] zeroinitializer,
                                                       [40  x float] zeroinitializer }
 
 implementation
 
-define i19 "foo"(i19 %blah)
+define i19 @"foo"(i19 %blah)
 begin
-	store i19 5, i19 *%MyVar
-	%idx = getelementptr { i39 *, i19 } * %MyIntList, i64 0, i32 1
+	store i19 5, i19* @MyVar
+	%idx = getelementptr { i39 *, i19 } * @MyIntList, i64 0, i32 1
   	store i19 12, i19* %idx
   	ret i19 %blah
 end
diff --git a/test/Integer/BitPacked.ll b/test/Integer/BitPacked.ll
index 267c3fdb41d..26c9ee95c7c 100644
--- a/test/Integer/BitPacked.ll
+++ b/test/Integer/BitPacked.ll
@@ -2,22 +2,21 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-
-%foo1 = external global <4 x float>;
-%foo2 = external global <2 x i10>;
+@foo1 = external global <4 x float>;
+@foo2 = external global <2 x i10>;
 
 implementation   ; Functions:
 
-define void %main() 
+define void @main() 
 {
-        store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* %foo1
-        store <2 x i10> <i10 4, i10 4>, <2 x i10>* %foo2
-	%l1 = load <4 x float>* %foo1
-        %l2 = load <2 x i10>* %foo2
+        store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* @foo1
+        store <2 x i10> <i10 4, i10 4>, <2 x i10>* @foo2
+	%l1 = load <4 x float>* @foo1
+        %l2 = load <2 x i10>* @foo2
         %r1 = extractelement <2 x i10> %l2, i32 1    
         %r2 = extractelement <2 x i10> %l2, i32 0
         %t = mul i10 %r1, %r2
         %r3 = insertelement <2 x i10> %l2, i10 %t, i32 0    
-        store <2 x i10> %r3, <2 x i10>* %foo2
+        store <2 x i10> %r3, <2 x i10>* @foo2
         ret void
 }
diff --git a/test/Integer/a1.ll b/test/Integer/a1.ll
index 1df494445d2..1e7934402e6 100644
--- a/test/Integer/a1.ll
+++ b/test/Integer/a1.ll
@@ -3,22 +3,22 @@
 
 ; test 1 bit
 ;
-%b = constant i1 add(i1 1 , i1 1)
-%c = constant i1 add(i1 -1, i1 1)
-%d = constant i1 add(i1 -1, i1 -1)
-%e = constant i1 sub(i1 -1, i1 1)
-%f = constant i1 sub(i1 1 , i1 -1)
-%g = constant i1 sub(i1 1 , i1 1)
+@b = constant i1 add(i1 1 , i1 1)
+@c = constant i1 add(i1 -1, i1 1)
+@d = constant i1 add(i1 -1, i1 -1)
+@e = constant i1 sub(i1 -1, i1 1)
+@f = constant i1 sub(i1 1 , i1 -1)
+@g = constant i1 sub(i1 1 , i1 1)
 
-%h = constant i1 shl(i1 1 , i8 1)
-%i = constant i1 shl(i1 1 , i8 0)
-%j = constant i1 lshr(i1 1, i8 1)
-%m = constant i1 ashr(i1 1, i8 1)
+@h = constant i1 shl(i1 1 , i8 1)
+@i = constant i1 shl(i1 1 , i8 0)
+@j = constant i1 lshr(i1 1, i8 1)
+@m = constant i1 ashr(i1 1, i8 1)
 
-%n = constant i1 mul(i1 -1, i1 1)
-%o = constant i1 sdiv(i1 -1, i1 1)
-%p = constant i1 sdiv(i1 1 , i1 -1)
-%q = constant i1 udiv(i1 -1, i1 1)
-%r = constant i1 udiv(i1 1, i1 -1)
-%s = constant i1 srem(i1 -1, i1 1)
-%t = constant i1 urem(i1 -1, i1 1)
+@n = constant i1 mul(i1 -1, i1 1)
+@o = constant i1 sdiv(i1 -1, i1 1)
+@p = constant i1 sdiv(i1 1 , i1 -1)
+@q = constant i1 udiv(i1 -1, i1 1)
+@r = constant i1 udiv(i1 1, i1 -1)
+@s = constant i1 srem(i1 -1, i1 1)
+@t = constant i1 urem(i1 -1, i1 1)
diff --git a/test/Integer/a1.ll.out b/test/Integer/a1.ll.out
index 762dcd8e371..d4ef5e07ee6 100644
--- a/test/Integer/a1.ll.out
+++ b/test/Integer/a1.ll.out
@@ -1,20 +1,20 @@
 ; ModuleID = '<stdin>'
-%b = constant i1 false		; <i1*> [#uses=0]
-%c = constant i1 false		; <i1*> [#uses=0]
-%d = constant i1 false		; <i1*> [#uses=0]
-%e = constant i1 false		; <i1*> [#uses=0]
-%f = constant i1 false		; <i1*> [#uses=0]
-%g = constant i1 false		; <i1*> [#uses=0]
-%h = constant i1 false		; <i1*> [#uses=0]
-%i = constant i1 true		; <i1*> [#uses=0]
-%j = constant i1 false		; <i1*> [#uses=0]
-%m = constant i1 true		; <i1*> [#uses=0]
-%n = constant i1 true		; <i1*> [#uses=0]
-%o = constant i1 true		; <i1*> [#uses=0]
-%p = constant i1 true		; <i1*> [#uses=0]
-%q = constant i1 true		; <i1*> [#uses=0]
-%r = constant i1 true		; <i1*> [#uses=0]
-%s = constant i1 false		; <i1*> [#uses=0]
-%t = constant i1 false		; <i1*> [#uses=0]
+@b = constant i1 false		; <i1*> [#uses=0]
+@c = constant i1 false		; <i1*> [#uses=0]
+@d = constant i1 false		; <i1*> [#uses=0]
+@e = constant i1 false		; <i1*> [#uses=0]
+@f = constant i1 false		; <i1*> [#uses=0]
+@g = constant i1 false		; <i1*> [#uses=0]
+@h = constant i1 false		; <i1*> [#uses=0]
+@i = constant i1 true		; <i1*> [#uses=0]
+@j = constant i1 false		; <i1*> [#uses=0]
+@m = constant i1 true		; <i1*> [#uses=0]
+@n = constant i1 true		; <i1*> [#uses=0]
+@o = constant i1 true		; <i1*> [#uses=0]
+@p = constant i1 true		; <i1*> [#uses=0]
+@q = constant i1 true		; <i1*> [#uses=0]
+@r = constant i1 true		; <i1*> [#uses=0]
+@s = constant i1 false		; <i1*> [#uses=0]
+@t = constant i1 false		; <i1*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a15.ll b/test/Integer/a15.ll
index fc4688b692a..d3cc319b427 100644
--- a/test/Integer/a15.ll
+++ b/test/Integer/a15.ll
@@ -3,26 +3,26 @@
 
 ; test 15 bits
 ;
-%b = constant i15 add(i15 32767, i15 1)
-%c = constant i15 add(i15 32767, i15 32767)
-%d = constant i15 add(i15 32760, i15 8)
-%e = constant i15 sub(i15 0 , i15 1)
-%f = constant i15 sub(i15 0 , i15 32767)
-%g = constant i15 sub(i15 2 , i15 32767)
+@b = constant i15 add(i15 32767, i15 1)
+@c = constant i15 add(i15 32767, i15 32767)
+@d = constant i15 add(i15 32760, i15 8)
+@e = constant i15 sub(i15 0 , i15 1)
+@f = constant i15 sub(i15 0 , i15 32767)
+@g = constant i15 sub(i15 2 , i15 32767)
 
-%h = constant i15 shl(i15 1 , i8 15)
-%i = constant i15 shl(i15 1 , i8 14)
-%j = constant i15 lshr(i15 32767 , i8 14)
-%k = constant i15 lshr(i15 32767 , i8 15)
-%l = constant i15 ashr(i15 32767 , i8 14)
-%m = constant i15 ashr(i15 32767 , i8 15)
+@h = constant i15 shl(i15 1 , i8 15)
+@i = constant i15 shl(i15 1 , i8 14)
+@j = constant i15 lshr(i15 32767 , i8 14)
+@k = constant i15 lshr(i15 32767 , i8 15)
+@l = constant i15 ashr(i15 32767 , i8 14)
+@m = constant i15 ashr(i15 32767 , i8 15)
 
-%n = constant i15 mul(i15 32767, i15 2)
-%q = constant i15 mul(i15 -16383,i15 -3)
-%r = constant i15 sdiv(i15 -1,   i15 16383)
-%s = constant i15 udiv(i15 -1,   i15 16383)
-%t = constant i15 srem(i15 1,    i15 32766)
-%u = constant i15 urem(i15 32767,i15 -1)
-%o = constant i15 trunc( i16 32768  to i15 )
-%p = constant i15 trunc( i16 32767  to i15 )
+@n = constant i15 mul(i15 32767, i15 2)
+@q = constant i15 mul(i15 -16383,i15 -3)
+@r = constant i15 sdiv(i15 -1,   i15 16383)
+@s = constant i15 udiv(i15 -1,   i15 16383)
+@t = constant i15 srem(i15 1,    i15 32766)
+@u = constant i15 urem(i15 32767,i15 -1)
+@o = constant i15 trunc( i16 32768  to i15 )
+@p = constant i15 trunc( i16 32767  to i15 )
  
diff --git a/test/Integer/a15.ll.out b/test/Integer/a15.ll.out
index c180a49f793..1ebc4e310fb 100644
--- a/test/Integer/a15.ll.out
+++ b/test/Integer/a15.ll.out
@@ -1,23 +1,23 @@
 ; ModuleID = '<stdin>'
-%b = constant i15 0		; <i15*> [#uses=0]
-%c = constant i15 -2		; <i15*> [#uses=0]
-%d = constant i15 0		; <i15*> [#uses=0]
-%e = constant i15 -1		; <i15*> [#uses=0]
-%f = constant i15 1		; <i15*> [#uses=0]
-%g = constant i15 3		; <i15*> [#uses=0]
-%h = constant i15 0		; <i15*> [#uses=0]
-%i = constant i15 -16384		; <i15*> [#uses=0]
-%j = constant i15 1		; <i15*> [#uses=0]
-%k = constant i15 0		; <i15*> [#uses=0]
-%l = constant i15 -1		; <i15*> [#uses=0]
-%m = constant i15 -1		; <i15*> [#uses=0]
-%n = constant i15 -2		; <i15*> [#uses=0]
-%q = constant i15 16381		; <i15*> [#uses=0]
-%r = constant i15 0		; <i15*> [#uses=0]
-%s = constant i15 2		; <i15*> [#uses=0]
-%t = constant i15 1		; <i15*> [#uses=0]
-%u = constant i15 0		; <i15*> [#uses=0]
-%o = constant i15 0		; <i15*> [#uses=0]
-%p = constant i15 -1		; <i15*> [#uses=0]
+@b = constant i15 0		; <i15*> [#uses=0]
+@c = constant i15 -2		; <i15*> [#uses=0]
+@d = constant i15 0		; <i15*> [#uses=0]
+@e = constant i15 -1		; <i15*> [#uses=0]
+@f = constant i15 1		; <i15*> [#uses=0]
+@g = constant i15 3		; <i15*> [#uses=0]
+@h = constant i15 0		; <i15*> [#uses=0]
+@i = constant i15 -16384		; <i15*> [#uses=0]
+@j = constant i15 1		; <i15*> [#uses=0]
+@k = constant i15 0		; <i15*> [#uses=0]
+@l = constant i15 -1		; <i15*> [#uses=0]
+@m = constant i15 -1		; <i15*> [#uses=0]
+@n = constant i15 -2		; <i15*> [#uses=0]
+@q = constant i15 16381		; <i15*> [#uses=0]
+@r = constant i15 0		; <i15*> [#uses=0]
+@s = constant i15 2		; <i15*> [#uses=0]
+@t = constant i15 1		; <i15*> [#uses=0]
+@u = constant i15 0		; <i15*> [#uses=0]
+@o = constant i15 0		; <i15*> [#uses=0]
+@p = constant i15 -1		; <i15*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a17.ll b/test/Integer/a17.ll
index 5770c7c0cff..82760786cd2 100644
--- a/test/Integer/a17.ll
+++ b/test/Integer/a17.ll
@@ -3,24 +3,24 @@
 
 ; test 17 bits
 ;
-%b = constant i17 add(i17 131071, i17 1)
-%c = constant i17 add(i17 131071, i17 131071)
-%d = constant i17 add(i17 131064, i17 8)
-%e = constant i17 sub(i17 0 , i17 1)
-%f = constant i17 sub(i17 0 , i17 131071)
-%g = constant i17 sub(i17 2 , i17 131071)
+@b = constant i17 add(i17 131071, i17 1)
+@c = constant i17 add(i17 131071, i17 131071)
+@d = constant i17 add(i17 131064, i17 8)
+@e = constant i17 sub(i17 0 , i17 1)
+@f = constant i17 sub(i17 0 , i17 131071)
+@g = constant i17 sub(i17 2 , i17 131071)
 
-%h = constant i17 shl(i17 1 , i8 17)
-%i = constant i17 shl(i17 1 , i8 16)
-%j = constant i17 lshr(i17 131071 , i8 16)
-%k = constant i17 lshr(i17 131071 , i8 17)
-%l = constant i17 ashr(i17 131071 , i8 16)
-%m = constant i17 ashr(i17 131071 , i8 17)
+@h = constant i17 shl(i17 1 , i8 17)
+@i = constant i17 shl(i17 1 , i8 16)
+@j = constant i17 lshr(i17 131071 , i8 16)
+@k = constant i17 lshr(i17 131071 , i8 17)
+@l = constant i17 ashr(i17 131071 , i8 16)
+@m = constant i17 ashr(i17 131071 , i8 17)
 
-%n = constant i17 mul(i17 131071, i17 2) 
-%q = constant i17 sdiv(i17 -1,    i17 65535)
-%r = constant i17 udiv(i17 -1,    i17 65535)
-%s = constant i17 srem(i17  1,    i17 131070)
-%t = constant i17 urem(i17 131071,i17 -1)
-%o = constant i17 trunc( i18 131072  to i17 )
-%p = constant i17 trunc( i18 131071  to i17 )
+@n = constant i17 mul(i17 131071, i17 2) 
+@q = constant i17 sdiv(i17 -1,    i17 65535)
+@r = constant i17 udiv(i17 -1,    i17 65535)
+@s = constant i17 srem(i17  1,    i17 131070)
+@t = constant i17 urem(i17 131071,i17 -1)
+@o = constant i17 trunc( i18 131072  to i17 )
+@p = constant i17 trunc( i18 131071  to i17 )
diff --git a/test/Integer/a17.ll.out b/test/Integer/a17.ll.out
index f0cb13a4fe5..c00ce519328 100644
--- a/test/Integer/a17.ll.out
+++ b/test/Integer/a17.ll.out
@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i17 0		; <i17*> [#uses=0]
-%c = constant i17 -2		; <i17*> [#uses=0]
-%d = constant i17 0		; <i17*> [#uses=0]
-%e = constant i17 -1		; <i17*> [#uses=0]
-%f = constant i17 1		; <i17*> [#uses=0]
-%g = constant i17 3		; <i17*> [#uses=0]
-%h = constant i17 0		; <i17*> [#uses=0]
-%i = constant i17 -65536		; <i17*> [#uses=0]
-%j = constant i17 1		; <i17*> [#uses=0]
-%k = constant i17 0		; <i17*> [#uses=0]
-%l = constant i17 -1		; <i17*> [#uses=0]
-%m = constant i17 -1		; <i17*> [#uses=0]
-%n = constant i17 -2		; <i17*> [#uses=0]
-%q = constant i17 0		; <i17*> [#uses=0]
-%r = constant i17 2		; <i17*> [#uses=0]
-%s = constant i17 1		; <i17*> [#uses=0]
-%t = constant i17 0		; <i17*> [#uses=0]
-%o = constant i17 0		; <i17*> [#uses=0]
-%p = constant i17 -1		; <i17*> [#uses=0]
+@b = constant i17 0		; <i17*> [#uses=0]
+@c = constant i17 -2		; <i17*> [#uses=0]
+@d = constant i17 0		; <i17*> [#uses=0]
+@e = constant i17 -1		; <i17*> [#uses=0]
+@f = constant i17 1		; <i17*> [#uses=0]
+@g = constant i17 3		; <i17*> [#uses=0]
+@h = constant i17 0		; <i17*> [#uses=0]
+@i = constant i17 -65536		; <i17*> [#uses=0]
+@j = constant i17 1		; <i17*> [#uses=0]
+@k = constant i17 0		; <i17*> [#uses=0]
+@l = constant i17 -1		; <i17*> [#uses=0]
+@m = constant i17 -1		; <i17*> [#uses=0]
+@n = constant i17 -2		; <i17*> [#uses=0]
+@q = constant i17 0		; <i17*> [#uses=0]
+@r = constant i17 2		; <i17*> [#uses=0]
+@s = constant i17 1		; <i17*> [#uses=0]
+@t = constant i17 0		; <i17*> [#uses=0]
+@o = constant i17 0		; <i17*> [#uses=0]
+@p = constant i17 -1		; <i17*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a31.ll b/test/Integer/a31.ll
index 50e229dee58..fa3774b4fb8 100644
--- a/test/Integer/a31.ll
+++ b/test/Integer/a31.ll
@@ -3,24 +3,24 @@
 
 ; test 31 bits
 ;
-%b = constant i31 add(i31 2147483647, i31 1)
-%c = constant i31 add(i31 2147483647, i31 2147483647)
-%d = constant i31 add(i31 2147483640, i31 8)
-%e = constant i31 sub(i31 0 , i31 1)
-%f = constant i31 sub(i31 0 , i31 2147483647)
-%g = constant i31 sub(i31 2 , i31 2147483647)
+@b = constant i31 add(i31 2147483647, i31 1)
+@c = constant i31 add(i31 2147483647, i31 2147483647)
+@d = constant i31 add(i31 2147483640, i31 8)
+@e = constant i31 sub(i31 0 , i31 1)
+@f = constant i31 sub(i31 0 , i31 2147483647)
+@g = constant i31 sub(i31 2 , i31 2147483647)
 
-%h = constant i31 shl(i31 1 , i8 31)
-%i = constant i31 shl(i31 1 , i8 30)
-%j = constant i31 lshr(i31 2147483647 , i8 30)
-%k = constant i31 lshr(i31 2147483647 , i8 31)
-%l = constant i31 ashr(i31 2147483647 , i8 30)
-%m = constant i31 ashr(i31 2147483647 , i8 31)
+@h = constant i31 shl(i31 1 , i8 31)
+@i = constant i31 shl(i31 1 , i8 30)
+@j = constant i31 lshr(i31 2147483647 , i8 30)
+@k = constant i31 lshr(i31 2147483647 , i8 31)
+@l = constant i31 ashr(i31 2147483647 , i8 30)
+@m = constant i31 ashr(i31 2147483647 , i8 31)
 
-%n = constant i31 mul(i31 2147483647, i31 2)
-%q = constant i31 sdiv(i31 -1,        i31 1073741823)
-%r = constant i31 udiv(i31 -1,        i31 1073741823)
-%s = constant i31 srem(i31  3,        i31 2147483646)
-%t = constant i31 urem(i31 2147483647,i31 -1)
-%o = constant i31 trunc( i32 2147483648  to i31 )
-%p = constant i31 trunc( i32 2147483647  to i31 ) 
+@n = constant i31 mul(i31 2147483647, i31 2)
+@q = constant i31 sdiv(i31 -1,        i31 1073741823)
+@r = constant i31 udiv(i31 -1,        i31 1073741823)
+@s = constant i31 srem(i31  3,        i31 2147483646)
+@t = constant i31 urem(i31 2147483647,i31 -1)
+@o = constant i31 trunc( i32 2147483648  to i31 )
+@p = constant i31 trunc( i32 2147483647  to i31 ) 
diff --git a/test/Integer/a31.ll.out b/test/Integer/a31.ll.out
index b86d64558c7..d8765748ee6 100644
--- a/test/Integer/a31.ll.out
+++ b/test/Integer/a31.ll.out
@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i31 0		; <i31*> [#uses=0]
-%c = constant i31 -2		; <i31*> [#uses=0]
-%d = constant i31 0		; <i31*> [#uses=0]
-%e = constant i31 -1		; <i31*> [#uses=0]
-%f = constant i31 1		; <i31*> [#uses=0]
-%g = constant i31 3		; <i31*> [#uses=0]
-%h = constant i31 0		; <i31*> [#uses=0]
-%i = constant i31 -1073741824		; <i31*> [#uses=0]
-%j = constant i31 1		; <i31*> [#uses=0]
-%k = constant i31 0		; <i31*> [#uses=0]
-%l = constant i31 -1		; <i31*> [#uses=0]
-%m = constant i31 -1		; <i31*> [#uses=0]
-%n = constant i31 -2		; <i31*> [#uses=0]
-%q = constant i31 0		; <i31*> [#uses=0]
-%r = constant i31 2		; <i31*> [#uses=0]
-%s = constant i31 1		; <i31*> [#uses=0]
-%t = constant i31 0		; <i31*> [#uses=0]
-%o = constant i31 0		; <i31*> [#uses=0]
-%p = constant i31 -1		; <i31*> [#uses=0]
+@b = constant i31 0		; <i31*> [#uses=0]
+@c = constant i31 -2		; <i31*> [#uses=0]
+@d = constant i31 0		; <i31*> [#uses=0]
+@e = constant i31 -1		; <i31*> [#uses=0]
+@f = constant i31 1		; <i31*> [#uses=0]
+@g = constant i31 3		; <i31*> [#uses=0]
+@h = constant i31 0		; <i31*> [#uses=0]
+@i = constant i31 -1073741824		; <i31*> [#uses=0]
+@j = constant i31 1		; <i31*> [#uses=0]
+@k = constant i31 0		; <i31*> [#uses=0]
+@l = constant i31 -1		; <i31*> [#uses=0]
+@m = constant i31 -1		; <i31*> [#uses=0]
+@n = constant i31 -2		; <i31*> [#uses=0]
+@q = constant i31 0		; <i31*> [#uses=0]
+@r = constant i31 2		; <i31*> [#uses=0]
+@s = constant i31 1		; <i31*> [#uses=0]
+@t = constant i31 0		; <i31*> [#uses=0]
+@o = constant i31 0		; <i31*> [#uses=0]
+@p = constant i31 -1		; <i31*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a33.ll b/test/Integer/a33.ll
index 17c6f952faf..cf14274acf4 100644
--- a/test/Integer/a33.ll
+++ b/test/Integer/a33.ll
@@ -3,25 +3,25 @@
 
 ; test 33 bits
 ;
-%b = constant i33 add(i33 8589934591, i33 1)
-%c = constant i33 add(i33 8589934591, i33 8589934591)
-%d = constant i33 add(i33 8589934584, i33 8)
-%e = constant i33 sub(i33 0 , i33 1)
-%f = constant i33 sub(i33 0 , i33 8589934591)
-%g = constant i33 sub(i33 2 , i33 8589934591)
+@b = constant i33 add(i33 8589934591, i33 1)
+@c = constant i33 add(i33 8589934591, i33 8589934591)
+@d = constant i33 add(i33 8589934584, i33 8)
+@e = constant i33 sub(i33 0 , i33 1)
+@f = constant i33 sub(i33 0 , i33 8589934591)
+@g = constant i33 sub(i33 2 , i33 8589934591)
 
-%h = constant i33 shl(i33 1 , i8 33)
-%i = constant i33 shl(i33 1 , i8 32)
-%j = constant i33 lshr(i33 8589934591 , i8 32)
-%k = constant i33 lshr(i33 8589934591 , i8 33)
-%l = constant i33 ashr(i33 8589934591 , i8 32)
-%m = constant i33 ashr(i33 8589934591 , i8 33)
+@h = constant i33 shl(i33 1 , i8 33)
+@i = constant i33 shl(i33 1 , i8 32)
+@j = constant i33 lshr(i33 8589934591 , i8 32)
+@k = constant i33 lshr(i33 8589934591 , i8 33)
+@l = constant i33 ashr(i33 8589934591 , i8 32)
+@m = constant i33 ashr(i33 8589934591 , i8 33)
 
-%n = constant i33 mul(i33 8589934591, i33 2)
-%q = constant i33 sdiv(i33 -1,        i33 4294967295)
-%r = constant i33 udiv(i33 -1,        i33 4294967295)
-%s = constant i33 srem(i33  3,        i33 8589934590)
-%t = constant i33 urem(i33 8589934591,i33 -1)
-%o = constant i33 trunc( i34 8589934592 to i33 )
-%p = constant i33 trunc( i34 8589934591  to i33 )
+@n = constant i33 mul(i33 8589934591, i33 2)
+@q = constant i33 sdiv(i33 -1,        i33 4294967295)
+@r = constant i33 udiv(i33 -1,        i33 4294967295)
+@s = constant i33 srem(i33  3,        i33 8589934590)
+@t = constant i33 urem(i33 8589934591,i33 -1)
+@o = constant i33 trunc( i34 8589934592 to i33 )
+@p = constant i33 trunc( i34 8589934591  to i33 )
  
diff --git a/test/Integer/a33.ll.out b/test/Integer/a33.ll.out
index 11dc54d3703..b63dae6ef6c 100644
--- a/test/Integer/a33.ll.out
+++ b/test/Integer/a33.ll.out
@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i33 0		; <i33*> [#uses=0]
-%c = constant i33 -2		; <i33*> [#uses=0]
-%d = constant i33 0		; <i33*> [#uses=0]
-%e = constant i33 -1		; <i33*> [#uses=0]
-%f = constant i33 1		; <i33*> [#uses=0]
-%g = constant i33 3		; <i33*> [#uses=0]
-%h = constant i33 0		; <i33*> [#uses=0]
-%i = constant i33 -4294967296		; <i33*> [#uses=0]
-%j = constant i33 1		; <i33*> [#uses=0]
-%k = constant i33 0		; <i33*> [#uses=0]
-%l = constant i33 -1		; <i33*> [#uses=0]
-%m = constant i33 -1		; <i33*> [#uses=0]
-%n = constant i33 -2		; <i33*> [#uses=0]
-%q = constant i33 0		; <i33*> [#uses=0]
-%r = constant i33 2		; <i33*> [#uses=0]
-%s = constant i33 1		; <i33*> [#uses=0]
-%t = constant i33 0		; <i33*> [#uses=0]
-%o = constant i33 0		; <i33*> [#uses=0]
-%p = constant i33 -1		; <i33*> [#uses=0]
+@b = constant i33 0		; <i33*> [#uses=0]
+@c = constant i33 -2		; <i33*> [#uses=0]
+@d = constant i33 0		; <i33*> [#uses=0]
+@e = constant i33 -1		; <i33*> [#uses=0]
+@f = constant i33 1		; <i33*> [#uses=0]
+@g = constant i33 3		; <i33*> [#uses=0]
+@h = constant i33 0		; <i33*> [#uses=0]
+@i = constant i33 -4294967296		; <i33*> [#uses=0]
+@j = constant i33 1		; <i33*> [#uses=0]
+@k = constant i33 0		; <i33*> [#uses=0]
+@l = constant i33 -1		; <i33*> [#uses=0]
+@m = constant i33 -1		; <i33*> [#uses=0]
+@n = constant i33 -2		; <i33*> [#uses=0]
+@q = constant i33 0		; <i33*> [#uses=0]
+@r = constant i33 2		; <i33*> [#uses=0]
+@s = constant i33 1		; <i33*> [#uses=0]
+@t = constant i33 0		; <i33*> [#uses=0]
+@o = constant i33 0		; <i33*> [#uses=0]
+@p = constant i33 -1		; <i33*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a63.ll b/test/Integer/a63.ll
index 29730018c04..ec348ff204b 100644
--- a/test/Integer/a63.ll
+++ b/test/Integer/a63.ll
@@ -3,25 +3,25 @@
 
 ; test 63 bits
 ;
-%b = constant i63 add(i63 9223372036854775807, i63 1)
-%c = constant i63 add(i63 9223372036854775807, i63 9223372036854775807)
-%d = constant i63 add(i63 9223372036854775800, i63 8)
-%e = constant i63 sub(i63 0 , i63 1)
-%f = constant i63 sub(i63 0 , i63 9223372036854775807)
-%g = constant i63 sub(i63 2 , i63 9223372036854775807)
+@b = constant i63 add(i63 9223372036854775807, i63 1)
+@c = constant i63 add(i63 9223372036854775807, i63 9223372036854775807)
+@d = constant i63 add(i63 9223372036854775800, i63 8)
+@e = constant i63 sub(i63 0 , i63 1)
+@f = constant i63 sub(i63 0 , i63 9223372036854775807)
+@g = constant i63 sub(i63 2 , i63 9223372036854775807)
 
-%h = constant i63 shl(i63 1 , i8 63)
-%i = constant i63 shl(i63 1 , i8 62)
-%j = constant i63 lshr(i63 9223372036854775807 , i8 62)
-%k = constant i63 lshr(i63 9223372036854775807 , i8 63)
-%l = constant i63 ashr(i63 9223372036854775807 , i8 62)
-%m = constant i63 ashr(i63 9223372036854775807 , i8 63)
+@h = constant i63 shl(i63 1 , i8 63)
+@i = constant i63 shl(i63 1 , i8 62)
+@j = constant i63 lshr(i63 9223372036854775807 , i8 62)
+@k = constant i63 lshr(i63 9223372036854775807 , i8 63)
+@l = constant i63 ashr(i63 9223372036854775807 , i8 62)
+@m = constant i63 ashr(i63 9223372036854775807 , i8 63)
 
-%n = constant i63 mul(i63 9223372036854775807, i63 2) 
-%q = constant i63 sdiv(i63 -1,                 i63 4611686018427387903)
-%u = constant i63 sdiv(i63 -1,                 i63 1)
-%r = constant i63 udiv(i63 -1,                 i63 4611686018427387903)
-%s = constant i63 srem(i63  3,                 i63 9223372036854775806)
-%t = constant i63 urem(i63 9223372036854775807,i63 -1)
-%o = constant i63 trunc( i64 9223372036854775808 to i63 )
-%p = constant i63 trunc( i64 9223372036854775807  to i63 )
+@n = constant i63 mul(i63 9223372036854775807, i63 2) 
+@q = constant i63 sdiv(i63 -1,                 i63 4611686018427387903)
+@u = constant i63 sdiv(i63 -1,                 i63 1)
+@r = constant i63 udiv(i63 -1,                 i63 4611686018427387903)
+@s = constant i63 srem(i63  3,                 i63 9223372036854775806)
+@t = constant i63 urem(i63 9223372036854775807,i63 -1)
+@o = constant i63 trunc( i64 9223372036854775808 to i63 )
+@p = constant i63 trunc( i64 9223372036854775807  to i63 )
diff --git a/test/Integer/a63.ll.out b/test/Integer/a63.ll.out
index 03bba1c5e54..3a82d74267d 100644
--- a/test/Integer/a63.ll.out
+++ b/test/Integer/a63.ll.out
@@ -1,23 +1,23 @@
 ; ModuleID = '<stdin>'
-%b = constant i63 0		; <i63*> [#uses=0]
-%c = constant i63 -2		; <i63*> [#uses=0]
-%d = constant i63 0		; <i63*> [#uses=0]
-%e = constant i63 -1		; <i63*> [#uses=0]
-%f = constant i63 1		; <i63*> [#uses=0]
-%g = constant i63 3		; <i63*> [#uses=0]
-%h = constant i63 0		; <i63*> [#uses=0]
-%i = constant i63 -4611686018427387904		; <i63*> [#uses=0]
-%j = constant i63 1		; <i63*> [#uses=0]
-%k = constant i63 0		; <i63*> [#uses=0]
-%l = constant i63 -1		; <i63*> [#uses=0]
-%m = constant i63 -1		; <i63*> [#uses=0]
-%n = constant i63 -2		; <i63*> [#uses=0]
-%q = constant i63 0		; <i63*> [#uses=0]
-%u = constant i63 -1		; <i63*> [#uses=0]
-%r = constant i63 2		; <i63*> [#uses=0]
-%s = constant i63 1		; <i63*> [#uses=0]
-%t = constant i63 0		; <i63*> [#uses=0]
-%o = constant i63 0		; <i63*> [#uses=0]
-%p = constant i63 -1		; <i63*> [#uses=0]
+@b = constant i63 0		; <i63*> [#uses=0]
+@c = constant i63 -2		; <i63*> [#uses=0]
+@d = constant i63 0		; <i63*> [#uses=0]
+@e = constant i63 -1		; <i63*> [#uses=0]
+@f = constant i63 1		; <i63*> [#uses=0]
+@g = constant i63 3		; <i63*> [#uses=0]
+@h = constant i63 0		; <i63*> [#uses=0]
+@i = constant i63 -4611686018427387904		; <i63*> [#uses=0]
+@j = constant i63 1		; <i63*> [#uses=0]
+@k = constant i63 0		; <i63*> [#uses=0]
+@l = constant i63 -1		; <i63*> [#uses=0]
+@m = constant i63 -1		; <i63*> [#uses=0]
+@n = constant i63 -2		; <i63*> [#uses=0]
+@q = constant i63 0		; <i63*> [#uses=0]
+@u = constant i63 -1		; <i63*> [#uses=0]
+@r = constant i63 2		; <i63*> [#uses=0]
+@s = constant i63 1		; <i63*> [#uses=0]
+@t = constant i63 0		; <i63*> [#uses=0]
+@o = constant i63 0		; <i63*> [#uses=0]
+@p = constant i63 -1		; <i63*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a7.ll b/test/Integer/a7.ll
index b0acefae8db..91904cc3ec2 100644
--- a/test/Integer/a7.ll
+++ b/test/Integer/a7.ll
@@ -3,31 +3,31 @@
 
 ; test 7 bits
 ;
-%b = constant i7 add(i7 127, i7 1)
-%q = constant i7 add(i7 -64, i7 -1)
-%c = constant i7 add(i7 127, i7 127)
-%d = constant i7 add(i7 120, i7 8)
-%e = constant i7 sub(i7 0 , i7 1)
-%f = constant i7 sub(i7 0 , i7 127)
-%g = constant i7 sub(i7 2 , i7 127)
-%r = constant i7 sub(i7 -3, i7 120)
-%s = constant i7 sub(i7 -3, i7 -8)
+@b = constant i7 add(i7 127, i7 1)
+@q = constant i7 add(i7 -64, i7 -1)
+@c = constant i7 add(i7 127, i7 127)
+@d = constant i7 add(i7 120, i7 8)
+@e = constant i7 sub(i7 0 , i7 1)
+@f = constant i7 sub(i7 0 , i7 127)
+@g = constant i7 sub(i7 2 , i7 127)
+@r = constant i7 sub(i7 -3, i7 120)
+@s = constant i7 sub(i7 -3, i7 -8)
 
-%h = constant i7 shl(i7 1 , i8 7)
-%i = constant i7 shl(i7 1 , i8 6)
-%j = constant i7 lshr(i7 127 , i8 6)
-%k = constant i7 lshr(i7 127 , i8 7)
-%l = constant i7 ashr(i7 127 , i8 6)
-%m = constant i7 ashr(i7 127 , i8 7)
-%m2= constant i7 ashr(i7 -1  , i8 3)
+@h = constant i7 shl(i7 1 , i8 7)
+@i = constant i7 shl(i7 1 , i8 6)
+@j = constant i7 lshr(i7 127 , i8 6)
+@k = constant i7 lshr(i7 127 , i8 7)
+@l = constant i7 ashr(i7 127 , i8 6)
+@m = constant i7 ashr(i7 127 , i8 7)
+@m2= constant i7 ashr(i7 -1  , i8 3)
 
-%n = constant i7 mul(i7 127, i7 2)
-%t = constant i7 mul(i7 -63, i7 -2)
-%u = constant i7 mul(i7 -32, i7 2)
-%v = constant i7 sdiv(i7 -1, i7 63)
-%w = constant i7 udiv(i7 -1, i7 63)
-%x = constant i7 srem(i7 1 , i7 126)
-%y = constant i7 urem(i7 127, i7 -1)
-%o = constant i7 trunc( i8 128  to i7 )
-%p = constant i7 trunc( i8 255  to i7 )
+@n = constant i7 mul(i7 127, i7 2)
+@t = constant i7 mul(i7 -63, i7 -2)
+@u = constant i7 mul(i7 -32, i7 2)
+@v = constant i7 sdiv(i7 -1, i7 63)
+@w = constant i7 udiv(i7 -1, i7 63)
+@x = constant i7 srem(i7 1 , i7 126)
+@y = constant i7 urem(i7 127, i7 -1)
+@o = constant i7 trunc( i8 128  to i7 )
+@p = constant i7 trunc( i8 255  to i7 )
  
diff --git a/test/Integer/a7.ll.out b/test/Integer/a7.ll.out
index 327a3315f5d..bbfc8da1a66 100644
--- a/test/Integer/a7.ll.out
+++ b/test/Integer/a7.ll.out
@@ -1,28 +1,28 @@
 ; ModuleID = '<stdin>'
-%b = constant i7 0		; <i7*> [#uses=0]
-%q = constant i7 63		; <i7*> [#uses=0]
-%c = constant i7 -2		; <i7*> [#uses=0]
-%d = constant i7 0		; <i7*> [#uses=0]
-%e = constant i7 -1		; <i7*> [#uses=0]
-%f = constant i7 1		; <i7*> [#uses=0]
-%g = constant i7 3		; <i7*> [#uses=0]
-%r = constant i7 5		; <i7*> [#uses=0]
-%s = constant i7 5		; <i7*> [#uses=0]
-%h = constant i7 0		; <i7*> [#uses=0]
-%i = constant i7 -64		; <i7*> [#uses=0]
-%j = constant i7 1		; <i7*> [#uses=0]
-%k = constant i7 0		; <i7*> [#uses=0]
-%l = constant i7 -1		; <i7*> [#uses=0]
-%m = constant i7 -1		; <i7*> [#uses=0]
-%m2 = constant i7 -1		; <i7*> [#uses=0]
-%n = constant i7 -2		; <i7*> [#uses=0]
-%t = constant i7 -2		; <i7*> [#uses=0]
-%u = constant i7 -64		; <i7*> [#uses=0]
-%v = constant i7 0		; <i7*> [#uses=0]
-%w = constant i7 2		; <i7*> [#uses=0]
-%x = constant i7 1		; <i7*> [#uses=0]
-%y = constant i7 0		; <i7*> [#uses=0]
-%o = constant i7 0		; <i7*> [#uses=0]
-%p = constant i7 -1		; <i7*> [#uses=0]
+@b = constant i7 0		; <i7*> [#uses=0]
+@q = constant i7 63		; <i7*> [#uses=0]
+@c = constant i7 -2		; <i7*> [#uses=0]
+@d = constant i7 0		; <i7*> [#uses=0]
+@e = constant i7 -1		; <i7*> [#uses=0]
+@f = constant i7 1		; <i7*> [#uses=0]
+@g = constant i7 3		; <i7*> [#uses=0]
+@r = constant i7 5		; <i7*> [#uses=0]
+@s = constant i7 5		; <i7*> [#uses=0]
+@h = constant i7 0		; <i7*> [#uses=0]
+@i = constant i7 -64		; <i7*> [#uses=0]
+@j = constant i7 1		; <i7*> [#uses=0]
+@k = constant i7 0		; <i7*> [#uses=0]
+@l = constant i7 -1		; <i7*> [#uses=0]
+@m = constant i7 -1		; <i7*> [#uses=0]
+@m2 = constant i7 -1		; <i7*> [#uses=0]
+@n = constant i7 -2		; <i7*> [#uses=0]
+@t = constant i7 -2		; <i7*> [#uses=0]
+@u = constant i7 -64		; <i7*> [#uses=0]
+@v = constant i7 0		; <i7*> [#uses=0]
+@w = constant i7 2		; <i7*> [#uses=0]
+@x = constant i7 1		; <i7*> [#uses=0]
+@y = constant i7 0		; <i7*> [#uses=0]
+@o = constant i7 0		; <i7*> [#uses=0]
+@p = constant i7 -1		; <i7*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/a9.ll b/test/Integer/a9.ll
index cb10350cc13..8e4cd9a8db3 100644
--- a/test/Integer/a9.ll
+++ b/test/Integer/a9.ll
@@ -3,25 +3,25 @@
 
 ; test 9 bits
 ;
-%b = constant i9 add(i9 511, i9 1)
-%c = constant i9 add(i9 511, i9 511)
-%d = constant i9 add(i9 504, i9 8)
-%e = constant i9 sub(i9 0 , i9 1)
-%f = constant i9 sub(i9 0 , i9 511)
-%g = constant i9 sub(i9 2 , i9 511)
+@b = constant i9 add(i9 511, i9 1)
+@c = constant i9 add(i9 511, i9 511)
+@d = constant i9 add(i9 504, i9 8)
+@e = constant i9 sub(i9 0 , i9 1)
+@f = constant i9 sub(i9 0 , i9 511)
+@g = constant i9 sub(i9 2 , i9 511)
 
-%h = constant i9 shl(i9 1 , i8 9)
-%i = constant i9 shl(i9 1 , i8 8)
-%j = constant i9 lshr(i9 511 , i8 8)
-%k = constant i9 lshr(i9 511 , i8 9)
-%l = constant i9 ashr(i9 511 , i8 8)
-%m = constant i9 ashr(i9 511 , i8 9)
+@h = constant i9 shl(i9 1 , i8 9)
+@i = constant i9 shl(i9 1 , i8 8)
+@j = constant i9 lshr(i9 511 , i8 8)
+@k = constant i9 lshr(i9 511 , i8 9)
+@l = constant i9 ashr(i9 511 , i8 8)
+@m = constant i9 ashr(i9 511 , i8 9)
 
-%n = constant i9 mul(i9 511, i9 2)
-%q = constant i9 sdiv(i9 511, i9 2)
-%r = constant i9 udiv(i9 511, i9 2)
-%s = constant i9 urem(i9 511, i9 -1)
-%t = constant i9 srem(i9 1, i9 510)
-%o = constant i9 trunc( i10 512  to i9 )
-%p = constant i9 trunc( i10 511  to i9 )
+@n = constant i9 mul(i9 511, i9 2)
+@q = constant i9 sdiv(i9 511, i9 2)
+@r = constant i9 udiv(i9 511, i9 2)
+@s = constant i9 urem(i9 511, i9 -1)
+@t = constant i9 srem(i9 1, i9 510)
+@o = constant i9 trunc( i10 512  to i9 )
+@p = constant i9 trunc( i10 511  to i9 )
 
diff --git a/test/Integer/a9.ll.out b/test/Integer/a9.ll.out
index 31f1ef3b48b..28c7cfc955a 100644
--- a/test/Integer/a9.ll.out
+++ b/test/Integer/a9.ll.out
@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i9 0		; <i9*> [#uses=0]
-%c = constant i9 -2		; <i9*> [#uses=0]
-%d = constant i9 0		; <i9*> [#uses=0]
-%e = constant i9 -1		; <i9*> [#uses=0]
-%f = constant i9 1		; <i9*> [#uses=0]
-%g = constant i9 3		; <i9*> [#uses=0]
-%h = constant i9 0		; <i9*> [#uses=0]
-%i = constant i9 -256		; <i9*> [#uses=0]
-%j = constant i9 1		; <i9*> [#uses=0]
-%k = constant i9 0		; <i9*> [#uses=0]
-%l = constant i9 -1		; <i9*> [#uses=0]
-%m = constant i9 -1		; <i9*> [#uses=0]
-%n = constant i9 -2		; <i9*> [#uses=0]
-%q = constant i9 0		; <i9*> [#uses=0]
-%r = constant i9 255		; <i9*> [#uses=0]
-%s = constant i9 0		; <i9*> [#uses=0]
-%t = constant i9 1		; <i9*> [#uses=0]
-%o = constant i9 0		; <i9*> [#uses=0]
-%p = constant i9 -1		; <i9*> [#uses=0]
+@b = constant i9 0		; <i9*> [#uses=0]
+@c = constant i9 -2		; <i9*> [#uses=0]
+@d = constant i9 0		; <i9*> [#uses=0]
+@e = constant i9 -1		; <i9*> [#uses=0]
+@f = constant i9 1		; <i9*> [#uses=0]
+@g = constant i9 3		; <i9*> [#uses=0]
+@h = constant i9 0		; <i9*> [#uses=0]
+@i = constant i9 -256		; <i9*> [#uses=0]
+@j = constant i9 1		; <i9*> [#uses=0]
+@k = constant i9 0		; <i9*> [#uses=0]
+@l = constant i9 -1		; <i9*> [#uses=0]
+@m = constant i9 -1		; <i9*> [#uses=0]
+@n = constant i9 -2		; <i9*> [#uses=0]
+@q = constant i9 0		; <i9*> [#uses=0]
+@r = constant i9 255		; <i9*> [#uses=0]
+@s = constant i9 0		; <i9*> [#uses=0]
+@t = constant i9 1		; <i9*> [#uses=0]
+@o = constant i9 0		; <i9*> [#uses=0]
+@p = constant i9 -1		; <i9*> [#uses=0]
 
 implementation   ; Functions:
diff --git a/test/Integer/alignment_bt.ll b/test/Integer/alignment_bt.ll
index d74d9291742..635cb1f6b37 100644
--- a/test/Integer/alignment_bt.ll
+++ b/test/Integer/alignment_bt.ll
@@ -2,16 +2,16 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-%X = global i19 4, align 16
+@X = global i19 4, align 16
 
-define i19 *%test() align 32 {
+define i19 *@test() align 32 {
 	%X = alloca i19, align 4
 	%Y = alloca i51, i32 42, align 16
 	%Z = alloca i32, align 0
 	ret i19 *%X
 }
 
-define i19 *%test2() {
+define i19 *@test2() {
 	%X = malloc i19, align 4
 	%Y = malloc i51, i32 42, align 16
 	%Z = malloc i32, align 0
diff --git a/test/Integer/basictest_bt.ll b/test/Integer/basictest_bt.ll
index 8140197e045..38d9ac98167 100644
--- a/test/Integer/basictest_bt.ll
+++ b/test/Integer/basictest_bt.ll
@@ -7,7 +7,7 @@ implementation
 ; Test "stripped" format where nothing is symbolic... this is how the bytecode
 ; format looks anyways (except for negative vs positive offsets)...
 ;
-define void "void"(i39, i39)   ; Def %0, %1
+define void @"void"(i39, i39)   ; Def %0, %1
 begin
 	add i39 0, 0      ; Def 2
 	sub i39 0, 4      ; Def 3
@@ -27,7 +27,7 @@ begin
 end
 
 ; This function always returns zero
-define i39 "zarro"()
+define i39 @"zarro"()
 begin
 Startup:
 	ret i39 0
diff --git a/test/Integer/calltest_bt.ll b/test/Integer/calltest_bt.ll
index d313a99d591..c4a7f63fe4c 100644
--- a/test/Integer/calltest_bt.ll
+++ b/test/Integer/calltest_bt.ll
@@ -4,32 +4,31 @@
 
 %FunTy = type i28(i28)
 
-declare i28 "test"(...)   ; Test differences of prototype
-declare i28 "test"()      ; Differ only by vararg
+declare i28 @"test"(...)   ; Test differences of prototype
+declare i28 @"test"()      ; Differ only by vararg
 
 implementation
 
-define void "invoke"(%FunTy *%x) {
+define void @"invoke"(%FunTy *%x) {
 	%foo = call %FunTy* %x(i28 123)
 	%foo2 = tail call %FunTy* %x(i28 123)
 	ret void
 }
 
-define i28 "main"(i28 %argc)   ; TODO: , sbyte **argv, sbyte **envp)
+define i28 @"main"(i28 %argc)   ; TODO: , sbyte **argv, sbyte **envp)
 begin
-        %retval = call i28 (i28) *%test(i28 %argc)
+        %retval = call i28 (i28) *@test(i28 %argc)
         %two    = add i28 %retval, %retval
-	%retval2 = invoke i28 %test(i28 %argc)
+	%retval2 = invoke i28 @test(i28 %argc)
 		   to label %Next unwind label %Error
 Next:
 	%two2 = add i28 %two, %retval2
-	call void %invoke (%FunTy* %test)
+	call void @invoke (%FunTy* @test)
         ret i28 %two2
 Error:
 	ret i28 -1
 end
 
-define i28 "test"(i28 %i0)
-begin
+define i28 @"test"(i28 %i0) {
     ret i28 %i0
-end
+}
diff --git a/test/Integer/cfgstructures_bt.ll b/test/Integer/cfgstructures_bt.ll
index d8381b44f6d..1dbceb65fc0 100644
--- a/test/Integer/cfgstructures_bt.ll
+++ b/test/Integer/cfgstructures_bt.ll
@@ -7,7 +7,7 @@ implementation
 ;; This is an irreducible flow graph
 
 
-define void "irreducible"(i1 %cond)
+define void @"irreducible"(i1 %cond)
 begin
 	br i1 %cond, label %X, label %Y
 
@@ -19,7 +19,7 @@ end
 
 ;; This is a pair of loops that share the same header
 
-define void "sharedheader"(i1 %cond)
+define void @"sharedheader"(i1 %cond)
 begin
 	br label %A
 A:
@@ -32,7 +32,7 @@ Y:
 end
 
 ;; This is a simple nested loop
-define void "nested"(i1 %cond1, i1 %cond2, i1 %cond3)
+define void @"nested"(i1 %cond1, i1 %cond2, i1 %cond3)
 begin
 	br label %Loop1
 
diff --git a/test/Integer/constexpr_bt.ll b/test/Integer/constexpr_bt.ll
index 45529889a95..2a8391acf46 100644
--- a/test/Integer/constexpr_bt.ll
+++ b/test/Integer/constexpr_bt.ll
@@ -14,18 +14,18 @@
 global i63 u0x00001     ; hexadecimal unsigned integer constants
 global i63  s0x012312   ; hexadecimal signed integer constants
 
-%t2 = global i33* %t1                             ;; Forward reference without cast
-%t3 = global i33* bitcast (i33* %t1 to i33*)       ;; Forward reference with cast
-%t1 = global i33 4                                ;; i32* %0
-%t4 = global i33** bitcast (i33** %t3 to i33**)     ;; Cast of a previous cast
-%t5 = global i33** %t3                           ;; Reference to a previous cast
-%t6 = global i33*** %t4
-%t7 = global float* inttoptr (i32 12345678 to float*) ;; Cast ordinary value to ptr
-%t9 = global i33 fptosi (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
-
-
-global i32* bitcast (float* %0 to i32*)   ;; Forward numeric reference
-global float* %0                       ;; Duplicate forward numeric reference
+@t2 = global i33* @t1                             ;; Forward reference without cast
+@t3 = global i33* bitcast (i33* @t1 to i33*)       ;; Forward reference with cast
+@t1 = global i33 4                                ;; i32* @0
+@t4 = global i33** bitcast (i33** @t3 to i33**)     ;; Cast of a previous cast
+@t5 = global i33** @t3                           ;; Reference to a previous cast
+@t6 = global i33*** @t4
+@t7 = global float* inttoptr (i32 12345678 to float*) ;; Cast ordinary value to ptr
+@t9 = global i33 fptosi (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
+
+
+global i32* bitcast (float* @0 to i32*)   ;; Forward numeric reference
+global float* @0                       ;; Duplicate forward numeric reference
 global float 0.0
 
 
@@ -33,18 +33,18 @@ global float 0.0
 ;; Test constant getelementpr expressions for arrays
 ;;---------------------------------------------------
 
-%array  = constant [2 x i33] [ i33 12, i33 52 ]
-%arrayPtr = global i33* getelementptr ([2 x i33]* %array, i64 0, i64 0)    ;; i33* &%array[0][0]
-%arrayPtr5 = global i33** getelementptr (i33** %arrayPtr, i64 5)    ;; i33* &%arrayPtr[5]
+@array  = constant [2 x i33] [ i33 12, i33 52 ]
+@arrayPtr = global i33* getelementptr ([2 x i33]* @array, i64 0, i64 0)    ;; i33* &@array[0][0]
+@arrayPtr5 = global i33** getelementptr (i33** @arrayPtr, i64 5)    ;; i33* &@arrayPtr[5]
 
-%somestr = constant [11x i8] c"hello world"
-%char5  = global i8* getelementptr([11x i8]* %somestr, i64 0, i64 5)
+@somestr = constant [11x i8] c"hello world"
+@char5  = global i8* getelementptr([11x i8]* @somestr, i64 0, i64 5)
 
 ;; cast of getelementptr
-%char8a = global i33* bitcast (i8* getelementptr([11x i8]* %somestr, i64 0, i64 8) to i33*)
+@char8a = global i33* bitcast (i8* getelementptr([11x i8]* @somestr, i64 0, i64 8) to i33*)
 
 ;; getelementptr containing casts
-%char8b = global i8* getelementptr([11x i8]* %somestr, i64 sext (i8 0 to i64), i64 sext (i8 8 to i64))
+@char8b = global i8* getelementptr([11x i8]* @somestr, i64 sext (i8 0 to i64), i64 sext (i8 8 to i64))
 
 ;;-------------------------------------------------------
 ;; TODO: Test constant getelementpr expressions for structures
@@ -53,27 +53,27 @@ global float 0.0
 %SType  = type { i33 , {float, {i8} }, i64 } ;; struct containing struct
 %SAType = type { i33 , {[2x float], i64} } ;; struct containing array
 
-%S1 = global %SType* null			;; Global initialized to NULL
-%S2c = constant %SType { i33 1, {float,{i8}} {float 2.0, {i8} {i8 3}}, i64 4}
+@S1 = global %SType* null			;; Global initialized to NULL
+@S2c = constant %SType { i33 1, {float,{i8}} {float 2.0, {i8} {i8 3}}, i64 4}
 
-%S3c = constant %SAType { i33 1, {[2x float], i64} {[2x float] [float 2.0, float 3.0], i64 4} }
+@S3c = constant %SAType { i33 1, {[2x float], i64} {[2x float] [float 2.0, float 3.0], i64 4} }
 
-%S1ptr = global %SType** %S1		    ;; Ref. to global S1
-%S2  = global %SType* %S2c		    ;; Ref. to constant S2
-%S3  = global %SAType* %S3c		    ;; Ref. to constant S3
+@S1ptr = global %SType** @S1		    ;; Ref. to global S1
+@S2  = global %SType* @S2c		    ;; Ref. to constant S2
+@S3  = global %SAType* @S3c		    ;; Ref. to constant S3
 
-					    ;; Pointer to float (**%S1).1.0
-%S1fld1a = global float* getelementptr (%SType* %S2c, i64 0, i32 1, i32 0)
+					    ;; Pointer to float (**@S1).1.0
+@S1fld1a = global float* getelementptr (%SType* @S2c, i64 0, i32 1, i32 0)
 					    ;; Another ptr to the same!
-%S1fld1b = global float* getelementptr (%SType* %S2c, i64 0, i32 1, i32 0)
+@S1fld1b = global float* getelementptr (%SType* @S2c, i64 0, i32 1, i32 0)
 
-%S1fld1bptr = global float** %S1fld1b	    ;; Ref. to previous pointer
+@S1fld1bptr = global float** @S1fld1b	    ;; Ref. to previous pointer
 
-					    ;; Pointer to i8 (**%S2).1.1.0
-%S2fld3 = global i8* getelementptr (%SType* %S2c, i64 0, i32 1, i32 1, i32 0) 
+					    ;; Pointer to i8 (**@S2).1.1.0
+@S2fld3 = global i8* getelementptr (%SType* @S2c, i64 0, i32 1, i32 1, i32 0) 
 
-					    ;; Pointer to float (**%S2).1.0[0]
-;%S3fld3 = global float* getelementptr (%SAType** %S3, i64 0, i64 0, i32 1, i32 0, i64 0) 
+					    ;; Pointer to float (**@S2).1.0[0]
+;@S3fld3 = global float* getelementptr (%SAType** @S3, i64 0, i64 0, i32 1, i32 0, i64 0) 
 
 ;;---------------------------------------------------------
 ;; TODO: Test constant expressions for unary and binary operators
diff --git a/test/Integer/constpointer_bt.ll b/test/Integer/constpointer_bt.ll
index cbae92b6dca..be8fdfdcc7d 100644
--- a/test/Integer/constpointer_bt.ll
+++ b/test/Integer/constpointer_bt.ll
@@ -10,24 +10,24 @@
 ;
 
 
-%t3 = global i40 * %t1           ;; Forward reference
-%t1 = global i40 4
-%t4 = global i40 ** %t3		 ;; reference to reference
+@t3 = global i40 * @t1           ;; Forward reference
+@t1 = global i40 4
+@t4 = global i40 ** @t3		 ;; reference to reference
 
-%t2 = global i40 * %t1
+@t2 = global i40 * @t1
 
-global float * %0                ;; Forward numeric reference
-global float * %0                ;; Duplicate forward numeric reference
+global float * @0                ;; Forward numeric reference
+global float * @0                ;; Duplicate forward numeric reference
 global float 0.0
-global float * %0                ;; Numeric reference
+global float * @0                ;; Numeric reference
 
 
-%fptr = global void() * %f       ;; Forward ref method defn
-declare void "f"()               ;; External method
+@fptr = global void() * @f       ;; Forward ref method defn
+declare void @"f"()               ;; External method
 
-%sptr1   = global [11x i8]* %somestr		;; Forward ref to a constant
-%somestr = constant [11x i8] c"hello world"
-%sptr2   = global [11x i8]* %somestr
+@sptr1   = global [11x i8]* @somestr		;; Forward ref to a constant
+@somestr = constant [11x i8] c"hello world"
+@sptr2   = global [11x i8]* @somestr
 
 implementation
 
diff --git a/test/Integer/forwardreftest_bt.ll b/test/Integer/forwardreftest_bt.ll
index d6011b0a229..6e2936d84e6 100644
--- a/test/Integer/forwardreftest_bt.ll
+++ b/test/Integer/forwardreftest_bt.ll
@@ -11,23 +11,23 @@
   %thisfuncty = type i55 (i55) *
 implementation
 
-declare void %F(%thisfuncty, %thisfuncty, %thisfuncty)
+declare void @F(%thisfuncty, %thisfuncty, %thisfuncty)
 
 ; This function always returns zero
-define i55 %zarro(i55 %Func)
+define i55 @zarro(i55 %Func)
 begin
 Startup:
     add i55 0, 10
     ret i55 0 
 end
 
-define i55 %test(i55) 
+define i55 @test(i55) 
 begin
-    call void %F(%thisfuncty %zarro, %thisfuncty %test, %thisfuncty %foozball)
+    call void @F(%thisfuncty @zarro, %thisfuncty @test, %thisfuncty @foozball)
     ret i55 0
 end
 
-define i55 %foozball(i55)
+define i55 @foozball(i55)
 begin
     ret i55 0
 end
diff --git a/test/Integer/globalredefinition_bt.ll b/test/Integer/globalredefinition_bt.ll
index 56b1ab1a45f..b369b2a5d80 100644
--- a/test/Integer/globalredefinition_bt.ll
+++ b/test/Integer/globalredefinition_bt.ll
@@ -4,15 +4,15 @@
 
 ; Test forward references and redefinitions of globals
 
-%A = global i17* %B
-%B = global i17 7
+@A = global i17* @B
+@B = global i17 7
 
-declare void %X()
+declare void @X()
 
-declare void %X()
+declare void @X()
 
-define void %X() {
+define void @X() {
   ret void
 }
 
-declare void %X()
+declare void @X()
diff --git a/test/Integer/globalvars_bt.ll b/test/Integer/globalvars_bt.ll
index b8df1b81e1e..702f57edcb5 100644
--- a/test/Integer/globalvars_bt.ll
+++ b/test/Integer/globalvars_bt.ll
@@ -4,23 +4,23 @@
 
 
 
-%MyVar     = external global i27
-%MyIntList = external global { \2 *, i27 }
+@MyVar     = external global i27
+@MyIntList = external global { \2 *, i27 }
              external global i27      ; i27*:0
 
-%AConst    = constant i27 123
+@AConst    = constant i27 123
 
-%AString   = constant [4 x i8] c"test"
+@AString   = constant [4 x i8] c"test"
 
-%ZeroInit  = global { [100 x i27 ], [40 x float ] } { [100 x i27] zeroinitializer,
+@ZeroInit  = global { [100 x i27 ], [40 x float ] } { [100 x i27] zeroinitializer,
                                                       [40  x float] zeroinitializer }
 
 implementation
 
-define i27 "foo"(i27 %blah)
+define i27 @"foo"(i27 %blah)
 begin
-	store i27 5, i27 *%MyVar
-        %idx = getelementptr { \2 *, i27 } * %MyIntList, i64 0, i32 1
+	store i27 5, i27 *@MyVar
+        %idx = getelementptr { \2 *, i27 } * @MyIntList, i64 0, i32 1
   	store i27 12, i27* %idx
   	ret i27 %blah
 end
diff --git a/test/Integer/indirectcall2_bt.ll b/test/Integer/indirectcall2_bt.ll
index 1fd48a0d394..1652f1691c0 100644
--- a/test/Integer/indirectcall2_bt.ll
+++ b/test/Integer/indirectcall2_bt.ll
@@ -4,18 +4,18 @@
 
 implementation
 
-define i63 "test"(i63 %X)
+define i63 @"test"(i63 %X)
 begin
 	ret i63 %X
 end
 
-define i63 "fib"(i63 %n)
+define i63 @"fib"(i63 %n)
 begin
   %T = icmp ult i63 %n, 2       ; {i1}:0
   br i1 %T, label %BaseCase, label %RecurseCase
 
 RecurseCase:
-  %result = call i63 %test(i63 %n)
+  %result = call i63 @test(i63 %n)
   br label %BaseCase
 
 BaseCase:
diff --git a/test/Integer/indirectcall_bt.ll b/test/Integer/indirectcall_bt.ll
index 8a6f77384d7..274dfc5a28e 100644
--- a/test/Integer/indirectcall_bt.ll
+++ b/test/Integer/indirectcall_bt.ll
@@ -4,9 +4,9 @@
 
 implementation
 
-declare i32 "atoi"(i8 *)
+declare i32 @"atoi"(i8 *)
 
-define i63 "fib"(i63 %n)
+define i63 @"fib"(i63 %n)
 begin
   icmp ult i63 %n, 2       ; {i1}:0
   br i1 %0, label %BaseCase, label %RecurseCase
@@ -17,13 +17,13 @@ BaseCase:
 RecurseCase:
   %n2 = sub i63 %n, 2
   %n1 = sub i63 %n, 1
-  %f2 = call i63(i63) * %fib(i63 %n2)
-  %f1 = call i63(i63) * %fib(i63 %n1)
+  %f2 = call i63(i63) * @fib(i63 %n2)
+  %f1 = call i63(i63) * @fib(i63 %n1)
   %result = add i63 %f2, %f1
   ret i63 %result
 end
 
-define i63 "realmain"(i32 %argc, i8 ** %argv)
+define i63 @"realmain"(i32 %argc, i8 ** %argv)
 begin
   icmp eq i32 %argc, 2      ; {i1}:0
   br i1 %0, label %HasArg, label %Continue
@@ -35,20 +35,19 @@ HasArg:
 Continue:
   %n = phi i32 [%n1, %HasArg], [1, %0]
   %N = sext i32 %n to i63
-  %F = call i63(i63) *%fib(i63 %N)
+  %F = call i63(i63) *@fib(i63 %N)
   ret i63 %F
 end
 
-define i63 "trampoline"(i63 %n, i63(i63)* %fibfunc)
+define i63 @"trampoline"(i63 %n, i63(i63)* %fibfunc)
 begin
   %F = call i63(i63) *%fibfunc(i63 %n)
   ret i63 %F
 end
 
-define i32 "main"()
+define i32 @"main"()
 begin
-  %Result = call i63 %trampoline(i63 10, i63(i63) *%fib)
+  %Result = call i63 @trampoline(i63 10, i63(i63) *@fib)
   %Result = trunc i63 %Result to i32
   ret i32 %Result
 end
-
diff --git a/test/Integer/instructions_bt.ll b/test/Integer/instructions_bt.ll
index e10fe9e3dd0..7ca58903527 100644
--- a/test/Integer/instructions_bt.ll
+++ b/test/Integer/instructions_bt.ll
@@ -3,23 +3,23 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-define i39 %test_extractelement(<4 x i39> %V) {
+define i39 @test_extractelement(<4 x i39> %V) {
         %R = extractelement <4 x i39> %V, i32 1
         ret i39 %R
 }
 
-define <4 x i39> %test_insertelement(<4 x i39> %V) {
+define <4 x i39> @test_insertelement(<4 x i39> %V) {
         %R = insertelement <4 x i39> %V, i39 0, i32 0
         ret <4 x i39> %R
 }
 
-define <4 x i39> %test_shufflevector_u(<4 x i39> %V) {
+define <4 x i39> @test_shufflevector_u(<4 x i39> %V) {
         %R = shufflevector <4 x i39> %V, <4 x i39> %V, 
                   <4 x i32> < i32 1, i32 undef, i32 7, i32 2>
         ret <4 x i39> %R
 }
 
-define <4 x float> %test_shufflevector_f(<4 x float> %V) {
+define <4 x float> @test_shufflevector_f(<4 x float> %V) {
         %R = shufflevector <4 x float> %V, <4 x float> undef, 
                   <4 x i32> < i32 1, i32 undef, i32 7, i32 2>
         ret <4 x float> %R
diff --git a/test/Integer/newcasts_bt.ll b/test/Integer/newcasts_bt.ll
index 446a0073154..e2eee4f7f12 100644
--- a/test/Integer/newcasts_bt.ll
+++ b/test/Integer/newcasts_bt.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-define void "NewCasts" (i17 %x) {
+define void @"NewCasts" (i17 %x) {
   %a = zext i17 %x to i32
   %b = sext i17 %x to i32
   %c = trunc i17 %x to i8
@@ -19,10 +19,10 @@ define void "NewCasts" (i17 %x) {
 }
 
 
-define i17 "ZExtConst" () {
+define i17 @"ZExtConst" () {
   ret i17 trunc ( i32 zext ( i17 42 to i32) to i17 )
 }
 
-define i17 "SExtConst" () {
+define i17 @"SExtConst" () {
   ret i17 trunc (i32 sext (i17 42 to i32) to i17 )
 }
diff --git a/test/Integer/packed_bt.ll b/test/Integer/packed_bt.ll
index 059e17f5bad..a2fa1277598 100644
--- a/test/Integer/packed_bt.ll
+++ b/test/Integer/packed_bt.ll
@@ -2,16 +2,16 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-%foo1 = external global <4 x float>;
-%foo2 = external global <2 x i10>;
+@foo1 = external global <4 x float>;
+@foo2 = external global <2 x i10>;
 
 implementation   ; Functions:
 
-define void %main() 
+define void @main() 
 {
-        store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* %foo1
-        store <2 x i10> <i10 4, i10 4>, <2 x i10>* %foo2
-	%l1 = load <4 x float>* %foo1
-        %l2 = load <2 x i10>* %foo2
+        store <4 x float> <float 1.0, float 2.0, float 3.0, float 4.0>, <4 x float>* @foo1
+        store <2 x i10> <i10 4, i10 4>, <2 x i10>* @foo2
+	%l1 = load <4 x float>* @foo1
+        %l2 = load <2 x i10>* @foo2
         ret void
 }
diff --git a/test/Integer/packed_struct_bt.ll b/test/Integer/packed_struct_bt.ll
index c72bc4c9426..abd303527fd 100644
--- a/test/Integer/packed_struct_bt.ll
+++ b/test/Integer/packed_struct_bt.ll
@@ -5,29 +5,29 @@
 ; RUN: grep "<{" %t2.ll
 
 %struct.anon = type <{ i8, i35, i35, i35 }>
-%foos = external global %struct.anon 
-%bara = external global [2 x <{ i35, i8 }>]
+@foos = external global %struct.anon 
+@bara = external global [2 x <{ i35, i8 }>]
 
 ;initializers should work for packed and non-packed the same way
-%E1 = global <{i8, i35, i35}> <{i8 1, i35 2, i35 3}>
-%E2 = global {i8, i35, i35} {i8 4, i35 5, i35 6}
+@E1 = global <{i8, i35, i35}> <{i8 1, i35 2, i35 3}>
+@E2 = global {i8, i35, i35} {i8 4, i35 5, i35 6}
 
 implementation   ; Functions:
 
-define i35 %main() 
+define i35 @main() 
 {
-        %tmp = load i35*  getelementptr (%struct.anon* %foos, i32 0, i32 1)            ; <i35> [#uses=1]
-        %tmp3 = load i35* getelementptr (%struct.anon* %foos, i32 0, i32 2)            ; <i35> [#uses=1]
-        %tmp6 = load i35* getelementptr (%struct.anon* %foos, i32 0, i32 3)            ; <i35> [#uses=1]
+        %tmp = load i35*  getelementptr (%struct.anon* @foos, i32 0, i32 1)            ; <i35> [#uses=1]
+        %tmp3 = load i35* getelementptr (%struct.anon* @foos, i32 0, i32 2)            ; <i35> [#uses=1]
+        %tmp6 = load i35* getelementptr (%struct.anon* @foos, i32 0, i32 3)            ; <i35> [#uses=1]
         %tmp4 = add i35 %tmp3, %tmp             ; <i35> [#uses=1]
         %tmp7 = add i35 %tmp4, %tmp6            ; <i35> [#uses=1]
         ret i35 %tmp7
 }
 
-define i35 %bar() {
+define i35 @bar() {
 entry:
-        %tmp = load i35* getelementptr([2 x <{ i35, i8 }>]* %bara, i32 0, i32 0, i32 0 )            ; <i35> [#uses=1]
-        %tmp4 = load i35* getelementptr ([2 x <{ i35, i8 }>]* %bara, i32 0, i32 1, i32 0)           ; <i35> [#uses=1]
+        %tmp = load i35* getelementptr([2 x <{ i35, i8 }>]* @bara, i32 0, i32 0, i32 0 )            ; <i35> [#uses=1]
+        %tmp4 = load i35* getelementptr ([2 x <{ i35, i8 }>]* @bara, i32 0, i32 1, i32 0)           ; <i35> [#uses=1]
         %tmp5 = add i35 %tmp4, %tmp             ; <i35> [#uses=1]
         ret i35 %tmp5
 }
diff --git a/test/Integer/paramattrs_bt.ll b/test/Integer/paramattrs_bt.ll
index 87116ed2060..abf6abdca84 100644
--- a/test/Integer/paramattrs_bt.ll
+++ b/test/Integer/paramattrs_bt.ll
@@ -5,16 +5,16 @@
 %ZFunTy = type i33(i8 zext)
 %SFunTy = type i33(i8 sext)
 
-declare i16 "test"(i16 sext %arg) sext 
-declare i8 "test2" (i16 zext %a2) zext 
+declare i16 @"test"(i16 sext %arg) sext 
+declare i8  @"test2" (i16 zext %a2) zext 
 
 implementation
 
-define i33 %main(i33 %argc, i8 **%argv) {
+define i33 @main(i33 %argc, i8 **%argv) {
     %val = trunc i33 %argc to i16
-    %res = call i16 (i16 sext) sext *%test(i16 %val)
+    %res = call i16 (i16 sext) sext *@test(i16 %val)
     %two = add i16 %res, %res
-    %res = call i8 %test2(i16 %two zext) zext 
+    %res = call i8 @test2(i16 %two zext) zext 
     %retVal = sext i16 %two to i33
     ret i33 %retVal
 }
diff --git a/test/Integer/properties_bt.ll b/test/Integer/properties_bt.ll
index fc88f239dc2..f24ddc2e80e 100644
--- a/test/Integer/properties_bt.ll
+++ b/test/Integer/properties_bt.ll
@@ -3,8 +3,7 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-target endian = little
-target pointersize = 32
+target datalayout = "e-p:32:32"
 target triple = "proc-vend-sys"
 deplibs = [ "m", "c" ]
 
diff --git a/test/Integer/prototype_bt.ll b/test/Integer/prototype_bt.ll
index c3dc6b23207..f1be2aaaa7f 100644
--- a/test/Integer/prototype_bt.ll
+++ b/test/Integer/prototype_bt.ll
@@ -4,11 +4,11 @@
 
 implementation
 
-declare i31 "bar"(i31 %in) 
+declare i31 @"bar"(i31 %in) 
 
-define i31 "foo"(i31 %blah)
+define i31 @"foo"(i31 %blah)
 begin
-  %xx = call i31 %bar(i31 %blah)
+  %xx = call i31 @bar(i31 %blah)
   ret i31 %xx
 end
 
diff --git a/test/Integer/recursivetype_bt.ll b/test/Integer/recursivetype_bt.ll
index 98886909644..5a0d1c7671e 100644
--- a/test/Integer/recursivetype_bt.ll
+++ b/test/Integer/recursivetype_bt.ll
@@ -40,13 +40,13 @@
 
 %list = type { %list*, i36 }
 
-declare i8 *"malloc"(i32)
+declare i8 *@"malloc"(i32)
 
 ;;**********************
 implementation
 ;;**********************
 
-define void "InsertIntoListTail"(%list** %L, i36 %Data)
+define void @"InsertIntoListTail"(%list** %L, i36 %Data)
 begin
 bb1:
         %reg116 = load %list** %L                               ;;<%list*>
@@ -66,7 +66,7 @@ bb2:
 bb3:
         %reg119 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
         %cast1006 = bitcast %list** %reg119 to i8**             ;;<i8**>
-        %reg111 = call i8* %malloc(i32 16)                  ;;<i8*>
+        %reg111 = call i8* @malloc(i32 16)                  ;;<i8*>
         store i8* %reg111, i8** %cast1006                 ;;<void>
 	%reg111 = ptrtoint i8* %reg111 to i64
 	%reg1002 = add i64 %reg111, 8
@@ -79,7 +79,7 @@ bb3:
         ret void
 end
 
-define %list* "FindData"(%list* %L, i36 %Data)
+define %list* @"FindData"(%list* %L, i36 %Data)
 begin
 bb1:
         br label %bb2
diff --git a/test/Integer/simplecalltest_bt.ll b/test/Integer/simplecalltest_bt.ll
index bb39ab10006..e7c675af4ad 100644
--- a/test/Integer/simplecalltest_bt.ll
+++ b/test/Integer/simplecalltest_bt.ll
@@ -6,24 +6,24 @@
 
 implementation
 
-define void "invoke"(%FunTy *%x)
+define void @"invoke"(%FunTy *%x)
 begin
 	%foo = call %FunTy* %x(i31 123)
 	ret void
 end
 
-define i31 "main"(i31 %argc, i8 **%argv, i8 **%envp)
+define i31 @"main"(i31 %argc, i8 **%argv, i8 **%envp)
 begin
-        %retval = call i31 (i31) *%test(i31 %argc)
+        %retval = call i31 (i31) *@test(i31 %argc)
         %two    = add i31 %retval, %retval
-	%retval2 = call i31 %test(i31 %argc)
+	%retval2 = call i31 @test(i31 %argc)
 
 	%two2 = add i31 %two, %retval2
-	call void %invoke (%FunTy* %test)
+	call void @invoke (%FunTy* @test)
         ret i31 %two2
 end
 
-define i31 "test"(i31 %i0)
+define i31 @"test"(i31 %i0)
 begin
     ret i31 %i0
 end
diff --git a/test/Integer/small_bt.ll b/test/Integer/small_bt.ll
index c020eae848d..f82c8c95c81 100644
--- a/test/Integer/small_bt.ll
+++ b/test/Integer/small_bt.ll
@@ -6,7 +6,7 @@
 
 implementation
 
-define i19 "foo"(i19 %in) 
+define i19 @"foo"(i19 %in) 
 begin
 label: 
   ret i19 2
diff --git a/test/Integer/testalloca_bt.ll b/test/Integer/testalloca_bt.ll
index a0d632ae5f1..267c061959f 100644
--- a/test/Integer/testalloca_bt.ll
+++ b/test/Integer/testalloca_bt.ll
@@ -8,7 +8,7 @@
 
 implementation
 
-define i33 %testfunction(i33 %i0, i33 %j0)
+define i33 @testfunction(i33 %i0, i33 %j0)
 begin
     alloca i8, i32 5
     %ptr = alloca i33                       ; yields {i33*}:ptr
diff --git a/test/Integer/testarith_bt.ll b/test/Integer/testarith_bt.ll
index d4b643d340e..2e0ec189822 100644
--- a/test/Integer/testarith_bt.ll
+++ b/test/Integer/testarith_bt.ll
@@ -4,7 +4,7 @@
 
 implementation
 
-define i31 "simpleArith"(i31 %i0, i31 %j0)
+define i31 @"simpleArith"(i31 %i0, i31 %j0)
 begin
 	%t1 = add i31 %i0, %j0
 	%t2 = sub i31 %i0, %j0
diff --git a/test/Integer/testconstants_bt.ll b/test/Integer/testconstants_bt.ll
index 1f4683cf54e..71cbf1310a2 100644
--- a/test/Integer/testconstants_bt.ll
+++ b/test/Integer/testconstants_bt.ll
@@ -2,32 +2,32 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-%somestr = constant [11x i8] c"hello world"
-%array   = constant [2 x i55] [ i55 12, i55 52 ]
+@somestr = constant [11x i8] c"hello world"
+@array   = constant [2 x i55] [ i55 12, i55 52 ]
            constant { i55, i55 } { i55 4, i55 3 }
 
 implementation
  
-define [2 x i55]* %testfunction(i55 %i0, i55 %j0)
+define [2 x i55]* @testfunction(i55 %i0, i55 %j0)
 begin
-	ret [2x i55]* %array
+	ret [2x i55]* @array
 end
 
-define  i8* %otherfunc(i55, double)
+define  i8* @otherfunc(i55, double)
 begin
-	%somestr = getelementptr [11x i8]* %somestr, i64 0, i64 0
+	%somestr = getelementptr [11x i8]* @somestr, i64 0, i64 0
 	ret i8* %somestr
 end
 
-define i8* %yetanotherfunc(i55, double)
+define i8* @yetanotherfunc(i55, double)
 begin
 	ret i8* null            ; Test null
 end
 
-define i55 %negativeUnsigned() {
+define i55 @negativeUnsigned() {
         ret i55 -1
 }
 
-define i55 %largeSigned() {
+define i55 @largeSigned() {
        ret i55 3900000000
 }
diff --git a/test/Integer/testicmp_bt.ll b/test/Integer/testicmp_bt.ll
index 15ff49e7fc4..4dc6d98306d 100644
--- a/test/Integer/testicmp_bt.ll
+++ b/test/Integer/testicmp_bt.ll
@@ -4,7 +4,7 @@
 
 implementation
 
-define i31 "simpleIcmp"(i31 %i0, i31 %j0)
+define i31 @"simpleIcmp"(i31 %i0, i31 %j0)
 begin
 	%t1 = icmp eq i31 %i0, %j0
 	%t2 = icmp ne i31 %i0, %j0
diff --git a/test/Integer/testlogical_bt.ll b/test/Integer/testlogical_bt.ll
index 62f6bf6505b..cd8a9499a6c 100644
--- a/test/Integer/testlogical_bt.ll
+++ b/test/Integer/testlogical_bt.ll
@@ -4,7 +4,7 @@
 
 implementation
 
-define i31 "simpleAdd"(i31 %i0, i31 %j0)
+define i31 @"simpleAdd"(i31 %i0, i31 %j0)
 begin
 	%t1 = xor i31 %i0, %j0
 	%t2 = or i31 %i0, %j0
diff --git a/test/Integer/testlogical_new_bt.ll b/test/Integer/testlogical_new_bt.ll
index 72675dea1d2..41f5d0cac32 100644
--- a/test/Integer/testlogical_new_bt.ll
+++ b/test/Integer/testlogical_new_bt.ll
@@ -4,7 +4,7 @@
 
 implementation
 
-define i31 "simpleAdd"(i31 %i0, i31 %j0)
+define i31 @"simpleAdd"(i31 %i0, i31 %j0)
 begin
 	%t1 = xor i31 %i0, %j0
 	%t2 = or i31 %i0, %j0
diff --git a/test/Integer/testmemory_bt.ll b/test/Integer/testmemory_bt.ll
index 4ed16827131..fe0465c659c 100644
--- a/test/Integer/testmemory_bt.ll
+++ b/test/Integer/testmemory_bt.ll
@@ -8,13 +8,13 @@
 
 implementation
 
-define i31 "main"()
+define i31 @"main"()
 begin
-  call i31 %testfunction(i64 0, i64 1)
+  call i31 @testfunction(i64 0, i64 1)
   ret i31 0
 end
 
-define i31 "testfunction"(i64 %i0, i64 %j0)
+define i31 @"testfunction"(i64 %i0, i64 %j0)
 begin
     %array0 = malloc [4 x i9]            ; yields {[4 x i9]*}:array0
     %size   = add i32 2, 2                 ; yields {i31}:size = i31 %4
diff --git a/test/Integer/testswitch_bt.ll b/test/Integer/testswitch_bt.ll
index f9c79d6b5dd..0ea2ac97b31 100644
--- a/test/Integer/testswitch_bt.ll
+++ b/test/Integer/testswitch_bt.ll
@@ -6,7 +6,7 @@
 
 implementation
 
-define i35 "squared"(%i35 %i0)
+define i35 @"squared"(%i35 %i0)
 begin
 	switch i35 %i0, label %Default [ 
 		i35 1, label %Case1
diff --git a/test/Integer/testvarargs_bt.ll b/test/Integer/testvarargs_bt.ll
index bd2b72b3dc4..d62e270dcaf 100644
--- a/test/Integer/testvarargs_bt.ll
+++ b/test/Integer/testvarargs_bt.ll
@@ -4,11 +4,11 @@
 
 implementation
 
-declare i31 "printf"(i8*, ...)   ;; Prototype for: i32 __builtin_printf(const char*, ...)
+declare i31 @"printf"(i8*, ...)   ;; Prototype for: i32 __builtin_printf(const char*, ...)
 
-define i31 "testvarar"()
+define i31 @"testvarar"()
 begin
-	call i31(i8*, ...) *%printf(i8 * null, i31 12, i8 42);
+	call i31(i8*, ...) *@printf(i8 * null, i31 12, i8 42);
 	ret i31 %0
 end
 
diff --git a/test/Integer/undefined_bt.ll b/test/Integer/undefined_bt.ll
index 94f51905cda..a1fb61aca65 100644
--- a/test/Integer/undefined_bt.ll
+++ b/test/Integer/undefined_bt.ll
@@ -3,17 +3,17 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-%X = global i31 undef
+@X = global i31 undef
 
 implementation
 
-declare i32 "atoi"(i8 *)
+declare i32 @"atoi"(i8 *)
 
-define i63 %test() {
+define i63 @test() {
 	ret i63 undef
 }
 
-define i31 %test2() {
+define i31 @test2() {
 	%X = add i31 undef, 1
 	ret i31 %X
 }
diff --git a/test/Integer/unreachable_bt.ll b/test/Integer/unreachable_bt.ll
index 1ab4e8e47ad..60b7bf8eb92 100644
--- a/test/Integer/unreachable_bt.ll
+++ b/test/Integer/unreachable_bt.ll
@@ -5,13 +5,13 @@
 
 implementation
 
-declare void %bar()
+declare void @bar()
 
-define i9 %foo() {  ;; Calling this function has undefined behavior
+define i9 @foo() {  ;; Calling this function has undefined behavior
 	unreachable
 }
 
-define double %xyz() {
-	call void %bar()
+define double @xyz() {
+	call void @bar()
 	unreachable          ;; Bar must not return.
 }
diff --git a/test/Integer/varargs_bt.ll b/test/Integer/varargs_bt.ll
index 0cc4d436065..36f96a3494f 100644
--- a/test/Integer/varargs_bt.ll
+++ b/test/Integer/varargs_bt.ll
@@ -6,19 +6,19 @@
 ; the va_arg instruction.
 
 implementation
-declare void %llvm.va_start(i8** %ap)
-declare void %llvm.va_copy(i8** %aq, i8** %ap)
-declare void %llvm.va_end(i8** %ap)
+declare void @llvm.va_start(i8** %ap)
+declare void @llvm.va_copy(i8** %aq, i8** %ap)
+declare void @llvm.va_end(i8** %ap)
 
-define i33 %test(i33 %X, ...) {
+define i33 @test(i33 %X, ...) {
         %ap = alloca i8*
-	call void %llvm.va_start(i8** %ap)
+	call void @llvm.va_start(i8** %ap)
 	%tmp = va_arg i8** %ap, i33 
 
         %aq = alloca i8*
-	call void %llvm.va_copy(i8** %aq, i8** %ap)
-	call void %llvm.va_end(i8** %aq)
+	call void @llvm.va_copy(i8** %aq, i8** %ap)
+	call void @llvm.va_end(i8** %aq)
 	
-	call void %llvm.va_end(i8** %ap)
+	call void @llvm.va_end(i8** %ap)
 	ret i33 %tmp
 }
diff --git a/test/Integer/varargs_new_bt.ll b/test/Integer/varargs_new_bt.ll
index f420ec13cdc..baa055ede9a 100644
--- a/test/Integer/varargs_new_bt.ll
+++ b/test/Integer/varargs_new_bt.ll
@@ -6,28 +6,28 @@
 ; the va_arg instruction.
 
 implementation   ; Functions:
-declare void %llvm.va_start(i8**)
-declare void %llvm.va_copy(i8**, i8*)
-declare void %llvm.va_end(i8**)
+declare void @llvm.va_start(i8**)
+declare void @llvm.va_copy(i8**, i8*)
+declare void @llvm.va_end(i8**)
 
-define i31 %test(i31 %X, ...) {
+define i31 @test(i31 %X, ...) {
         ; Allocate two va_list items.  On this target, va_list is of type i8*
         %ap = alloca i8*             ; <i8**> [#uses=4]
         %aq = alloca i8*             ; <i8**> [#uses=2]
 
         ; Initialize variable argument processing
-        call void %llvm.va_start(i8** %ap)
+        call void @llvm.va_start(i8** %ap)
 
         ; Read a single integer argument
         %tmp = va_arg i8** %ap, i31           ; <i31> [#uses=1]
 
         ; Demonstrate usage of llvm.va_copy and llvm_va_end
         %apv = load i8** %ap         ; <i8*> [#uses=1]
-        call void %llvm.va_copy(i8** %aq, i8* %apv)
-        call void %llvm.va_end(i8** %aq)
+        call void @llvm.va_copy(i8** %aq, i8* %apv)
+        call void @llvm.va_end(i8** %aq)
 
         ; Stop processing of arguments.
-        call void %llvm.va_end(i8** %ap)
+        call void @llvm.va_end(i8** %ap)
         ret i31 %tmp
 
 }