Remove llvm-upgrade

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

47 files changed, 267 insertions, 346 deletions

diff --git a/test/Assembler/2002-01-24-BadSymbolTableAssert.ll b/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
index c2a31d1084..0a10d9db18 100644
--- a/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
+++ b/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
@@ -1,13 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
-; This testcase failed due to a bad assertion in SymbolTable.cpp, removed in 
-; the 1.20 revision. Basically the symbol table assumed that if there was an 
-; abstract type in the symbol table, [in this case for the entry %foo of type 
-; void(opaque)* ], that there should have also been named types by now.  This 
+; This testcase failed due to a bad assertion in SymbolTable.cpp, removed in
+; the 1.20 revision. Basically the symbol table assumed that if there was an
+; abstract type in the symbol table, [in this case for the entry %foo of type
+; void(opaque)* ], that there should have also been named types by now.  This
 ; was obviously not the case here, and this is valid.  Assertion disabled.
+	
+%bb = type i32
 
-declare void "foo"(%bb)
-%bb = type int 
-
-implementation
-
+declare void @foo(i32)
diff --git a/test/Assembler/2002-01-24-ValueRefineAbsType.ll b/test/Assembler/2002-01-24-ValueRefineAbsType.ll
index ed12c096f7..2561b05dd2 100644
--- a/test/Assembler/2002-01-24-ValueRefineAbsType.ll
+++ b/test/Assembler/2002-01-24-ValueRefineAbsType.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
 ; This testcase used to fail due to a lack of this diff in Value.cpp:
 ; diff -r1.16 Value.cpp
@@ -13,16 +13,11 @@
 ; >   if (OldTy == NewTy && !OldTy->isAbstract())
 ; >     Ty.removeUserFromConcrete();
 ;
-; This was causing an assertion failure, due to the "foo" Method object never 
+; This was causing an assertion failure, due to the "foo" Method object never
 ; releasing it's reference to the opaque %bb value.
 ;
-declare void "foo"(%bb)
-
-%exception_descriptor = type opaque  
-
-%bb = type int
-
-%exception_descriptor = type int
-
-implementation
+	
+%bb = type i32
+%exception_descriptor = type i32
 
+declare void @foo(i32)
diff --git a/test/Assembler/2002-02-19-TypeParsing.ll b/test/Assembler/2002-02-19-TypeParsing.ll
index b777b3494f..b5ddb5f5fb 100644
--- a/test/Assembler/2002-02-19-TypeParsing.ll
+++ b/test/Assembler/2002-02-19-TypeParsing.ll
@@ -1,10 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-
-  %Hosp = type { int, int, int, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6,
-   int, int } * } *, \2 * }, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6, int,
-    int } * } *, \2 * }, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6, int, int 
-    } * } *, \2 * }, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6, int, int } * }
-     *, \2 * } }
-
-implementation
-
+; RUN: llvm-as < %s -o /dev/null -f
+	
+%Hosp = type { i32, i32, i32, { \2*, { i32, i32, i32, { [4 x \3], \2, \5, %Hosp, i32, i32 }* }*, \2* }, { \2*, { i32, i32, i32, { [4 x \3], \2, \5, %Hosp, i32, i32 }* }*, \2* }, { \2*, { i32, i32, i32, { [4 x \3], \2, \5, %Hosp, i32, i32 }* }*, \2* }, { \2*, { i32, i32, i32, { [4 x \3], \2, \5, %Hosp, i32, i32 }* }*, \2* } }
diff --git a/test/Assembler/2002-03-08-NameCollision.ll b/test/Assembler/2002-03-08-NameCollision.ll
index 8d0c4bddcf..e74332cbb2 100644
--- a/test/Assembler/2002-03-08-NameCollision.ll
+++ b/test/Assembler/2002-03-08-NameCollision.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
 ; Method arguments were being checked for collisions at the global scope before
-; the method object was created by the parser.  Because of this, false 
-; collisions could occur that would cause the following error message to be 
+; the method object was created by the parser.  Because of this, false
+; collisions could occur that would cause the following error message to be
 ; produced:
 ;
 ;    Redefinition of value named 'X' in the 'int *' type plane!
