Remove llvm-upgrade.

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

4 files changed, 45 insertions, 51 deletions

diff --git a/test/Analysis/GlobalsModRef/aliastest.ll b/test/Analysis/GlobalsModRef/aliastest.ll
index 4363d3b30f..13d0bdb1cd 100644
--- a/test/Analysis/GlobalsModRef/aliastest.ll
+++ b/test/Analysis/GlobalsModRef/aliastest.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
-%X = internal global int 4
+; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
+@X = internal global i32 4		; <i32*> [#uses=1]
 
-int %test(int *%P) {
-  store int 7, int* %P
-  store int 12,  int* %X   ;; cannot alias P, X's addr isn't taken
-  %V = load int* %P
-  ret int %V
+define i32 @test(i32* %P) {
+	store i32 7, i32* %P
+	store i32 12, i32* @X
+	%V = load i32* %P		; <i32> [#uses=1]
+	ret i32 %V
 }
diff --git a/test/Analysis/GlobalsModRef/indirect-global.ll b/test/Analysis/GlobalsModRef/indirect-global.ll
index 0ab82aefb8..3f73782d0e 100644
--- a/test/Analysis/GlobalsModRef/indirect-global.ll
+++ b/test/Analysis/GlobalsModRef/indirect-global.ll
@@ -1,26 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | \
-; RUN:   opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | \
 ; RUN:   grep {ret i32 0}
-; END.
-%G = internal global int* null
 
-implementation
+@G = internal global i32* null		; <i32**> [#uses=3]
 
-void %test() {
-	%A = malloc int
-	store int* %A, int** %G
+define void @test() {
+	%A = malloc i32		; <i32*> [#uses=1]
+	store i32* %A, i32** @G
 	ret void
 }
 
-int %test1(int *%P) {
-	%g1 = load int** %G
-	%h1 = load int* %g1
-
-	; This store cannot alias either G or g1.
-	store int 123, int* %P
-
-	%g2 = load int** %G
-	%h2 = load int* %g1
-	%X = sub int %h1, %h2   ;; -> 0
-	ret int %X
+define i32 @test1(i32* %P) {
+	%g1 = load i32** @G		; <i32*> [#uses=2]
+	%h1 = load i32* %g1		; <i32> [#uses=1]
+	store i32 123, i32* %P
+	%g2 = load i32** @G		; <i32*> [#uses=0]
+	%h2 = load i32* %g1		; <i32> [#uses=1]
+	%X = sub i32 %h1, %h2		; <i32> [#uses=1]
+	ret i32 %X
 }
diff --git a/test/Analysis/GlobalsModRef/modreftest.ll b/test/Analysis/GlobalsModRef/modreftest.ll
index fadc7471f8..9783664a34 100644
--- a/test/Analysis/GlobalsModRef/modreftest.ll
+++ b/test/Analysis/GlobalsModRef/modreftest.ll
@@ -1,13 +1,13 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
-%X = internal global int 4
+; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load
+@X = internal global i32 4		; <i32*> [#uses=2]
 
-int %test(int *%P) {
-  store int 12,  int* %X
-  call void %doesnotmodX()
-  %V = load int* %X
-  ret int %V
+define i32 @test(i32* %P) {
+	store i32 12, i32* @X
+	call void @doesnotmodX( )
+	%V = load i32* @X		; <i32> [#uses=1]
+	ret i32 %V
 }
 
-void %doesnotmodX() {
-  ret void
+define void @doesnotmodX() {
+	ret void
 }
diff --git a/test/Analysis/GlobalsModRef/purecse.ll b/test/Analysis/GlobalsModRef/purecse.ll
index 0c95182d46..1977f4750e 100644
--- a/test/Analysis/GlobalsModRef/purecse.ll
+++ b/test/Analysis/GlobalsModRef/purecse.ll
@@ -1,23 +1,23 @@
 ; Test that pure functions are cse'd away
+; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | \
+; RUN: llvm-dis | not grep sub
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub
-
-int %pure(int %X) {
-	%Y = add int %X, 1
-	ret int %Y
+define i32 @pure(i32 %X) {
+        %Y = add i32 %X, 1              ; <i32> [#uses=1]
+        ret i32 %Y
 }
 
-int %test1(int %X) {
-	%A = call int %pure(int %X)
-	%B = call int %pure(int %X)
-	%C = sub int %A, %B
-	ret int %C
+define i32 @test1(i32 %X) {
+        %A = call i32 @pure( i32 %X )           ; <i32> [#uses=1]
+        %B = call i32 @pure( i32 %X )           ; <i32> [#uses=1]
+        %C = sub i32 %A, %B             ; <i32> [#uses=1]
+        ret i32 %C
 }
 
-int %test2(int %X, int* %P) {
-	%A = call int %pure(int %X)
-	store int %X, int* %P          ;; Does not invalidate 'pure' call.
-	%B = call int %pure(int %X)
-	%C = sub int %A, %B
-	ret int %C
+define i32 @test2(i32 %X, i32* %P) {
+        %A = call i32 @pure( i32 %X )           ; <i32> [#uses=1]
+        store i32 %X, i32* %P ;; Does not invalidate 'pure' call.
+        %B = call i32 @pure( i32 %X )           ; <i32> [#uses=1]
+        %C = sub i32 %A, %B             ; <i32> [#uses=1]
+        ret i32 %C
 }