For PR950:
Update the test suite to accommodate the change from signed integer types
to signless integer types. The changes were of only a few kinds:
1. Make sure llvm-upgrade is run on the source which does the bulk of the
changes automatically.
2. Change things like "grep 'int'" to "grep 'i32'"
3. In several tests bitcasting caused the same name to be reused in the
same type plane. These had to be manually fixed. The fix was (generally)
to leave the bitcast and provide the instruction with a new name. This
should not affect the semantics of the test. In a few cases, the
bitcasts were known to be superfluous and irrelevant to the test case
so they were removed.
4. One test case uses a bytecode file which needed to be updated to the
latest bytecode format.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32789 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
index 82212af..f888fc0 100644
--- a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
+++ b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store i32 0'
void %test({int,int }* %P) {
%Q = getelementptr {int,int}* %P, int 1
diff --git a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
index e828910..f82816e 100644
--- a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
+++ b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load int\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load i32\* %A'
declare double* %useit(int*)
diff --git a/test/Analysis/BasicAA/tailcall-modref.ll b/test/Analysis/BasicAA/tailcall-modref.ll
index 7fbddd7..a92f85d 100644
--- a/test/Analysis/BasicAA/tailcall-modref.ll
+++ b/test/Analysis/BasicAA/tailcall-modref.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret i32 0'
declare void %foo(int*)
declare void %bar()
diff --git a/test/Analysis/GlobalsModRef/indirect-global.ll b/test/Analysis/GlobalsModRef/indirect-global.ll
index d0f79c1..bb75732 100644
--- a/test/Analysis/GlobalsModRef/indirect-global.ll
+++ b/test/Analysis/GlobalsModRef/indirect-global.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN: grep 'ret i32 0'
%G = internal global int* null
implementation
diff --git a/test/Analysis/LoadVN/casts.ll b/test/Analysis/LoadVN/casts.ll
index 5dd3bc6..9b8f6a5 100644
--- a/test/Analysis/LoadVN/casts.ll
+++ b/test/Analysis/LoadVN/casts.ll
@@ -1,7 +1,7 @@
; Check to make sure that Value Numbering doesn't merge casts of different
; flavors.
; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | \
-; RUN: grep '[sz]ext' | wc -l | grep 2
+; RUN: grep '[sz]ext' | wc -l | grep 2
declare void %external(int)
diff --git a/test/Assembler/2002-07-08-HugePerformanceProblem.llx b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
index 9c97b5d..02a05f8 100644
--- a/test/Assembler/2002-07-08-HugePerformanceProblem.llx
+++ b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
@@ -1,6 +1,6 @@
; 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: ulimit -t 20; llvm-as < %s
+; RUN: ulimit -t 20; llvm-upgrade < %s | llvm-as
%ALL_INTERSECTIONS_METHOD = type int (%OBJECT*, %RAY*, %ISTACK*)*
%BBOX = type { %BBOX_VECT, %BBOX_VECT }
diff --git a/test/Assembler/2003-04-15-ConstantInitAssertion.llx b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
index 0665e41..33f6448 100644
--- a/test/Assembler/2003-04-15-ConstantInitAssertion.llx
+++ b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
@@ -1,4 +1,4 @@
-; RUN: (llvm-as < %s 2>&1) | grep Expected
+; RUN: llvm-upgrade < %s | llvm-as 2>&1 >/dev/null | grep Expected
; Test the case of a misformed constant initializer
; This should cause an assembler error, not an assertion failure!
%X = constant {int} { float 1.0 }
diff --git a/test/Assembler/2003-05-21-MalformedShiftCrash.llx b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
index 7a4782e..24f4c98 100644
--- a/test/Assembler/2003-05-21-MalformedShiftCrash.llx
+++ b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
@@ -1,4 +1,4 @@
; Found by inspection of the code
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | grep "Shift constant expression"
+; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Shift constant expression"
global int shr (float 1.0, ubyte 2)
diff --git a/test/Assembler/2003-05-21-MalformedStructCrash.llx b/test/Assembler/2003-05-21-MalformedStructCrash.llx
index c606aa0..98c8428 100644
--- a/test/Assembler/2003-05-21-MalformedStructCrash.llx
+++ b/test/Assembler/2003-05-21-MalformedStructCrash.llx
@@ -1,4 +1,4 @@
; Found by inspection of the code
-; RUN: llvm-as < %s 2>&1 | grep "Illegal"
+; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Illegal"
global {} { int 7, float 1.0, int 7, int 8 }
diff --git a/test/Assembler/2003-11-12-ConstantExprCast.llx b/test/Assembler/2003-11-12-ConstantExprCast.llx
index d243df4..ce48c20 100644
--- a/test/Assembler/2003-11-12-ConstantExprCast.llx
+++ b/test/Assembler/2003-11-12-ConstantExprCast.llx
@@ -1,9 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep ' bitcast ('
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep ' bitcast ('
%.Base64_1 = external constant [4 x sbyte]
-ubyte %test(sbyte %X) { ; No predecessors!
- %X = cast sbyte %X to ubyte ; <ubyte> [#uses=1]
+ubyte %test(sbyte %Y) { ; No predecessors!
+ %X = cast sbyte %Y to ubyte ; <ubyte> [#uses=1]
%tmp.13 = add ubyte %X, cast (sbyte sub (sbyte 0, sbyte cast ([4 x sbyte]* %.Base64_1 to sbyte)) to ubyte) ; <ubyte> [#uses=1]
ret ubyte %tmp.13
}
diff --git a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
index a3d4590..5438825 100644
--- a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
+++ b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s 2>&1 | grep 'Reference to an undefined type'
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | \
+; 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 }
diff --git a/test/Assembler/2004-10-22-BCWriterUndefBug.llx b/test/Assembler/2004-10-22-BCWriterUndefBug.llx
index e1bcfe0..7da4853 100644
--- a/test/Assembler/2004-10-22-BCWriterUndefBug.llx
+++ b/test/Assembler/2004-10-22-BCWriterUndefBug.llx
@@ -1,5 +1,5 @@
;; The bytecode writer was trying to treat undef values as ConstantArray's when
;; they looked like strings.
-;; RUN: llvm-as < %s -o /dev/null -f
+;; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%G = internal global [8 x sbyte] undef
diff --git a/test/C++Frontend/2006-09-27-Debug-Protection.cpp b/test/C++Frontend/2006-09-27-Debug-Protection.cpp
index a15e86d..87bc0d5 100644
--- a/test/C++Frontend/2006-09-27-Debug-Protection.cpp
+++ b/test/C++Frontend/2006-09-27-Debug-Protection.cpp
@@ -1,6 +1,6 @@
// XFAIL: llvmgcc3
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'uint 1,' &&
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'uint 2,'
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 1,' &&
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 2,'
class A {
public:
diff --git a/test/CFrontend/2005-12-04-DeclarationLineNumbers.c b/test/CFrontend/2005-12-04-DeclarationLineNumbers.c
index 4e2bcc8..ab176c7 100644
--- a/test/CFrontend/2005-12-04-DeclarationLineNumbers.c
+++ b/test/CFrontend/2005-12-04-DeclarationLineNumbers.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -g -o - | grep 'llvm.dbg.stoppoint.*uint 14'
+// RUN: %llvmgcc %s -S -g -o - | grep 'llvm.dbg.stoppoint.*i32 14'
// PR664: ensure that line #'s are emitted for declarations
diff --git a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
index 8790976..645f40c 100644
--- a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
+++ b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
@@ -1,5 +1,5 @@
-// RUN: %llvmgcc -S %s -o - | grep 'llvm.ctlz.i32(uint' &&
-// RUN: %llvmgcc -S %s -o - | not grep 'llvm.ctlz.i32(int'
+// RUN: %llvmgcc -S %s -o - | grep 'llvm.ctlz.i32(i32'
+// RUNMEIFWEHADSIGNEDTYPES: %llvmgcc -S %s -o - | not grep 'llvm.ctlz.i32(i32'
unsigned t2(unsigned X) {
return __builtin_clz(X);
diff --git a/test/CFrontend/2006-03-03-MissingInitializer.c b/test/CFrontend/2006-03-03-MissingInitializer.c
index f0e6bd7..5a2acb5 100644
--- a/test/CFrontend/2006-03-03-MissingInitializer.c
+++ b/test/CFrontend/2006-03-03-MissingInitializer.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | gccas | llvm-dis | grep nate | grep 'global int 0'
+// RUN: %llvmgcc %s -S -o - | gccas | llvm-dis | grep nate | grep 'global i32 0'
struct X { int *XX; int Y;};
diff --git a/test/CodeGen/ARM/vargs2.ll b/test/CodeGen/ARM/vargs2.ll
index 1404a41..9a6dbd2 100644
--- a/test/CodeGen/ARM/vargs2.ll
+++ b/test/CodeGen/ARM/vargs2.ll
@@ -3,14 +3,14 @@
implementation ; Functions:
-void %f(int %a, ...) {
+void %f(int %a_arg, ...) {
entry:
- %a = cast int %a to uint ; <uint> [#uses=1]
+ %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]
call void %llvm.va_start( sbyte** %l1 )
- %tmp22 = seteq int %a, 0 ; <bool> [#uses=1]
+ %tmp22 = seteq int %a_arg, 0 ; <bool> [#uses=1]
%tmp23 = volatile load sbyte** %l1 ; <sbyte*> [#uses=2]
br bool %tmp22, label %bb8, label %bb
diff --git a/test/CodeGen/Alpha/zapnot.ll b/test/CodeGen/Alpha/zapnot.ll
index 057d16b..aaeaa11 100644
--- a/test/CodeGen/Alpha/zapnot.ll
+++ b/test/CodeGen/Alpha/zapnot.ll
@@ -1,11 +1,10 @@
; Make sure this testcase codegens to the bic instruction
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot'
+; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot'
implementation ; Functions:
-ushort %foo(long %y) {
+define i16 @zext %foo(i64 %y) {
entry:
- %tmp.1 = cast long %y to ushort ; <ushort> [#uses=1]
- ret ushort %tmp.1
+ %tmp.1 = trunc i64 %y to i16 ; <ushort> [#uses=1]
+ ret i16 %tmp.1
}
-
diff --git a/test/CodeGen/Generic/2005-10-21-longlonggtu.ll b/test/CodeGen/Generic/2005-10-21-longlonggtu.ll
index 6023213..d445e59 100644
--- a/test/CodeGen/Generic/2005-10-21-longlonggtu.ll
+++ b/test/CodeGen/Generic/2005-10-21-longlonggtu.ll
@@ -1,6 +1,6 @@
; RUN: llvm-upgrade < %s | llvm-as | llc
-float %t(long %u) {
- %u = cast long %u to ulong ; <ulong> [#uses=1]
+float %t(long %u_arg) {
+ %u = cast long %u_arg to ulong ; <ulong> [#uses=1]
%tmp5 = add ulong %u, 9007199254740991 ; <ulong> [#uses=1]
%tmp = setgt ulong %tmp5, 18014398509481982 ; <bool> [#uses=1]
br bool %tmp, label %T, label %F
diff --git a/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll b/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
index f5d0fb3..1fe13f8 100644
--- a/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
+++ b/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
@@ -239,19 +239,19 @@
ret void
bb1876: ; preds = %bb1808
- %tmp1877 = load int* %which_alternative ; <int> [#uses=4]
- %tmp1877 = cast int %tmp1877 to uint ; <uint> [#uses=1]
+ %tmp1877signed = load int* %which_alternative ; <int> [#uses=4]
+ %tmp1877 = cast int %tmp1877signed to uint ; <uint> [#uses=1]
%bothcond699 = setlt uint %tmp1877, 2 ; <bool> [#uses=1]
- %tmp1888 = seteq int %tmp1877, 2 ; <bool> [#uses=1]
+ %tmp1888 = seteq int %tmp1877signed, 2 ; <bool> [#uses=1]
%bothcond700 = or bool %bothcond699, %tmp1888 ; <bool> [#uses=1]
%bothcond700.not = xor bool %bothcond700, true ; <bool> [#uses=1]
- %tmp1894 = seteq int %tmp1877, 3 ; <bool> [#uses=1]
+ %tmp1894 = seteq int %tmp1877signed, 3 ; <bool> [#uses=1]
%bothcond701 = or bool %tmp1894, %bothcond700.not ; <bool> [#uses=1]
%bothcond702 = or bool %bothcond701, false ; <bool> [#uses=1]
br bool %bothcond702, label %UnifiedReturnBlock, label %cond_next1902
cond_next1902: ; preds = %bb1876
- switch int %tmp1877, label %cond_next1937 [
+ switch int %tmp1877signed, label %cond_next1937 [
int 0, label %bb1918
int 1, label %bb1918
int 2, label %bb1918
diff --git a/test/CodeGen/Generic/SwitchLowering.ll b/test/CodeGen/Generic/SwitchLowering.ll
index 37bfffa..4eef030 100644
--- a/test/CodeGen/Generic/SwitchLowering.ll
+++ b/test/CodeGen/Generic/SwitchLowering.ll
@@ -19,7 +19,6 @@
]
bb7: ; preds = %bb, %bb
- %tmp = cast sbyte %tmp to ubyte ; <ubyte> [#uses=1]
tail call void %foo( ubyte %tmp )
ret sbyte* %tmp2
}
diff --git a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
index 8edb962..7700459 100644
--- a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
+++ b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
@@ -1,16 +1,16 @@
; RUN: llvm-upgrade < %s | llvm-as | llc
void %iterative_hash_host_wide_int() {
- %zero = alloca int ; <int*> [#uses=2]
- %b = alloca uint ; <uint*> [#uses=1]
+ %zero = alloca int ; <int*> [#uses=2]
+ %b = alloca uint ; <uint*> [#uses=1]
store int 0, int* %zero
- %tmp = load int* %zero ; <int> [#uses=1]
+ %tmp = load int* %zero ; <int> [#uses=1]
%tmp5 = cast int %tmp to uint ; <uint> [#uses=1]
- %tmp6 = add uint %tmp5, 32 ; <uint> [#uses=1]
- %tmp6 = cast uint %tmp6 to int ; <int> [#uses=1]
- %tmp7 = load long* null ; <long> [#uses=1]
+ %tmp6.u = add uint %tmp5, 32 ; <uint> [#uses=1]
+ %tmp6 = cast uint %tmp6.u to int ; <int> [#uses=1]
+ %tmp7 = load long* null ; <long> [#uses=1]
%tmp6 = cast int %tmp6 to ubyte ; <ubyte> [#uses=1]
- %tmp8 = shr long %tmp7, ubyte %tmp6 ; <long> [#uses=1]
+ %tmp8 = shr long %tmp7, ubyte %tmp6 ; <long> [#uses=1]
%tmp8 = cast long %tmp8 to uint ; <uint> [#uses=1]
store uint %tmp8, uint* %b
unreachable
diff --git a/test/CodeGen/PowerPC/and-elim.ll b/test/CodeGen/PowerPC/and-elim.ll
index ae1f57d..c866d6e 100644
--- a/test/CodeGen/PowerPC/and-elim.ll
+++ b/test/CodeGen/PowerPC/and-elim.ll
@@ -10,7 +10,8 @@
ret void
}
-ushort %test2(ushort %crc) { ; No and's should be needed for the ushorts here.
+ushort @zext %test2(ushort @zext %crc) {
+ ; No and's should be needed for the ushorts here.
%tmp.1 = shr ushort %crc, ubyte 1
%tmp.7 = xor ushort %tmp.1, 40961
ret ushort %tmp.7
diff --git a/test/CodeGen/PowerPC/branch-opt.ll b/test/CodeGen/PowerPC/branch-opt.ll
index 7f40a2d..1f94169 100644
--- a/test/CodeGen/PowerPC/branch-opt.ll
+++ b/test/CodeGen/PowerPC/branch-opt.ll
@@ -9,10 +9,10 @@
void %foo(int %W, int %X, int %Y, int %Z) {
entry:
- %X = cast int %X to uint ; <uint> [#uses=1]
- %Y = cast int %Y to uint ; <uint> [#uses=1]
- %Z = cast int %Z to uint ; <uint> [#uses=1]
- %W = cast int %W to uint ; <uint> [#uses=1]
+ %X.u = cast int %X to uint ; <uint> [#uses=1]
+ %Y.u = cast int %Y to uint ; <uint> [#uses=1]
+ %Z.u = cast int %Z to uint ; <uint> [#uses=1]
+ %W.u = cast int %W to uint ; <uint> [#uses=1]
%tmp1 = and int %W, 1 ; <int> [#uses=1]
%tmp1 = seteq int %tmp1, 0 ; <bool> [#uses=1]
br bool %tmp1, label %cond_false, label %bb5
@@ -21,7 +21,7 @@
%indvar77 = phi uint [ %indvar.next78, %bb ], [ 0, %bb5 ] ; <uint> [#uses=1]
%tmp2 = tail call int (...)* %bar( ) ; <int> [#uses=0]
%indvar.next78 = add uint %indvar77, 1 ; <uint> [#uses=2]
- %exitcond79 = seteq uint %indvar.next78, %X ; <bool> [#uses=1]
+ %exitcond79 = seteq uint %indvar.next78, %X.u ; <bool> [#uses=1]
br bool %exitcond79, label %cond_next48, label %bb
bb5: ; preds = %entry
@@ -37,7 +37,7 @@
%indvar72 = phi uint [ %indvar.next73, %bb12 ], [ 0, %bb16 ] ; <uint> [#uses=1]
%tmp13 = tail call int (...)* %bar( ) ; <int> [#uses=0]
%indvar.next73 = add uint %indvar72, 1 ; <uint> [#uses=2]
- %exitcond74 = seteq uint %indvar.next73, %Y ; <bool> [#uses=1]
+ %exitcond74 = seteq uint %indvar.next73, %Y.u ; <bool> [#uses=1]
br bool %exitcond74, label %cond_next48, label %bb12
bb16: ; preds = %cond_false
@@ -53,7 +53,7 @@
%indvar67 = phi uint [ %indvar.next68, %bb25 ], [ 0, %bb29 ] ; <uint> [#uses=1]
%tmp26 = tail call int (...)* %bar( ) ; <int> [#uses=0]
%indvar.next68 = add uint %indvar67, 1 ; <uint> [#uses=2]
- %exitcond69 = seteq uint %indvar.next68, %Z ; <bool> [#uses=1]
+ %exitcond69 = seteq uint %indvar.next68, %Z.u ; <bool> [#uses=1]
br bool %exitcond69, label %cond_next48, label %bb25
bb29: ; preds = %cond_false20
@@ -72,9 +72,8 @@
bb42: ; preds = %cond_false33, %bb38
%indvar = phi uint [ %indvar.next, %bb38 ], [ 0, %cond_false33 ] ; <uint> [#uses=3]
- %indvar = cast uint %indvar to int ; <int> [#uses=1]
%W_addr.0 = sub int %W, %indvar ; <int> [#uses=1]
- %exitcond = seteq uint %indvar, %W ; <bool> [#uses=1]
+ %exitcond = seteq uint %indvar, %W.u ; <bool> [#uses=1]
br bool %exitcond, label %cond_next48, label %bb38
cond_next48: ; preds = %bb, %bb12, %bb25, %bb42, %cond_false33, %bb29, %bb16, %bb5
diff --git a/test/CodeGen/PowerPC/rotl.ll b/test/CodeGen/PowerPC/rotl.ll
index fc3a6bc..e2045fe 100644
--- a/test/CodeGen/PowerPC/rotl.ll
+++ b/test/CodeGen/PowerPC/rotl.ll
@@ -7,12 +7,11 @@
int %rotlw(uint %x, int %sh) {
entry:
%tmp.3 = cast int %sh to ubyte ; <ubyte> [#uses=1]
- %x = cast uint %x to int ; <int> [#uses=1]
+ %x.s = cast uint %x to int ; <int> [#uses=1]
%tmp.7 = sub int 32, %sh ; <int> [#uses=1]
%tmp.9 = cast int %tmp.7 to ubyte ; <ubyte> [#uses=1]
%tmp.10 = shr uint %x, ubyte %tmp.9 ; <uint> [#uses=1]
- %tmp.4 = shl int %x, ubyte %tmp.3 ; <int> [#uses=1]
- %tmp.10 = cast uint %tmp.10 to int ; <int> [#uses=1]
+ %tmp.4 = shl int %x.s, ubyte %tmp.3 ; <int> [#uses=1]
%tmp.12 = or int %tmp.10, %tmp.4 ; <int> [#uses=1]
ret int %tmp.12
}
@@ -23,19 +22,17 @@
%tmp.4 = shr uint %x, ubyte %tmp.3 ; <uint> [#uses=1]
%tmp.7 = sub int 32, %sh ; <int> [#uses=1]
%tmp.9 = cast int %tmp.7 to ubyte ; <ubyte> [#uses=1]
- %x = cast uint %x to int ; <int> [#uses=1]
- %tmp.4 = cast uint %tmp.4 to int ; <int> [#uses=1]
- %tmp.10 = shl int %x, ubyte %tmp.9 ; <int> [#uses=1]
+ %x.s = cast uint %x to int ; <int> [#uses=1]
+ %tmp.10 = shl int %x.s, ubyte %tmp.9 ; <int> [#uses=1]
%tmp.12 = or int %tmp.4, %tmp.10 ; <int> [#uses=1]
ret int %tmp.12
}
int %rotlwi(uint %x) {
entry:
- %x = cast uint %x to int ; <int> [#uses=1]
+ %x.s = cast uint %x to int ; <int> [#uses=1]
%tmp.7 = shr uint %x, ubyte 27 ; <uint> [#uses=1]
- %tmp.3 = shl int %x, ubyte 5 ; <int> [#uses=1]
- %tmp.7 = cast uint %tmp.7 to int ; <int> [#uses=1]
+ %tmp.3 = shl int %x.s, ubyte 5 ; <int> [#uses=1]
%tmp.9 = or int %tmp.3, %tmp.7 ; <int> [#uses=1]
ret int %tmp.9
}
@@ -43,9 +40,8 @@
int %rotrwi(uint %x) {
entry:
%tmp.3 = shr uint %x, ubyte 5 ; <uint> [#uses=1]
- %x = cast uint %x to int ; <int> [#uses=1]
- %tmp.3 = cast uint %tmp.3 to int ; <int> [#uses=1]
- %tmp.7 = shl int %x, ubyte 27 ; <int> [#uses=1]
+ %x.s = cast uint %x to int ; <int> [#uses=1]
+ %tmp.7 = shl int %x.s, ubyte 27 ; <int> [#uses=1]
%tmp.9 = or int %tmp.3, %tmp.7 ; <int> [#uses=1]
ret int %tmp.9
}
diff --git a/test/CodeGen/PowerPC/small-arguments.ll b/test/CodeGen/PowerPC/small-arguments.ll
index 40217f6..aa0d5b6 100644
--- a/test/CodeGen/PowerPC/small-arguments.ll
+++ b/test/CodeGen/PowerPC/small-arguments.ll
@@ -1,15 +1,14 @@
-
; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 &&
; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'extsh\|rlwinm'
-declare short %foo()
+declare short @sext %foo()
-int %test1(short %X) {
+int %test1(short @sext %X) {
%Y = cast short %X to int ;; dead
ret int %Y
}
-int %test2(ushort %X) {
+int %test2(ushort @zext %X) {
%Y = cast ushort %X to int
%Z = and int %Y, 65535 ;; dead
ret int %Z
@@ -48,8 +47,7 @@
ret uint %tmp.2
}
-ushort %test7(float %a) {
+ushort @zext %test7(float %a) {
%tmp.1 = cast float %a to ushort
ret ushort %tmp.1
}
-
diff --git a/test/CodeGen/PowerPC/vec_spat.ll b/test/CodeGen/PowerPC/vec_spat.ll
index fb25402..6691995 100644
--- a/test/CodeGen/PowerPC/vec_spat.ll
+++ b/test/CodeGen/PowerPC/vec_spat.ll
@@ -62,10 +62,10 @@
void %spltish(<16 x ubyte>* %A, <16 x ubyte>* %B) {
; Gets converted to 16 x ubyte
%tmp = load <16 x ubyte>* %B
- %tmp = cast <16 x ubyte> %tmp to <16 x sbyte>
- %tmp4 = sub <16 x sbyte> %tmp, cast (<8 x short> < short 15, short 15, short 15, short 15, short 15, short 15, short 15, short 15 > to <16 x sbyte>)
- %tmp4 = cast <16 x sbyte> %tmp4 to <16 x ubyte>
- store <16 x ubyte> %tmp4, <16 x ubyte>* %A
+ %tmp.s = cast <16 x ubyte> %tmp to <16 x sbyte>
+ %tmp4 = sub <16 x sbyte> %tmp.s, cast (<8 x short> < short 15, short 15, short 15, short 15, short 15, short 15, short 15, short 15 > to <16 x sbyte>)
+ %tmp4.u = cast <16 x sbyte> %tmp4 to <16 x ubyte>
+ store <16 x ubyte> %tmp4.u, <16 x ubyte>* %A
ret void
}
diff --git a/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
index 631e416..4711897 100644
--- a/test/CodeGen/X86/2006-05-02-InstrSched1.ll
+++ b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
@@ -11,10 +11,8 @@
%tmp4 = getelementptr ubyte* %tmp, uint %tmp3 ; <ubyte*> [#uses=1]
%tmp7 = load uint* %tmp ; <uint> [#uses=1]
%tmp8 = getelementptr ubyte* %tmp, uint %tmp7 ; <ubyte*> [#uses=1]
- %tmp8 = cast ubyte* %tmp8 to sbyte* ; <sbyte*> [#uses=1]
- %tmp4 = cast ubyte* %tmp4 to sbyte* ; <sbyte*> [#uses=1]
- %tmp = tail call int %memcmp( sbyte* %tmp8, sbyte* %tmp4, uint %tmp ) ; <int> [#uses=1]
- ret int %tmp
+ %result = tail call int %memcmp( sbyte* %tmp8, sbyte* %tmp4, uint %tmp ) ; <int> [#uses=1]
+ ret int %result
}
declare int %memcmp(sbyte*, sbyte*, uint)
diff --git a/test/CodeGen/X86/2006-08-07-CycleInDAG.ll b/test/CodeGen/X86/2006-08-07-CycleInDAG.ll
index 1de4028..6cc548e 100644
--- a/test/CodeGen/X86/2006-08-07-CycleInDAG.ll
+++ b/test/CodeGen/X86/2006-08-07-CycleInDAG.ll
@@ -10,8 +10,8 @@
%tmp24.i = load int* null ; <int> [#uses=1]
%tmp13.i12.i = tail call double %ldexp( double 0.000000e+00, int 0 ) ; <double> [#uses=1]
%tmp13.i13.i = cast double %tmp13.i12.i to float ; <float> [#uses=1]
- %tmp11.i = load int* null ; <int> [#uses=1]
- %tmp11.i = cast int %tmp11.i to uint ; <uint> [#uses=1]
+ %tmp11.s = load int* null ; <int> [#uses=1]
+ %tmp11.i = cast int %tmp11.s to uint ; <uint> [#uses=1]
%n.i = cast int %tmp24.i to uint ; <uint> [#uses=1]
%tmp13.i7 = mul uint %tmp11.i, %n.i ; <uint> [#uses=1]
%tmp.i8 = tail call sbyte* %calloc( uint %tmp13.i7, uint 4 ) ; <sbyte*> [#uses=0]
diff --git a/test/CodeGen/X86/loop-hoist.ll b/test/CodeGen/X86/loop-hoist.ll
index 3ee0cbc..ccbf53f 100644
--- a/test/CodeGen/X86/loop-hoist.ll
+++ b/test/CodeGen/X86/loop-hoist.ll
@@ -5,9 +5,9 @@
implementation ; Functions:
-void %foo(int %N) {
+void %foo(int %N.in) {
entry:
- %N = cast int %N to uint ; <uint> [#uses=1]
+ %N = cast int %N.in to uint ; <uint> [#uses=1]
br label %cond_true
cond_true: ; preds = %cond_true, %entry
diff --git a/test/CodeGen/X86/loop-strength-reduce.ll b/test/CodeGen/X86/loop-strength-reduce.ll
index a54d907..b0f5766 100644
--- a/test/CodeGen/X86/loop-strength-reduce.ll
+++ b/test/CodeGen/X86/loop-strength-reduce.ll
@@ -4,10 +4,10 @@
%A = internal global [16 x [16 x int]] zeroinitializer, align 32
-void %test(int %row, int %N) {
+void %test(int %row, int %N.in) {
entry:
- %N = cast int %N to uint
- %tmp5 = setgt int %N, 0
+ %N = cast int %N.in to uint
+ %tmp5 = setgt int %N.in, 0
br bool %tmp5, label %cond_true, label %return
cond_true:
diff --git a/test/CodeGen/X86/trunc-to-bool.ll b/test/CodeGen/X86/trunc-to-bool.ll
index 3e00975..f4fa9c6 100644
--- a/test/CodeGen/X86/trunc-to-bool.ll
+++ b/test/CodeGen/X86/trunc-to-bool.ll
@@ -1,19 +1,21 @@
; An integer truncation to bool should be done with an and instruction to make
; sure only the LSBit survives. Test that this is the case both for a returned
; value and as the operand of a branch.
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | wc -l | grep 6
-bool %test1(int %X) {
- %Y = trunc int %X to bool
+; RUN: llvm-as < %s | llc -march=x86 &&
+; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | \
+; RUN: wc -l | grep 6
+
+define bool @zext %test1(i32 %X) {
+ %Y = trunc i32 %X to bool
ret bool %Y
}
-bool %test2(int %val, int %mask) {
+define bool %test2(i32 %val, i32 %mask) {
entry:
- %mask = trunc int %mask to ubyte
- %shifted = ashr int %val, ubyte %mask
- %anded = and int %shifted, 1
- %trunced = trunc int %anded to bool
+ %mask = trunc i32 %mask to i8
+ %shifted = ashr i32 %val, i8 %mask
+ %anded = and i32 %shifted, 1
+ %trunced = trunc i32 %anded to bool
br bool %trunced, label %ret_true, label %ret_false
ret_true:
ret bool true
@@ -21,39 +23,40 @@
ret bool false
}
-int %test3(sbyte* %ptr) {
- %val = load sbyte* %ptr
- %tmp = trunc sbyte %val to bool ; %<bool> [#uses=1]
+define i32 %test3(i8* %ptr) {
+ %val = load i8* %ptr
+ %tmp = trunc i8 %val to bool
br bool %tmp, label %cond_true, label %cond_false
cond_true:
- ret int 21
+ ret i32 21
cond_false:
- ret int 42
+ ret i32 42
}
-int %test4(sbyte* %ptr) {
- %tmp = ptrtoint sbyte* %ptr to bool
+define i32 %test4(i8* %ptr) {
+ %tmp = ptrtoint i8* %ptr to bool
br bool %tmp, label %cond_true, label %cond_false
cond_true:
- ret int 21
+ ret i32 21
cond_false:
- ret int 42
+ ret i32 42
}
-int %test5(float %f) {
+define i32 %test5(float %f) {
%tmp = fptoui float %f to bool
br bool %tmp, label %cond_true, label %cond_false
cond_true:
- ret int 21
+ ret i32 21
cond_false:
- ret int 42
+ ret i32 42
}
-int %test6(double %d) {
+define i32 %test6(double %d) {
%tmp = fptosi double %d to bool
br bool %tmp, label %cond_true, label %cond_false
cond_true:
- ret int 21
+ ret i32 21
cond_false:
- ret int 42
+ ret i32 42
}
+
diff --git a/test/CodeGen/X86/vec_ins_extract.ll b/test/CodeGen/X86/vec_ins_extract.ll
index 9d9f17e..b243506 100644
--- a/test/CodeGen/X86/vec_ins_extract.ll
+++ b/test/CodeGen/X86/vec_ins_extract.ll
@@ -1,7 +1,7 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -instcombine | \
-; RUN: llc -march=x86 -mcpu=yonah &&
+; RUN: llc -march=x86 -mcpu=yonah &&
; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -instcombine | \
-; RUN: llc -march=x86 -mcpu=yonah | not grep sub.*esp
+; RUN: llc -march=x86 -mcpu=yonah | not grep sub.*esp
; This checks that various insert/extract idiom work without going to the
; stack.
diff --git a/test/ExecutionEngine/2003-01-04-PhiTest.ll b/test/ExecutionEngine/2003-01-04-PhiTest.ll
index c8c76ee..45af830 100644
--- a/test/ExecutionEngine/2003-01-04-PhiTest.ll
+++ b/test/ExecutionEngine/2003-01-04-PhiTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
int %main() {
diff --git a/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll b/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
index 6b1b0ab..1d9ba77 100644
--- a/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
+++ b/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
target endian = little
diff --git a/test/ExecutionEngine/2003-06-05-PHIBug.ll b/test/ExecutionEngine/2003-06-05-PHIBug.ll
index 6e4e5e1..8c1aaba 100644
--- a/test/ExecutionEngine/2003-06-05-PHIBug.ll
+++ b/test/ExecutionEngine/2003-06-05-PHIBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
; Testcase distilled from 256.bzip2.
diff --git a/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll b/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
index 80b5153..adc8220 100644
--- a/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ b/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
; This testcase failed to work because two variable sized allocas confused the
diff --git a/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll b/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
index 1a7e05e..4d1d045 100644
--- a/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
; This testcase exposes a bug in the local register allocator where it runs out
diff --git a/test/ExecutionEngine/hello.ll b/test/ExecutionEngine/hello.ll
index 0f62dcb..ea2f9a4 100644
--- a/test/ExecutionEngine/hello.ll
+++ b/test/ExecutionEngine/hello.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
%.LC0 = internal global [12 x sbyte] c"Hello World\00"
diff --git a/test/ExecutionEngine/hello2.ll b/test/ExecutionEngine/hello2.ll
index 92aa5f1..b186c52 100644
--- a/test/ExecutionEngine/hello2.ll
+++ b/test/ExecutionEngine/hello2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
diff --git a/test/ExecutionEngine/simplesttest.ll b/test/ExecutionEngine/simplesttest.ll
index 207229f..1f578d2 100644
--- a/test/ExecutionEngine/simplesttest.ll
+++ b/test/ExecutionEngine/simplesttest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
diff --git a/test/ExecutionEngine/simpletest.ll b/test/ExecutionEngine/simpletest.ll
index 47a5c64..68b7044 100644
--- a/test/ExecutionEngine/simpletest.ll
+++ b/test/ExecutionEngine/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
implementation
diff --git a/test/ExecutionEngine/test-loadstore.ll b/test/ExecutionEngine/test-loadstore.ll
index ac558b0..8a4b793 100644
--- a/test/ExecutionEngine/test-loadstore.ll
+++ b/test/ExecutionEngine/test-loadstore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
diff --git a/test/ExecutionEngine/test-logical.ll b/test/ExecutionEngine/test-logical.ll
index bad6a9a..86af2e2 100644
--- a/test/ExecutionEngine/test-logical.ll
+++ b/test/ExecutionEngine/test-logical.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
diff --git a/test/ExecutionEngine/test-malloc.ll b/test/ExecutionEngine/test-malloc.ll
index 69c412a..7a7f245 100644
--- a/test/ExecutionEngine/test-malloc.ll
+++ b/test/ExecutionEngine/test-malloc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
diff --git a/test/ExecutionEngine/test-ret.ll b/test/ExecutionEngine/test-ret.ll
index 6fbaf71..e206912 100644
--- a/test/ExecutionEngine/test-ret.ll
+++ b/test/ExecutionEngine/test-ret.ll
@@ -1,16 +1,16 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
; RUN: lli %t.bc > /dev/null
; test return instructions
-void %test() { ret void }
-sbyte %test() { ret sbyte 1 }
-ubyte %test() { ret ubyte 1 }
-short %test() { ret short -1 }
-ushort %test() { ret ushort 65535 }
+void %test1() { ret void }
+sbyte %test2() { ret sbyte 1 }
+ubyte %test3() { ret ubyte 1 }
+short %test4() { ret short -1 }
+ushort %test5() { ret ushort 65535 }
int %main() { ret int 0 }
-uint %test() { ret uint 4 }
-long %test() { ret long 0 }
-ulong %test() { ret ulong 0 }
-float %test() { ret float 1.0 }
-double %test() { ret double 2.0 }
+uint %test6() { ret uint 4 }
+long %test7() { ret long 0 }
+ulong %test8() { ret ulong 0 }
+float %test9() { ret float 1.0 }
+double %test10() { ret double 2.0 }
diff --git a/test/ExecutionEngine/test-shift.ll b/test/ExecutionEngine/test-shift.ll
index 22e4678..2549f34 100644
--- a/test/ExecutionEngine/test-shift.ll
+++ b/test/ExecutionEngine/test-shift.ll
@@ -6,35 +6,35 @@
%shamt = add ubyte 0, 1
; Left shifts...
- %t1 = shl int 1, ubyte %shamt
- %t2 = shl int 1, ubyte 4
+ %t1.s = shl int 1, ubyte %shamt
+ %t2.s = shl int 1, ubyte 4
%t1 = shl uint 1, ubyte %shamt
%t2 = shl uint 1, ubyte 5
;%t1 = shl long 1, ubyte %shamt
- %t2 = shl long 1, ubyte 4
+ %t2.s = shl long 1, ubyte 4
;%t1 = shl ulong 1, ubyte %shamt
%t2 = shl ulong 1, ubyte 5
; Right shifts...
- %tr1 = shr int 1, ubyte %shamt
- %tr2 = shr int 1, ubyte 4
+ %tr1.s = shr int 1, ubyte %shamt
+ %tr2.s = shr int 1, ubyte 4
%tr1 = shr uint 1, ubyte %shamt
%tr2 = shr uint 1, ubyte 5
;%tr1 = shr long 1, ubyte %shamt
- %tr1 = shr long 1, ubyte 4
- %tr2 = shr long 1, ubyte %shamt
- %tr3 = shl long 1, ubyte 4
- %tr4 = shl long 1, ubyte %shamt
+ %tr1.l = shr long 1, ubyte 4
+ %tr2.l = shr long 1, ubyte %shamt
+ %tr3.l = shl long 1, ubyte 4
+ %tr4.l = shl long 1, ubyte %shamt
;%t1 = shr ulong 1, ubyte %shamt
- %tr1 = shr ulong 1, ubyte 5
- %tr2 = shr ulong 1, ubyte %shamt
- %tr3 = shl ulong 1, ubyte 5
- %tr4 = shl ulong 1, ubyte %shamt
+ %tr1.u = shr ulong 1, ubyte 5
+ %tr2.u = shr ulong 1, ubyte %shamt
+ %tr3.u = shl ulong 1, ubyte 5
+ %tr4.u = shl ulong 1, ubyte %shamt
ret int 0
}
diff --git a/test/Linker/2002-07-17-GlobalFail.ll b/test/Linker/2002-07-17-GlobalFail.ll
index 285b6ab..d950e40 100644
--- a/test/Linker/2002-07-17-GlobalFail.ll
+++ b/test/Linker/2002-07-17-GlobalFail.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s > %t.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
; RUN: echo | llvm-as > %t.tmp.bc
; RUN: llvm-link %t.tmp.bc %t.bc
diff --git a/test/Linker/2002-07-17-LinkTest2.ll b/test/Linker/2002-07-17-LinkTest2.ll
index 413a31a..67bf686 100644
--- a/test/Linker/2002-07-17-LinkTest2.ll
+++ b/test/Linker/2002-07-17-LinkTest2.ll
@@ -1,7 +1,7 @@
; This fails linking when it is linked with an empty file as the first object file
; RUN: llvm-as > %t1.bc < /dev/null
-; RUN: llvm-as < %s > %t2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t2.bc
; RUN: llvm-link %t[12].bc
%work = global int (int, int)* %zip
diff --git a/test/Linker/2002-08-20-ConstantExpr.ll b/test/Linker/2002-08-20-ConstantExpr.ll
index 8b00cb9..03b178e 100644
--- a/test/Linker/2002-08-20-ConstantExpr.ll
+++ b/test/Linker/2002-08-20-ConstantExpr.ll
@@ -1,7 +1,7 @@
; This fails linking when it is linked with an empty file as the first object file
; RUN: llvm-as > %t.LinkTest.bc < /dev/null
-; RUN: llvm-as < %s > %t.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
; RUN: llvm-link %t.LinkTest.bc %t.bc
%work = global int 4
diff --git a/test/Linker/2003-04-26-NullPtrLinkProblem.ll b/test/Linker/2003-04-26-NullPtrLinkProblem.ll
index a076045..3caf763 100644
--- a/test/Linker/2003-04-26-NullPtrLinkProblem.ll
+++ b/test/Linker/2003-04-26-NullPtrLinkProblem.ll
@@ -1,7 +1,7 @@
; This one fails because the LLVM runtime is allowing two null pointers of
; the same type to be created!
-; RUN: echo "%T = type int" | llvm-as > %t.2.bc
+; RUN: echo "%T = type int" | llvm-upgrade | llvm-as > %t.2.bc
; RUN: llvm-upgrade < %s | llvm-as -f > %t.1.bc
; RUN: llvm-link %t.[12].bc
diff --git a/test/Linker/2003-05-15-TypeProblem.ll b/test/Linker/2003-05-15-TypeProblem.ll
index 163cdfd..ee1caf7 100644
--- a/test/Linker/2003-05-15-TypeProblem.ll
+++ b/test/Linker/2003-05-15-TypeProblem.ll
@@ -1,8 +1,8 @@
; This one fails because the LLVM runtime is allowing two null pointers of
; the same type to be created!
-; RUN: echo "%S = type { %T*} %T = type opaque" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%S = type { %T*} %T = type opaque" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc
%S = type { %T* }
diff --git a/test/Linker/2003-06-02-TypeResolveProblem.ll b/test/Linker/2003-06-02-TypeResolveProblem.ll
index ceb046e..05d7adf 100644
--- a/test/Linker/2003-06-02-TypeResolveProblem.ll
+++ b/test/Linker/2003-06-02-TypeResolveProblem.ll
@@ -1,5 +1,5 @@
-; RUN: echo "%T = type opaque" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%T = type opaque" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc
%T = type opaque
diff --git a/test/Linker/2003-06-02-TypeResolveProblem2.ll b/test/Linker/2003-06-02-TypeResolveProblem2.ll
index aa1bc17..c0228c4 100644
--- a/test/Linker/2003-06-02-TypeResolveProblem2.ll
+++ b/test/Linker/2003-06-02-TypeResolveProblem2.ll
@@ -1,5 +1,5 @@
-; RUN: echo "%T = type int" | llvm-as > %t.1.bc
-; RUN: llvm-as < %s > %t.2.bc
+; RUN: echo "%T = type int" | llvm-upgrade | llvm-as > %t.1.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.2.bc
; RUN: llvm-link %t.[12].bc
%T = type opaque
diff --git a/test/Linker/2003-08-20-OpaqueTypeResolve.ll b/test/Linker/2003-08-20-OpaqueTypeResolve.ll
index 5b45cdf..6b378d5 100644
--- a/test/Linker/2003-08-20-OpaqueTypeResolve.ll
+++ b/test/Linker/2003-08-20-OpaqueTypeResolve.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type { int, int* }" | llvm-as > %t.out2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
+; RUN: echo "%S = type { int, int* }" | llvm-upgrade | llvm-as > %t.out2.bc
; RUN: llvm-link %t.out[12].bc
%T = type opaque
diff --git a/test/Linker/2003-08-23-GlobalVarLinking.ll b/test/Linker/2003-08-23-GlobalVarLinking.ll
index 51ad194..e249641 100644
--- a/test/Linker/2003-08-23-GlobalVarLinking.ll
+++ b/test/Linker/2003-08-23-GlobalVarLinking.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = external global { int, opaque* } declare void %F(opaque*)" | llvm-as > %t.out2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
+; RUN: echo "%S = external global { int, opaque* } declare void %F(opaque*)" | llvm-upgrade | llvm-as > %t.out2.bc
; RUN: llvm-link %t.out[12].bc | llvm-dis | not grep opaque
; After linking this testcase, there should be no opaque types left. The two
diff --git a/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll b/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
index e052d56..1a95b87 100644
--- a/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
+++ b/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
@@ -1,8 +1,8 @@
; It's a bad idea to go recursively traipsing through types without a safety
; net.
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type { %S*, int* }" | llvm-as > %t.out2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
+; RUN: echo "%S = type { %S*, int* }" | llvm-upgrade | llvm-as > %t.out2.bc
; RUN: llvm-link %t.out[12].bc
%S = type { %S*, opaque* }
diff --git a/test/Linker/2003-10-21-ConflictingTypesTolerance.ll b/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
index afc8f46..db098d6 100644
--- a/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
+++ b/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type [8 x int] external global %S " | llvm-as > %t.out2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
+; RUN: echo "%S = type [8 x int] external global %S " | llvm-upgrade | llvm-as > %t.out2.bc
; RUN: llvm-link %t.out[12].bc | llvm-dis | grep %S | grep '{'
%S = type { int }
diff --git a/test/Linker/2003-10-27-LinkOncePromote.ll b/test/Linker/2003-10-27-LinkOncePromote.ll
index e726222..617e5c6 100644
--- a/test/Linker/2003-10-27-LinkOncePromote.ll
+++ b/test/Linker/2003-10-27-LinkOncePromote.ll
@@ -1,8 +1,8 @@
; The linker should merge link-once globals into strong external globals,
; just like it does for weak symbols!
-; RUN: echo "%X = global int 7" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%X = global int 7" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc
%X = linkonce global int 7
diff --git a/test/Linker/2004-02-17-WeakStrongLinkage.ll b/test/Linker/2004-02-17-WeakStrongLinkage.ll
index 352c16b..b2579d4 100644
--- a/test/Linker/2004-02-17-WeakStrongLinkage.ll
+++ b/test/Linker/2004-02-17-WeakStrongLinkage.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out2.bc
-; RUN: echo "%me = global int* null" | llvm-as > %t.out1.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out2.bc
+; RUN: echo "%me = global int* null" | llvm-upgrade | llvm-as > %t.out1.bc
; RUN: llvm-link %t.out[12].bc -o /dev/null -f
%me = weak global int * null
diff --git a/test/Linker/2005-02-12-ConstantGlobals-2.ll b/test/Linker/2005-02-12-ConstantGlobals-2.ll
index 6de7747..bf93ca8 100644
--- a/test/Linker/2005-02-12-ConstantGlobals-2.ll
+++ b/test/Linker/2005-02-12-ConstantGlobals-2.ll
@@ -1,8 +1,8 @@
; Test that a prototype can be marked const, and the definition is allowed
; to be nonconst.
-; RUN: echo "%X = external constant int" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global int 7'
+; RUN: echo "%X = external constant int" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
+; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global i32 7'
%X = global int 7
diff --git a/test/Linker/2005-02-12-ConstantGlobals.ll b/test/Linker/2005-02-12-ConstantGlobals.ll
index f1e219e..5bb43a7 100644
--- a/test/Linker/2005-02-12-ConstantGlobals.ll
+++ b/test/Linker/2005-02-12-ConstantGlobals.ll
@@ -1,8 +1,8 @@
; Test that a prototype can be marked const, and the definition is allowed
; to be nonconst.
-; RUN: echo "%X = global int 7" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global int 7'
+; RUN: echo "%X = global int 7" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
+; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global i32 7'
%X = external constant int
diff --git a/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll b/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
index 5caea0a..c5b78cc 100644
--- a/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
+++ b/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
@@ -1,5 +1,5 @@
-; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-as > %t.out2.bc
-; RUN: llvm-as < %s > %t.out1.bc
+; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-upgrade | llvm-as > %t.out2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '%G ='
; When linked, the globals should be merged, and the result should still
diff --git a/test/Linker/2006-01-19-ConstantPacked.ll b/test/Linker/2006-01-19-ConstantPacked.ll
index 3f7bf46..df56105 100644
--- a/test/Linker/2006-01-19-ConstantPacked.ll
+++ b/test/Linker/2006-01-19-ConstantPacked.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %s.bc ; llvm-link -f -o %s.linked %s.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %s.bc ; llvm-link -f -o %s.linked %s.bc
target endian = big
target pointersize = 32
diff --git a/test/Linker/2006-06-15-GlobalVarAlignment.ll b/test/Linker/2006-06-15-GlobalVarAlignment.ll
index 65fde7c..22e9755 100644
--- a/test/Linker/2006-06-15-GlobalVarAlignment.ll
+++ b/test/Linker/2006-06-15-GlobalVarAlignment.ll
@@ -1,7 +1,7 @@
; The linker should choose the largest alignment when linking.
-; RUN: echo "%X = global int 7, align 8" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%X = global int 7, align 8" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'align 8'
%X = weak global int 7, align 4
diff --git a/test/Linker/AppendingLinkage2.ll b/test/Linker/AppendingLinkage2.ll
index 8aabc8b..a906f69 100644
--- a/test/Linker/AppendingLinkage2.ll
+++ b/test/Linker/AppendingLinkage2.ll
@@ -1,7 +1,7 @@
; Test that appending linkage works correctly when arrays are the same size.
-; RUN: echo "%X = appending global [1x int] [int 8]" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%X = appending global [1x int] [int 8]" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis | grep 7 | grep 8
%X = appending global [1 x int] [int 7]
diff --git a/test/Linker/ConstantGlobals1.ll b/test/Linker/ConstantGlobals1.ll
index ac2d5c0..1a05f7a 100644
--- a/test/Linker/ConstantGlobals1.ll
+++ b/test/Linker/ConstantGlobals1.ll
@@ -1,7 +1,7 @@
; Test that appending linkage works correctly when arrays are the same size.
-; RUN: echo "%X = constant [1x int] [int 8]" | llvm-as > %t.2.bc
-; RUN: llvm-upgrade %s | llvm-as > %t.1.bc
+; RUN: echo "%X = constant [1x int] [int 8]" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant
%X = uninitialized global [1 x int]
diff --git a/test/Linker/ConstantGlobals2.ll b/test/Linker/ConstantGlobals2.ll
index 3650c5f..ae97a0b 100644
--- a/test/Linker/ConstantGlobals2.ll
+++ b/test/Linker/ConstantGlobals2.ll
@@ -1,7 +1,7 @@
; Test that appending linkage works correctly when arrays are the same size.
-; RUN: echo "%X = external global [1x int]" | llvm-as > %t.2.bc
-; RUN: llvm-upgrade %s | llvm-as > %t.1.bc
+; RUN: echo "%X = external global [1x int]" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade %s -o - | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant
%X = constant [1 x int] [ int 12 ]
diff --git a/test/Linker/ConstantGlobals3.ll b/test/Linker/ConstantGlobals3.ll
index 5872706..9a84c3a 100644
--- a/test/Linker/ConstantGlobals3.ll
+++ b/test/Linker/ConstantGlobals3.ll
@@ -1,6 +1,6 @@
; Test that appending linkage works correctly when arrays are the same size.
-; RUN: echo "%X = external constant [1x int]" | llvm-as > %t.2.bc
+; RUN: echo "%X = external constant [1x int]" | llvm-upgrade | llvm-as > %t.2.bc
; RUN: llvm-upgrade %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant
diff --git a/test/Linker/LinkOnce.ll b/test/Linker/LinkOnce.ll
index 17e742e..95f65ae 100644
--- a/test/Linker/LinkOnce.ll
+++ b/test/Linker/LinkOnce.ll
@@ -1,8 +1,8 @@
; This fails because the linker renames the non-opaque type not the opaque
; one...
-; RUN: echo "%X = linkonce global int 8" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%X = linkonce global int 8" | llvm-upgrade | llvm-as > %t.2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc
; RUN: llvm-link %t.[12].bc | llvm-dis
%X = linkonce global int 7
diff --git a/test/Linker/weakextern.ll b/test/Linker/weakextern.ll
index d1f78fb..3bda535 100644
--- a/test/Linker/weakextern.ll
+++ b/test/Linker/weakextern.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-as < `dirname %s`/testlink1.ll > %t2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
+; RUN: llvm-upgrade < `dirname %s`/testlink1.ll | llvm-as > %t2.bc
; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc -f
-; RUN: llvm-dis < %t1.bc |grep "kallsyms_names = extern_weak" &&
-; RUN: llvm-dis < %t1.bc |grep "MyVar = external global int" &&
-; RUN: llvm-dis < %t1.bc |grep "Inte = global int"
+; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak" &&
+; RUN: llvm-dis < %t1.bc | grep "MyVar = external global i32" &&
+; RUN: llvm-dis < %t1.bc | grep "Inte = global i32"
%kallsyms_names = extern_weak global [0 x ubyte]
%MyVar = extern_weak global int
diff --git a/test/Transforms/ArgumentPromotion/control-flow2.ll b/test/Transforms/ArgumentPromotion/control-flow2.ll
index ba77776..d42c9c3 100644
--- a/test/Transforms/ArgumentPromotion/control-flow2.ll
+++ b/test/Transforms/ArgumentPromotion/control-flow2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep 'load int\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep 'load i32\* %A'
implementation
diff --git a/test/Transforms/ConstProp/2006-11-30-vector-cast.ll b/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
index 5f52d6e..4a9d8a5 100644
--- a/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
+++ b/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'uint -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'i32 -1' &&
; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep zeroinitializer
< 4 x uint> %test() {
diff --git a/test/Transforms/ConstProp/2006-12-01-bool-casts.ll b/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
index a2d6feb..fbc3111 100644
--- a/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
+++ b/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret int -1' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret uint 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret i32 -1' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret i32 1'
int %test1() {
%A = sext bool true to int
diff --git a/test/Transforms/ConstProp/bitcast.ll b/test/Transforms/ConstProp/bitcast.ll
index 9987ca7..39cd534 100644
--- a/test/Transforms/ConstProp/bitcast.ll
+++ b/test/Transforms/ConstProp/bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis &&
-; RUN: llvm-as < %s | llvm-dis | grep 0x36A0000000000000
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis &&
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 0x36A0000000000000
%A = global float bitcast (int 1 to float)
diff --git a/test/Transforms/ConstProp/float-to-ptr-cast.ll b/test/Transforms/ConstProp/float-to-ptr-cast.ll
index dc6c391..df641cd 100644
--- a/test/Transforms/ConstProp/float-to-ptr-cast.ll
+++ b/test/Transforms/ConstProp/float-to-ptr-cast.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep -F 'ret int* null' | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep -F 'ret i32* null' | wc -l | grep 2
int* %test1() {
%X = cast float 0.0 to int*
ret int* %X
diff --git a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
index b78be88..100c795 100644
--- a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
+++ b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store int 1234567'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store i32 1234567'
; Do not delete stores that are only partially killed.
diff --git a/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll b/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
index 1d1be15..5242934 100644
--- a/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
+++ b/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
@@ -755,22 +755,22 @@
%tmp.i = load %struct.TType** %DP_TTable ; <%struct.TType*> [#uses=1]
%tmp.i7.b = load bool* %TTSize.b ; <bool> [#uses=1]
%tmp1.i = select bool %tmp.i7.b, uint 60000000, uint 0 ; <uint> [#uses=1]
- %tmp.i = getelementptr %struct.TType* %tmp.i, int 0, uint 0 ; <sbyte*> [#uses=1]
- call void %llvm.memset.i32( sbyte* %tmp.i, ubyte 0, uint %tmp1.i, uint 4 )
+ %tmp.i.sb = getelementptr %struct.TType* %tmp.i, int 0, uint 0 ; <sbyte*> [#uses=1]
+ call void %llvm.memset.i32( sbyte* %tmp.i.sb, ubyte 0, uint %tmp1.i, uint 4 )
%tmp2.i = load %struct.TType** %AS_TTable ; <%struct.TType*> [#uses=1]
%tmp3.i8.b = load bool* %TTSize.b ; <bool> [#uses=1]
%tmp4.i = select bool %tmp3.i8.b, uint 60000000, uint 0 ; <uint> [#uses=1]
%tmp2.i = getelementptr %struct.TType* %tmp2.i, int 0, uint 0 ; <sbyte*> [#uses=1]
call void %llvm.memset.i32( sbyte* %tmp2.i, ubyte 0, uint %tmp4.i, uint 4 )
- %tmp.i = load %struct.QTType** %QS_TTable ; <%struct.QTType*> [#uses=1]
+ %tmp.i.QTT = load %struct.QTType** %QS_TTable ; <%struct.QTType*> [#uses=1]
%tmp5.i9.b = load bool* %TTSize.b ; <bool> [#uses=1]
%tmp6.i10 = select bool %tmp5.i9.b, uint 48000000, uint 0 ; <uint> [#uses=1]
- %tmp7.i = getelementptr %struct.QTType* %tmp.i, int 0, uint 0 ; <sbyte*> [#uses=1]
+ %tmp7.i = getelementptr %struct.QTType* %tmp.i.QTT, int 0, uint 0 ; <sbyte*> [#uses=1]
call void %llvm.memset.i32( sbyte* %tmp7.i, ubyte 0, uint %tmp6.i10, uint 4 )
- %tmp.i = load %struct.ECacheType** %ECache ; <%struct.ECacheType*> [#uses=1]
+ %tmp.i.ECache = load %struct.ECacheType** %ECache ; <%struct.ECacheType*> [#uses=1]
%tmp.i14.b = load bool* %ECacheSize.b ; <bool> [#uses=1]
%tmp1.i16 = select bool %tmp.i14.b, uint 12000000, uint 0 ; <uint> [#uses=1]
- %tmp.i17 = cast %struct.ECacheType* %tmp.i to sbyte* ; <sbyte*> [#uses=1]
+ %tmp.i17 = cast %struct.ECacheType* %tmp.i.ECache to sbyte* ; <sbyte*> [#uses=1]
call void %llvm.memset.i32( sbyte* %tmp.i17, ubyte 0, uint %tmp1.i16, uint 4 )
call void %llvm.memset.i32( sbyte* cast ([300 x int]* %rootlosers to sbyte*), ubyte 0, uint 1200, uint 4 )
%tmp234.b = load bool* %is_pondering.b ; <bool> [#uses=1]
@@ -800,12 +800,12 @@
%tmp1.b.i = load bool* %PBSize.b ; <bool> [#uses=1]
%tmp1.i1 = select bool %tmp1.b.i, uint 200000, uint 0 ; <uint> [#uses=1]
%tmp.i2 = call sbyte* %calloc( uint %tmp1.i1, uint 44 ) ; <sbyte*> [#uses=1]
- %tmp.i = cast sbyte* %tmp.i2 to ubyte* ; <ubyte*> [#uses=1]
- store ubyte* %tmp.i, ubyte** %membuff
+ %tmp.i.ub = cast sbyte* %tmp.i2 to ubyte* ; <ubyte*> [#uses=1]
+ store ubyte* %tmp.i.ub, ubyte** %membuff
%tmp2.i3 = call sbyte* %calloc( uint 1, uint 44 ) ; <sbyte*> [#uses=3]
%tmp2.i = cast sbyte* %tmp2.i3 to %struct.node_t* ; <%struct.node_t*> [#uses=6]
- %tmp.i = getelementptr [512 x %struct.move_s]* null, int 0, int 0 ; <%struct.move_s*> [#uses=3]
- call fastcc void %gen( %struct.move_s* %tmp.i )
+ %tmp.i.move_s = getelementptr [512 x %struct.move_s]* null, int 0, int 0 ; <%struct.move_s*> [#uses=3]
+ call fastcc void %gen( %struct.move_s* %tmp.i.move_s )
%tmp3.i4 = load int* %numb_moves ; <int> [#uses=4]
%tmp3.i5 = cast int %tmp3.i4 to uint ; <uint> [#uses=0]
store bool false, bool* %alllosers.b
@@ -850,8 +850,8 @@
cond_true43.i: ; preds = %cond_false12.i.i, %cond_true4.i.i
%tmp21.0.ph.i = phi int [ %tmp217.i, %cond_true4.i.i ], [ %tmp2120.i, %cond_false12.i.i ] ; <int> [#uses=1]
%i.0.0.i = cast uint 0 to int ; <int> [#uses=2]
- call fastcc void %make( %struct.move_s* %tmp.i, int %i.0.0.i )
- %tmp27.i = call fastcc uint %check_legal( %struct.move_s* %tmp.i, int %i.0.0.i, int %tmp21.0.ph.i ) ; <uint> [#uses=1]
+ call fastcc void %make( %struct.move_s* %tmp.i.move_s, int %i.0.0.i )
+ %tmp27.i = call fastcc uint %check_legal( %struct.move_s* %tmp.i.move_s, int %i.0.0.i, int %tmp21.0.ph.i ) ; <uint> [#uses=1]
%tmp.i6 = seteq uint %tmp27.i, 0 ; <bool> [#uses=0]
ret void
diff --git a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
index 7bda152..8fcd8e4 100644
--- a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
+++ b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 152'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret i32 152'
int %main() {
entry:
diff --git a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
index 30f0c95..deb9abd 100644
--- a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
+++ b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 27'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret i32 27'
; Make sure to compute the right exit value based on negative strides.
; PR726
diff --git a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
index a8883ff..d464cfa 100644
--- a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
+++ b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | grep 'store int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | grep 'store i32 0'
; Test that -indvars can reduce variable stride IVs. If it can reduce variable
; stride iv's, it will make %iv. and %m.0.0 isomorphic to each other without
; cycles, allowing the tmp.21 subtraction to be eliminated.
@@ -19,7 +19,7 @@
br label %no_exit
no_exit: ; preds = %no_exit, %no_exit.preheader
- %iv. = phi uint [ 0, %no_exit.preheader ], [ %iv..inc, %no_exit ] ; <uint> [#uses=1]
+ %iv.ui = phi uint [ 0, %no_exit.preheader ], [ %iv..inc.ui, %no_exit ] ; <uint> [#uses=1]
%iv. = phi int [ %tmp.5, %no_exit.preheader ], [ %iv..inc, %no_exit ] ; <int> [#uses=2]
%m.0.0 = phi int [ %tmp.5, %no_exit.preheader ], [ %tmp.24, %no_exit ] ; <int> [#uses=2]
store int 2, int* %tmp.16
@@ -27,8 +27,8 @@
store int %tmp.21, int* %data
%tmp.24 = add int %m.0.0, %tmp.9 ; <int> [#uses=1]
%iv..inc = add int %tmp.9, %iv. ; <int> [#uses=1]
- %iv..inc = add uint %iv., 1 ; <uint> [#uses=2]
- %iv..inc1 = cast uint %iv..inc to int ; <int> [#uses=1]
+ %iv..inc.ui = add uint %iv.ui, 1 ; <uint> [#uses=2]
+ %iv..inc1 = cast uint %iv..inc.ui to int ; <int> [#uses=1]
%tmp.12 = setlt int %iv..inc1, %tmp.2 ; <bool> [#uses=1]
br bool %tmp.12, label %no_exit, label %return.loopexit
diff --git a/test/Transforms/Inline/casts.ll b/test/Transforms/Inline/casts.ll
index c201a45..e7b1744 100644
--- a/test/Transforms/Inline/casts.ll
+++ b/test/Transforms/Inline/casts.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep 'ret int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep 'ret i32 1'
; ModuleID = 'short.opt.bc'
implementation ; Functions:
diff --git a/test/Transforms/InstCombine/2006-05-06-Infloop.ll b/test/Transforms/InstCombine/2006-05-06-Infloop.ll
index ef05e6b..3b708cd 100644
--- a/test/Transforms/InstCombine/2006-05-06-Infloop.ll
+++ b/test/Transforms/InstCombine/2006-05-06-Infloop.ll
@@ -10,7 +10,7 @@
int %mem_mono_copy_mono(%struct.gx_device* %dev, ubyte* %base, int %sourcex, int %raster, int %x, int %y, int %w, int %h, uint %zero, uint %one) {
entry:
- %raster = cast int %raster to uint ; <uint> [#uses=3]
+ %raster.ui = cast int %raster to uint ; <uint> [#uses=3]
%tmp = seteq uint %one, %zero ; <bool> [#uses=1]
br bool %tmp, label %cond_true, label %cond_next
@@ -146,7 +146,6 @@
%optr.3.2 = phi ubyte* [ %tmp232, %cond_true249 ], [ %dest.1.0, %cond_true249.preheader ] ; <ubyte*> [#uses=1]
%bptr.3.2 = phi ubyte* [ %tmp226, %cond_true249 ], [ %line.1.0, %cond_true249.preheader ] ; <ubyte*> [#uses=1]
%tmp. = add int %tmp109, %w ; <int> [#uses=1]
- %indvar = cast uint %indvar to int ; <int> [#uses=1]
%tmp.58 = mul int %indvar, -8 ; <int> [#uses=1]
%tmp.57 = add int %tmp., -16 ; <int> [#uses=1]
%tmp246.2 = add int %tmp.58, %tmp.57 ; <int> [#uses=1]
@@ -236,10 +235,8 @@
%dest.1.0.us = phi ubyte* [ %tmp286.us, %cond_next280.us ], [ %tmp100, %cond_true295.preheader.split.us ] ; <ubyte*> [#uses=3]
%dest_line.1.0.us = phi ubyte** [ %tmp282.us, %cond_next280.us ], [ %tmp96, %cond_true295.preheader.split.us ] ; <ubyte**> [#uses=1]
%tmp.89 = sub uint 0, %indvar86 ; <uint> [#uses=1]
- %tmp.89 = cast uint %tmp.89 to int ; <int> [#uses=1]
%tmp292.0.us = add int %tmp.89, %tmp29222 ; <int> [#uses=1]
- %tmp.91 = mul uint %indvar86, %raster ; <uint> [#uses=1]
- %tmp.91 = cast uint %tmp.91 to int ; <int> [#uses=1]
+ %tmp.91 = mul uint %indvar86, %raster.ui ; <uint> [#uses=1]
%tmp104.sum101 = add int %tmp102, %tmp.91 ; <int> [#uses=1]
%line.1.0.us = getelementptr ubyte* %base, int %tmp104.sum101 ; <ubyte*> [#uses=2]
%tmp.us = load ubyte* %line.1.0.us ; <ubyte> [#uses=1]
@@ -313,10 +310,8 @@
%dest.1.0 = phi ubyte* [ %tmp286, %cond_next280 ], [ %tmp100, %cond_true295.preheader.split ] ; <ubyte*> [#uses=4]
%dest_line.1.0 = phi ubyte** [ %tmp282, %cond_next280 ], [ %tmp96, %cond_true295.preheader.split ] ; <ubyte**> [#uses=1]
%tmp.63 = sub uint 0, %indvar60 ; <uint> [#uses=1]
- %tmp.63 = cast uint %tmp.63 to int ; <int> [#uses=1]
%tmp292.0 = add int %tmp.63, %tmp29222 ; <int> [#uses=1]
- %tmp.65 = mul uint %indvar60, %raster ; <uint> [#uses=1]
- %tmp.65 = cast uint %tmp.65 to int ; <int> [#uses=1]
+ %tmp.65 = mul uint %indvar60, %raster.ui ; <uint> [#uses=1]
%tmp104.sum97 = add int %tmp102, %tmp.65 ; <int> [#uses=1]
%line.1.0 = getelementptr ubyte* %base, int %tmp104.sum97 ; <ubyte*> [#uses=3]
%tmp = load ubyte* %line.1.0 ; <ubyte> [#uses=1]
@@ -386,7 +381,6 @@
%optr309.3.0 = phi ubyte* [ %optr309.3, %cond_true398 ], [ %optr309.353, %cond_true398.preheader ] ; <ubyte*> [#uses=2]
%optr309.3.in.0 = add uint %indvar66, %optr309.3.in51 ; <uint> [#uses=1]
%tmp.70 = add int %tmp109, %w ; <int> [#uses=1]
- %indvar66 = cast uint %indvar66 to int ; <int> [#uses=1]
%tmp.72 = mul int %indvar66, -8 ; <int> [#uses=1]
%tmp.71 = add int %tmp.70, -8 ; <int> [#uses=1]
%count308.3.0 = add int %tmp.72, %tmp.71 ; <int> [#uses=1]
@@ -440,7 +434,6 @@
%tmp416 = load ubyte* %tmp410 ; <ubyte> [#uses=1]
%tmp416 = cast ubyte %tmp416 to uint ; <uint> [#uses=1]
%tmp418 = shr uint %tmp416, ubyte %tmp319 ; <uint> [#uses=1]
- %tmp418 = cast uint %tmp418 to int ; <int> [#uses=1]
%tmp420 = add int %tmp418, %tmp408 ; <int> [#uses=1]
br label %cond_next422
@@ -479,7 +472,6 @@
%tmp354 = and uint %iftmp.37.0, %mask.1.1 ; <uint> [#uses=1]
%tmp361 = sub int %w, %tmp110 ; <int> [#uses=2]
%tmp39755 = setgt int %tmp361, 7 ; <bool> [#uses=1]
- %iftmp.35.0 = cast uint %iftmp.35.0 to int ; <int> [#uses=1]
%tmp426 = cast uint %rmask.0.1 to ubyte ; <ubyte> [#uses=1]
%tmp426not = xor ubyte %tmp426, 255 ; <ubyte> [#uses=1]
%tmp428 = or ubyte %tmp347, %tmp426not ; <ubyte> [#uses=1]
@@ -492,10 +484,8 @@
%dest.3.0 = phi ubyte* [ %tmp448, %cond_next442 ], [ %tmp100, %cond_true457.preheader ] ; <ubyte*> [#uses=3]
%dest_line.3.0 = phi ubyte** [ %tmp444, %cond_next442 ], [ %tmp96, %cond_true457.preheader ] ; <ubyte**> [#uses=1]
%tmp.77 = sub uint 0, %indvar74 ; <uint> [#uses=1]
- %tmp.77 = cast uint %tmp.77 to int ; <int> [#uses=1]
%tmp454.0 = add int %tmp.77, %tmp45438 ; <int> [#uses=1]
- %tmp.79 = mul uint %indvar74, %raster ; <uint> [#uses=1]
- %tmp.79 = cast uint %tmp.79 to int ; <int> [#uses=1]
+ %tmp.79 = mul uint %indvar74, %raster.ui ; <uint> [#uses=1]
%tmp104.sum = add int %tmp102, %tmp.79 ; <int> [#uses=1]
%line.3.0 = getelementptr ubyte* %base, int %tmp104.sum ; <ubyte*> [#uses=3]
%tmp318 = load ubyte* %line.3.0 ; <ubyte> [#uses=2]
diff --git a/test/Transforms/InstCombine/2006-06-28-infloop.ll b/test/Transforms/InstCombine/2006-06-28-infloop.ll
index beb4489..bd1dbd0 100644
--- a/test/Transforms/InstCombine/2006-06-28-infloop.ll
+++ b/test/Transforms/InstCombine/2006-06-28-infloop.ll
@@ -9,8 +9,8 @@
entry:
%tmp = getelementptr { long, long, long, long }* null, int 0, uint 3
%tmp = load long* %tmp ; <long> [#uses=1]
- %tmp8 = load ulong* null ; <ulong> [#uses=1]
- %tmp8 = cast ulong %tmp8 to long ; <long> [#uses=1]
+ %tmp8.ui = load ulong* null ; <ulong> [#uses=1]
+ %tmp8 = cast ulong %tmp8.ui to long ; <long> [#uses=1]
%tmp9 = and long %tmp8, %tmp ; <long> [#uses=1]
%sext = cast long %tmp9 to int ; <int> [#uses=1]
%tmp27.i = cast int %sext to long ; <long> [#uses=1]
diff --git a/test/Transforms/InstCombine/2006-09-15-CastToBool.ll b/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
index c38b325..051d91f 100644
--- a/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
+++ b/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
@@ -2,10 +2,10 @@
; PR913
int %test(int* %tmp1) {
- %tmp = load int* %tmp1 ; <int> [#uses=1]
- %tmp = cast int %tmp to uint ; <uint> [#uses=1]
- %tmp2 = shr uint %tmp, ubyte 5 ; <uint> [#uses=1]
- %tmp2 = cast uint %tmp2 to int ; <int> [#uses=1]
+ %tmp.i = load int* %tmp1 ; <int> [#uses=1]
+ %tmp = cast int %tmp.i to uint ; <uint> [#uses=1]
+ %tmp2.ui = shr uint %tmp, ubyte 5 ; <uint> [#uses=1]
+ %tmp2 = cast uint %tmp2.ui to int ; <int> [#uses=1]
%tmp3 = and int %tmp2, 1 ; <int> [#uses=1]
%tmp3 = cast int %tmp3 to bool ; <bool> [#uses=1]
%tmp34 = cast bool %tmp3 to int ; <int> [#uses=1]
diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
index d3bfdfa..89ec03d 100644
--- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
+++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
@@ -1,5 +1,5 @@
; The optimizer should be able to remove cast operation here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*i32'
bool %eq_signed_to_small_unsigned(sbyte %SB) {
%Y = cast sbyte %SB to uint ; <uint> [#uses=1]
diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
index cab0b94..edd9054 100644
--- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
+++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
@@ -1,6 +1,6 @@
; This test case is reduced from llvmAsmParser.cpp
; The optimizer should not remove the cast here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*i32'
bool %test(short %X) {
%A = cast short %X to uint
diff --git a/test/Transforms/InstCombine/deadcode.ll b/test/Transforms/InstCombine/deadcode.ll
index fbd3c0c..836d614 100644
--- a/test/Transforms/InstCombine/deadcode.ll
+++ b/test/Transforms/InstCombine/deadcode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret int %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i32 %A'
int %test(int %A) {
%X = or bool false, false
diff --git a/test/Transforms/InstCombine/fpcast.ll b/test/Transforms/InstCombine/fpcast.ll
index dedcd13..1da8e42 100644
--- a/test/Transforms/InstCombine/fpcast.ll
+++ b/test/Transforms/InstCombine/fpcast.ll
@@ -1,14 +1,14 @@
; Test some floating point casting cases
; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast
; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
-; RUN: grep 'ret [us]byte \(-1\)\|\(255\)'
+; RUN: grep 'ret i8 \(-1\)\|\(255\)'
-sbyte %test() {
+sbyte %test1() {
%x = fptoui float 255.0 to sbyte
ret sbyte %x
}
-ubyte %test() {
+ubyte %test2() {
%x = fptosi float -1.0 to ubyte
ret ubyte %x
}
diff --git a/test/Transforms/InstCombine/shift-sra.ll b/test/Transforms/InstCombine/shift-sra.ll
index 43a4ebd..a887d61 100644
--- a/test/Transforms/InstCombine/shift-sra.ll
+++ b/test/Transforms/InstCombine/shift-sra.ll
@@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'lshr int' | wc -l | grep 2 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'lshr i32' | wc -l | grep 2 &&
; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ashr
int %test1(int %X, ubyte %A) {
diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll
index 8ca2e78..ebc1a6d 100644
--- a/test/Transforms/InstCombine/sub.ll
+++ b/test/Transforms/InstCombine/sub.ll
@@ -1,7 +1,7 @@
; This test makes sure that these instructions are properly eliminated.
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub int %Cok, %Bok' | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub i32 %Cok, %Bok' | not grep sub
implementation
diff --git a/test/Transforms/InstCombine/zeroext-and-reduce.ll b/test/Transforms/InstCombine/zeroext-and-reduce.ll
index e32f4b9..2d30f91 100644
--- a/test/Transforms/InstCombine/zeroext-and-reduce.ll
+++ b/test/Transforms/InstCombine/zeroext-and-reduce.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and int %Y, 8'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and i32 %Y, 8'
int %test1(ubyte %X) {
%Y = cast ubyte %X to int
diff --git a/test/Transforms/LCSSA/basictest.ll b/test/Transforms/LCSSA/basictest.ll
index 05a0ad1..7d12aee 100644
--- a/test/Transforms/LCSSA/basictest.ll
+++ b/test/Transforms/LCSSA/basictest.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi int" &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add int 3, %X3.lcssa"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi i32" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add i32 3, %X3.lcssa"
void %lcssa(bool %S2) {
entry:
@@ -23,4 +23,4 @@
loop.exit:
%X4 = add int 3, %X3
ret void
-}
\ No newline at end of file
+}
diff --git a/test/Transforms/LICM/basictest.ll b/test/Transforms/LICM/basictest.ll
index 6458f03..f3311ea 100644
--- a/test/Transforms/LICM/basictest.ll
+++ b/test/Transforms/LICM/basictest.ll
@@ -1,12 +1,12 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis
-void "testfunc"(int %i) {
+void "testfunc"(int %i.s) {
br label %Loop
Loop:
%j = phi uint [0, %0], [%Next, %Loop]
- %i = cast int %i to uint
+ %i = cast int %i.s to uint
%i2 = mul uint %i, 17
%Next = add uint %j, %i2
%cond = seteq uint %Next, 0
diff --git a/test/Transforms/LICM/no-preheader-test.ll b/test/Transforms/LICM/no-preheader-test.ll
index 954857a..7f4b51a 100644
--- a/test/Transforms/LICM/no-preheader-test.ll
+++ b/test/Transforms/LICM/no-preheader-test.ll
@@ -1,7 +1,7 @@
; Test that LICM works when there is not a loop-preheader
; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis
-void "testfunc"(int %i, bool %ifcond) {
+void "testfunc"(int %i.s, bool %ifcond) {
br bool %ifcond, label %Then, label %Else
Then:
br label %Loop
@@ -10,7 +10,7 @@
Loop:
%j = phi uint [0, %Then], [12, %Else], [%Next, %Loop]
- %i = cast int %i to uint
+ %i = cast int %i.s to uint
%i2 = mul uint %i, 17
%Next = add uint %j, %i2
%cond = seteq uint %Next, 0
diff --git a/test/Transforms/LoopSimplify/2006-08-11-LoopSimplifyLongTime.ll.bc b/test/Transforms/LoopSimplify/2006-08-11-LoopSimplifyLongTime.ll.bc
index 75c92cf..7d86f0d 100644
--- a/test/Transforms/LoopSimplify/2006-08-11-LoopSimplifyLongTime.ll.bc
+++ b/test/Transforms/LoopSimplify/2006-08-11-LoopSimplifyLongTime.ll.bc
Binary files differ
diff --git a/test/Transforms/LoopStrengthReduce/nested-reduce.ll b/test/Transforms/LoopStrengthReduce/nested-reduce.ll
index 3caa366..1959832 100644
--- a/test/Transforms/LoopStrengthReduce/nested-reduce.ll
+++ b/test/Transforms/LoopStrengthReduce/nested-reduce.ll
@@ -25,8 +25,8 @@
br label %no_exit.1
no_exit.1: ; preds = %cond_continue, %no_exit.1.outer
- %indvar = phi uint [ 0, %no_exit.1.outer ], [ %indvar.next, %cond_continue ] ; <uint> [#uses=2]
- %indvar = cast uint %indvar to int ; <int> [#uses=1]
+ %indvar.ui = phi uint [ 0, %no_exit.1.outer ], [ %indvar.next, %cond_continue ] ; <uint> [#uses=2]
+ %indvar = cast uint %indvar.ui to int ; <int> [#uses=1]
%j.1.2 = add int %indvar, %j.1.2.ph ; <int> [#uses=2]
%tmp.11 = add int %j.1.2, %tmp.9 ; <int> [#uses=1]
%tmp.12 = cast int %tmp.11 to ubyte ; <ubyte> [#uses=1]
@@ -43,7 +43,7 @@
cond_continue: ; preds = %no_exit.1
%tmp.519 = setlt int %inc.1, %C ; <bool> [#uses=1]
- %indvar.next = add uint %indvar, 1 ; <uint> [#uses=1]
+ %indvar.next = add uint %indvar.ui, 1 ; <uint> [#uses=1]
br bool %tmp.519, label %no_exit.1, label %loopexit.1
loopexit.1: ; preds = %cond_continue, %cond_true, %loopentry.1
diff --git a/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll b/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
index ba897c4..d8316a5 100644
--- a/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
+++ b/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
@@ -1,17 +1,17 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1
; LSR should not make two copies of the Q*L expression in the preheader!
-sbyte %test(sbyte* %A, sbyte* %B, int %L, int %Q, int %N) {
+sbyte %test(sbyte* %A, sbyte* %B, int %L, int %Q, int %N.s) {
entry:
%tmp.6 = mul int %Q, %L ; <int> [#uses=1]
- %N = cast int %N to uint ; <uint> [#uses=1]
+ %N = cast int %N.s to uint ; <uint> [#uses=1]
br label %no_exit
no_exit: ; preds = %no_exit, %no_exit.preheader
- %indvar = phi uint [ 0, %entry], [ %indvar.next, %no_exit ] ; <uint> [#uses=2]
+ %indvar.ui = phi uint [ 0, %entry], [ %indvar.next, %no_exit ] ; <uint> [#uses=2]
%Sum.0.0 = phi sbyte [ 0, %entry], [ %tmp.21, %no_exit ] ; <sbyte> [#uses=1]
- %indvar = cast uint %indvar to int ; <int> [#uses=1]
- %N_addr.0.0 = sub int %N, %indvar ; <int> [#uses=1]
+ %indvar = cast uint %indvar.ui to int ; <int> [#uses=1]
+ %N_addr.0.0 = sub int %N.s, %indvar ; <int> [#uses=1]
%tmp.8 = add int %N_addr.0.0, %tmp.6 ; <int> [#uses=2]
%tmp.9 = getelementptr sbyte* %A, int %tmp.8 ; <sbyte*> [#uses=1]
%tmp.10 = load sbyte* %tmp.9 ; <sbyte> [#uses=1]
@@ -19,7 +19,7 @@
%tmp.18 = load sbyte* %tmp.17 ; <sbyte> [#uses=1]
%tmp.19 = sub sbyte %tmp.10, %tmp.18 ; <sbyte> [#uses=1]
%tmp.21 = add sbyte %tmp.19, %Sum.0.0 ; <sbyte> [#uses=2]
- %indvar.next = add uint %indvar, 1 ; <uint> [#uses=2]
+ %indvar.next = add uint %indvar.ui, 1 ; <uint> [#uses=2]
%exitcond = seteq uint %indvar.next, %N ; <bool> [#uses=1]
br bool %exitcond, label %loopexit, label %no_exit
diff --git a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
index 4a6e9b2..028400c 100644
--- a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
+++ b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep 'add uint %iv.*inc, 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep 'add i32 %iv.*inc, 1'
;
; Make sure that the use of the IV outside of the loop (the store) uses the
; post incremented value of the IV, not the preincremented value. This
@@ -13,13 +13,13 @@
br label %no_exit.2
no_exit.2: ; preds = %no_exit.2, %then.0
- %indvar630 = phi uint [ 0, %then.0 ], [ %indvar.next631, %no_exit.2 ] ; <uint> [#uses=3]
- %indvar630 = cast uint %indvar630 to int ; <int> [#uses=1]
- %tmp.38 = getelementptr [700 x int]* %nbeaux_.0__558, int 0, uint %indvar630 ; <int*> [#uses=1]
+ %indvar630.ui = phi uint [ 0, %then.0 ], [ %indvar.next631, %no_exit.2 ] ; <uint> [#uses=3]
+ %indvar630 = cast uint %indvar630.ui to int ; <int> [#uses=1]
+ %tmp.38 = getelementptr [700 x int]* %nbeaux_.0__558, int 0, uint %indvar630.ui ; <int*> [#uses=1]
store int 0, int* %tmp.38
%inc.2 = add int %indvar630, 2 ; <int> [#uses=2]
%tmp.34 = call bool %pred(int %indvar630)
- %indvar.next631 = add uint %indvar630, 1 ; <uint> [#uses=1]
+ %indvar.next631 = add uint %indvar630.ui, 1 ; <uint> [#uses=1]
br bool %tmp.34, label %no_exit.2, label %loopexit.2.loopexit
loopexit.2.loopexit: ; preds = %no_exit.2
diff --git a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
index 7b4f022..3e8f63a 100644
--- a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
+++ b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
@@ -17,10 +17,10 @@
implementation ; Functions:
-void %foo(int %k, int %i) {
+void %foo(int %k, int %i.s) {
entry:
- %i = cast int %i to uint ; <uint> [#uses=2]
- %k_addr.012 = shl int %i, ubyte 1 ; <int> [#uses=1]
+ %i = cast int %i.s to uint ; <uint> [#uses=2]
+ %k_addr.012 = shl int %i.s, ubyte 1 ; <int> [#uses=1]
%tmp14 = setgt int %k_addr.012, 8192 ; <bool> [#uses=1]
br bool %tmp14, label %return, label %bb.preheader
@@ -35,7 +35,7 @@
%k_addr.0.0 = cast uint %tmp.16 to int ; <int> [#uses=1]
%tmp = getelementptr [8193 x sbyte]* %flags2, int 0, uint %tmp.16 ; <sbyte*> [#uses=1]
store sbyte 0, sbyte* %tmp
- %k_addr.0 = add int %k_addr.0.0, %i ; <int> [#uses=1]
+ %k_addr.0 = add int %k_addr.0.0, %i.s ; <int> [#uses=1]
%tmp = setgt int %k_addr.0, 8192 ; <bool> [#uses=1]
%indvar.next = add uint %indvar, 1 ; <uint> [#uses=1]
br bool %tmp, label %return.loopexit, label %bb
diff --git a/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll b/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
index ac0b798..38df259 100644
--- a/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
+++ b/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll
@@ -1421,8 +1421,8 @@
no_exit.53: ; preds = %else.166, %else.168, %then.360, %no_exit.53.outer
%file.2.3.3.ph = phi int [ 0, %no_exit.53.outer ], [ %inc.551688, %then.360 ], [ %inc.551701, %else.168 ], [ %file.2.3.3.ph, %else.166 ] ; <int> [#uses=2]
%nempty.5.3.ph = phi int [ 0, %no_exit.53.outer ], [ %nempty.5.3, %then.360 ], [ %nempty.5.3, %else.168 ], [ %nempty.5.3.ph, %else.166 ] ; <int> [#uses=2]
- %indvar2053 = phi uint [ 0, %no_exit.53.outer ], [ 0, %then.360 ], [ 0, %else.168 ], [ %indvar.next2054, %else.166 ] ; <uint> [#uses=2]
- %indvar2053 = cast uint %indvar2053 to int ; <int> [#uses=2]
+ %indvar2053.ui = phi uint [ 0, %no_exit.53.outer ], [ 0, %then.360 ], [ 0, %else.168 ], [ %indvar.next2054, %else.166 ] ; <uint> [#uses=2]
+ %indvar2053 = cast uint %indvar2053.ui to int ; <int> [#uses=2]
%file.2.3.3 = add int %indvar2053, %file.2.3.3.ph ; <int> [#uses=4]
%nempty.5.3 = add int %indvar2053, %nempty.5.3.ph ; <int> [#uses=3]
%tmp.4749 = add int %file.2.3.3, %tmp.4747 ; <int> [#uses=1]
@@ -1472,7 +1472,7 @@
else.166: ; preds = %no_exit.53
%inc.55 = add int %file.2.3.3, 1 ; <int> [#uses=1]
%tmp.47421705 = setlt int %inc.55, 8 ; <bool> [#uses=1]
- %indvar.next2054 = add uint %indvar2053, 1 ; <uint> [#uses=1]
+ %indvar.next2054 = add uint %indvar2053.ui, 1 ; <uint> [#uses=1]
br bool %tmp.47421705, label %no_exit.53, label %loopexit.56
loopexit.56: ; preds = %else.166, %else.168, %then.360
diff --git a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
index 8f2fdbd..1023497 100644
--- a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
+++ b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
@@ -16,8 +16,8 @@
br label %cond_true
cond_true: ; preds = %return.i, %cond_true.outer
- %indvar = phi uint [ 0, %cond_true.outer ], [ %indvar.next, %return.i ] ; <uint> [#uses=2]
- %indvar = cast uint %indvar to int ; <int> [#uses=1]
+ %indvar.ui = phi uint [ 0, %cond_true.outer ], [ %indvar.next, %return.i ] ; <uint> [#uses=2]
+ %indvar = cast uint %indvar.ui to int ; <int> [#uses=1]
%i.0.0 = add int %indvar, %i.0.0.ph ; <int> [#uses=3]
%savedstack = call sbyte* %llvm.stacksave( ) ; <sbyte*> [#uses=2]
%tmp.i = seteq int %i.0.0, 0 ; <bool> [#uses=1]
@@ -38,7 +38,7 @@
return.i: ; preds = %cond_true
call void %llvm.stackrestore( sbyte* %savedstack )
%tmp21 = setgt int %tmp5, 9999 ; <bool> [#uses=1]
- %indvar.next = add uint %indvar, 1 ; <uint> [#uses=1]
+ %indvar.next = add uint %indvar.ui, 1 ; <uint> [#uses=1]
br bool %tmp21, label %bb8, label %cond_true
bb8: ; preds = %return.i, %cond_true.i
diff --git a/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll b/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
index e51c8cc..4583769 100644
--- a/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
+++ b/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'ret i32 0'
int %f(int %a0, int %a1, int %a2, int %a3, int %a4) {
%tmp.2 = add int %a4, %a3 ; <int> [#uses=1]
diff --git a/test/Transforms/Reassociate/shifttest.ll b/test/Transforms/Reassociate/shifttest.ll
index 6a65aaf..0bfe0ec 100644
--- a/test/Transforms/Reassociate/shifttest.ll
+++ b/test/Transforms/Reassociate/shifttest.ll
@@ -1,6 +1,6 @@
; With shl->mul reassociation, we can see that this is (shl A, 9) * A
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, ubyte 9'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, i8 9'
int %test(int %A, int %B) {
%X = shl int %A, ubyte 5
diff --git a/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
index 9d08137..52cda01 100644
--- a/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
+++ b/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret i32 1'
; This function definitely returns 1, even if we don't know the direction
; of the branch.
diff --git a/test/Transforms/SCCP/2006-12-04-PackedType.ll b/test/Transforms/SCCP/2006-12-04-PackedType.ll
index ddb9c4f..7942b65 100644
--- a/test/Transforms/SCCP/2006-12-04-PackedType.ll
+++ b/test/Transforms/SCCP/2006-12-04-PackedType.ll
@@ -105,8 +105,8 @@
void %gldLLVMVecPointRender(%struct.GLDContextRec* %ctx) {
entry:
- %tmp = getelementptr %struct.GLDContextRec* %ctx, int 0, uint 22 ; <uint*> [#uses=1]
- %tmp = load uint* %tmp ; <uint> [#uses=3]
+ %tmp.uip = getelementptr %struct.GLDContextRec* %ctx, int 0, uint 22 ; <uint*> [#uses=1]
+ %tmp = load uint* %tmp.uip ; <uint> [#uses=3]
%tmp91 = lshr uint %tmp, ubyte 5 ; <uint> [#uses=1]
%tmp92 = trunc uint %tmp91 to bool ; <bool> [#uses=1]
br bool %tmp92, label %cond_true93, label %cond_next116
diff --git a/test/Transforms/SCCP/ipsccp-basic.ll b/test/Transforms/SCCP/ipsccp-basic.ll
index 18bfd8e..2c42dfa 100644
--- a/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/test/Transforms/SCCP/ipsccp-basic.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 17' | grep -v 'ret int undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret i32 17' | grep -v 'ret i32 undef' | not grep ret
implementation
diff --git a/test/Transforms/SCCP/ipsccp-conditional.ll b/test/Transforms/SCCP/ipsccp-conditional.ll
index fceb31e..5f06df3 100644
--- a/test/Transforms/SCCP/ipsccp-conditional.ll
+++ b/test/Transforms/SCCP/ipsccp-conditional.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 0' | grep -v 'ret int undef' | not grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret i32 0' | grep -v 'ret i32 undef' | not grep ret
implementation
diff --git a/test/Transforms/SCCP/logical-nuke.ll b/test/Transforms/SCCP/logical-nuke.ll
index 446e99e..c0a555a 100644
--- a/test/Transforms/SCCP/logical-nuke.ll
+++ b/test/Transforms/SCCP/logical-nuke.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret i32 0'
; Test that SCCP has basic knowledge of when and/or nuke overdefined values.
diff --git a/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll b/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
index ae79585..82bb1ed 100644
--- a/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
+++ b/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll
@@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x int>]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x i32>]'
int %func(<4 x float> %v0, <4 x float> %v1) {
%vsiidx = alloca [2 x <4 x int>], align 16 ; <[2 x <4 x int>]*> [#uses=3]
diff --git a/test/Transforms/ScalarRepl/union-fp-int.ll b/test/Transforms/ScalarRepl/union-fp-int.ll
index 9c0e23e..681636b 100644
--- a/test/Transforms/ScalarRepl/union-fp-int.ll
+++ b/test/Transforms/ScalarRepl/union-fp-int.ll
@@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'bitcast.*float.*int'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'bitcast.*float.*i32'
int %test(float %X) {
%X_addr = alloca float
diff --git a/test/Transforms/ScalarRepl/union-pointer.ll b/test/Transforms/ScalarRepl/union-pointer.ll
index 0207ab9..be4c460 100644
--- a/test/Transforms/ScalarRepl/union-pointer.ll
+++ b/test/Transforms/ScalarRepl/union-pointer.ll
@@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'ret sbyte'
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'ret i8'
; PR892
diff --git a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
index ca48041..d067ac0 100644
--- a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
+++ b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
@@ -413,11 +413,11 @@
cond_next225: ; preds = %invcont222, %cond_true217, %invcont213
%toPage.1 = phi int [ %tmp223, %invcont222 ], [ %tmp214, %cond_true217 ], [ %tmp214, %invcont213 ] ; <int> [#uses=2]
%fromPage.1 = phi int [ 1, %invcont222 ], [ %tmp211, %cond_true217 ], [ %tmp211, %invcont213 ] ; <int> [#uses=2]
- %tmp = invoke uint %_ZNK8QPrinter9pageOrderEv( %struct.QPrinter* %printer )
+ %tmp.page = invoke uint %_ZNK8QPrinter9pageOrderEv( %struct.QPrinter* %printer )
to label %invcont227 unwind label %cleanup329 ; <uint> [#uses=1]
invcont227: ; preds = %cond_next225
- %tmp228 = seteq uint %tmp, 1 ; <bool> [#uses=1]
+ %tmp228 = seteq uint %tmp.page, 1 ; <bool> [#uses=1]
br bool %tmp228, label %cond_true230, label %cond_next234
cond_true230: ; preds = %invcont227
diff --git a/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll b/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
index 2063d9f..1ca0482 100644
--- a/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
+++ b/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll
@@ -56,7 +56,7 @@
bb: ; preds = %bb33
%tmp = load %struct.FILE** %f_addr ; <%struct.FILE*> [#uses=1]
- %tmp = call int %_IO_getc( %struct.FILE* %tmp ) ; <int> [#uses=1]
+ %tmp.r = call int %_IO_getc( %struct.FILE* %tmp ) ; <int> [#uses=1]
%tmp6 = call int %tolower( int %tmp ) ; <int> [#uses=1]
%tmp6 = trunc int %tmp6 to sbyte ; <sbyte> [#uses=1]
store sbyte %tmp6, sbyte* %c
diff --git a/test/Transforms/SimplifyLibCalls/ExitInMain.ll b/test/Transforms/SimplifyLibCalls/ExitInMain.ll
index 944e39d..f8af2ec 100644
--- a/test/Transforms/SimplifyLibCalls/ExitInMain.ll
+++ b/test/Transforms/SimplifyLibCalls/ExitInMain.ll
@@ -1,5 +1,5 @@
; Test that the ExitInMainOptimization pass works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep -c 'ret i32 3' | grep 1
declare void %exit(int)
declare void %exitonly(int)
diff --git a/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll b/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
index 198e5ae..6ddb1b7 100644
--- a/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
+++ b/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'call int %foo'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'call i32 %foo'
declare void %bar(int*)
int %foo(uint %N) {
diff --git a/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll b/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll
index 33b02df..8125960 100644
--- a/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll
+++ b/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'int %foo'
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'i32 %foo'
declare void %bar(int*)
int %foo() {