@@ -10,10 +10,6 @@
 ; Fixed by delaying binding of variable names until _after_ the method symtab is
 ; created.
 ;
+@X = global i32 4		; <i32*> [#uses=0]
 
-%X = global int 4
-
-declare int "xxx"(int * %X)
-
-implementation
-
+declare i32 @xxx(i32*)
diff --git a/test/Assembler/2002-03-08-NameCollision2.ll b/test/Assembler/2002-03-08-NameCollision2.ll
index cd81c03ea1..f545376761 100644
--- a/test/Assembler/2002-03-08-NameCollision2.ll
+++ b/test/Assembler/2002-03-08-NameCollision2.ll
@@ -1,18 +1,12 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
-; Another name collision problem.  Here the problem was that if a forward 
+; Another name collision problem.  Here the problem was that if a forward
 ; declaration for a method was found, that this would cause spurious conflicts
 ; to be detected between locals and globals.
 ;
-%Var = uninitialized global int
+@Var = external global i32		; <i32*> [#uses=0]
 
-declare void "foo"()
-
-implementation
-
-void "foo"()
-begin
-	%Var = alloca int  ; Conflict with global var
+define void @foo() {
+	%Var = alloca i32		; <i32*> [#uses=0]
 	ret void
-end
-
+}
diff --git a/test/Assembler/2002-04-04-PureVirtMethCall.ll b/test/Assembler/2002-04-04-PureVirtMethCall.ll
index 9eac901422..6831854c0f 100644
--- a/test/Assembler/2002-04-04-PureVirtMethCall.ll
+++ b/test/Assembler/2002-04-04-PureVirtMethCall.ll
@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
   type { { \2 *, \4 ** },
          { \2 *, \4 ** }
        }
 
-implementation
diff --git a/test/Assembler/2002-04-04-PureVirtMethCall2.ll b/test/Assembler/2002-04-04-PureVirtMethCall2.ll
index eb60570639..9dd86ee743 100644
--- a/test/Assembler/2002-04-04-PureVirtMethCall2.ll
+++ b/test/Assembler/2002-04-04-PureVirtMethCall2.ll
@@ -1,7 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-as < %s -o /dev/null -f
 
 %t = type { { \2*, \2 },
             { \2*, \2 }
           }
-
-implementation
diff --git a/test/Assembler/2002-04-05-TypeParsing.ll b/test/Assembler/2002-04-05-TypeParsing.ll
index 3418de9447..60e704fbed 100644
--- a/test/Assembler/2002-04-05-TypeParsing.ll
+++ b/test/Assembler/2002-04-05-TypeParsing.ll
@@ -1,8 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-
-  %Hosp = type {
-                 { \2 *, { \2, \4 } * },
-                 { \2 *, { \2, \4 } * }
-               }
-
-implementation
+; RUN: llvm-as < %s -o /dev/null -f
+  
+ %Hosp = type { { \2*, { \2, %Hosp }* }, { \2*, { \2, %Hosp }* } }
diff --git a/test/Assembler/2002-04-07-HexFloatConstants.llx b/test/Assembler/2002-04-07-HexFloatConstants.llx
index 543c869ba0..b9860b3ac5 100644
--- a/test/Assembler/2002-04-07-HexFloatConstants.llx
+++ b/test/Assembler/2002-04-07-HexFloatConstants.llx
@@ -5,15 +5,12 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | \
-; RUN:    llvm-dis > %t.2
+; RUN: llvm-as < %s | opt -constprop | llvm-dis > %t.1
+; RUN: llvm-as < %s | llvm-dis | llvm-as | opt -constprop | \
+; RUN: llvm-dis > %t.2
 ; RUN: diff %t.1 %t.2
 
-implementation
-
-double "test"()
-begin
-	%tmp = mul double 72.0e100, 0x427f4000
-	ret double %tmp
-end
+define double @test() {
+        %tmp = mul double 7.200000e+101, 0x427F4000             ; <double> [#uses=1]
+        ret double %tmp
+}
diff --git a/test/Assembler/2002-04-07-InfConstant.llx b/test/Assembler/2002-04-07-InfConstant.llx
index afce5b8ac4..06e649e5c1 100644
--- a/test/Assembler/2002-04-07-InfConstant.llx
+++ b/test/Assembler/2002-04-07-InfConstant.llx
@@ -1,11 +1,9 @@
 ; The output formater prints out 1.0e100 as Inf!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
 
-implementation
+define float @test() {
+        %tmp = mul float 0x7FF0000000000000, 1.000000e+01               ; <float> [#uses=1]
+        ret float %tmp
+}
 
-float "test"()
-begin
-	%tmp = mul float 0x7FF0000000000000, 1.0e1
-	ret float %tmp
-end
diff --git a/test/Assembler/2002-04-29-NameBinding.llx b/test/Assembler/2002-04-29-NameBinding.llx
index c65616c903..9665aef143 100644
--- a/test/Assembler/2002-04-29-NameBinding.llx
+++ b/test/Assembler/2002-04-29-NameBinding.llx
@@ -4,17 +4,15 @@
 ; Check by running globaldce, which will remove the constant if there are
 ; no references to it!
 ; 
-; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | \
+; RUN: llvm-as < %s | opt -globaldce | llvm-dis | \
 ; RUN:   not grep constant
 ;
-	
-%v1 = internal constant int 5
 
-implementation
+@v1 = internal constant i32 5           
 
-int "createtask"() begin
-	%v1 = alloca int           ;; Alloca should have one use!
-	%reg112 = load int* %v1    ;; This load should not use the global!
-	ret int %reg112
-end
+define i32 @createtask() {
+        %v1 = alloca i32                ;; Alloca should have one use! 
+        %reg112 = load i32* %v1         ;; This load should not use the global!
+        ret i32 %reg112
+}
 
diff --git a/test/Assembler/2002-05-02-InvalidForwardRef.ll b/test/Assembler/2002-05-02-InvalidForwardRef.ll
index 85c7368a61..8203365c1c 100644
--- a/test/Assembler/2002-05-02-InvalidForwardRef.ll
+++ b/test/Assembler/2002-05-02-InvalidForwardRef.ll
@@ -1,13 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-
+; RUN: llvm-as < %s -o /dev/null -f
 ; It looks like the assembler is not forward resolving the function declaraion
 ; correctly.
 
-void "test"()
-begin
-	call void %foo()
-	ret void
-end
-
-declare void "foo"()
+define void @test() {
+        call void @foo( )
+        ret void
+}
 
+declare void @foo()
diff --git a/test/Assembler/2002-07-08-HugePerformanceProblem.llx b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
index 2ec4e82844..d961ce6fba 100644
--- a/test/Assembler/2002-07-08-HugePerformanceProblem.llx
+++ b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
@@ -1,69 +1,67 @@
 ; This file takes about 48 __MINUTES__ to assemble using as.  This is WAY too
-; long.  The type resolution code needs to be sped up a lot.	
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-; END.
-
-	%ALL_INTERSECTIONS_METHOD = type int (%OBJECT*, %RAY*, %ISTACK*)*
+; long.  The type resolution code needs to be sped up a lot.
+; RUN: llvm-as < %s -o /dev/null -f	
+	%ALL_INTERSECTIONS_METHOD = type i32 (%OBJECT*, %RAY*, %ISTACK*)*
 	%BBOX = type { %BBOX_VECT, %BBOX_VECT }
-	%BBOX_TREE = type { short, short, %BBOX, %BBOX_TREE** }
+	%BBOX_TREE = type { i16, i16, %BBOX, %BBOX_TREE** }
 	%BBOX_VECT = type [3 x float]
-	%BLEND_MAP = type { short, short, short, int, %BLEND_MAP_ENTRY* }
-	%BLEND_MAP_ENTRY = type { float, ubyte, { %COLOUR, %PIGMENT*, %TNORMAL*, %TEXTURE*, %UV_VECT } }
-	%CAMERA = type { %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, double, double, int, double, double, int, double, %TNORMAL* }
+	%BLEND_MAP = type { i16, i16, i16, i32, %BLEND_MAP_ENTRY* }
+	%BLEND_MAP_ENTRY = type { float, i8, { %COLOUR, %PIGMENT*, %TNORMAL*, %TEXTURE*, %UV_VECT } }
+	%CAMERA = type { %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, double, double, i32, double, double, i32, double, %TNORMAL* }
 	%COLOUR = type [5 x float]
-	%COPY_METHOD = type sbyte* (%OBJECT*)*
-	%COUNTER = type { uint, uint }
-	%DENSITY_FILE = type { int, %DENSITY_FILE_DATA* }
-	%DENSITY_FILE_DATA = type { int, sbyte*, int, int, int, ubyte*** }
+	%COPY_METHOD = type i8* (%OBJECT*)*
+	%COUNTER = type { i32, i32 }
+	%DENSITY_FILE = type { i32, %DENSITY_FILE_DATA* }
+	%DENSITY_FILE_DATA = type { i32, i8*, i32, i32, i32, i8*** }
 	%DESTROY_METHOD = type void (%OBJECT*)*
-	%FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
-	%FILE_HANDLE = type { sbyte*, int, int, int, int, sbyte*, %FILE*, int, int (%FILE_HANDLE*, sbyte*, int*, int*, int, int)*, void (%FILE_HANDLE*, %COLOUR*, int)*, int (%FILE_HANDLE*, %COLOUR*, int*)*, void (%IMAGE*, sbyte*)*, void (%FILE_HANDLE*)* }
+	%FILE = type { i32, i8*, i8*, i8, i8, i32, i32, i32 }
+	%FILE_HANDLE = type { i8*, i32, i32, i32, i32, i8*, %FILE*, i32, i32 (%FILE_HANDLE*, i8*, i32*, i32*, i32, i32)*, void (%FILE_HANDLE*, %COLOUR*, i32)*, i32 (%FILE_HANDLE*, %COLOUR*, i32*)*, void (%IMAGE*, i8*)*, void (%FILE_HANDLE*)* }
 	%FINISH = type { float, float, float, float, float, float, float, float, float, float, float, float, float, float, float, %BBOX_VECT, %BBOX_VECT }
-	%FOG = type { int, double, double, double, %COLOUR, %VECTOR, %TURB*, float, %FOG* }
-	%FRAME = type { %CAMERA*, int, int, int, %LIGHT_SOURCE*, %OBJECT*, double, double, %COLOUR, %COLOUR, %COLOUR, %IMEDIA*, %FOG*, %RAINBOW*, %SKYSPHERE* }
-	%FRAMESEQ = type { int, double, int, int, double, int, int, double, int, double, int, double, uint, uint }
-	%IMAGE = type { int, int, int, int, int, short, short, %VECTOR, float, float, int, int, short, %IMAGE_COLOUR*, { %IMAGE_LINE*, ubyte** } }
-	%IMAGE_COLOUR = type { ushort, ushort, ushort, ushort, ushort }
-	%IMAGE_LINE = type { ubyte*, ubyte*, ubyte*, ubyte* }
-	%IMEDIA = type { int, int, int, int, int, double, double, int, int, int, int, %COLOUR, %COLOUR, %COLOUR, %COLOUR, double, double, double, double*, %PIGMENT*, %IMEDIA* }
-	%INSIDE_METHOD = type int (double*, %OBJECT*)*
-	%INTERIOR = type { int, int, float, float, float, float, float, %IMEDIA* }
-	%INTERSECTION = type { double, %VECTOR, %VECTOR, %OBJECT*, int, int, double, double, sbyte* }
+	%FOG = type { i32, double, double, double, %COLOUR, %VECTOR, %TURB*, float, %FOG* }
+	%FRAME = type { %CAMERA*, i32, i32, i32, %LIGHT_SOURCE*, %OBJECT*, double, double, %COLOUR, %COLOUR, %COLOUR, %IMEDIA*, %FOG*, %RAINBOW*, %SKYSPHERE* }
+	%FRAMESEQ = type { i32, double, i32, i32, double, i32, i32, double, i32, double, i32, double, i32, i32 }
+	%IMAGE = type { i32, i32, i32, i32, i32, i16, i16, %VECTOR, float, float, i32, i32, i16, %IMAGE_COLOUR*, { %IMAGE_LINE*, i8** } }
+	%IMAGE_COLOUR = type { i16, i16, i16, i16, i16 }
+	%IMAGE_LINE = type { i8*, i8*, i8*, i8* }
+	%IMEDIA = type { i32, i32, i32, i32, i32, double, double, i32, i32, i32, i32, %COLOUR, %COLOUR, %COLOUR, %COLOUR, double, double, double, double*, %PIGMENT*, %IMEDIA* }
+	%INSIDE_METHOD = type i32 (double*, %OBJECT*)*
+	%INTERIOR = type { i32, i32, float, float, float, float, float, %IMEDIA* }
+	%INTERSECTION = type { double, %VECTOR, %VECTOR, %OBJECT*, i32, i32, double, double, i8* }
 	%INVERT_METHOD = type void (%OBJECT*)*
-	%ISTACK = type { %ISTACK*, %INTERSECTION*, uint }
-	%LIGHT_SOURCE = type { %METHODS*, int, %OBJECT*, %TEXTURE*, %INTERIOR*, %OBJECT*, %OBJECT*, %BBOX, uint, %OBJECT*, %COLOUR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, double, double, double, double, double, %LIGHT_SOURCE*, ubyte, ubyte, ubyte, ubyte, int, int, int, int, int, %COLOUR**, %OBJECT*, [6 x %PROJECT_TREE_NODE*] }
+	%ISTACK = type { %ISTACK*, %INTERSECTION*, i32 }
+	%LIGHT_SOURCE = type { %METHODS*, i32, %OBJECT*, %TEXTURE*, %INTERIOR*, %OBJECT*, %OBJECT*, %BBOX, i32, %OBJECT*, %COLOUR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, %VECTOR, double, double, double, double, double, %LIGHT_SOURCE*, i8, i8, i8, i8, i32, i32, i32, i32, i32, %COLOUR**, %OBJECT*, [6 x %PROJECT_TREE_NODE*] }
 	%MATRIX = type [4 x %VECTOR_4D]
 	%METHODS = type { %ALL_INTERSECTIONS_METHOD, %INSIDE_METHOD, %NORMAL_METHOD, %COPY_METHOD, %ROTATE_METHOD, %ROTATE_METHOD, %ROTATE_METHOD, %TRANSFORM_METHOD, %DESTROY_METHOD, %DESTROY_METHOD }
 	%NORMAL_METHOD = type void (double*, %OBJECT*, %INTERSECTION*)*
-	%OBJECT = type { %METHODS*, int, %OBJECT*, %TEXTURE*, %INTERIOR*, %OBJECT*, %OBJECT*, %BBOX, uint }
-	%Opts = type { int, uint, sbyte, sbyte, sbyte, int, [150 x sbyte], [150 x sbyte], [150 x sbyte], [150 x sbyte], [150 x sbyte], double, double, uint, int, double, double, int, [25 x sbyte*], int, int, int, double, double, int, int, double, double, double, uint, int, int, int, int, %FRAMESEQ, double, int, double, double, double, double, double, int, int, int, int, int, int, int, int, int, int, int, int, int, [150 x sbyte], %SHELLDATA*, [150 x sbyte], int, int }
-	%PIGMENT = type { ushort, ushort, ushort, int, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, short, short, short, { float, %VECTOR }, %complex.float }, %COLOUR }
-	%PRIORITY_QUEUE = type { uint, uint, %QELEM* }
-	%PROJECT = type { int, int, int, int }
-	%PROJECT_QUEUE = type { uint, uint, %PROJECT_TREE_NODE** }
-	%PROJECT_TREE_NODE = type { ushort, %BBOX_TREE*, %PROJECT, ushort, %PROJECT_TREE_NODE** }
+	%OBJECT = type { %METHODS*, i32, %OBJECT*, %TEXTURE*, %INTERIOR*, %OBJECT*, %OBJECT*, %BBOX, i32 }
+	%Opts = type { i32, i32, i8, i8, i8, i32, [150 x i8], [150 x i8], [150 x i8], [150 x i8], [150 x i8], double, double, i32, i32, double, double, i32, [25 x i8*], i32, i32, i32, double, double, i32, i32, double, double, double, i32, i32, i32, i32, i32, %FRAMESEQ, double, i32, double, double, double, double, double, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, [150 x i8], %SHELLDATA*, [150 x i8], i32, i32 }
+	%PIGMENT = type { i16, i16, i16, i32, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, i16, i16, i16, { float, %VECTOR }, %complex.float }, %COLOUR }
+	%PRIORITY_QUEUE = type { i32, i32, %QELEM* }
+	%PROJECT = type { i32, i32, i32, i32 }
+	%PROJECT_QUEUE = type { i32, i32, %PROJECT_TREE_NODE** }
+	%PROJECT_TREE_NODE = type { i16, %BBOX_TREE*, %PROJECT, i16, %PROJECT_TREE_NODE** }
 	%QELEM = type { double, %BBOX_TREE* }
 	%RAINBOW = type { double, double, double, double, double, double, double, %VECTOR, %VECTOR, %VECTOR, %PIGMENT*, %RAINBOW* }
-	%RAY = type { %VECTOR, %VECTOR, int, [100 x %INTERIOR*] }
+	%RAY = type { %VECTOR, %VECTOR, i32, [100 x %INTERIOR*] }
 	%RAYINFO = type { %VECTOR, %VECTOR, %VECTORI, %VECTORI }
 	%RGB = type [3 x float]
 	%ROTATE_METHOD = type void (%OBJECT*, double*, %TRANSFORM*)*
 	%SCALE_METHOD = type void (%OBJECT*, double*, %TRANSFORM*)*
-	%SHELLDATA = type { int, int, [250 x sbyte] }
-	%SKYSPHERE = type { int, %PIGMENT**, %TRANSFORM* }
+	%SHELLDATA = type { i32, i32, [250 x i8] }
+	%SKYSPHERE = type { i32, %PIGMENT**, %TRANSFORM* }
 	%SNGL_VECT = type [3 x float]
-	%TEXTURE = type { ushort, ushort, ushort, int, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, short, short, short, { float, %VECTOR }, %complex.float }, %TEXTURE*, %PIGMENT*, %TNORMAL*, %FINISH*, %TEXTURE*, int }
-	%TNORMAL = type { ushort, ushort, ushort, int, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, short, short, short, { float, %VECTOR }, %complex.float }, float }
-	%TPATTERN = type { ushort, ushort, ushort, int, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, short, short, short, { float, %VECTOR }, %complex.float } }
+	%TEXTURE = type { i16, i16, i16, i32, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, i16, i16, i16, { float, %VECTOR }, %complex.float }, %TEXTURE*, %PIGMENT*, %TNORMAL*, %FINISH*, %TEXTURE*, i32 }
+	%TNORMAL = type { i16, i16, i16, i32, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, i16, i16, i16, { float, %VECTOR }, %complex.float }, float }
+	%TPATTERN = type { i16, i16, i16, i32, float, float, float, %WARP*, %TPATTERN*, %BLEND_MAP*, { %DENSITY_FILE*, %IMAGE*, %VECTOR, float, i16, i16, i16, { float, %VECTOR }, %complex.float } }
 	%TRANSFORM = type { %MATRIX, %MATRIX }
 	%TRANSFORM_METHOD = type void (%OBJECT*, %TRANSFORM*)*
 	%TRANSLATE_METHOD = type void (%OBJECT*, double*, %TRANSFORM*)*
