Remove llvm-upgrade and update tests.

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

44 files changed, 262 insertions, 264 deletions

diff --git a/test/CodeGen/CBackend/2002-05-16-NameCollide.ll b/test/CodeGen/CBackend/2002-05-16-NameCollide.ll
index 249927d..c69b9b0 100644
--- a/test/CodeGen/CBackend/2002-05-16-NameCollide.ll
+++ b/test/CodeGen/CBackend/2002-05-16-NameCollide.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; Make sure that global variables do not collide if they have the same name,
 ; but different types.
 
-%X = global int 5
-%X = global long 7
+@X = global i32 5               ; <i32*> [#uses=0]
+@X.upgrd.1 = global i64 7               ; <i64*> [#uses=0]
+
diff --git a/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll b/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll
index 775a762..2908157 100644
--- a/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll
+++ b/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; This case was emitting code that looked like this:
 ; ...
@@ -8,10 +8,13 @@
 ; Which the Sun C compiler rejected, so now we are sure to put a return 
 ; instruction in there if the basic block is otherwise empty.
 ;
-void "test"() {
-	br label %BB1
-BB2:
-	br label %BB2
-BB1:
-	ret void
+define void @test() {
+        br label %BB1
+
+BB2:            ; preds = %BB2
+        br label %BB2
+
+BB1:            ; preds = %0
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll b/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
index c8d1201..297807e 100644
--- a/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
+++ b/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; Test const pointer refs & forward references
 
-%t3 = global int * %t1           ;; Forward reference
-%t1 = global int 4
+@t3 = global i32* @t1           ; <i32**> [#uses=0]
+@t1 = global i32 4              ; <i32*> [#uses=1]
 
diff --git a/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll b/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
index 2842faa..ead1bce 100644
--- a/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
+++ b/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll
@@ -1,9 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-global int* cast (float* %0 to int*)   ;; Forward numeric reference
-global float* %0                       ;; Duplicate forward numeric reference
+global i32* bitcast (float* @2 to i32*)   ;; Forward numeric reference
+global float* @2                       ;; Duplicate forward numeric reference
 global float 0.0
 
-%array  = constant [2 x int] [ int 12, int 52 ]
-%arrayPtr = global int* getelementptr ([2 x int]* %array, long 0, long 0)    ;; int* &%array[0][0]
-
+@array = constant [2 x i32] [ i32 12, i32 52 ]
+@arrayPtr = global i32* getelementptr ([2 x i32]* @array, i64 0, i64 0)
diff --git a/test/CodeGen/CBackend/2002-08-19-DataPointer.ll b/test/CodeGen/CBackend/2002-08-19-DataPointer.ll
index ca2af79..7ae13ec 100644
--- a/test/CodeGen/CBackend/2002-08-19-DataPointer.ll
+++ b/test/CodeGen/CBackend/2002-08-19-DataPointer.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
-
-%sptr1   = global [11x sbyte]* %somestr         ;; Forward ref to a constant
-%somestr = constant [11x sbyte] c"hello world"
+; RUN: llvm-as < %s | llc -march=c
 
+@sptr1 = global [11 x i8]* @somestr         ;; Forward ref to a constant
+@somestr = constant [11 x i8] c"hello world"
diff --git a/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll b/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
index baf7d78..25f63a0 100644
--- a/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
+++ b/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-%fptr = global void() * %f       ;; Forward ref method defn
-declare void "f"()               ;; External method
+@fptr = global void ()* @f       ;; Forward ref method defn
+declare void @f()               ;; External method
 
diff --git a/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll b/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
index 51bc950..528b8de 100644
--- a/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
+++ b/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-%array = constant [2 x int] [ int 12, int 52 ]          ; <[2 x int]*> [#uses=1]
-%arrayPtr = global int* getelementptr ([2 x int]* %array, long 0, long 0)               ; <int**> [#uses=1]
+@array = constant [2 x i32] [ i32 12, i32 52 ]          ; <[2 x i32]*> [#uses=1]
+@arrayPtr = global i32* getelementptr ([2 x i32]* @array, i64 0, i64 0)         ; <i32**> [#uses=0]
 
diff --git a/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll b/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
index fdcdeed..e9df0c2 100644
--- a/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
+++ b/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
-
-%MyIntList = uninitialized global { \2 *, int }
+; RUN: llvm-as < %s | llc -march=c
 
+@MyIntList = external global { \2*, i32 }
diff --git a/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll b/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
index 3ec23fb..ccffe68 100644
--- a/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
+++ b/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll
@@ -1,11 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; The C Writer bombs on this testcase because it tries the print the prototype
 ; for the test function, which tries to print the argument name.  The function
 ; has not been incorporated into the slot calculator, so after it does the name
 ; lookup, it tries a slot calculator lookup, which fails.
 
-int %test(int) {
-        ret int 0
+define i32 @test(i32) {
+        ret i32 0
 }
-
diff --git a/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll b/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
index 4a977e8..bf592ce 100644
--- a/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
+++ b/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll
@@ -1,16 +1,17 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; Indirect function call test... found by Joel & Brian
 ;
 
-%taskArray = uninitialized global int*
+@taskArray = external global i32*               ; <i32**> [#uses=1]
 
-void %test(int %X) {
-	%Y = add int %X, -1          ; <int>:1 [#uses=3]
-        %cast100 = cast int %Y to long          ; <uint> [#uses=1]
-        %gep100 = getelementptr int** %taskArray, long %cast100         ; <int**> [#uses=1]
-        %fooPtr = load int** %gep100            ; <int*> [#uses=1]
-        %cast101 = cast int* %fooPtr to void (int)*             ; <void (int)*> [#uses=1]
-        call void %cast101( int 1000 )
-	ret void
+define void @test(i32 %X) {
+        %Y = add i32 %X, -1             ; <i32> [#uses=1]
+        %cast100 = sext i32 %Y to i64           ; <i64> [#uses=1]
+        %gep100 = getelementptr i32** @taskArray, i64 %cast100          ; <i32**> [#uses=1]
+        %fooPtr = load i32** %gep100            ; <i32*> [#uses=1]
+        %cast101 = bitcast i32* %fooPtr to void (i32)*          ; <void (i32)*> [#uses=1]
+        call void %cast101( i32 1000 )
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll b/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
index d8477d5..e048905 100644
--- a/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
+++ b/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; This testcase fails because the C backend does not arrange to output the 
 ; contents of a structure type before it outputs the structure type itself.
 
-%Y = uninitialized global { {int } }
-%X = uninitialized global { float }
+@Y = external global { { i32 } }                ; <{ { i32 } }*> [#uses=0]
+@X = external global { float }          ; <{ float }*> [#uses=0]
+
diff --git a/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll b/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
index 6158b2f..ebb1c0f 100644
--- a/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
+++ b/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll
@@ -1,10 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-
-
-implementation
-
-void %test() {
-	%X = alloca [4xint]
-	ret void
+define void @test() {
+        %X = alloca [4 x i32]           ; <[4 x i32]*> [#uses=0]
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll b/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
index f3841f4..69f4575 100644
--- a/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
+++ b/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 
-declare void %foo(...)
+declare void @foo(...)
 
 
diff --git a/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll b/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
index 1a9cdb7..2f6d9be 100644
--- a/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
+++ b/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll
@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-	%MPI_Comm = type %struct.Comm*
-	%struct.Comm = type opaque
-%thing = global %MPI_Comm* null		; <%MPI_Comm**> [#uses=0]
+%MPI_Comm = type %struct.Comm*
+%struct.Comm = type opaque
+@thing = global %MPI_Comm* null         ; <%MPI_Comm**> [#uses=0]
 
-implementation   ; Functions:
diff --git a/test/CodeGen/CBackend/2002-10-16-External.ll b/test/CodeGen/CBackend/2002-10-16-External.ll
index d60a3d8..d40cbda 100644
--- a/test/CodeGen/CBackend/2002-10-16-External.ll
+++ b/test/CodeGen/CBackend/2002-10-16-External.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-%bob = external global int              ; <int*> [#uses=2]
+@bob = external global i32              ; <i32*> [#uses=0]
 
diff --git a/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll b/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
index b887488..a17b8db 100644
--- a/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
+++ b/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll
@@ -1,12 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
+        %BitField = type i32
+        %tokenptr = type i32*
 
-	%BitField = type int
-        %tokenptr = type %BitField*
-
-implementation
-
-void %test() {
-	%pmf1 = alloca %tokenptr (%tokenptr, sbyte*)*
-	ret void
+define void @test() {
+        %pmf1 = alloca %tokenptr (%tokenptr, i8*)*              ; <%tokenptr (%tokenptr, i8*)**> [#uses=0]
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll b/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
index 62c0e27..2dd281a 100644
--- a/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
+++ b/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll
@@ -1,12 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-%testString = internal constant [18 x sbyte] c "Escaped newline\n\00"
+@testString = internal constant [18 x i8] c"Escaped newline\5Cn\00"             ; <[18 x i8]*> [#uses=1]
 
-implementation
+declare i32 @printf(i8*, ...)
 
-declare int %printf(sbyte*, ...)
-
-int %main() {
-  call int (sbyte*, ...)* %printf( sbyte* getelementptr ([18 x sbyte]* %testString, long 0, long 0))
-  ret int 0
+define i32 @main() {
+        call i32 (i8*, ...)* @printf( i8* getelementptr ([18 x i8]* @testString, i64 0, i64 0) )                ; <i32>:1 [#uses=0]
+        ret i32 0
 }
+
diff --git a/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll b/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
index 2c6a596..4a7170d 100644
--- a/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
+++ b/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; Apparently this constant was unsigned in ISO C 90, but not in C 99.
 
-int %foo() {
-	ret int -2147483648
+define i32 @foo() {
+        ret i32 -2147483648
 }
+
diff --git a/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll b/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
index 1e08b2d..2a4e839 100644
--- a/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
+++ b/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll
@@ -1,10 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; This testcase breaks the C backend, because gcc doesn't like (...) functions
 ; with no arguments at all.
 
-void %test(long %Ptr) {
-	%P = cast long %Ptr to void(...) *
-	call void(...)* %P(long %Ptr)
-	ret void
+define void @test(i64 %Ptr) {
+        %P = inttoptr i64 %Ptr to void (...)*           ; <void (...)*> [#uses=1]
+        call void (...)* %P( i64 %Ptr )
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll b/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll
index 567d8e4..fb7e2ba 100644
--- a/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll
+++ b/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; The C backend was dying when there was no typename for a struct type!
 
-declare int %test(int,{ [32 x int] }*)
-
+declare i32 @test(i32, { [32 x i32] }*)
diff --git a/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll b/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll
index 224ba15..6b7f9f0 100644
--- a/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll
+++ b/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
+%X = type { i32, float }
 
-%X = type { int, float }
-
-void %test() {
-  getelementptr %X* null, long 0, uint 1
-  ret void
+define void @test() {
+        getelementptr %X* null, i64 0, i32 1            ; <float*>:1 [#uses=0]
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2003-06-11-HexConstant.ll b/test/CodeGen/CBackend/2003-06-11-HexConstant.ll
index bc5691f..c6128d6 100644
--- a/test/CodeGen/CBackend/2003-06-11-HexConstant.ll
+++ b/test/CodeGen/CBackend/2003-06-11-HexConstant.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; Make sure hex constant does not continue into a valid hexadecimal letter/number
-%version = global [3 x sbyte] c"\001\00"
-
+@version = global [3 x i8] c"\001\00"
diff --git a/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll b/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
index 7af255b..fd68211 100644
--- a/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
+++ b/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll
@@ -1,5 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
-
-
-%version = global [3 x sbyte] c"1\00\00"
+; RUN: llvm-as < %s | llc -march=c
 
+@version = global [3 x i8] c"1\00\00"
diff --git a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
index f49b98c..e074c2e 100644
--- a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
+++ b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
@@ -1,16 +1,17 @@
 
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c > %t1.cbe.c
+; RUN: llvm-as < %s | llc -march=c > %t1.cbe.c
 ; RUN: gcc -B/usr/bin/ %t1.cbe.c -o %t1.cbe
 ; RUN: ./%t1.cbe
 
-bool %doTest(ubyte %x) {
-	%dec.0 = add ubyte %x, 255
-    %tmp.1001 = trunc ubyte %dec.0 to bool
-    ret bool %tmp.1001
+define i1 @doTest(i8 %x) {
+        %dec.0 = add i8 %x, -1          ; <i8> [#uses=1]
+        %tmp.1001 = trunc i8 %dec.0 to i1               ; <i1> [#uses=1]
+        ret i1 %tmp.1001
 }
 
-int %main () {
-    %result = call bool %doTest(ubyte 1)
-    %p = cast bool %result to int
-    ret int %p
+define i32 @main() {
+        %result = call i1 @doTest( i8 1 )               ; <i1> [#uses=1]
+        %p = zext i1 %result to i32             ; <i32> [#uses=1]
+        ret i32 %p
 }
+
diff --git a/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll b/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
index f69c7dc..9fe98e2 100644
--- a/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
+++ b/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll
@@ -1,14 +1,17 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
+declare i32 @callee(i32, i32)
 
-declare int %callee(int, int)
+define i32 @test(i32 %X) {
+; <label>:0
+        %A = invoke i32 @callee( i32 %X, i32 5 )
+                        to label %Ok unwind label %Threw                ; <i32> [#uses=1]
 
+Ok:             ; preds = %Threw, %0
+        %B = phi i32 [ %A, %0 ], [ -1, %Threw ]         ; <i32> [#uses=1]
+        ret i32 %B
 
-int %test(int %X) {
-	%A = invoke int %callee(int %X, int 5) to label %Ok except label %Threw
-Ok:
-	%B = phi int [%A, %0], [-1, %Threw]
-	ret int %B
-Threw:
-	br label %Ok
+Threw:          ; preds = %0
+        br label %Ok
 }
+
diff --git a/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx b/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
index 75e223d..ef3b579 100644
--- a/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
+++ b/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep common | grep X
-
-%X = linkonce global int 5
+; RUN: llvm-as < %s | llc -march=c | grep common | grep X
 
+@X = linkonce global i32 5
diff --git a/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll b/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
index a82d7e5..077f16c 100644
--- a/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
+++ b/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; This is a non-normal FP value: it's a nan.
-%NAN = global { float } { float 0x7FF8000000000000 } 
-%NANs = global { float } { float 0x7FF4000000000000 } 
+@NAN = global { float } { float 0x7FF8000000000000 }            ; <{ float }*> [#uses=0]
+@NANs = global { float } { float 0x7FFC000000000000 }           ; <{ float }*> [#uses=0]
diff --git a/test/CodeGen/CBackend/2003-10-23-UnusedType.ll b/test/CodeGen/CBackend/2003-10-23-UnusedType.ll
index e073928..e67ba2e 100644
--- a/test/CodeGen/CBackend/2003-10-23-UnusedType.ll
+++ b/test/CodeGen/CBackend/2003-10-23-UnusedType.ll
@@ -1,6 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
+%A = type { i32, i8*, { i32, i32, i32, i32, i32, i32, i32, i32 }*, i16 }
 
-%A = type { uint, sbyte*, { uint, uint, uint, uint, uint, uint, uint, uint }*, ushort }
+define void @test(%A*) {
+        ret void
+}
 
-void %test(%A *) { ret void }
diff --git a/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll b/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
index 4c7ab32..41f3f1e 100644
--- a/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
+++ b/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll
@@ -1,12 +1,12 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
 ; reduced from DOOM.
-%union._XEvent = type { int }
-%.X_event_9 = global %union._XEvent zeroinitializer
+        %union._XEvent = type { i32 }
+@.X_event_9 = global %union._XEvent zeroinitializer             ; <%union._XEvent*> [#uses=1]
 
-implementation   ; Functions:
-void %I_InitGraphics() {
-shortcirc_next.3:		; preds = %no_exit.1
-	%tmp.319 = load int* getelementptr ({ int, int }* cast (%union._XEvent* %.X_event_9 to { int, int }*), long 0, uint 1)		; <int> [#uses=1]
-    ret void
+define void @I_InitGraphics() {
+shortcirc_next.3:
+        %tmp.319 = load i32* getelementptr ({ i32, i32 }* bitcast (%union._XEvent* @.X_event_9 to { i32, i32 }*), i64 0, i32 1)               ; <i32> [#uses=0]
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll b/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
index 3866200..e8da787 100644
--- a/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
+++ b/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll
@@ -1,12 +1,13 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
+@y = weak global i8 0           ; <i8*> [#uses=1]
 
-%y = weak global sbyte 0
-implementation
-uint %testcaseshr() {
+define i32 @testcaseshr() {
 entry:
-	ret uint shr (uint cast (sbyte* %y to uint), ubyte 4)
+        ret i32 lshr (i32 ptrtoint (i8* @y to i32), i32 4)
 }
-uint %testcaseshl() {
+
+define i32 @testcaseshl() {
 entry:
-	ret uint shl (uint cast (sbyte* %y to uint), ubyte 4)
+        ret i32 shl (i32 ptrtoint (i8* @y to i32), i32 4)
 }
+
diff --git a/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx b/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
index 973e6d8..911d6d4 100644
--- a/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
+++ b/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx
@@ -1,14 +1,16 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep builtin_return_address
+; RUN: llvm-as < %s | llc -march=c | grep builtin_return_address
 
-declare sbyte* %llvm.returnaddress(uint)
-declare sbyte* %llvm.frameaddress(uint)
+declare i8* @llvm.returnaddress(i32)
 
-sbyte *%test1() {
-	%X = call sbyte* %llvm.returnaddress(uint 0)
-	ret sbyte* %X
+declare i8* @llvm.frameaddress(i32)
+
+define i8* @test1() {
+        %X = call i8* @llvm.returnaddress( i32 0 )              ; <i8*> [#uses=1]
+        ret i8* %X
 }
 
-sbyte *%test2() {
-	%X = call sbyte* %llvm.frameaddress(uint 0)
-	ret sbyte* %X
+define i8* @test2() {
+        %X = call i8* @llvm.frameaddress( i32 0 )               ; <i8*> [#uses=1]
+        ret i8* %X
 }
+
diff --git a/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx b/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
index 1afa47b..1629deb 100644
--- a/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
+++ b/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx
@@ -4,13 +4,15 @@
 ; this testcase for example, which caused the CBE to mangle one, screwing
 ; everything up.  :(  Test that this does not happen anymore.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep _memcpy
+; RUN: llvm-as < %s | llc -march=c | not grep _memcpy
 
-declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint,uint)
-declare float* %memcpy(int*, uint,int)
+declare void @llvm.memcpy.i32(i8*, i8*, i32, i32)
 
-int %test(sbyte *%A, sbyte* %B, int* %C) {
-	call float* %memcpy(int* %C, uint 4, int 17)
-	call void %llvm.memcpy.i32(sbyte* %A, sbyte* %B, uint 123, uint 14)
-	ret int 7
+declare float* @memcpy(i32*, i32, i32)
+
+define i32 @test(i8* %A, i8* %B, i32* %C) {
+        call float* @memcpy( i32* %C, i32 4, i32 17 )           ; <float*>:1 [#uses=0]
+        call void @llvm.memcpy.i32( i8* %A, i8* %B, i32 123, i32 14 )
+        ret i32 7
 }
+
diff --git a/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx b/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
index 87a642b..6f23915 100644
--- a/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
+++ b/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx
@@ -1,10 +1,11 @@
 ; This is a non-normal FP value
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep FPConstant | grep static
+; RUN: llvm-as < %s | llc -march=c | grep FPConstant | grep static
 
-float %func () {
-  ret float 0xFFF0000000000000  ; -inf
+define float @func() {
+        ret float 0xFFF0000000000000
 }
 
-double %func2() {
-  ret double 0xFF20000000000000  ; -inf
+define double @func2() {
+        ret double 0xFF20000000000000
 }
+
diff --git a/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx b/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
index 997f1c9..2d62231 100644
--- a/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
+++ b/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx
@@ -1,8 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep func1 | grep WEAK
+; RUN: llvm-as < %s | llc -march=c | grep func1 | grep WEAK
 
-implementation
-
-linkonce int %func1 () {
-  ret int 5
+define linkonce i32 @func1() {
+        ret i32 5
 }
 
diff --git a/test/CodeGen/CBackend/2004-08-09-va-end-null.ll b/test/CodeGen/CBackend/2004-08-09-va-end-null.ll
index f8e8fe5..ae7ba53 100644
--- a/test/CodeGen/CBackend/2004-08-09-va-end-null.ll
+++ b/test/CodeGen/CBackend/2004-08-09-va-end-null.ll
@@ -1,9 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-declare void %llvm.va_end(sbyte*)
+declare void @llvm.va_end(i8*)
 
-void %test() {
-  call void %llvm.va_end( sbyte* null )
-  ret void
+define void @test() {
+        %va.upgrd.1 = bitcast i8* null to i8*           ; <i8*> [#uses=1]
+        call void @llvm.va_end( i8* %va.upgrd.1 )
+        ret void
 }
 
diff --git a/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx b/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
index 99bb602..a8ee438 100644
--- a/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
+++ b/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx
@@ -1,17 +1,12 @@
 ; The CBE should not emit code that casts the function pointer.  This causes
 ; GCC to get testy and insert trap instructions instead of doing the right
 ; thing. :(
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-implementation
+declare void @external(i8*)
 
-declare void %external(sbyte*)
-
-int %test(int *%X) {
-	%RV = call int (int*)* cast (void(sbyte*)* %external to int(int*)*)(int* %X)
-	ret int %RV
+define i32 @test(i32* %X) {
+        %RV = call i32 bitcast (void (i8*)* @external to i32 (i32*)*)( i32* %X )                ; <i32> [#uses=1]
+        ret i32 %RV
 }
 
-
-
-
diff --git a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
index a285dae..8acab76 100644
--- a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
+++ b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
@@ -1,12 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep extern.*msg
+; RUN: llvm-as < %s | llc -march=c | not grep extern.*msg
+; PR472
 
-; This is PR472
+@msg = internal global [6 x i8] c"hello\00"             ; <[6 x i8]*> [#uses=1]
 
-%msg = internal global [6 x sbyte] c"hello\00"
-
-implementation   ; Functions:
-
-sbyte* %foo() {
+define i8* @foo() {
 entry:
-	ret sbyte* getelementptr ([6 x sbyte]* %msg, int 0, int 0)
+        ret i8* getelementptr ([6 x i8]* @msg, i32 0, i32 0)
 }
+
diff --git a/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll b/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
index ebe4566..9acaa72 100644
--- a/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
+++ b/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-int %foo() {
-  ret int and (int 123456, int cast (int()* %foo to int))
+define i32 @foo() {
+        ret i32 and (i32 123456, i32 ptrtoint (i32 ()* @foo to i32))
 }
diff --git a/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll b/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
index e161e46..12c8790 100644
--- a/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
+++ b/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep volatile
+; RUN: llvm-as < %s | llc -march=c | grep volatile
 
-void %test(int* %P) {
-	%X = volatile load int*%P
-	volatile store int %X, int* %P
-	ret void
+define void @test(i32* %P) {
+        %X = volatile load i32* %P              ; <i32> [#uses=1]
+        volatile store i32 %X, i32* %P
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll b/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
index 5349488..162e3d3 100644
--- a/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
+++ b/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c
+; RUN: llvm-as < %s | llc -march=c
 
-%JNIEnv = type %struct.JNINa*
-%struct.JNINa = type { sbyte*, sbyte*, sbyte*, void (%JNIEnv*)* }
+        %JNIEnv = type %struct.JNINa*
+        %struct.JNINa = type { i8*, i8*, i8*, void (%JNIEnv*)* }
 
diff --git a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
index e73eb63..55d43e2 100644
--- a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
+++ b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
@@ -1,20 +1,18 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep -- --65535
+; RUN: llvm-as < %s | llc -march=c | not grep -- --65535
 ; PR596
 
-target endian = little
-target pointersize = 32
+target datalayout = "e-p:32:32"
 target triple = "i686-pc-linux-gnu"
 
-implementation   ; Functions:
+declare void @func(i32)
 
-declare void %func(int)
-
-void %funcb() {
+define void @funcb() {
 entry:
-	%tmp.1 = sub int 0, -65535		; <int> [#uses=1]
-	call void %func( int %tmp.1 )
-	br label %return
+        %tmp.1 = sub i32 0, -65535              ; <i32> [#uses=1]
+        call void @func( i32 %tmp.1 )
+        br label %return
 
-return:		; preds = %entry
-	ret void
+return:         ; preds = %entry
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2005-08-23-Fmod.ll b/test/CodeGen/CBackend/2005-08-23-Fmod.ll
index 5ce1e96..7c55019 100644
--- a/test/CodeGen/CBackend/2005-08-23-Fmod.ll
+++ b/test/CodeGen/CBackend/2005-08-23-Fmod.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep fmod
+; RUN: llvm-as < %s | llc -march=c | grep fmod
 
-double %test(double %A, double %B) {
-	%C = rem double %A, %B
-	ret double %C
+define double @test(double %A, double %B) {
+        %C = frem double %A, %B         ; <double> [#uses=1]
+        ret double %C
 }
+
diff --git a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
index 32a7088..37f311d 100644
--- a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
+++ b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
@@ -1,9 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep {\\* *volatile *\\*}
+; RUN: llvm-as < %s | llc -march=c | grep {\\* *volatile *\\*}
 
-%G = external global void()*
+@G = external global void ()*           ; <void ()**> [#uses=2]
 
-void %test() {
-	volatile store void()* %test, void()** %G
-	volatile load void()** %G
-	ret void
+define void @test() {
+        volatile store void ()* @test, void ()** @G
+        volatile load void ()** @G              ; <void ()*>:1 [#uses=0]
+        ret void
 }
+
diff --git a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
index e692005..ca4e48e 100644
--- a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
+++ b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
@@ -1,48 +1,49 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | \
+; RUN: llvm-as < %s | llc -march=c | \
 ; RUN:   grep __BITCAST | count 14
 
-int %test1(float %F) {
-   %X = bitcast float %F to int
-   ret int %X
+define i32 @test1(float %F) {
+        %X = bitcast float %F to i32            ; <i32> [#uses=1]
+        ret i32 %X
 }
 
-float %test2(int %I) {
-  %X = bitcast int %I to float
-  ret float %X
+define float @test2(i32 %I) {
+        %X = bitcast i32 %I to float            ; <float> [#uses=1]
+        ret float %X
 }
 
-long %test3(double %D) {
-  %X = bitcast double %D to long
-  ret long %X
+define i64 @test3(double %D) {
+        %X = bitcast double %D to i64           ; <i64> [#uses=1]
+        ret i64 %X
 }
 
-double %test4(long %L) {
-  %X = bitcast long %L to double
-  ret double %X
+define double @test4(i64 %L) {
+        %X = bitcast i64 %L to double           ; <double> [#uses=1]
+        ret double %X
 }
 
-double %test5(double %D) {
-  %X = bitcast double %D to double
-  %Y = add double %X, 2.0
-  %Z = bitcast double %Y to long
-  %res = bitcast long %Z to double
-  ret double %res
+define double @test5(double %D) {
+        %X = bitcast double %D to double                ; <double> [#uses=1]
+        %Y = add double %X, 2.000000e+00                ; <double> [#uses=1]
+        %Z = bitcast double %Y to i64           ; <i64> [#uses=1]
+        %res = bitcast i64 %Z to double         ; <double> [#uses=1]
+        ret double %res
 }
 
-float %test6(float %F) {
-  %X = bitcast float %F to float
-  %Y = add float %X, 2.0
-  %Z = bitcast float %Y to int
-  %res = bitcast int %Z to float
-  ret float %res
+define float @test6(float %F) {
+        %X = bitcast float %F to float          ; <float> [#uses=1]
+        %Y = add float %X, 2.000000e+00         ; <float> [#uses=1]
+        %Z = bitcast float %Y to i32            ; <i32> [#uses=1]
+        %res = bitcast i32 %Z to float          ; <float> [#uses=1]
+        ret float %res
 }
 
-int %main(int %argc, sbyte** %argv) {
-  %a = call int %test1(float 0x400921FB40000000)
-  %b = call float %test2(int %a)
-  %c = call long %test3(double 0x400921FB4D12D84A)
-  %d = call double %test4(long %c)
-  %e = call double %test5(double 7.0)
-  %f = call float %test6(float 7.0)
-  ret int %a
+define i32 @main(i32 %argc, i8** %argv) {
+        %a = call i32 @test1( float 0x400921FB40000000 )                ; <i32> [#uses=2]
+        %b = call float @test2( i32 %a )                ; <float> [#uses=0]
+        %c = call i64 @test3( double 0x400921FB4D12D84A )               ; <i64> [#uses=1]
+        %d = call double @test4( i64 %c )               ; <double> [#uses=0]
+        %e = call double @test5( double 7.000000e+00 )          ; <double> [#uses=0]
+        %f = call float @test6( float 7.000000e+00 )            ; <float> [#uses=0]
+        ret i32 %a
 }
+