Covnert testcases to not use indexed loads/stores

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

3 files changed, 21 insertions, 11 deletions

diff --git a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
index 4ddb3f1..10e6578 100644
--- a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
+++ b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
@@ -17,7 +17,7 @@ bb0:					;[#uses=0]
 	br label %bb1
 
 bb1:					;[#uses=2]
-	%reg107 = load %node_t** %nodelist, uint 0		; <%node_t*> [#uses=2]
+	%reg107 = load %node_t** %nodelist		; <%node_t*> [#uses=2]
 	%cond211 = seteq %node_t* %reg107, null		; <bool> [#uses=1]
 	br bool %cond211, label %bb3, label %bb2
 
diff --git a/test/Transforms/ADCE/basictest1.ll b/test/Transforms/ADCE/basictest1.ll
index bf99e5b..c7a6d46 100644
--- a/test/Transforms/ADCE/basictest1.ll
+++ b/test/Transforms/ADCE/basictest1.ll
@@ -49,8 +49,10 @@ bb5:					;[#uses=1]
 	%reg107-idxcast1 = cast int %fd to uint		; <uint> [#uses=2]
 	%reg107-idxcast2 = cast int %fd to uint		; <uint> [#uses=1]
 	%reg1311 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast2		; <%spec_fd_t*> [#uses=1]
-	%reg1321 = load [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
-	%reg1331 = load %spec_fd_t* %reg1311, uint 0, ubyte 1		; <int> [#uses=1]
+	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
+	%reg1321 = load int* %idx1
+	%idx2 = getelementptr %spec_fd_t* %reg1311, uint 0, ubyte 1		; <int> [#uses=1]
+	%reg1331 = load int* %idx2
 	%cond270 = setlt int %reg1321, %reg1331		; <bool> [#uses=1]
 	br bool %cond270, label %bb9, label %bb6
 
@@ -68,12 +70,15 @@ bb8:					;[#uses=3]
 
 bb9:					;[#uses=1]
 	%reg107-idxcast3 = cast int %fd to uint		; <uint> [#uses=1]
-	%reg1601 = load [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%reg1601 = load ubyte** %idx3
 	%reg132-idxcast1 = cast int %reg1321 to uint		; <uint> [#uses=1]
-	%reg1621 = load ubyte* %reg1601, uint %reg132-idxcast1		; <ubyte> [#uses=2]
+	%idx4 = getelementptr ubyte* %reg1601, uint %reg132-idxcast1		; <ubyte> [#uses=2]
+	%reg1621 = load ubyte* %idx4
 	%cast108 = cast ubyte %reg1621 to uint		; <uint> [#uses=0]
 	%reg157 = add int %reg1321, 1		; <int> [#uses=1]
-	store int %reg157, [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2
+	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2
+	store int %reg157, int* %idx5
 	%reg163 = load int* %dbglvl		; <int> [#uses=1]
 	%cond272 = setle int %reg163, 4		; <bool> [#uses=1]
 	br bool %cond272, label %bb11, label %bb10
diff --git a/test/Transforms/ADCE/basictest2.ll b/test/Transforms/ADCE/basictest2.ll
index 7414d97..e0cb83a 100644
--- a/test/Transforms/ADCE/basictest2.ll
+++ b/test/Transforms/ADCE/basictest2.ll
@@ -50,8 +50,10 @@ bb5:					;[#uses=1]
 	%reg107-idxcast1 = cast int %fd to uint		; <uint> [#uses=2]
 	%reg107-idxcast2 = cast int %fd to uint		; <uint> [#uses=1]
 	%reg1311 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast2		; <%spec_fd_t*> [#uses=1]
-	%reg1321 = load [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
-	%reg1331 = load %spec_fd_t* %reg1311, uint 0, ubyte 1		; <int> [#uses=1]
+	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
+	%reg1321 = load int* %idx1
+	%idx2 = getelementptr %spec_fd_t* %reg1311, uint 0, ubyte 1		; <int> [#uses=1]
+	%reg1331 = load int* %idx2
 	%cond270 = setlt int %reg1321, %reg1331		; <bool> [#uses=1]
 	br bool %cond270, label %bb9, label %bb6
 
@@ -69,12 +71,15 @@ bb8:					;[#uses=3]
 
 bb9:					;[#uses=1]
 	%reg107-idxcast3 = cast int %fd to uint		; <uint> [#uses=1]
-	%reg1601 = load [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%reg1601 = load ubyte** %idx3
 	%reg132-idxcast1 = cast int %reg1321 to uint		; <uint> [#uses=1]
-	%reg1621 = load ubyte* %reg1601, uint %reg132-idxcast1		; <ubyte> [#uses=2]
+	%idx4 = getelementptr ubyte* %reg1601, uint %reg132-idxcast1		; <ubyte> [#uses=2]
+	%reg1621 = load ubyte* %idx4
 	%cast108 = cast ubyte %reg1621 to uint		; <uint> [#uses=0]
 	%reg157 = add int %reg1321, 1		; <int> [#uses=1]
-	store int %reg157, [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2
+	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, uint 0, uint %reg107-idxcast1, ubyte 2
+	store int %reg157, int* %idx5
 	%reg163 = load int* %dbglvl		; <int> [#uses=1]
 	%cond272 = setle int %reg163, 4		; <bool> [#uses=1]
 	br bool %cond272, label %bb11, label %bb10