-	%TURB = type { ushort, %WARP*, %VECTOR, int, float, float }
+	%TURB = type { i16, %WARP*, %VECTOR, i32, float, float }
 	%UV_VECT = type [2 x double]
 	%VECTOR = type [3 x double]
-	%VECTORI = type [3 x int]
+	%VECTORI = type [3 x i32]
 	%VECTOR_4D = type [4 x double]
-	%WARP = type { ushort, %WARP* }
-	%__FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
-	%_h_val = type { [2 x uint], double }
+	%WARP = type { i16, %WARP* }
+	%__FILE = type { i32, i8*, i8*, i8, i8, i32, i32, i32 }
+	%_h_val = type { [2 x i32], double }
 	%complex.float = type { float, float }
diff --git a/test/Assembler/2002-07-14-InternalLossage.llx b/test/Assembler/2002-07-14-InternalLossage.llx
index 51f88e4d61..f93f1c4a5f 100644
--- a/test/Assembler/2002-07-14-InternalLossage.llx
+++ b/test/Assembler/2002-07-14-InternalLossage.llx
@@ -1,11 +1,9 @@
 ; Test to make sure that the 'internal' tag is not lost!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep internal
+; RUN: llvm-as < %s | llvm-dis | grep internal
 
-declare void %foo()
-implementation
+declare void @foo()
 
