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

test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll

@@ -3,8 +3,6 @@
 ; PR1109
 
 target datalayout = "e-p:32:32"
-target endian = little
-target pointersize = 32
 target triple = "i686-apple-darwin8"
 	%struct.CONSTRAINT = type { i32, i32, i32, i32 }
 	%struct.FILE_POS = type { i8, i8, i16, i32 }
@@ -21,7 +19,7 @@ target triple = "i686-apple-darwin8"
 
 implementation   ; Functions:
 
-define i32 %test(%struct.closure_type* %tmp18169) {
+define i32 @test(%struct.closure_type* %tmp18169) {
 	%tmp18174 = getelementptr %struct.closure_type* %tmp18169, i32 0, i32 4, i32 0, i32 0		; <i32*> [#uses=2]
 	%tmp18269 = bitcast i32* %tmp18174  to %struct.STYLE*		; <%struct.STYLE*> [#uses=1]
 	%A = load i32* %tmp18174		; <i32> [#uses=1]

test/Analysis/Dominators/2007-01-14-BreakCritEdges.ll

@@ -14,7 +14,7 @@
 
 implementation   ; Functions:
 
-define void %ov_read() {
+define void @ov_read() {
 entry:
 	br i1 false, label %bb, label %return
 

test/Analysis/ScalarEvolution/trip-count.ll

@@ -1,17 +1,18 @@
-; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | grep '10000 iterations'
+; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | \
+; RUN:   grep '10000 iterations'
 ; PR1101
 
-%A = weak global [1000 x i32] zeroinitializer, align 32         
+@A = weak global [1000 x i32] zeroinitializer, align 32         
 
 implementation   ; Functions:
 
-define void %test(i32 %N) {
+define void @test(i32 %N) {
 entry:
         "alloca point" = bitcast i32 0 to i32           ; <i32> [#uses=0]
         br label %bb3
 
 bb:             ; preds = %bb3
-        %tmp = getelementptr [1000 x i32]* %A, i32 0, i32 %i.0          ; <i32*> [#uses=1]
+        %tmp = getelementptr [1000 x i32]* @A, i32 0, i32 %i.0          ; <i32*> [#uses=1]
         store i32 123, i32* %tmp
         %tmp2 = add i32 %i.0, 1         ; <i32> [#uses=1]
         br label %bb3

test/Assembler/2002-05-02-ParseError.ll

@@ -5,6 +5,6 @@
 
 %T = type i32 *
 
-define %T %test() {
+define %T @test() {
 	ret %T null
 }

test/Assembler/2002-07-25-ParserAssertionFailure.llx

@@ -1,13 +1,13 @@
 ; Make sure we don't get an assertion failure, even though this is a parse 
 ; error
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | grep 'No arguments'
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | grep 'No arguments'
 
-%ty = type void (int)
+%ty = type void (i32)
 
-declare %ty* %foo()
+declare %ty* @foo()
 
-void %test() {
+define void @test() {
-        call %ty* %foo( )               ; <%ty*>:0 [#uses=0]
+        call %ty* @foo( )               ; <%ty*>:0 [#uses=0]
         ret void
 }
 

test/Assembler/2002-12-15-GlobalResolve.ll

@@ -1,6 +1,5 @@
 ; RUN: llvm-upgrade < %s 2>/dev/null | llvm-as -o /dev/null -f &&
-; RUN: llvm-upgrade < %s 2>&1 | grep "Cannot disambiguate global value '%X'" &&
+; RUN: llvm-upgrade < %s 2>&1 | grep "Renaming global variable 'X' to"
-; RUN: llvm-upgrade < %s 2>&1 | grep "Renaming global value '%X' to '%X.un"
 
 %X = external global uint *
 %X = external global %T* 

test/Assembler/2003-04-15-ConstantInitAssertion.llx

@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 >/dev/null | grep Expected
+; RUN: llvm-as 2>&1 < %s >/dev/null | grep "Expected type 'i32' for element #0"
 ; Test the case of a misformed constant initializer
 ; This should cause an assembler error, not an assertion failure!
-%X = constant {int} { float 1.0 }
+constant { i32 } { float 1.0 }

test/Assembler/2003-05-21-MalformedShiftCrash.llx

@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Shift constant expression"
+; RUN: llvm-as 2>&1 < %s > /dev/null | grep "Shift constant expression"
 
-global int shr (float 1.0, ubyte 2)
+global i32 ashr (float 1.0, i8 2)

test/Assembler/2003-05-21-MalformedStructCrash.llx

@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Illegal"
+; RUN: llvm-as 2>&1 < %s  > /dev/null | grep "Illegal number of init"
 
-global {} { int 7, float 1.0, int 7, int 8 }
+global {} { i32 7, float 1.0, i32 7, i32 8 }

test/Assembler/2003-12-30-TypeMapInvalidMemory.llx

@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | \
+; RUN: llvm-as      2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
-; RUN:   grep 'Reference to an undefined type'
 
 
-%d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null }
+@d_reduction_0_dparser_gram = global { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)*, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** } { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)* null, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** null }
 
 implementation

test/Assembler/2004-11-28-InvalidTypeCrash.ll

@@ -1,4 +1,4 @@
-; RUN: (llvm-upgrade < %s | llvm-as -o /dev/null -f) 2>&1 | \
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
 ; RUN:   grep 'Cannot create a null initialized value of this type!'
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
-%.FOO  = internal global %struct.none zeroinitializer
+@.FOO  = internal global %struct.none zeroinitializer

test/Assembler/2005-01-31-CallingAggregateFunction.ll

@@ -1,8 +1,9 @@
-; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "LLVM functions cannot return aggregate types"
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
+; RUN:    grep "LLVM functions cannot return aggregate types"
 
-void %test() {
+define void @test() {
-	call {} %foo()
+	call {} @foo()
 	ret void
 }
 
-declare {} %foo()
+declare {} @foo()

test/Assembler/2006-09-28-CrashOnInvalid.ll

@@ -1,7 +1,8 @@
 ; Test for PR902.  This program is erroneous, but should not crash llvm-as.
 ; This tests that a simple error is caught and processed correctly.
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 | grep 'FP constant invalid for type'
+; RUN: llvm-as < %s 2>&1 >/dev/null | grep 'FP constant invalid for type'
-void %test() {
+
-  add int 1, 2.0
+define void @test() {
+  add i32 1, 2.0
   ret void
 }

test/Assembler/2006-12-09-Cast-To-Bool.ll

@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llvm-dis | grep bitcast
-define i1 %main(i32 %X) {
+
+define i1 @main(i32 %X) {
   %res = bitcast i1 true to i1
   ret i1 %res
 }

test/Assembler/2007-01-02-Undefined-Arg-Type.ll

@@ -5,6 +5,6 @@
 
 implementation   ; Functions:
 
-define i1 %someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
+define i1 @someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
 	ret i1 true
 }

test/Assembler/2007-01-05-Local-Name-Conflict.ll

@@ -1,5 +1,4 @@
 ; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-; XFAIL: *
 
 implementation   ; Functions:
 

test/Assembler/2007-01-12-Varargs-Upgrade.ll

@@ -1,45 +1,18 @@
 ; For PR1093: This test checks that llvm-upgrade correctly translates
 ; the llvm.va_* intrinsics to their cannonical argument form (i8*).
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
-; RUN:   grep 'va_upgrade[0-9] = bitcast' | wc -l | grep 5
+; RUN:   grep ' bitcast' | wc -l | grep 5
 %str = internal constant [7 x ubyte] c"%d %d\0A\00"		; <[7 x ubyte]*> [#uses=1]
 
 implementation   ; Functions:
 
 void %f(int %a_arg, ...) {
 entry:
-	%a = cast int %a_arg to uint		; <uint> [#uses=1]
 	%l1 = alloca sbyte*, align 4		; <sbyte**> [#uses=5]
 	%l2 = alloca sbyte*, align 4		; <sbyte**> [#uses=4]
-	%memtmp = alloca sbyte*		; <sbyte**> [#uses=2]
+	%l3 = alloca sbyte*		; <sbyte**> [#uses=2]
 	call void %llvm.va_start( sbyte** %l1 )
-	%tmp22 = seteq int %a_arg, 0		; <bool> [#uses=1]
+	call void %llvm.va_copy( sbyte** %l2, sbyte** %l3 )
-	%tmp23 = volatile load sbyte** %l1		; <sbyte*> [#uses=2]
-	br bool %tmp22, label %bb8, label %bb
-
-bb:		; preds = %bb, %entry
-	%indvar = phi uint [ 0, %entry ], [ %indvar.next, %bb ]		; <uint> [#uses=1]
-	%tmp.0 = phi sbyte* [ %tmp23, %entry ], [ %tmp, %bb ]		; <sbyte*> [#uses=2]
-	%tmp2 = getelementptr sbyte* %tmp.0, int 4		; <sbyte*> [#uses=1]
-	volatile store sbyte* %tmp2, sbyte** %l1
-	%tmp3 = cast sbyte* %tmp.0 to int*		; <int*> [#uses=1]
-	%tmp = load int* %tmp3		; <int> [#uses=1]
-	%tmp = volatile load sbyte** %l1		; <sbyte*> [#uses=2]
-	%indvar.next = add uint %indvar, 1		; <uint> [#uses=2]
-	%exitcond = seteq uint %indvar.next, %a		; <bool> [#uses=1]
-	br bool %exitcond, label %bb8, label %bb
-
-bb8:		; preds = %bb, %entry
-	%p1.0.1 = phi int [ undef, %entry ], [ %tmp, %bb ]		; <int> [#uses=1]
-	%tmp.1 = phi sbyte* [ %tmp23, %entry ], [ %tmp, %bb ]		; <sbyte*> [#uses=1]
-	store sbyte* %tmp.1, sbyte** %memtmp
-	call void %llvm.va_copy( sbyte** %l2, sbyte** %memtmp )
-	%tmp10 = volatile load sbyte** %l2		; <sbyte*> [#uses=2]
-	%tmp12 = getelementptr sbyte* %tmp10, int 4		; <sbyte*> [#uses=1]
-	volatile store sbyte* %tmp12, sbyte** %l2
-	%tmp13 = cast sbyte* %tmp10 to int*		; <int*> [#uses=1]
-	%tmp14 = load int* %tmp13		; <int> [#uses=1]
-	%tmp17 = call int (ubyte*, ...)* %printf( ubyte* getelementptr ([7 x ubyte]* %str, int 0, uint 0), int %p1.0.1, int %tmp14 )		; <int> [#uses=0]
 	call void %llvm.va_end( sbyte** %l1 )
 	call void %llvm.va_end( sbyte** %l2 )
 	ret void

test/Assembler/2007-01-16-CrashOnBadCast.ll

@@ -2,7 +2,7 @@
 ; RUN: llvm-as < %s 2>&1 > /dev/null | \
 ; RUN:  grep "invalid cast opcode for cast from"
 
-define i8* %nada(i64 %X) {
+define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*
     ret i8* %result
 }

test/Assembler/2007-01-16-CrashOnBadCast2.ll

@@ -2,4 +2,4 @@
 ; RUN: llvm-as < %s 2>&1 > /dev/null | \
 ; RUN:  grep "invalid cast opcode for cast from"
 
-%X = constant i8* trunc (i64 0 to i8*)
+@X = constant i8* trunc (i64 0 to i8*)

test/Assembler/2007-01-21-UpgradeNoArgs.ll

@@ -0,0 +1,13 @@
+; Make sure we don't get an assertion failure, even though this is a parse 
+; error
+; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep 'No arguments passed to a '
+
+%ty = type void (int)
+
+declare %ty* %foo()
+
+void %test() {
+        call %ty* %foo( )               ; <%ty*>:0 [#uses=0]
+        ret void
+}
+

test/Assembler/2007-01-22-UpgradeMalformedShift.ll

@@ -0,0 +1,4 @@
+; Found by inspection of the code
+; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep "Shift constant expression"
+
+global int shr (float 1.0, ubyte 2)

test/Assembler/2007-01-22-UpgradeMalformedStruct.ll

@@ -0,0 +1,4 @@
+; Found by inspection of the code
+; RUN: llvm-upgrade 2>&1 < %s  > /dev/null | grep "Illegal number of init"
+
+global {} { int 7, float 1.0, int 7, int 8 }

test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll

@@ -0,0 +1,5 @@
+; RUN: llvm-upgrade 2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
+
+%d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null }
+
+implementation

test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll

@@ -1,10 +1,10 @@
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2
 
-%quant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
+@quant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
-%dequant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
+@dequant_coef = external global [6 x [4 x [4 x i32]]]		; <[6 x [4 x [4 x i32]]]*> [#uses=1]
-%A = external global [4 x [4 x i32]]		; <[4 x [4 x i32]]*> [#uses=1]
+@A = external global [4 x [4 x i32]]		; <[4 x [4 x i32]]*> [#uses=1]
 
-define fastcc i32 %dct_luma_sp(i32 %block_x, i32 %block_y, i32* %coeff_cost) {
+define fastcc i32 @dct_luma_sp(i32 %block_x, i32 %block_y, i32* %coeff_cost) {
 entry:
 	%predicted_block = alloca [4 x [4 x i32]], align 4		; <[4 x [4 x i32]]*> [#uses=1]
 	br label %cond_next489
@@ -17,7 +17,7 @@ cond_next489:		; preds = %cond_false, %bb471
 	%tmp495 = getelementptr [4 x [4 x i32]]* %predicted_block, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=2]
 	%tmp496 = load i32* %tmp495		; <i32> [#uses=2]
 	%tmp502 = load i32* null		; <i32> [#uses=1]
-	%tmp542 = getelementptr [6 x [4 x [4 x i32]]]* %quant_coef, i32 0, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
+	%tmp542 = getelementptr [6 x [4 x [4 x i32]]]* @quant_coef, i32 0, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
 	%tmp543 = load i32* %tmp542		; <i32> [#uses=1]
 	%tmp548 = ashr i32 0, i8 0		; <i32> [#uses=3]
 	%tmp561 = sub i32 0, %tmp496		; <i32> [#uses=3]
@@ -30,14 +30,14 @@ cond_next489:		; preds = %cond_false, %bb471
 	br i1 %tmp579, label %bb712, label %cond_next589
 
 cond_next589:		; preds = %cond_next489
-	%tmp605 = getelementptr [6 x [4 x [4 x i32]]]* %dequant_coef, i32 0, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
+	%tmp605 = getelementptr [6 x [4 x [4 x i32]]]* @dequant_coef, i32 0, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
 	%tmp606 = load i32* %tmp605		; <i32> [#uses=1]
 	%tmp612 = load i32* null		; <i32> [#uses=1]
 	%tmp629 = load i32* null		; <i32> [#uses=1]
 	%tmp629 = sitofp i32 %tmp629 to double		; <double> [#uses=1]
 	%tmp631 = mul double %tmp629, 0.000000e+00		; <double> [#uses=1]
 	%tmp632 = add double 0.000000e+00, %tmp631		; <double> [#uses=1]
-	%tmp642 = call fastcc i32 %sign( i32 %tmp576, i32 %tmp561 )		; <i32> [#uses=1]
+	%tmp642 = call fastcc i32 @sign( i32 %tmp576, i32 %tmp561 )		; <i32> [#uses=1]
 	%tmp650 = mul i32 %tmp606, %tmp642		; <i32> [#uses=1]
 	%tmp656 = mul i32 %tmp650, %tmp612		; <i32> [#uses=1]
 	%tmp658 = shl i32 %tmp656, i8 0		; <i32> [#uses=1]
@@ -45,7 +45,7 @@ cond_next589:		; preds = %cond_next489
 	%tmp660 = sub i32 0, %tmp659		; <i32> [#uses=1]
 	%tmp666 = sub i32 %tmp660, %tmp496		; <i32> [#uses=1]
 	%tmp666 = sitofp i32 %tmp666 to double		; <double> [#uses=2]
-	call void %levrun_linfo_inter( i32 %tmp576, i32 0, i32* null, i32* null )
+	call void @levrun_linfo_inter( i32 %tmp576, i32 0, i32* null, i32* null )
 	%tmp671 = mul double %tmp666, %tmp666		; <double> [#uses=1]
 	%tmp675 = add double %tmp671, 0.000000e+00		; <double> [#uses=1]
 	%tmp678 = fcmp oeq double %tmp632, %tmp675		; <i1> [#uses=1]
@@ -79,9 +79,9 @@ bb737:		; preds = %cond_false689
 	br i1 %tmp739, label %cond_next791, label %cond_true740
 
 cond_true740:		; preds = %bb737
-	%tmp761 = call fastcc i32 %sign( i32 %tmp576, i32 0 )		; <i32> [#uses=1]
+	%tmp761 = call fastcc i32 @sign( i32 %tmp576, i32 0 )		; <i32> [#uses=1]
 	%tmp780 = load i32* null		; <i32> [#uses=1]
-	%tmp785 = getelementptr [4 x [4 x i32]]* %A, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
+	%tmp785 = getelementptr [4 x [4 x i32]]* @A, i32 0, i32 %i.8, i32 %j.7		; <i32*> [#uses=1]
 	%tmp786 = load i32* %tmp785		; <i32> [#uses=1]
 	%tmp781 = mul i32 %tmp780, %tmp761		; <i32> [#uses=1]
 	%tmp787 = mul i32 %tmp781, %tmp786		; <i32> [#uses=1]
@@ -94,10 +94,10 @@ cond_next791:		; preds = %cond_true740, %bb737
 	%tmp796 = load i32* %tmp495		; <i32> [#uses=1]
 	%tmp798 = add i32 %tmp796, %ilev.1		; <i32> [#uses=1]
 	%tmp812 = mul i32 0, %tmp502		; <i32> [#uses=0]
-	%tmp818 = call fastcc i32 %sign( i32 0, i32 %tmp798 )		; <i32> [#uses=0]
+	%tmp818 = call fastcc i32 @sign( i32 0, i32 %tmp798 )		; <i32> [#uses=0]
 	unreachable
 }
 
-declare i32 %sign(i32, i32)
+declare i32 @sign(i32, i32)
 
-declare void %levrun_linfo_inter(i32, i32, i32*, i32*)
+declare void @levrun_linfo_inter(i32, i32, i32*, i32*)

test/CodeGen/ARM/fcopysign.ll

@@ -3,17 +3,17 @@
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 &&
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | grep fneg | wc -l | grep 2
 
-define float %test1(float %x, double %y) {
+define float @test1(float %x, double %y) {
 	%tmp = fpext float %x to double
-	%tmp2 = tail call double %copysign( double %tmp, double %y )
+	%tmp2 = tail call double @copysign( double %tmp, double %y )
 	%tmp2 = fptrunc double %tmp2 to float
 	ret float %tmp2
 }
 
-define double %test2(double %x, float %y) {
+define double @test2(double %x, float %y) {
 	%tmp = fpext float %y to double
-	%tmp2 = tail call double %copysign( double %x, double %tmp )
+	%tmp2 = tail call double @copysign( double %x, double %tmp )
 	ret double %tmp2
 }
 
-declare double %copysign(double, double)
+declare double @copysign(double, double)

test/CodeGen/ARM/fpcmp_ueq.ll

@@ -2,7 +2,7 @@
 ; RUN: llvm-as < %s | llc -march=arm | grep moveq &&
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | grep movvs
 
-define i32 %f7(float %a, float %b) {
+define i32 @f7(float %a, float %b) {
 entry:
     %tmp = fcmp ueq float %a,%b
     %retval = select i1 %tmp, i32 666, i32 42

test/CodeGen/ARM/large-stack.ll

@@ -1,12 +1,12 @@
 ; RUN: llvm-as < %s | llc -march=arm &&
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb
 
-define void %test1() {
+define void @test1() {
     %tmp = alloca [ 64 x i32 ] , align 4
     ret void
 }
 
-define void %test2() {
+define void @test2() {
     %tmp = alloca [ 4168 x i8 ] , align 4
     ret void
 }

test/CodeGen/ARM/ldr_ext.ll

@@ -8,25 +8,25 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep "ldrsb" | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep "ldrsh" | wc -l | grep 1
 
-define i32 %test1(i8* %v.pntr.s0.u1) {
+define i32 @test1(i8* %v.pntr.s0.u1) {
     %tmp.u = load i8* %v.pntr.s0.u1
     %tmp1.s = zext i8 %tmp.u to i32
     ret i32 %tmp1.s
 }
 
-define i32 %test2(i16* %v.pntr.s0.u1) {
+define i32 @test2(i16* %v.pntr.s0.u1) {
     %tmp.u = load i16* %v.pntr.s0.u1
     %tmp1.s = zext i16 %tmp.u to i32
     ret i32 %tmp1.s
 }
 
-define i32 %test3(i8* %v.pntr.s1.u0) {
+define i32 @test3(i8* %v.pntr.s1.u0) {
     %tmp.s = load i8* %v.pntr.s1.u0
     %tmp1.s = sext i8 %tmp.s to i32
     ret i32 %tmp1.s
 }
 
-define i32 %test4() {
+define i32 @test4() {
     %tmp.s = load i16* null
     %tmp1.s = sext i16 %tmp.s to i32
     ret i32 %tmp1.s

test/CodeGen/ARM/ldr_frame.ll

@@ -3,14 +3,14 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb &&
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep cpy | wc -l | grep 2
 
-define i32 %f1() {
+define i32 @f1() {
 	%buf = alloca [32 x i32], align 4
 	%tmp = getelementptr [32 x i32]* %buf, i32 0, i32 0
 	%tmp1 = load i32* %tmp
 	ret i32 %tmp1
 }
 
-define i32 %f2() {
+define i32 @f2() {
 	%buf = alloca [32 x i8], align 4
 	%tmp = getelementptr [32 x i8]* %buf, i32 0, i32 0
 	%tmp1 = load i8* %tmp
@@ -18,14 +18,14 @@ define i32 %f2() {
 	ret i32 %tmp2
 }
 
-define i32 %f3() {
+define i32 @f3() {
 	%buf = alloca [32 x i32], align 4
 	%tmp = getelementptr [32 x i32]* %buf, i32 0, i32 32
 	%tmp1 = load i32* %tmp
 	ret i32 %tmp1
 }
 
-define i32 %f4() {
+define i32 @f4() {
 	%buf = alloca [32 x i8], align 4
 	%tmp = getelementptr [32 x i8]* %buf, i32 0, i32 2
 	%tmp1 = load i8* %tmp

test/CodeGen/ARM/mul.ll

@@ -4,22 +4,22 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep mul | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep lsl | wc -l | grep 1
 
-define i32 %f1(i32 %u) {
+define i32 @f1(i32 %u) {
     %tmp = mul i32 %u, %u
     ret i32 %tmp
 }
 
-define i32 %f2(i32 %u, i32 %v) {
+define i32 @f2(i32 %u, i32 %v) {
     %tmp = mul i32 %u, %v
     ret i32 %tmp
 }
 
-define i32 %f3(i32 %u) {
+define i32 @f3(i32 %u) {
 	%tmp = mul i32 %u, 5
         ret i32 %tmp
 }
 
-define i32 %f4(i32 %u) {
+define i32 @f4(i32 %u) {
 	%tmp = mul i32 %u, 4
         ret i32 %tmp
 }

test/CodeGen/ARM/select.ll

@@ -14,49 +14,49 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep bhi | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep __ltdf2
 
-define i32 %f1(i32 %a.s) {
+define i32 @f1(i32 %a.s) {
 entry:
     %tmp = icmp eq i32 %a.s, 4
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define i32 %f2(i32 %a.s) {
+define i32 @f2(i32 %a.s) {
 entry:
     %tmp = icmp sgt i32 %a.s, 4
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define i32 %f3(i32 %a.s, i32 %b.s) {
+define i32 @f3(i32 %a.s, i32 %b.s) {
 entry:
     %tmp = icmp slt i32 %a.s, %b.s
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define i32 %f4(i32 %a.s, i32 %b.s) {
+define i32 @f4(i32 %a.s, i32 %b.s) {
 entry:
     %tmp = icmp sle i32 %a.s, %b.s
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define i32 %f5(i32 %a.u, i32 %b.u) {
+define i32 @f5(i32 %a.u, i32 %b.u) {
 entry:
     %tmp = icmp ule i32 %a.u, %b.u
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define i32 %f6(i32 %a.u, i32 %b.u) {
+define i32 @f6(i32 %a.u, i32 %b.u) {
 entry:
     %tmp = icmp ugt i32 %a.u, %b.u
     %tmp1.s = select i1 %tmp, i32 2, i32 3
     ret i32 %tmp1.s
 }
 
-define double %f7(double %a, double %b) {
+define double @f7(double %a, double %b) {
     %tmp = fcmp olt double %a, 1.234e+00
     %tmp1 = select i1 %tmp, double -1.000e+00, double %b
     ret double %tmp1

test/CodeGen/ARM/sxt_rot.ll

@@ -3,7 +3,7 @@
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "sxtb"  | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "sxtab" | wc -l | grep 1
 
-define i8 %test1(i32 %A) sext {
+define i8 @test1(i32 %A) sext {
 	%B = lshr i32 %A, i8 8
 	%C = shl i32 %A, i8 24
 	%D = or i32 %B, %C
@@ -11,7 +11,7 @@ define i8 %test1(i32 %A) sext {
 	ret i8 %E
 }
 
-define i32 %test2(i32 %A, i32 %X) sext {
+define i32 @test2(i32 %A, i32 %X) sext {
 	%B = lshr i32 %A, i8 8
 	%C = shl i32 %A, i8 24
 	%D = or i32 %B, %C

test/CodeGen/ARM/thumb-imm.ll

@@ -2,10 +2,10 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-thumb | not grep CPI
 
 
-define i32 %test1() {
+define i32 @test1() {
   ret i32 1000
 }
 
-define i32 %test2() {
+define i32 @test2() {
   ret i32 -256
 }

test/CodeGen/ARM/uxt_rot.ll

@@ -4,19 +4,19 @@
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "uxtab" | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep "uxth"  | wc -l | grep 1
 
-define i8 %test1(i32 %A.u) zext {
+define i8 @test1(i32 %A.u) zext {
     %B.u = trunc i32 %A.u to i8
     ret i8 %B.u
 }
 
-define i32 %test2(i32 %A.u, i32 %B.u) zext {
+define i32 @test2(i32 %A.u, i32 %B.u) zext {
     %C.u = trunc i32 %B.u to i8
     %D.u = zext i8 %C.u to i32
     %E.u = add i32 %A.u, %D.u
     ret i32 %E.u
 }
 
-define i32 %test3(i32 %A.u) zext {
+define i32 @test3(i32 %A.u) zext {
     %B.u = lshr i32 %A.u, i8 8
     %C.u = shl i32 %A.u, i8 24
     %D.u = or i32 %B.u, %C.u

test/CodeGen/Alpha/add.ll

@@ -19,160 +19,160 @@
 
 implementation   ; Functions:
 
-define i32 %al(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @al(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.3.s = add i32 %y.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %ali(i32 sext %x.s) sext {
+define i32 @ali(i32 sext %x.s) sext {
 entry:
 	%tmp.3.s = add i32 100, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %aq(i64 sext %x.s, i64 sext %y.s) sext {
+define i64 @aq(i64 sext %x.s, i64 sext %y.s) sext {
 entry:
 	%tmp.3.s = add i64 %y.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %aqi(i64 %x.s) {
+define i64 @aqi(i64 %x.s) {
 entry:
 	%tmp.3.s = add i64 100, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i32 %sl(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @sl(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.3.s = sub i32 %y.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %sli(i32 sext %x.s) sext {
+define i32 @sli(i32 sext %x.s) sext {
 entry:
 	%tmp.3.s = sub i32 %x.s, 100		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %sq(i64 %x.s, i64 %y.s) {
+define i64 @sq(i64 %x.s, i64 %y.s) {
 entry:
 	%tmp.3.s = sub i64 %y.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %sqi(i64 %x.s) {
+define i64 @sqi(i64 %x.s) {
 entry:
 	%tmp.3.s = sub i64 %x.s, 100		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i32 %a4l(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @a4l(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 2		; <i32> [#uses=1]
 	%tmp.3.s = add i32 %tmp.1.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %a8l(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @a8l(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 3		; <i32> [#uses=1]
 	%tmp.3.s = add i32 %tmp.1.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %a4q(i64 %x.s, i64 %y.s) {
+define i64 @a4q(i64 %x.s, i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 2		; <i64> [#uses=1]
 	%tmp.3.s = add i64 %tmp.1.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %a8q(i64 %x.s, i64 %y.s) {
+define i64 @a8q(i64 %x.s, i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 3		; <i64> [#uses=1]
 	%tmp.3.s = add i64 %tmp.1.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i32 %a4li(i32 sext %y.s) sext {
+define i32 @a4li(i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 2		; <i32> [#uses=1]
 	%tmp.3.s = add i32 100, %tmp.1.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %a8li(i32 sext %y.s) sext {
+define i32 @a8li(i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 3		; <i32> [#uses=1]
 	%tmp.3.s = add i32 100, %tmp.1.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %a4qi(i64 %y.s) {
+define i64 @a4qi(i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 2		; <i64> [#uses=1]
 	%tmp.3.s = add i64 100, %tmp.1.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %a8qi(i64 %y.s) {
+define i64 @a8qi(i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 3		; <i64> [#uses=1]
 	%tmp.3.s = add i64 100, %tmp.1.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i32 %s4l(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @s4l(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 2		; <i32> [#uses=1]
 	%tmp.3.s = sub i32 %tmp.1.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %s8l(i32 sext %x.s, i32 sext %y.s) sext {
+define i32 @s8l(i32 sext %x.s, i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 3		; <i32> [#uses=1]
 	%tmp.3.s = sub i32 %tmp.1.s, %x.s		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %s4q(i64 %x.s, i64 %y.s) {
+define i64 @s4q(i64 %x.s, i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 2		; <i64> [#uses=1]
 	%tmp.3.s = sub i64 %tmp.1.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %s8q(i64 %x.s, i64 %y.s) {
+define i64 @s8q(i64 %x.s, i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 3		; <i64> [#uses=1]
 	%tmp.3.s = sub i64 %tmp.1.s, %x.s		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i32 %s4li(i32 sext %y.s) sext {
+define i32 @s4li(i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 2		; <i32> [#uses=1]
 	%tmp.3.s = sub i32 %tmp.1.s, 100		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i32 %s8li(i32 sext %y.s) sext {
+define i32 @s8li(i32 sext %y.s) sext {
 entry:
 	%tmp.1.s = shl i32 %y.s, i8 3		; <i32> [#uses=1]
 	%tmp.3.s = sub i32 %tmp.1.s, 100		; <i32> [#uses=1]
 	ret i32 %tmp.3.s
 }
 
-define i64 %s4qi(i64 %y.s) {
+define i64 @s4qi(i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 2		; <i64> [#uses=1]
 	%tmp.3.s = sub i64 %tmp.1.s, 100		; <i64> [#uses=1]
 	ret i64 %tmp.3.s
 }
 
-define i64 %s8qi(i64 %y.s) {
+define i64 @s8qi(i64 %y.s) {
 entry:
 	%tmp.1.s = shl i64 %y.s, i8 3		; <i64> [#uses=1]
 	%tmp.3.s = sub i64 %tmp.1.s, 100		; <i64> [#uses=1]

test/CodeGen/Alpha/i32_sub_1.ll

@@ -3,7 +3,7 @@
 
 implementation   ; Functions:
 
-define i32 %foo(i32 sext %x) sext {
+define i32 @foo(i32 sext %x) sext {
 entry:
 	%tmp.1 = add i32 %x, -1		; <int> [#uses=1]
 	ret i32 %tmp.1

test/CodeGen/Alpha/zapnot.ll

@@ -3,7 +3,7 @@
 
 implementation   ; Functions:
 
-define i16 %foo(i64 %y) zext {
+define i16 @foo(i64 %y) zext {
 entry:
         %tmp.1 = trunc i64 %y to i16         ; <ushort> [#uses=1]
         ret i16 %tmp.1

test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll

@@ -4,14 +4,12 @@
 ; XFAIL: *
 
 target datalayout = "e-p:32:32"
-target endian = little
-target pointersize = 32
 target triple = "i686-apple-darwin8"
         %struct.Connector = type { i16, i16, i8, i8, %struct.Connector*, i8* }
 
 implementation   ; Functions:
 
-define bool %prune_match_entry_2E_ce(%struct.Connector* %a, i16 %b.0.0.val) {
+define bool @prune_match_entry_2E_ce(%struct.Connector* %a, i16 %b.0.0.val) {
 newFuncRoot:
         br label %entry.ce
 

test/CodeGen/CBackend/2007-01-17-StackSaveNRestore.ll

@@ -2,11 +2,11 @@
 ; RUN: llvm-as < %s | llc -march=c | grep __builtin_stack_restore
 ; PR1028
 
-declare i8* %llvm.stacksave()
+declare i8* @llvm.stacksave()
-declare void %llvm.stackrestore(i8*)
+declare void @llvm.stackrestore(i8*)
 
-define i8* %test() {
+define i8* @test() {
-    %s = call i8* %llvm.stacksave()
+    %s = call i8* @llvm.stacksave()
-    call void %llvm.stackrestore(i8* %s)
+    call void @llvm.stackrestore(i8* %s)
     ret i8* %s
 }

test/CodeGen/Generic/2007-01-15-LoadSelectCycle.ll

@@ -1,12 +1,12 @@
 ; RUN: llvm-as < %s | llc
 ; PR1114
 
-declare i1 %foo()
+declare i1 @foo()
 
-define i32 %test(i32* %A, i32* %B) {
+define i32 @test(i32* %A, i32* %B) {
 	%a = load i32* %A
 	%b = load i32* %B
-	%cond = call i1 %foo()
+	%cond = call i1 @foo()
 	%c = select i1 %cond, i32 %a, i32 %b
 	ret i32 %c
 }

test/CodeGen/PowerPC/2007-01-04-ArgExtension.ll

@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 | grep extsb &&
 ; RUN: llvm-as < %s | llc -march=ppc32 | grep extsh
 
-define i32 %p1(i8 %c, i16 %s) {
+define i32 @p1(i8 %c, i16 %s) {
 entry:
         %tmp = sext i8 %c to i32                ; <i32> [#uses=1]
         %tmp1 = sext i16 %s to i32              ; <i32> [#uses=1]

test/CodeGen/PowerPC/2007-01-15-AsmDialect.ll

@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 | grep cntlzw
 
-define i32 %foo() {
+define i32 @foo() {
 entry:
 	%retval = alloca i32, align 4		; <i32*> [#uses=2]
 	%tmp = alloca i32, align 4		; <i32*> [#uses=2]

test/CodeGen/PowerPC/and-elim.ll

@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 &&
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwin
 
-define void %test(i8* %P) {
+define void @test(i8* %P) {
 	%W = load i8* %P
 	%X = shl i8 %W, i8 1
 	%Y = add i8 %X, 2
@@ -10,7 +10,7 @@ define void %test(i8* %P) {
 	ret void
 }
 
-define i16 %test2(i16 zext %crc) zext { 
+define i16 @test2(i16 zext %crc) zext { 
         ; No and's should be needed for the i16s here.
         %tmp.1 = lshr i16 %crc, i8 1
         %tmp.7 = xor i16 %tmp.1, 40961

test/CodeGen/PowerPC/and_sext.ll

@@ -3,14 +3,14 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsh  &&
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb
 
-define i32 %test1(i32 %mode.0.i.0) {
+define i32 @test1(i32 %mode.0.i.0) {
         %tmp.79 = trunc i32 %mode.0.i.0 to i16
         %tmp.80 = sext i16 %tmp.79 to i32
         %tmp.81 = and i32 %tmp.80, 24
         ret i32 %tmp.81
 }
 
-define i16 %test2(i16 sext %X, i16 sext %x) sext {
+define i16 @test2(i16 sext %X, i16 sext %x) sext {
         %tmp = sext i16 %X to i32
         %tmp1 = sext i16 %x to i32
         %tmp2 = add i32 %tmp, %tmp1
@@ -21,7 +21,7 @@ define i16 %test2(i16 sext %X, i16 sext %x) sext {
         ret i16 %retval
 }
 
-define i16 %test3(i32 zext %X) sext {
+define i16 @test3(i32 zext %X) sext {
         %tmp1 = lshr i32 %X, i8 16
         %tmp1 = trunc i32 %tmp1 to i16
         ret i16 %tmp1

test/CodeGen/PowerPC/small-arguments.ll

@@ -1,39 +1,39 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 &&
 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'extsh\|rlwinm'
 
-declare i16 %foo() sext 
+declare i16 @foo() sext 
 
-define i32 %test1(i16 sext %X) {
+define i32 @test1(i16 sext %X) {
 	%Y = sext i16 %X to i32  ;; dead
 	ret i32 %Y
 }
 
-define i32 %test2(i16 zext %X) {
+define i32 @test2(i16 zext %X) {
 	%Y = sext i16 %X to i32
 	%Z = and i32 %Y, 65535      ;; dead
 	ret i32 %Z
 }
 
-define void %test3() {
+define void @test3() {
-	%tmp.0 = call i16 %foo() sext            ;; no extsh!
+	%tmp.0 = call i16 @foo() sext            ;; no extsh!
 	%tmp.1 = icmp slt i16 %tmp.0, 1234
 	br i1 %tmp.1, label %then, label %UnifiedReturnBlock
 
 then:	
-	call i32 %test1(i16 0 sext)
+	call i32 @test1(i16 0 sext)
 	ret void
 UnifiedReturnBlock:
 	ret void
 }
 
-define i32 %test4(i16* %P) {
+define i32 @test4(i16* %P) {
         %tmp.1 = load i16* %P
         %tmp.2 = zext i16 %tmp.1 to i32
         %tmp.3 = and i32 %tmp.2, 255
         ret i32 %tmp.3
 }
 
-define i32 %test5(i16* %P) {
+define i32 @test5(i16* %P) {
         %tmp.1 = load i16* %P
         %tmp.2 = bitcast i16 %tmp.1 to i16
         %tmp.3 = zext i16 %tmp.2 to i32
@@ -41,13 +41,13 @@ define i32 %test5(i16* %P) {
         ret i32 %tmp.4
 }
 
-define i32 %test6(i32* %P) {
+define i32 @test6(i32* %P) {
         %tmp.1 = load i32* %P
         %tmp.2 = and i32 %tmp.1, 255
         ret i32 %tmp.2
 }
 
-define i16 %test7(float %a) zext {
+define i16 @test7(float %a) zext {
         %tmp.1 = fptoui float %a to i16
         ret i16 %tmp.1
 }

test/CodeGen/PowerPC/unsafe-math.ll

@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=ppc32 | grep fmul | wc -l | grep 2 &&
 ; RUN: llvm-as < %s | llc -march=ppc32 -enable-unsafe-fp-math | grep fmul | wc -l | grep 1
 
-define double %foo(double %X) {
+define double @foo(double %X) {
         %tmp1 = mul double %X, 1.23
         %tmp2 = mul double %tmp1, 4.124
         ret double %tmp2

test/CodeGen/X86/2006-05-11-InstrSched.ll

@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -stats 2>&1 | grep 'asm-printer' | grep 39
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -stats 2>&1 |\
+; RUN:     grep 'asm-printer' | grep 39
 
+target datalayout = "e-p:32:32"
 void %foo(int* %mc, int* %bp, int* %ms, int* %xmb, int* %mpp, int* %tpmm, int* %ip, int* %tpim, int* %dpp, int* %tpdm, int* %bpi, int %M) {
 entry:
 	%tmp9 = setlt int %M, 5		; <bool> [#uses=1]

test/CodeGen/X86/2007-01-08-InstrSched.ll

@@ -2,7 +2,7 @@
 ; RUN:   %prcontext 'mulss LCPI1_3' 1 | grep mulss | wc -l | grep 1
 ; PR1075
 
-define float %foo(float %x) {
+define float @foo(float %x) {
     %tmp1 = mul float %x, 3.000000e+00
     %tmp3 = mul float %x, 5.000000e+00
     %tmp5 = mul float %x, 7.000000e+00

test/CodeGen/X86/2007-01-13-StackPtrIndex.ll

@@ -3,13 +3,11 @@
 ; PR1103
 
 target datalayout = "e-p:64:64"
-target endian = little
+@i6000 = global [128 x i64] zeroinitializer, align 16
-target pointersize = 64
-%i6000 = global [128 x i64] zeroinitializer, align 16
 
 implementation
 
-define void %foo(i32* %a0, i32* %a1, i32* %a2, i32* %a3, i32* %a4, i32* %a5) {
+define void @foo(i32* %a0, i32* %a1, i32* %a2, i32* %a3, i32* %a4, i32* %a5) {
 b:
 	%r = load i32* %a0
 	%r2 = load i32* %a1
@@ -135,14 +133,14 @@ b341:
 	%d753 = bitcast i64 %w1874 to i64
 	%r343 = add i64 %s661, 0
 	%r346 = add i64 %r343, 0
-	%r347 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r346
+	%r347 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r346
 	%r348 = load float* %r347
 	%r352 = add i64 %r343, 0
-	%r353 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r352
+	%r353 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r352
 	%r354 = load float* %r353
-	%r362 = load float* bitcast ([128 x i64]* %i6000 to float*)
+	%r362 = load float* bitcast ([128 x i64]* @i6000 to float*)
 	%r363 = add float 0.000000e+00, %r362
-	%r370 = load float* bitcast ([128 x i64]* %i6000 to float*)
+	%r370 = load float* bitcast ([128 x i64]* @i6000 to float*)
 	%r376 = icmp slt i64 %r16, 0
 	br i1 %r376, label %b377, label %a35b
 b377:
@@ -186,9 +184,9 @@ b535:
 	%s923 = phi i64 [ 0, %b514 ], [ %r799, %b712 ]
 	%s933 = phi i64 [ %r533, %b514 ], [ %r795, %b712 ]
 	%r538 = add i64 %w1855, 0
-	%r539 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r538
+	%r539 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r538
 	%r540 = load float* %r539
-	%r551 = load float* bitcast ([128 x i64]* %i6000 to float*)
+	%r551 = load float* bitcast ([128 x i64]* @i6000 to float*)
 	%r562 = sub i64 %s933, 0
 	%r564 = icmp slt i64 %r512, 0
 	br i1 %r564, label %b565, label %a45b
@@ -215,22 +213,22 @@ b712:
 a45b714:
 	%r717 = add i64 %e944, 0
 	%r720 = add i64 %r717, 0
-	%r721 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r720
+	%r721 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r720
 	%r722 = load float* %r721
 	%r726 = add i64 %r717, 0
-	%r727 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r726
+	%r727 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r726
 	%r728 = load float* %r727
 	%r732 = add i64 %r717, 0
-	%r733 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r732
+	%r733 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r732
 	%r734 = load float* %r733
 	%r738 = add i64 %r717, 0
-	%r739 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r738
+	%r739 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r738
 	%r740 = load float* %r739
 	%r744 = add i64 %r717, 0
-	%r745 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r744
+	%r745 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r744
 	%r746 = load float* %r745
 	%r750 = add i64 %r717, 0
-	%r751 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r750
+	%r751 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r750
 	%r752 = load float* %r751
 	%r753 = add float %r752, %r746
 	%r754 = add float %r728, %r722
@@ -239,10 +237,10 @@ a45b714:
 	%r757 = add float %r753, %r756
 	%r759 = add float %r757, %r540
 	%r770 = add i64 %r717, 0
-	%r771 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r770
+	%r771 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r770
 	%r772 = load float* %r771
 	%r776 = add i64 %r717, 0
-	%r777 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r776
+	%r777 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r776
 	%r778 = load float* %r777
 	%r781 = add float %r363, %r772
 	%r782 = add float %r781, %r778
@@ -256,7 +254,7 @@ b820:
 	%r844 = add i64 %r16, 0
 	%r846 = sext i32 %r60 to i64
 	%r847 = add i64 %r846, 0
-	%r851 = load float* bitcast ([128 x i64]* %i6000 to float*)
+	%r851 = load float* bitcast ([128 x i64]* @i6000 to float*)
 	%r856 = sub i64 %r, 0
 	br label %b858
 b858:
@@ -268,10 +266,10 @@ b858:
 	%s1173 = add i64 %b1902, 0
 	%r859 = add i64 %r856, 0
 	%r862 = add i64 %w1891, 0
-	%r863 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r862
+	%r863 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r862
 	%r864 = load float* %r863
 	%r868 = add i64 %w1891, 0
-	%r869 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r868
+	%r869 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r868
 	%r870 = load float* %r869
 	%r873 = sub i64 %r859, 0
 	%r876 = sub i64 %s1173, 0
@@ -338,7 +336,7 @@ b1117:
 	%d1353 = bitcast i64 %w1915 to i64
 	%r1120 = add i64 %s661, 0
 	%r1121 = add i64 %r1120, 0
-	%r1122 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r1121
+	%r1122 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r1121
 	%r1123 = load float* %r1122
 	%r1132 = bitcast i8* %c22012 to float*
 	%r1134 = getelementptr float* %r1132, i64 %w1915
@@ -412,7 +410,7 @@ b1342:
 	%r1352 = add i64 %s1523, 0
 	%r1355 = sub i64 %r1352, 0
 	%r1370 = add i64 %d1533, 0
-	%r1371 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r1370
+	%r1371 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r1370
 	%r1372 = load float* %r1371
 	br label %a74b
 a74b:
@@ -446,10 +444,10 @@ a97b:
 	%r1756 = getelementptr float* %r1754, i64 %w1970
 	%r1757 = load float* %r1756
 	%r1761 = add i64 %r1622, 0
-	%r1762 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r1761
+	%r1762 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r1761
 	%r1763 = load float* %r1762
 	%r1767 = add i64 %r1622, 0
-	%r1768 = getelementptr float* bitcast ([128 x i64]* %i6000 to float*), i64 %r1767
+	%r1768 = getelementptr float* bitcast ([128 x i64]* @i6000 to float*), i64 %r1767
 	%r1772 = add float %r1763, 0.000000e+00
 	%r1773 = add float %r1772, 0.000000e+00
 	%r1809 = add float %r1757, 0.000000e+00

test/CodeGen/X86/sse-fcopysign.ll

@@ -1,17 +1,17 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 &&
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not getp test
 
-define float %test1(float %a, float %b) {
+define float @test1(float %a, float %b) {
-	%tmp = tail call float %copysignf( float %b, float %a )
+	%tmp = tail call float @copysignf( float %b, float %a )
 	ret float %tmp
 }
 
-define double %test2(double %a, float %b, float %c) {
+define double @test2(double %a, float %b, float %c) {
 	%tmp1 = add float %b, %c
 	%tmp2 = fpext float %tmp1 to double
-	%tmp = tail call double %copysign( double %a, double %tmp2 )
+	%tmp = tail call double @copysign( double %a, double %tmp2 )
 	ret double %tmp
 }
 
-declare float %copysignf(float, float)
+declare float @copysignf(float, float)
-declare double %copysign(double, double)
+declare double @copysign(double, double)

test/CodeGen/X86/test-hidden.ll

@@ -3,18 +3,18 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8.8.0 | grep ".private_extern" | wc -l | grep 2 
 
 %struct.Person = type { i32 }
-%a = hidden global i32 0
+@a = hidden global i32 0
-%b = external global i32
+@b = external global i32
 
 implementation   ; Functions:
 
-define weak hidden void %_ZN6Person13privateMethodEv(%struct.Person* %this) {
+define weak hidden void @_ZN6Person13privateMethodEv(%struct.Person* %this) {
   ret void
 }
 
-declare void %function(i32)
+declare void @function(i32)
 
-define weak void %_ZN6PersonC1Ei(%struct.Person* %this, i32 %_c) {
+define weak void @_ZN6PersonC1Ei(%struct.Person* %this, i32 %_c) {
   ret void
 }
 

test/CodeGen/X86/test-pic-1.ll

@@ -4,15 +4,15 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOT | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 0
 
-%ptr = external global i32* 
+@ptr = external global i32* 
-%dst = external global i32 
+@dst = external global i32 
-%src = external global i32 
+@src = external global i32 
 
-define void %foo() {
+define void @foo() {
 entry:
-    store i32* %dst, i32** %ptr
+    store i32* @dst, i32** @ptr
-    %tmp.s = load i32* %src
+    %tmp.s = load i32* @src
-    store i32 %tmp.s, i32* %dst
+    store i32 %tmp.s, i32* @dst
     ret void
 }
 

test/CodeGen/X86/test-pic-2.ll

@@ -3,15 +3,15 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 4
 
-%ptr = internal global i32* null
+@ptr = internal global i32* null
-%dst = internal global i32 0
+@dst = internal global i32 0
-%src = internal global i32 0
+@src = internal global i32 0
 
-define void %foo() {
+define void @foo() {
 entry:
-    store i32* %dst, i32** %ptr
+    store i32* @dst, i32** @ptr
-    %tmp.s = load i32* %src
+    %tmp.s = load i32* @src
-    store i32 %tmp.s, i32* %dst
+    store i32 %tmp.s, i32* @dst
     ret void
 }
 

test/CodeGen/X86/test-pic-3.ll

@@ -3,12 +3,12 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 1
 
-define void %bar() {
+define void @bar() {
 entry:
-    call void(...)* %foo()
+    call void(...)* @foo()
     br label %return
 return:
     ret void
 }
 
-declare void %foo(...)
+declare void @foo(...)

test/CodeGen/X86/test-pic-4.ll

@@ -5,17 +5,17 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep "GOT" | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep "GOTOFF" | wc -l | grep 0
 
-%pfoo = external global void(...)* 
+@pfoo = external global void(...)* 
 
-define void %bar() {
+define void @bar() {
 entry:
-    %tmp = call void(...)*(...)* %afoo()
+    %tmp = call void(...)*(...)* @afoo()
-    store void(...)* %tmp, void(...)** %pfoo
+    store void(...)* %tmp, void(...)** @pfoo
-    %tmp1 = load void(...)** %pfoo
+    %tmp1 = load void(...)** @pfoo
     call void(...)* %tmp1()
     br label %return
 return:
     ret void
 }
 
-declare void(...)* %afoo(...)
+declare void(...)* @afoo(...)

test/CodeGen/X86/test-pic-5.ll

@@ -3,9 +3,9 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep PLT | wc -l | grep 1
 
-%ptr = external global i32* 
+@ptr = external global i32* 
 
-define void %foo() {
+define void @foo() {
 entry:
     %ptr = malloc i32, i32 10
     ret void

test/CodeGen/X86/test-pic-6.ll

@@ -3,15 +3,15 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep piclabel | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOT | wc -l | grep 3
 
-%ptr = global i32* null
+@ptr = global i32* null
-%dst = global i32 0
+@dst = global i32 0
-%src = global i32 0
+@src = global i32 0
 
-define void %foo() {
+define void @foo() {
 entry:
-    store i32* %dst, i32** %ptr
+    store i32* @dst, i32** @ptr
-    %tmp.s = load i32* %src
+    %tmp.s = load i32* @src
-    store i32 %tmp.s, i32* %dst
+    store i32 %tmp.s, i32* @dst
     ret void
 }
 

test/CodeGen/X86/test-pic-cpool.ll

@@ -4,7 +4,7 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 2 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep CPI | wc -l | grep 4
 
-define double %foo(i32 %a.u) {
+define double @foo(i32 %a.u) {
 entry:
     %tmp = icmp eq i32 %a.u,0
     %retval = select i1 %tmp, double 4.561230e+02, double 1.234560e+02

test/CodeGen/X86/test-pic-jtbl.ll

@@ -5,53 +5,53 @@
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep GOTOFF | wc -l | grep 1 &&
 ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep JTI | wc -l | grep 15
 
-define void %bar(i32 %n.u) {
+define void @bar(i32 %n.u) {
 entry:
     switch i32 %n.u, label %bb12 [i32 1, label %bb i32 2, label %bb6 i32 4, label %bb7 i32 5, label %bb8 i32 6, label %bb10 i32 7, label %bb1 i32 8, label %bb3 i32 9, label %bb4 i32 10, label %bb9 i32 11, label %bb2 i32 12, label %bb5 i32 13, label %bb11 ]
 bb:
-    tail call void(...)* %foo1()
+    tail call void(...)* @foo1()
     ret void
 bb1:
-    tail call void(...)* %foo2()
+    tail call void(...)* @foo2()
     ret void
 bb2:
-    tail call void(...)* %foo6()
+    tail call void(...)* @foo6()
     ret void
 bb3:
-    tail call void(...)* %foo3()
+    tail call void(...)* @foo3()
     ret void
 bb4:
-    tail call void(...)* %foo4()
+    tail call void(...)* @foo4()
     ret void
 bb5:
-    tail call void(...)* %foo5()
+    tail call void(...)* @foo5()
     ret void
 bb6:
-    tail call void(...)* %foo1()
+    tail call void(...)* @foo1()
     ret void
 bb7:
-    tail call void(...)* %foo2()
+    tail call void(...)* @foo2()
     ret void
 bb8:
-    tail call void(...)* %foo6()
+    tail call void(...)* @foo6()
     ret void
 bb9:
-    tail call void(...)* %foo3()
+    tail call void(...)* @foo3()
     ret void
 bb10:
-    tail call void(...)* %foo4()
+    tail call void(...)* @foo4()
     ret void
 bb11:
-    tail call void(...)* %foo5()
+    tail call void(...)* @foo5()
     ret void
 bb12:
-    tail call void(...)* %foo6()
+    tail call void(...)* @foo6()
     ret void
 }
 
-declare void %foo1(...)
+declare void @foo1(...)
-declare void %foo2(...)
+declare void @foo2(...)
-declare void %foo6(...)
+declare void @foo6(...)
-declare void %foo3(...)
+declare void @foo3(...)
-declare void %foo4(...)
+declare void @foo4(...)
-declare void %foo5(...)
+declare void @foo5(...)

test/CodeGen/X86/trunc-to-bool.ll

@@ -5,12 +5,12 @@
 ; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | \
 ; RUN:   wc -l | grep 6
 
-define i1 %test1(i32 %X) zext {
+define i1 @test1(i32 %X) zext {
     %Y = trunc i32 %X to i1
     ret i1 %Y
 }
 
-define i1 %test2(i32 %val, i32 %mask) {
+define i1 @test2(i32 %val, i32 %mask) {
 entry:
     %mask = trunc i32 %mask to i8
     %shifted = ashr i32 %val, i8 %mask
@@ -23,7 +23,7 @@ ret_false:
     ret i1 false
 }
 
-define i32 %test3(i8* %ptr) {
+define i32 @test3(i8* %ptr) {
     %val = load i8* %ptr
     %tmp = trunc i8 %val to i1
     br i1 %tmp, label %cond_true, label %cond_false
@@ -33,7 +33,7 @@ cond_false:
     ret i32 42
 }
 
-define i32 %test4(i8* %ptr) {
+define i32 @test4(i8* %ptr) {
     %tmp = ptrtoint i8* %ptr to i1
     br i1 %tmp, label %cond_true, label %cond_false
 cond_true:
@@ -42,7 +42,7 @@ cond_false:
     ret i32 42
 }
 
-define i32 %test5(float %f) {
+define i32 @test5(float %f) {
     %tmp = fptoui float %f to i1
     br i1 %tmp, label %cond_true, label %cond_false
 cond_true:
@@ -51,7 +51,7 @@ cond_false:
     ret i32 42
 }
 
-define i32 %test6(double %d) {
+define i32 @test6(double %d) {
     %tmp = fptosi double %d to i1
     br i1 %tmp, label %cond_true, label %cond_false
 cond_true:

test/Feature/globalredefinition2.ll

@@ -1,6 +1,6 @@
 ; Test that redefinitions of globals produces an error in llvm-upgrade
 ; RUN: llvm-upgrade < %s -o /dev/null -f 2>&1 | \
-; RUN:   grep "Global variable '%B' was renamed to '"
+; RUN:   grep "Renaming global variable 'B' to.*linkage errors"
 
 %B = global int 7
 %B = global int 7

test/Feature/globalredefinition3.ll

@@ -4,5 +4,5 @@
 
 ; Test forward references and redefinitions of globals
 
-%B = global i32 7
+@B = global i32 7
-%B = global i32 7
+@B = global i32 7

test/Feature/newcasts.ll

@@ -1,28 +1,28 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-void "NewCasts" (short %x) {
+define void @"NewCasts" (i16 %x) {
-  %a = zext short %x to int
+  %a = zext i16 %x to i32
-  %b = sext short %x to uint
+  %b = sext i16 %x to i32
-  %c = trunc short %x to ubyte
+  %c = trunc i16 %x to i8
-  %d = uitofp short %x to float
+  %d = uitofp i16 %x to float
-  %e = sitofp short %x to double
+  %e = sitofp i16 %x to double
-  %f = fptoui float %d to short
+  %f = fptoui float %d to i16
-  %g = fptosi double %e to short
+  %g = fptosi double %e to i16
   %i = fpext float %d to double
   %j = fptrunc double %i to float
-  %k = bitcast int %a to float
+  %k = bitcast i32 %a to float
-  %l = inttoptr short %x to int*
+  %l = inttoptr i16 %x to i32*
-  %m = ptrtoint int* %l to long
+  %m = ptrtoint i32* %l to i64
   ret void
 }
 
 
-ushort "ZExtConst" () {
+define i16 @"ZExtConst" () {
-  ret ushort trunc ( uint zext ( short 42 to uint) to ushort )
+  ret i16 trunc ( i32 zext ( i16 42 to i32) to i16 )
 }
 
-short "SExtConst" () {
+define i16 @"SExtConst" () {
-  ret short trunc (int sext (ushort 42 to int) to short )
+  ret i16 trunc (i32 sext (i16 42 to i32) to i16 )
 }

test/Feature/packed_struct.ll

@@ -5,29 +5,29 @@
 ; RUN: grep "<{" %t2.ll
 
 %struct.anon = type <{ i8, i32, i32, i32 }>
-%foos = external global %struct.anon 
+@foos = external global %struct.anon 
-%bara = external global [2 x <{ i32, i8 }>]
+@bara = external global [2 x <{ i32, i8 }>]
 
 ;initializers should work for packed and non-packed the same way
-%E1 = global <{i8, i32, i32}> <{i8 1, i32 2, i32 3}>
+@E1 = global <{i8, i32, i32}> <{i8 1, i32 2, i32 3}>
-%E2 = global {i8, i32, i32} {i8 4, i32 5, i32 6}
+@E2 = global {i8, i32, i32} {i8 4, i32 5, i32 6}
 
 implementation   ; Functions:
 
-define i32 %main() 
+define i32 @main() 
 {
-        %tmp = load i32*  getelementptr (%struct.anon* %foos, i32 0, i32 1)            ; <i32> [#uses=1]
+        %tmp = load i32*  getelementptr (%struct.anon* @foos, i32 0, i32 1)            ; <i32> [#uses=1]
-        %tmp3 = load i32* getelementptr (%struct.anon* %foos, i32 0, i32 2)            ; <i32> [#uses=1]
+        %tmp3 = load i32* getelementptr (%struct.anon* @foos, i32 0, i32 2)            ; <i32> [#uses=1]
-        %tmp6 = load i32* getelementptr (%struct.anon* %foos, i32 0, i32 3)            ; <i32> [#uses=1]
+        %tmp6 = load i32* getelementptr (%struct.anon* @foos, i32 0, i32 3)            ; <i32> [#uses=1]
         %tmp4 = add i32 %tmp3, %tmp             ; <i32> [#uses=1]
         %tmp7 = add i32 %tmp4, %tmp6            ; <i32> [#uses=1]
         ret i32 %tmp7
 }
 
-define i32 %bar() {
+define i32 @bar() {
 entry:
-        %tmp = load i32* getelementptr([2 x <{ i32, i8 }>]* %bara, i32 0, i32 0, i32 0 )            ; <i32> [#uses=1]
+        %tmp = load i32* getelementptr([2 x <{ i32, i8 }>]* @bara, i32 0, i32 0, i32 0 )            ; <i32> [#uses=1]
-        %tmp4 = load i32* getelementptr ([2 x <{ i32, i8 }>]* %bara, i32 0, i32 1, i32 0)           ; <i32> [#uses=1]
+        %tmp4 = load i32* getelementptr ([2 x <{ i32, i8 }>]* @bara, i32 0, i32 1, i32 0)           ; <i32> [#uses=1]
         %tmp5 = add i32 %tmp4, %tmp             ; <i32> [#uses=1]
         ret i32 %tmp5
 }

test/Feature/paramattrs.ll

@@ -5,16 +5,16 @@
 %ZFunTy = type i32(i8 zext)
 %SFunTy = type i32(i8 sext)
 
-declare i16 "test"(i16 sext %arg) sext 
+declare i16 @"test"(i16 sext %arg) sext 
-declare i8 "test2" (i16 zext %a2) zext 
+declare i8 @"test2" (i16 zext %a2) zext 
 
 implementation
 
-define i32 %main(i32 %argc, i8 **%argv) {
+define i32 @main(i32 %argc, i8 **%argv) {
     %val = trunc i32 %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 i32
     ret i32 %retVal
 }

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
+@ARRAY   = global [ 20 x i17 ] zeroinitializer
-%FORMAT  = constant [ 4 x i8 ] c"%d\0A\00"
+@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) 
+  call void @multiply(i32 %i, i32 -1, i32 255) 
-  %P = getelementptr [20 x i17]* %ARRAY, i32 0, i32 0
+  %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
+  %fmt = getelementptr [4 x i8]* @FORMAT, i32 0, i32 0
-  call i32 (i8*,...)* %printf(i8* %fmt, i32 %result)
+  call i32 (i8*,...)* @printf(i8* %fmt, i32 %result)
   ret i32 %result
 }
 

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

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

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

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

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"()
+define void @"foo"() {
-begin
 	%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
+}

test/Integer/BitMisc.ll

@@ -3,23 +3,23 @@
 ; RUN: diff %t1.ll %t2.ll
 
 
-%MyVar     = external global i19
+@MyVar     = external global i19
-%MyIntList = external global { i39 *, 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
+	store i19 5, i19* @MyVar
-	%idx = getelementptr { i39 *, i19 } * %MyIntList, i64 0, i32 1
+	%idx = getelementptr { i39 *, i19 } * @MyIntList, i64 0, i32 1
   	store i19 12, i19* %idx
   	ret i19 %blah
 end

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>;
-%foo1 = external global <4 x float>;
+@foo2 = external global <2 x i10>;
-%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 <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
+        store <2 x i10> <i10 4, i10 4>, <2 x i10>* @foo2
-	%l1 = load <4 x float>* %foo1
+	%l1 = load <4 x float>* @foo1
-        %l2 = load <2 x i10>* %foo2
+        %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
 }

test/Integer/a1.ll

@@ -3,22 +3,22 @@
 
 ; test 1 bit
 ;
-%b = constant i1 add(i1 1 , i1 1)
+@b = constant i1 add(i1 1 , i1 1)
-%c = constant i1 add(i1 -1, i1 1)
+@c = constant i1 add(i1 -1, i1 1)
-%d = constant i1 add(i1 -1, i1 -1)
+@d = constant i1 add(i1 -1, i1 -1)
-%e = constant i1 sub(i1 -1, i1 1)
+@e = constant i1 sub(i1 -1, i1 1)
-%f = constant i1 sub(i1 1 , i1 -1)
+@f = constant i1 sub(i1 1 , i1 -1)
-%g = constant i1 sub(i1 1 , i1 1)
+@g = constant i1 sub(i1 1 , i1 1)
 
-%h = constant i1 shl(i1 1 , i8 1)
+@h = constant i1 shl(i1 1 , i8 1)
-%i = constant i1 shl(i1 1 , i8 0)
+@i = constant i1 shl(i1 1 , i8 0)
-%j = constant i1 lshr(i1 1, i8 1)
+@j = constant i1 lshr(i1 1, i8 1)
-%m = constant i1 ashr(i1 1, i8 1)
+@m = constant i1 ashr(i1 1, i8 1)
 
-%n = constant i1 mul(i1 -1, i1 1)
+@n = constant i1 mul(i1 -1, i1 1)
-%o = constant i1 sdiv(i1 -1, i1 1)
+@o = constant i1 sdiv(i1 -1, i1 1)
-%p = constant i1 sdiv(i1 1 , i1 -1)
+@p = constant i1 sdiv(i1 1 , i1 -1)
-%q = constant i1 udiv(i1 -1, i1 1)
+@q = constant i1 udiv(i1 -1, i1 1)
-%r = constant i1 udiv(i1 1, i1 -1)
+@r = constant i1 udiv(i1 1, i1 -1)
-%s = constant i1 srem(i1 -1, i1 1)
+@s = constant i1 srem(i1 -1, i1 1)
-%t = constant i1 urem(i1 -1, i1 1)
+@t = constant i1 urem(i1 -1, i1 1)

test/Integer/a1.ll.out

@@ -1,20 +1,20 @@
 ; ModuleID = '<stdin>'
-%b = constant i1 false		; <i1*> [#uses=0]
+@b = constant i1 false		; <i1*> [#uses=0]
-%c = constant i1 false		; <i1*> [#uses=0]
+@c = constant i1 false		; <i1*> [#uses=0]
-%d = constant i1 false		; <i1*> [#uses=0]
+@d = constant i1 false		; <i1*> [#uses=0]
-%e = constant i1 false		; <i1*> [#uses=0]
+@e = constant i1 false		; <i1*> [#uses=0]
-%f = constant i1 false		; <i1*> [#uses=0]
+@f = constant i1 false		; <i1*> [#uses=0]
-%g = constant i1 false		; <i1*> [#uses=0]
+@g = constant i1 false		; <i1*> [#uses=0]
-%h = constant i1 false		; <i1*> [#uses=0]
+@h = constant i1 false		; <i1*> [#uses=0]
-%i = constant i1 true		; <i1*> [#uses=0]
+@i = constant i1 true		; <i1*> [#uses=0]
-%j = constant i1 false		; <i1*> [#uses=0]
+@j = constant i1 false		; <i1*> [#uses=0]
-%m = constant i1 true		; <i1*> [#uses=0]
+@m = constant i1 true		; <i1*> [#uses=0]
-%n = constant i1 true		; <i1*> [#uses=0]
+@n = constant i1 true		; <i1*> [#uses=0]
-%o = constant i1 true		; <i1*> [#uses=0]
+@o = constant i1 true		; <i1*> [#uses=0]
-%p = constant i1 true		; <i1*> [#uses=0]
+@p = constant i1 true		; <i1*> [#uses=0]
-%q = constant i1 true		; <i1*> [#uses=0]
+@q = constant i1 true		; <i1*> [#uses=0]
-%r = constant i1 true		; <i1*> [#uses=0]
+@r = constant i1 true		; <i1*> [#uses=0]
-%s = constant i1 false		; <i1*> [#uses=0]
+@s = constant i1 false		; <i1*> [#uses=0]
-%t = constant i1 false		; <i1*> [#uses=0]
+@t = constant i1 false		; <i1*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a15.ll

@@ -3,26 +3,26 @@
 
 ; test 15 bits
 ;
-%b = constant i15 add(i15 32767, i15 1)
+@b = constant i15 add(i15 32767, i15 1)
-%c = constant i15 add(i15 32767, i15 32767)
+@c = constant i15 add(i15 32767, i15 32767)
-%d = constant i15 add(i15 32760, i15 8)
+@d = constant i15 add(i15 32760, i15 8)
-%e = constant i15 sub(i15 0 , i15 1)
+@e = constant i15 sub(i15 0 , i15 1)
-%f = constant i15 sub(i15 0 , i15 32767)
+@f = constant i15 sub(i15 0 , i15 32767)
-%g = constant i15 sub(i15 2 , i15 32767)
+@g = constant i15 sub(i15 2 , i15 32767)
 
-%h = constant i15 shl(i15 1 , i8 15)
+@h = constant i15 shl(i15 1 , i8 15)
-%i = constant i15 shl(i15 1 , i8 14)
+@i = constant i15 shl(i15 1 , i8 14)
-%j = constant i15 lshr(i15 32767 , i8 14)
+@j = constant i15 lshr(i15 32767 , i8 14)
-%k = constant i15 lshr(i15 32767 , i8 15)
+@k = constant i15 lshr(i15 32767 , i8 15)
-%l = constant i15 ashr(i15 32767 , i8 14)
+@l = constant i15 ashr(i15 32767 , i8 14)
-%m = constant i15 ashr(i15 32767 , i8 15)
+@m = constant i15 ashr(i15 32767 , i8 15)
 
-%n = constant i15 mul(i15 32767, i15 2)
+@n = constant i15 mul(i15 32767, i15 2)
-%q = constant i15 mul(i15 -16383,i15 -3)
+@q = constant i15 mul(i15 -16383,i15 -3)
-%r = constant i15 sdiv(i15 -1,   i15 16383)
+@r = constant i15 sdiv(i15 -1,   i15 16383)
-%s = constant i15 udiv(i15 -1,   i15 16383)
+@s = constant i15 udiv(i15 -1,   i15 16383)
-%t = constant i15 srem(i15 1,    i15 32766)
+@t = constant i15 srem(i15 1,    i15 32766)
-%u = constant i15 urem(i15 32767,i15 -1)
+@u = constant i15 urem(i15 32767,i15 -1)
-%o = constant i15 trunc( i16 32768  to i15 )
+@o = constant i15 trunc( i16 32768  to i15 )
-%p = constant i15 trunc( i16 32767  to i15 )
+@p = constant i15 trunc( i16 32767  to i15 )
  

test/Integer/a15.ll.out

@@ -1,23 +1,23 @@
 ; ModuleID = '<stdin>'
-%b = constant i15 0		; <i15*> [#uses=0]
+@b = constant i15 0		; <i15*> [#uses=0]
-%c = constant i15 -2		; <i15*> [#uses=0]
+@c = constant i15 -2		; <i15*> [#uses=0]
-%d = constant i15 0		; <i15*> [#uses=0]
+@d = constant i15 0		; <i15*> [#uses=0]
-%e = constant i15 -1		; <i15*> [#uses=0]
+@e = constant i15 -1		; <i15*> [#uses=0]
-%f = constant i15 1		; <i15*> [#uses=0]
+@f = constant i15 1		; <i15*> [#uses=0]
-%g = constant i15 3		; <i15*> [#uses=0]
+@g = constant i15 3		; <i15*> [#uses=0]
-%h = constant i15 0		; <i15*> [#uses=0]
+@h = constant i15 0		; <i15*> [#uses=0]
-%i = constant i15 -16384		; <i15*> [#uses=0]
+@i = constant i15 -16384		; <i15*> [#uses=0]
-%j = constant i15 1		; <i15*> [#uses=0]
+@j = constant i15 1		; <i15*> [#uses=0]
-%k = constant i15 0		; <i15*> [#uses=0]
+@k = constant i15 0		; <i15*> [#uses=0]
-%l = constant i15 -1		; <i15*> [#uses=0]
+@l = constant i15 -1		; <i15*> [#uses=0]
-%m = constant i15 -1		; <i15*> [#uses=0]
+@m = constant i15 -1		; <i15*> [#uses=0]
-%n = constant i15 -2		; <i15*> [#uses=0]
+@n = constant i15 -2		; <i15*> [#uses=0]
-%q = constant i15 16381		; <i15*> [#uses=0]
+@q = constant i15 16381		; <i15*> [#uses=0]
-%r = constant i15 0		; <i15*> [#uses=0]
+@r = constant i15 0		; <i15*> [#uses=0]
-%s = constant i15 2		; <i15*> [#uses=0]
+@s = constant i15 2		; <i15*> [#uses=0]
-%t = constant i15 1		; <i15*> [#uses=0]
+@t = constant i15 1		; <i15*> [#uses=0]
-%u = constant i15 0		; <i15*> [#uses=0]
+@u = constant i15 0		; <i15*> [#uses=0]
-%o = constant i15 0		; <i15*> [#uses=0]
+@o = constant i15 0		; <i15*> [#uses=0]
-%p = constant i15 -1		; <i15*> [#uses=0]
+@p = constant i15 -1		; <i15*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a17.ll

@@ -3,24 +3,24 @@
 
 ; test 17 bits
 ;
-%b = constant i17 add(i17 131071, i17 1)
+@b = constant i17 add(i17 131071, i17 1)
-%c = constant i17 add(i17 131071, i17 131071)
+@c = constant i17 add(i17 131071, i17 131071)
-%d = constant i17 add(i17 131064, i17 8)
+@d = constant i17 add(i17 131064, i17 8)
-%e = constant i17 sub(i17 0 , i17 1)
+@e = constant i17 sub(i17 0 , i17 1)
-%f = constant i17 sub(i17 0 , i17 131071)
+@f = constant i17 sub(i17 0 , i17 131071)
-%g = constant i17 sub(i17 2 , i17 131071)
+@g = constant i17 sub(i17 2 , i17 131071)
 
-%h = constant i17 shl(i17 1 , i8 17)
+@h = constant i17 shl(i17 1 , i8 17)
-%i = constant i17 shl(i17 1 , i8 16)
+@i = constant i17 shl(i17 1 , i8 16)
-%j = constant i17 lshr(i17 131071 , i8 16)
+@j = constant i17 lshr(i17 131071 , i8 16)
-%k = constant i17 lshr(i17 131071 , i8 17)
+@k = constant i17 lshr(i17 131071 , i8 17)
-%l = constant i17 ashr(i17 131071 , i8 16)
+@l = constant i17 ashr(i17 131071 , i8 16)
-%m = constant i17 ashr(i17 131071 , i8 17)
+@m = constant i17 ashr(i17 131071 , i8 17)
 
-%n = constant i17 mul(i17 131071, i17 2) 
+@n = constant i17 mul(i17 131071, i17 2) 
-%q = constant i17 sdiv(i17 -1,    i17 65535)
+@q = constant i17 sdiv(i17 -1,    i17 65535)
-%r = constant i17 udiv(i17 -1,    i17 65535)
+@r = constant i17 udiv(i17 -1,    i17 65535)
-%s = constant i17 srem(i17  1,    i17 131070)
+@s = constant i17 srem(i17  1,    i17 131070)
-%t = constant i17 urem(i17 131071,i17 -1)
+@t = constant i17 urem(i17 131071,i17 -1)
-%o = constant i17 trunc( i18 131072  to i17 )
+@o = constant i17 trunc( i18 131072  to i17 )
-%p = constant i17 trunc( i18 131071  to i17 )
+@p = constant i17 trunc( i18 131071  to i17 )

test/Integer/a17.ll.out

@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i17 0		; <i17*> [#uses=0]
+@b = constant i17 0		; <i17*> [#uses=0]
-%c = constant i17 -2		; <i17*> [#uses=0]
+@c = constant i17 -2		; <i17*> [#uses=0]
-%d = constant i17 0		; <i17*> [#uses=0]
+@d = constant i17 0		; <i17*> [#uses=0]
-%e = constant i17 -1		; <i17*> [#uses=0]
+@e = constant i17 -1		; <i17*> [#uses=0]
-%f = constant i17 1		; <i17*> [#uses=0]
+@f = constant i17 1		; <i17*> [#uses=0]
-%g = constant i17 3		; <i17*> [#uses=0]
+@g = constant i17 3		; <i17*> [#uses=0]
-%h = constant i17 0		; <i17*> [#uses=0]
+@h = constant i17 0		; <i17*> [#uses=0]
-%i = constant i17 -65536		; <i17*> [#uses=0]
+@i = constant i17 -65536		; <i17*> [#uses=0]
-%j = constant i17 1		; <i17*> [#uses=0]
+@j = constant i17 1		; <i17*> [#uses=0]
-%k = constant i17 0		; <i17*> [#uses=0]
+@k = constant i17 0		; <i17*> [#uses=0]
-%l = constant i17 -1		; <i17*> [#uses=0]
+@l = constant i17 -1		; <i17*> [#uses=0]
-%m = constant i17 -1		; <i17*> [#uses=0]
+@m = constant i17 -1		; <i17*> [#uses=0]
-%n = constant i17 -2		; <i17*> [#uses=0]
+@n = constant i17 -2		; <i17*> [#uses=0]
-%q = constant i17 0		; <i17*> [#uses=0]
+@q = constant i17 0		; <i17*> [#uses=0]
-%r = constant i17 2		; <i17*> [#uses=0]
+@r = constant i17 2		; <i17*> [#uses=0]
-%s = constant i17 1		; <i17*> [#uses=0]
+@s = constant i17 1		; <i17*> [#uses=0]
-%t = constant i17 0		; <i17*> [#uses=0]
+@t = constant i17 0		; <i17*> [#uses=0]
-%o = constant i17 0		; <i17*> [#uses=0]
+@o = constant i17 0		; <i17*> [#uses=0]
-%p = constant i17 -1		; <i17*> [#uses=0]
+@p = constant i17 -1		; <i17*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a31.ll

@@ -3,24 +3,24 @@
 
 ; test 31 bits
 ;
-%b = constant i31 add(i31 2147483647, i31 1)
+@b = constant i31 add(i31 2147483647, i31 1)
-%c = constant i31 add(i31 2147483647, i31 2147483647)
+@c = constant i31 add(i31 2147483647, i31 2147483647)
-%d = constant i31 add(i31 2147483640, i31 8)
+@d = constant i31 add(i31 2147483640, i31 8)
-%e = constant i31 sub(i31 0 , i31 1)
+@e = constant i31 sub(i31 0 , i31 1)
-%f = constant i31 sub(i31 0 , i31 2147483647)
+@f = constant i31 sub(i31 0 , i31 2147483647)
-%g = constant i31 sub(i31 2 , i31 2147483647)
+@g = constant i31 sub(i31 2 , i31 2147483647)
 
-%h = constant i31 shl(i31 1 , i8 31)
+@h = constant i31 shl(i31 1 , i8 31)
-%i = constant i31 shl(i31 1 , i8 30)
+@i = constant i31 shl(i31 1 , i8 30)
-%j = constant i31 lshr(i31 2147483647 , i8 30)
+@j = constant i31 lshr(i31 2147483647 , i8 30)
-%k = constant i31 lshr(i31 2147483647 , i8 31)
+@k = constant i31 lshr(i31 2147483647 , i8 31)
-%l = constant i31 ashr(i31 2147483647 , i8 30)
+@l = constant i31 ashr(i31 2147483647 , i8 30)
-%m = constant i31 ashr(i31 2147483647 , i8 31)
+@m = constant i31 ashr(i31 2147483647 , i8 31)
 
-%n = constant i31 mul(i31 2147483647, i31 2)
+@n = constant i31 mul(i31 2147483647, i31 2)
-%q = constant i31 sdiv(i31 -1,        i31 1073741823)
+@q = constant i31 sdiv(i31 -1,        i31 1073741823)
-%r = constant i31 udiv(i31 -1,        i31 1073741823)
+@r = constant i31 udiv(i31 -1,        i31 1073741823)
-%s = constant i31 srem(i31  3,        i31 2147483646)
+@s = constant i31 srem(i31  3,        i31 2147483646)
-%t = constant i31 urem(i31 2147483647,i31 -1)
+@t = constant i31 urem(i31 2147483647,i31 -1)
-%o = constant i31 trunc( i32 2147483648  to i31 )
+@o = constant i31 trunc( i32 2147483648  to i31 )
-%p = constant i31 trunc( i32 2147483647  to i31 ) 
+@p = constant i31 trunc( i32 2147483647  to i31 ) 

test/Integer/a31.ll.out

@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i31 0		; <i31*> [#uses=0]
+@b = constant i31 0		; <i31*> [#uses=0]
-%c = constant i31 -2		; <i31*> [#uses=0]
+@c = constant i31 -2		; <i31*> [#uses=0]
-%d = constant i31 0		; <i31*> [#uses=0]
+@d = constant i31 0		; <i31*> [#uses=0]
-%e = constant i31 -1		; <i31*> [#uses=0]
+@e = constant i31 -1		; <i31*> [#uses=0]
-%f = constant i31 1		; <i31*> [#uses=0]
+@f = constant i31 1		; <i31*> [#uses=0]
-%g = constant i31 3		; <i31*> [#uses=0]
+@g = constant i31 3		; <i31*> [#uses=0]
-%h = constant i31 0		; <i31*> [#uses=0]
+@h = constant i31 0		; <i31*> [#uses=0]
-%i = constant i31 -1073741824		; <i31*> [#uses=0]
+@i = constant i31 -1073741824		; <i31*> [#uses=0]
-%j = constant i31 1		; <i31*> [#uses=0]
+@j = constant i31 1		; <i31*> [#uses=0]
-%k = constant i31 0		; <i31*> [#uses=0]
+@k = constant i31 0		; <i31*> [#uses=0]
-%l = constant i31 -1		; <i31*> [#uses=0]
+@l = constant i31 -1		; <i31*> [#uses=0]
-%m = constant i31 -1		; <i31*> [#uses=0]
+@m = constant i31 -1		; <i31*> [#uses=0]
-%n = constant i31 -2		; <i31*> [#uses=0]
+@n = constant i31 -2		; <i31*> [#uses=0]
-%q = constant i31 0		; <i31*> [#uses=0]
+@q = constant i31 0		; <i31*> [#uses=0]
-%r = constant i31 2		; <i31*> [#uses=0]
+@r = constant i31 2		; <i31*> [#uses=0]
-%s = constant i31 1		; <i31*> [#uses=0]
+@s = constant i31 1		; <i31*> [#uses=0]
-%t = constant i31 0		; <i31*> [#uses=0]
+@t = constant i31 0		; <i31*> [#uses=0]
-%o = constant i31 0		; <i31*> [#uses=0]
+@o = constant i31 0		; <i31*> [#uses=0]
-%p = constant i31 -1		; <i31*> [#uses=0]
+@p = constant i31 -1		; <i31*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a33.ll

@@ -3,25 +3,25 @@
 
 ; test 33 bits
 ;
-%b = constant i33 add(i33 8589934591, i33 1)
+@b = constant i33 add(i33 8589934591, i33 1)
-%c = constant i33 add(i33 8589934591, i33 8589934591)
+@c = constant i33 add(i33 8589934591, i33 8589934591)
-%d = constant i33 add(i33 8589934584, i33 8)
+@d = constant i33 add(i33 8589934584, i33 8)
-%e = constant i33 sub(i33 0 , i33 1)
+@e = constant i33 sub(i33 0 , i33 1)
-%f = constant i33 sub(i33 0 , i33 8589934591)
+@f = constant i33 sub(i33 0 , i33 8589934591)
-%g = constant i33 sub(i33 2 , i33 8589934591)
+@g = constant i33 sub(i33 2 , i33 8589934591)
 
-%h = constant i33 shl(i33 1 , i8 33)
+@h = constant i33 shl(i33 1 , i8 33)
-%i = constant i33 shl(i33 1 , i8 32)
+@i = constant i33 shl(i33 1 , i8 32)
-%j = constant i33 lshr(i33 8589934591 , i8 32)
+@j = constant i33 lshr(i33 8589934591 , i8 32)
-%k = constant i33 lshr(i33 8589934591 , i8 33)
+@k = constant i33 lshr(i33 8589934591 , i8 33)
-%l = constant i33 ashr(i33 8589934591 , i8 32)
+@l = constant i33 ashr(i33 8589934591 , i8 32)
-%m = constant i33 ashr(i33 8589934591 , i8 33)
+@m = constant i33 ashr(i33 8589934591 , i8 33)
 
-%n = constant i33 mul(i33 8589934591, i33 2)
+@n = constant i33 mul(i33 8589934591, i33 2)
-%q = constant i33 sdiv(i33 -1,        i33 4294967295)
+@q = constant i33 sdiv(i33 -1,        i33 4294967295)
-%r = constant i33 udiv(i33 -1,        i33 4294967295)
+@r = constant i33 udiv(i33 -1,        i33 4294967295)
-%s = constant i33 srem(i33  3,        i33 8589934590)
+@s = constant i33 srem(i33  3,        i33 8589934590)
-%t = constant i33 urem(i33 8589934591,i33 -1)
+@t = constant i33 urem(i33 8589934591,i33 -1)
-%o = constant i33 trunc( i34 8589934592 to i33 )
+@o = constant i33 trunc( i34 8589934592 to i33 )
-%p = constant i33 trunc( i34 8589934591  to i33 )
+@p = constant i33 trunc( i34 8589934591  to i33 )
  

test/Integer/a33.ll.out

@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i33 0		; <i33*> [#uses=0]
+@b = constant i33 0		; <i33*> [#uses=0]
-%c = constant i33 -2		; <i33*> [#uses=0]
+@c = constant i33 -2		; <i33*> [#uses=0]
-%d = constant i33 0		; <i33*> [#uses=0]
+@d = constant i33 0		; <i33*> [#uses=0]
-%e = constant i33 -1		; <i33*> [#uses=0]
+@e = constant i33 -1		; <i33*> [#uses=0]
-%f = constant i33 1		; <i33*> [#uses=0]
+@f = constant i33 1		; <i33*> [#uses=0]
-%g = constant i33 3		; <i33*> [#uses=0]
+@g = constant i33 3		; <i33*> [#uses=0]
-%h = constant i33 0		; <i33*> [#uses=0]
+@h = constant i33 0		; <i33*> [#uses=0]
-%i = constant i33 -4294967296		; <i33*> [#uses=0]
+@i = constant i33 -4294967296		; <i33*> [#uses=0]
-%j = constant i33 1		; <i33*> [#uses=0]
+@j = constant i33 1		; <i33*> [#uses=0]
-%k = constant i33 0		; <i33*> [#uses=0]
+@k = constant i33 0		; <i33*> [#uses=0]
-%l = constant i33 -1		; <i33*> [#uses=0]
+@l = constant i33 -1		; <i33*> [#uses=0]
-%m = constant i33 -1		; <i33*> [#uses=0]
+@m = constant i33 -1		; <i33*> [#uses=0]
-%n = constant i33 -2		; <i33*> [#uses=0]
+@n = constant i33 -2		; <i33*> [#uses=0]
-%q = constant i33 0		; <i33*> [#uses=0]
+@q = constant i33 0		; <i33*> [#uses=0]
-%r = constant i33 2		; <i33*> [#uses=0]
+@r = constant i33 2		; <i33*> [#uses=0]
-%s = constant i33 1		; <i33*> [#uses=0]
+@s = constant i33 1		; <i33*> [#uses=0]
-%t = constant i33 0		; <i33*> [#uses=0]
+@t = constant i33 0		; <i33*> [#uses=0]
-%o = constant i33 0		; <i33*> [#uses=0]
+@o = constant i33 0		; <i33*> [#uses=0]
-%p = constant i33 -1		; <i33*> [#uses=0]
+@p = constant i33 -1		; <i33*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a63.ll

@@ -3,25 +3,25 @@
 
 ; test 63 bits
 ;
-%b = constant i63 add(i63 9223372036854775807, i63 1)
+@b = constant i63 add(i63 9223372036854775807, i63 1)
-%c = constant i63 add(i63 9223372036854775807, i63 9223372036854775807)
+@c = constant i63 add(i63 9223372036854775807, i63 9223372036854775807)
-%d = constant i63 add(i63 9223372036854775800, i63 8)
+@d = constant i63 add(i63 9223372036854775800, i63 8)
-%e = constant i63 sub(i63 0 , i63 1)
+@e = constant i63 sub(i63 0 , i63 1)
-%f = constant i63 sub(i63 0 , i63 9223372036854775807)
+@f = constant i63 sub(i63 0 , i63 9223372036854775807)
-%g = constant i63 sub(i63 2 , i63 9223372036854775807)
+@g = constant i63 sub(i63 2 , i63 9223372036854775807)
 
-%h = constant i63 shl(i63 1 , i8 63)
+@h = constant i63 shl(i63 1 , i8 63)
-%i = constant i63 shl(i63 1 , i8 62)
+@i = constant i63 shl(i63 1 , i8 62)
-%j = constant i63 lshr(i63 9223372036854775807 , i8 62)
+@j = constant i63 lshr(i63 9223372036854775807 , i8 62)
-%k = constant i63 lshr(i63 9223372036854775807 , i8 63)
+@k = constant i63 lshr(i63 9223372036854775807 , i8 63)
-%l = constant i63 ashr(i63 9223372036854775807 , i8 62)
+@l = constant i63 ashr(i63 9223372036854775807 , i8 62)
-%m = constant i63 ashr(i63 9223372036854775807 , i8 63)
+@m = constant i63 ashr(i63 9223372036854775807 , i8 63)
 
-%n = constant i63 mul(i63 9223372036854775807, i63 2) 
+@n = constant i63 mul(i63 9223372036854775807, i63 2) 
-%q = constant i63 sdiv(i63 -1,                 i63 4611686018427387903)
+@q = constant i63 sdiv(i63 -1,                 i63 4611686018427387903)
-%u = constant i63 sdiv(i63 -1,                 i63 1)
+@u = constant i63 sdiv(i63 -1,                 i63 1)
-%r = constant i63 udiv(i63 -1,                 i63 4611686018427387903)
+@r = constant i63 udiv(i63 -1,                 i63 4611686018427387903)
-%s = constant i63 srem(i63  3,                 i63 9223372036854775806)
+@s = constant i63 srem(i63  3,                 i63 9223372036854775806)
-%t = constant i63 urem(i63 9223372036854775807,i63 -1)
+@t = constant i63 urem(i63 9223372036854775807,i63 -1)
-%o = constant i63 trunc( i64 9223372036854775808 to i63 )
+@o = constant i63 trunc( i64 9223372036854775808 to i63 )
-%p = constant i63 trunc( i64 9223372036854775807  to i63 )
+@p = constant i63 trunc( i64 9223372036854775807  to i63 )

test/Integer/a63.ll.out

@@ -1,23 +1,23 @@
 ; ModuleID = '<stdin>'
-%b = constant i63 0		; <i63*> [#uses=0]
+@b = constant i63 0		; <i63*> [#uses=0]
-%c = constant i63 -2		; <i63*> [#uses=0]
+@c = constant i63 -2		; <i63*> [#uses=0]
-%d = constant i63 0		; <i63*> [#uses=0]
+@d = constant i63 0		; <i63*> [#uses=0]
-%e = constant i63 -1		; <i63*> [#uses=0]
+@e = constant i63 -1		; <i63*> [#uses=0]
-%f = constant i63 1		; <i63*> [#uses=0]
+@f = constant i63 1		; <i63*> [#uses=0]
-%g = constant i63 3		; <i63*> [#uses=0]
+@g = constant i63 3		; <i63*> [#uses=0]
-%h = constant i63 0		; <i63*> [#uses=0]
+@h = constant i63 0		; <i63*> [#uses=0]
-%i = constant i63 -4611686018427387904		; <i63*> [#uses=0]
+@i = constant i63 -4611686018427387904		; <i63*> [#uses=0]
-%j = constant i63 1		; <i63*> [#uses=0]
+@j = constant i63 1		; <i63*> [#uses=0]
-%k = constant i63 0		; <i63*> [#uses=0]
+@k = constant i63 0		; <i63*> [#uses=0]
-%l = constant i63 -1		; <i63*> [#uses=0]
+@l = constant i63 -1		; <i63*> [#uses=0]
-%m = constant i63 -1		; <i63*> [#uses=0]
+@m = constant i63 -1		; <i63*> [#uses=0]
-%n = constant i63 -2		; <i63*> [#uses=0]
+@n = constant i63 -2		; <i63*> [#uses=0]
-%q = constant i63 0		; <i63*> [#uses=0]
+@q = constant i63 0		; <i63*> [#uses=0]
-%u = constant i63 -1		; <i63*> [#uses=0]
+@u = constant i63 -1		; <i63*> [#uses=0]
-%r = constant i63 2		; <i63*> [#uses=0]
+@r = constant i63 2		; <i63*> [#uses=0]
-%s = constant i63 1		; <i63*> [#uses=0]
+@s = constant i63 1		; <i63*> [#uses=0]
-%t = constant i63 0		; <i63*> [#uses=0]
+@t = constant i63 0		; <i63*> [#uses=0]
-%o = constant i63 0		; <i63*> [#uses=0]
+@o = constant i63 0		; <i63*> [#uses=0]
-%p = constant i63 -1		; <i63*> [#uses=0]
+@p = constant i63 -1		; <i63*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a7.ll

@@ -3,31 +3,31 @@
 
 ; test 7 bits
 ;
-%b = constant i7 add(i7 127, i7 1)
+@b = constant i7 add(i7 127, i7 1)
-%q = constant i7 add(i7 -64, i7 -1)
+@q = constant i7 add(i7 -64, i7 -1)
-%c = constant i7 add(i7 127, i7 127)
+@c = constant i7 add(i7 127, i7 127)
-%d = constant i7 add(i7 120, i7 8)
+@d = constant i7 add(i7 120, i7 8)
-%e = constant i7 sub(i7 0 , i7 1)
+@e = constant i7 sub(i7 0 , i7 1)
-%f = constant i7 sub(i7 0 , i7 127)
+@f = constant i7 sub(i7 0 , i7 127)
-%g = constant i7 sub(i7 2 , i7 127)
+@g = constant i7 sub(i7 2 , i7 127)
-%r = constant i7 sub(i7 -3, i7 120)
+@r = constant i7 sub(i7 -3, i7 120)
-%s = constant i7 sub(i7 -3, i7 -8)
+@s = constant i7 sub(i7 -3, i7 -8)
 
-%h = constant i7 shl(i7 1 , i8 7)
+@h = constant i7 shl(i7 1 , i8 7)
-%i = constant i7 shl(i7 1 , i8 6)
+@i = constant i7 shl(i7 1 , i8 6)
-%j = constant i7 lshr(i7 127 , i8 6)
+@j = constant i7 lshr(i7 127 , i8 6)
-%k = constant i7 lshr(i7 127 , i8 7)
+@k = constant i7 lshr(i7 127 , i8 7)
-%l = constant i7 ashr(i7 127 , i8 6)
+@l = constant i7 ashr(i7 127 , i8 6)
-%m = constant i7 ashr(i7 127 , i8 7)
+@m = constant i7 ashr(i7 127 , i8 7)
-%m2= constant i7 ashr(i7 -1  , i8 3)
+@m2= constant i7 ashr(i7 -1  , i8 3)
 
-%n = constant i7 mul(i7 127, i7 2)
+@n = constant i7 mul(i7 127, i7 2)
-%t = constant i7 mul(i7 -63, i7 -2)
+@t = constant i7 mul(i7 -63, i7 -2)
-%u = constant i7 mul(i7 -32, i7 2)
+@u = constant i7 mul(i7 -32, i7 2)
-%v = constant i7 sdiv(i7 -1, i7 63)
+@v = constant i7 sdiv(i7 -1, i7 63)
-%w = constant i7 udiv(i7 -1, i7 63)
+@w = constant i7 udiv(i7 -1, i7 63)
-%x = constant i7 srem(i7 1 , i7 126)
+@x = constant i7 srem(i7 1 , i7 126)
-%y = constant i7 urem(i7 127, i7 -1)
+@y = constant i7 urem(i7 127, i7 -1)
-%o = constant i7 trunc( i8 128  to i7 )
+@o = constant i7 trunc( i8 128  to i7 )
-%p = constant i7 trunc( i8 255  to i7 )
+@p = constant i7 trunc( i8 255  to i7 )
  

test/Integer/a7.ll.out

@@ -1,28 +1,28 @@
 ; ModuleID = '<stdin>'
-%b = constant i7 0		; <i7*> [#uses=0]
+@b = constant i7 0		; <i7*> [#uses=0]
-%q = constant i7 63		; <i7*> [#uses=0]
+@q = constant i7 63		; <i7*> [#uses=0]
-%c = constant i7 -2		; <i7*> [#uses=0]
+@c = constant i7 -2		; <i7*> [#uses=0]
-%d = constant i7 0		; <i7*> [#uses=0]
+@d = constant i7 0		; <i7*> [#uses=0]
-%e = constant i7 -1		; <i7*> [#uses=0]
+@e = constant i7 -1		; <i7*> [#uses=0]
-%f = constant i7 1		; <i7*> [#uses=0]
+@f = constant i7 1		; <i7*> [#uses=0]
-%g = constant i7 3		; <i7*> [#uses=0]
+@g = constant i7 3		; <i7*> [#uses=0]
-%r = constant i7 5		; <i7*> [#uses=0]
+@r = constant i7 5		; <i7*> [#uses=0]
-%s = constant i7 5		; <i7*> [#uses=0]
+@s = constant i7 5		; <i7*> [#uses=0]
-%h = constant i7 0		; <i7*> [#uses=0]
+@h = constant i7 0		; <i7*> [#uses=0]
-%i = constant i7 -64		; <i7*> [#uses=0]
+@i = constant i7 -64		; <i7*> [#uses=0]
-%j = constant i7 1		; <i7*> [#uses=0]
+@j = constant i7 1		; <i7*> [#uses=0]
-%k = constant i7 0		; <i7*> [#uses=0]
+@k = constant i7 0		; <i7*> [#uses=0]
-%l = constant i7 -1		; <i7*> [#uses=0]
+@l = constant i7 -1		; <i7*> [#uses=0]
-%m = constant i7 -1		; <i7*> [#uses=0]
+@m = constant i7 -1		; <i7*> [#uses=0]
-%m2 = constant i7 -1		; <i7*> [#uses=0]
+@m2 = constant i7 -1		; <i7*> [#uses=0]
-%n = constant i7 -2		; <i7*> [#uses=0]
+@n = constant i7 -2		; <i7*> [#uses=0]
-%t = constant i7 -2		; <i7*> [#uses=0]
+@t = constant i7 -2		; <i7*> [#uses=0]
-%u = constant i7 -64		; <i7*> [#uses=0]
+@u = constant i7 -64		; <i7*> [#uses=0]
-%v = constant i7 0		; <i7*> [#uses=0]
+@v = constant i7 0		; <i7*> [#uses=0]
-%w = constant i7 2		; <i7*> [#uses=0]
+@w = constant i7 2		; <i7*> [#uses=0]
-%x = constant i7 1		; <i7*> [#uses=0]
+@x = constant i7 1		; <i7*> [#uses=0]
-%y = constant i7 0		; <i7*> [#uses=0]
+@y = constant i7 0		; <i7*> [#uses=0]
-%o = constant i7 0		; <i7*> [#uses=0]
+@o = constant i7 0		; <i7*> [#uses=0]
-%p = constant i7 -1		; <i7*> [#uses=0]
+@p = constant i7 -1		; <i7*> [#uses=0]
 
 implementation   ; Functions:

test/Integer/a9.ll

@@ -3,25 +3,25 @@
 
 ; test 9 bits
 ;
-%b = constant i9 add(i9 511, i9 1)
+@b = constant i9 add(i9 511, i9 1)
-%c = constant i9 add(i9 511, i9 511)
+@c = constant i9 add(i9 511, i9 511)
-%d = constant i9 add(i9 504, i9 8)
+@d = constant i9 add(i9 504, i9 8)
-%e = constant i9 sub(i9 0 , i9 1)
+@e = constant i9 sub(i9 0 , i9 1)
-%f = constant i9 sub(i9 0 , i9 511)
+@f = constant i9 sub(i9 0 , i9 511)
-%g = constant i9 sub(i9 2 , i9 511)
+@g = constant i9 sub(i9 2 , i9 511)
 
-%h = constant i9 shl(i9 1 , i8 9)
+@h = constant i9 shl(i9 1 , i8 9)
-%i = constant i9 shl(i9 1 , i8 8)
+@i = constant i9 shl(i9 1 , i8 8)
-%j = constant i9 lshr(i9 511 , i8 8)
+@j = constant i9 lshr(i9 511 , i8 8)
-%k = constant i9 lshr(i9 511 , i8 9)
+@k = constant i9 lshr(i9 511 , i8 9)
-%l = constant i9 ashr(i9 511 , i8 8)
+@l = constant i9 ashr(i9 511 , i8 8)
-%m = constant i9 ashr(i9 511 , i8 9)
+@m = constant i9 ashr(i9 511 , i8 9)
 
-%n = constant i9 mul(i9 511, i9 2)
+@n = constant i9 mul(i9 511, i9 2)
-%q = constant i9 sdiv(i9 511, i9 2)
+@q = constant i9 sdiv(i9 511, i9 2)
-%r = constant i9 udiv(i9 511, i9 2)
+@r = constant i9 udiv(i9 511, i9 2)
-%s = constant i9 urem(i9 511, i9 -1)
+@s = constant i9 urem(i9 511, i9 -1)
-%t = constant i9 srem(i9 1, i9 510)
+@t = constant i9 srem(i9 1, i9 510)
-%o = constant i9 trunc( i10 512  to i9 )
+@o = constant i9 trunc( i10 512  to i9 )
-%p = constant i9 trunc( i10 511  to i9 )
+@p = constant i9 trunc( i10 511  to i9 )
 

test/Integer/a9.ll.out

@@ -1,22 +1,22 @@
 ; ModuleID = '<stdin>'
-%b = constant i9 0		; <i9*> [#uses=0]
+@b = constant i9 0		; <i9*> [#uses=0]
-%c = constant i9 -2		; <i9*> [#uses=0]
+@c = constant i9 -2		; <i9*> [#uses=0]
-%d = constant i9 0		; <i9*> [#uses=0]
+@d = constant i9 0		; <i9*> [#uses=0]
-%e = constant i9 -1		; <i9*> [#uses=0]
+@e = constant i9 -1		; <i9*> [#uses=0]
-%f = constant i9 1		; <i9*> [#uses=0]
+@f = constant i9 1		; <i9*> [#uses=0]
-%g = constant i9 3		; <i9*> [#uses=0]
+@g = constant i9 3		; <i9*> [#uses=0]
-%h = constant i9 0		; <i9*> [#uses=0]
+@h = constant i9 0		; <i9*> [#uses=0]
-%i = constant i9 -256		; <i9*> [#uses=0]
+@i = constant i9 -256		; <i9*> [#uses=0]
-%j = constant i9 1		; <i9*> [#uses=0]
+@j = constant i9 1		; <i9*> [#uses=0]
-%k = constant i9 0		; <i9*> [#uses=0]
+@k = constant i9 0		; <i9*> [#uses=0]
-%l = constant i9 -1		; <i9*> [#uses=0]
+@l = constant i9 -1		; <i9*> [#uses=0]
-%m = constant i9 -1		; <i9*> [#uses=0]
+@m = constant i9 -1		; <i9*> [#uses=0]
-%n = constant i9 -2		; <i9*> [#uses=0]
+@n = constant i9 -2		; <i9*> [#uses=0]
-%q = constant i9 0		; <i9*> [#uses=0]
+@q = constant i9 0		; <i9*> [#uses=0]
-%r = constant i9 255		; <i9*> [#uses=0]
+@r = constant i9 255		; <i9*> [#uses=0]
-%s = constant i9 0		; <i9*> [#uses=0]
+@s = constant i9 0		; <i9*> [#uses=0]
-%t = constant i9 1		; <i9*> [#uses=0]
+@t = constant i9 1		; <i9*> [#uses=0]
-%o = constant i9 0		; <i9*> [#uses=0]
+@o = constant i9 0		; <i9*> [#uses=0]
-%p = constant i9 -1		; <i9*> [#uses=0]
+@p = constant i9 -1		; <i9*> [#uses=0]
 
 implementation   ; Functions:

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

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

test/Integer/calltest_bt.ll

@@ -4,32 +4,31 @@
 
 %FunTy = type i28(i28)
 
-declare i28 "test"(...)   ; Test differences of prototype
+declare i28 @"test"(...)   ; Test differences of prototype
-declare i28 "test"()      ; Differ only by vararg
+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)
+define i28 @"test"(i28 %i0) {
-begin
     ret i28 %i0
-end
+}

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
 

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
+@t2 = global i33* @t1                             ;; Forward reference without cast
-%t3 = global i33* bitcast (i33* %t1 to i33*)       ;; Forward reference with cast
+@t3 = global i33* bitcast (i33* @t1 to i33*)       ;; Forward reference with cast
-%t1 = global i33 4                                ;; i32* %0
+@t1 = global i33 4                                ;; i32* @0
-%t4 = global i33** bitcast (i33** %t3 to i33**)     ;; Cast of a previous cast
+@t4 = global i33** bitcast (i33** @t3 to i33**)     ;; Cast of a previous cast
-%t5 = global i33** %t3                           ;; Reference to a previous cast
+@t5 = global i33** @t3                           ;; Reference to a previous cast
-%t6 = global i33*** %t4
+@t6 = global i33*** @t4
-%t7 = global float* inttoptr (i32 12345678 to float*) ;; Cast ordinary value to ptr
+@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
+@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 i32* bitcast (float* @0 to i32*)   ;; Forward numeric reference
-global float* %0                       ;; Duplicate 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 ]
+@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]
+@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]
+@arrayPtr5 = global i33** getelementptr (i33** @arrayPtr, i64 5)    ;; i33* &@arrayPtr[5]
 
-%somestr = constant [11x i8] c"hello world"
+@somestr = constant [11x i8] c"hello world"
-%char5  = global i8* getelementptr([11x i8]* %somestr, i64 0, i64 5)
+@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
+@S1 = global %SType* null			;; Global initialized to NULL
-%S2c = constant %SType { i33 1, {float,{i8}} {float 2.0, {i8} {i8 3}}, i64 4}
+@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
+@S1ptr = global %SType** @S1		    ;; Ref. to global S1
-%S2  = global %SType* %S2c		    ;; Ref. to constant S2
+@S2  = global %SType* @S2c		    ;; Ref. to constant S2
-%S3  = global %SAType* %S3c		    ;; Ref. to constant S3
+@S3  = global %SAType* @S3c		    ;; Ref. to constant S3
 
-					    ;; Pointer to float (**%S1).1.0
+					    ;; Pointer to float (**@S1).1.0
-%S1fld1a = global float* getelementptr (%SType* %S2c, i64 0, i32 1, i32 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
+					    ;; Pointer to i8 (**@S2).1.1.0
-%S2fld3 = global i8* getelementptr (%SType* %S2c, i64 0, i32 1, i32 1, i32 0) 
+@S2fld3 = global i8* getelementptr (%SType* @S2c, i64 0, i32 1, i32 1, i32 0) 
 
-					    ;; Pointer to float (**%S2).1.0[0]
+					    ;; Pointer to float (**@S2).1.0[0]
-;%S3fld3 = global float* getelementptr (%SAType** %S3, i64 0, i64 0, i32 1, i32 0, i64 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

test/Integer/constpointer_bt.ll

@@ -10,24 +10,24 @@
 ;
 
 
-%t3 = global i40 * %t1           ;; Forward reference
+@t3 = global i40 * @t1           ;; Forward reference
-%t1 = global i40 4
+@t1 = global i40 4
-%t4 = global i40 ** %t3		 ;; reference to reference
+@t4 = global i40 ** @t3		 ;; reference to reference
 
-%t2 = global i40 * %t1
+@t2 = global i40 * @t1
 
-global float * %0                ;; Forward numeric reference
+global float * @0                ;; Forward numeric reference
-global float * %0                ;; Duplicate 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
+@fptr = global void() * @f       ;; Forward ref method defn
-declare void "f"()               ;; External method
+declare void @"f"()               ;; External method
 
-%sptr1   = global [11x i8]* %somestr		;; Forward ref to a constant
+@sptr1   = global [11x i8]* @somestr		;; Forward ref to a constant
-%somestr = constant [11x i8] c"hello world"
+@somestr = constant [11x i8] c"hello world"
-%sptr2   = global [11x i8]* %somestr
+@sptr2   = global [11x i8]* @somestr
 
 implementation
 

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

test/Integer/globalredefinition_bt.ll

@@ -4,15 +4,15 @@
 
 ; Test forward references and redefinitions of globals
 
-%A = global i17* %B
+@A = global i17* @B
-%B = global i17 7
+@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()

test/Integer/globalvars_bt.ll

@@ -4,23 +4,23 @@
 
 
 
-%MyVar     = external global i27
+@MyVar     = external global i27
-%MyIntList = external global { \2 *, 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
+	store i27 5, i27 *@MyVar
-        %idx = getelementptr { \2 *, i27 } * %MyIntList, i64 0, i32 1
+        %idx = getelementptr { \2 *, i27 } * @MyIntList, i64 0, i32 1
   	store i27 12, i27* %idx
   	ret i27 %blah
 end

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:

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)
+  %f2 = call i63(i63) * @fib(i63 %n2)
-  %f1 = call i63(i63) * %fib(i63 %n1)
+  %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
-