-internal void %foo() {
-	ret void
+define internal void @foo() {
+        ret void
 }
-
diff --git a/test/Assembler/2002-07-14-OpaqueType.llx b/test/Assembler/2002-07-14-OpaqueType.llx
index dce13fe6b8..662fb0f31c 100644
--- a/test/Assembler/2002-07-14-OpaqueType.llx
+++ b/test/Assembler/2002-07-14-OpaqueType.llx
@@ -1,12 +1,10 @@
 ; Test that opaque types are preserved correctly
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
 ;
 
 %Ty = type opaque
 
-implementation
-
-%Ty* %func() {
+define %Ty* @func() {
 	ret %Ty* null
 }
  
diff --git a/test/Assembler/2002-07-25-QuoteInString.llx b/test/Assembler/2002-07-25-QuoteInString.llx
index 59a664e054..facc5bdae6 100644
--- a/test/Assembler/2002-07-25-QuoteInString.llx
+++ b/test/Assembler/2002-07-25-QuoteInString.llx
@@ -1,6 +1,5 @@
 ; Test double quotes in strings work correctly!
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
 ;
-
-%str = internal global [6 x sbyte] c"\22foo\22\00"
+@str = internal global [6 x i8] c"\22foo\22\00"         ; <[6 x i8]*> [#uses=0]
 
diff --git a/test/Assembler/2002-07-25-ReturnPtrFunction.llx b/test/Assembler/2002-07-25-ReturnPtrFunction.llx
index c5c4aa8a8b..515d105c14 100644
--- a/test/Assembler/2002-07-25-ReturnPtrFunction.llx
+++ b/test/Assembler/2002-07-25-ReturnPtrFunction.llx
@@ -1,13 +1,15 @@
 ; Test that returning a pointer to a function causes the disassembler to print 
 ; the right thing.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as
+; RUN: llvm-as < %s | llvm-dis | llvm-as
 
-%ty = type void (int)
+%ty = type void (i32)
 
-declare %ty* %foo()
+declare %ty* @foo()
 
-void %test() {
-	call %ty*()* %foo()
-	ret void
+define void @test() {
+        call %ty* ()* @foo( )           ; <%ty*>:1 [#uses=0]
+        ret void
 }
+
+
diff --git a/test/Assembler/2002-07-31-SlashInString.llx b/test/Assembler/2002-07-31-SlashInString.llx
index 9fae11aa33..ff48258870 100644
--- a/test/Assembler/2002-07-31-SlashInString.llx
+++ b/test/Assembler/2002-07-31-SlashInString.llx
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as 
+; RUN: llvm-as < %s | llvm-dis | llvm-as 
 
 ; Make sure that \\ works in a string initializer
-%Slashtest = internal global [8 x sbyte] c"\5Cbegin{\00"
+@Slashtest = internal global [8 x i8] c"\5Cbegin{\00"
 
diff --git a/test/Assembler/2002-08-15-CastAmbiguity.ll b/test/Assembler/2002-08-15-CastAmbiguity.ll
index c44ee670eb..267a0d33ee 100644
--- a/test/Assembler/2002-08-15-CastAmbiguity.ll
+++ b/test/Assembler/2002-08-