From 73e70822ae9dd03f092b1ae56c5fed6d39b7af3c Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Fri, 29 Dec 2006 20:01:32 +0000 Subject: Update tests that need to be run through llvm-upgrade. This is necessary for upcoming changes to the llvm assembly grammar. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32768 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx | 2 +- test/Analysis/LoadVN/casts.ll | 3 ++- test/Assembler/2002-07-25-ParserAssertionFailure.llx | 2 +- test/Assembler/2003-12-30-TypeMapInvalidMemory.llx | 1 + test/Assembler/2004-06-07-VerifierBug.llx | 2 +- test/Assembler/2004-09-29-VerifierIsReallySlow.llx | 2 +- test/BugPoint/crash-basictest.ll | 4 +++- test/BugPoint/crash-narrowfunctiontest.ll | 3 ++- test/BugPoint/misopt-basictest.ll | 5 ++--- test/BugPoint/remove_arguments_test.ll | 3 ++- test/Bytecode/2006-12-11-Cast-ConstExpr.ll | 2 +- test/CodeGen/ARM/arm-asm.ll | 2 +- test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll | 5 +++-- test/CodeGen/Generic/2002-04-16-StackFrameSizeAlignment.ll | 2 +- test/CodeGen/Generic/2006-12-16-InlineAsmCrash.ll | 2 +- test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll | 6 +++--- test/CodeGen/X86/2006-12-19-IntelSyntax.ll | 2 +- test/CodeGen/X86/bitcast.ll | 6 +++--- test/CodeGen/X86/packed_struct.ll | 10 +++++----- test/CodeGen/X86/vec_ins_extract.ll | 6 ++++-- test/CodeGen/X86/x86-64-asm.ll | 2 +- test/DebugInfo/funccall.ll | 2 +- test/Linker/2003-01-30-LinkerRename.ll | 5 +++-- test/Linker/2003-04-21-Linkage.ll | 4 ++-- test/Linker/2003-04-23-LinkOnceLost.ll | 5 +++-- test/Linker/2003-08-28-TypeResolvesGlobal.ll | 4 ++-- test/Linker/2003-08-28-TypeResolvesGlobal2.ll | 4 ++-- test/Linker/2003-08-28-TypeResolvesGlobal3.ll | 4 ++-- test/Linker/2004-05-07-TypeResolution1.ll | 5 +++-- test/Linker/AppendingLinkage.ll | 5 +++-- test/Linker/testlink1.ll | 4 ++-- test/Transforms/ADCE/2002-07-29-Segfault.ll | 2 +- test/Transforms/IndVarsSimplify/2006-12-10-BitCast.ll | 2 +- test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll | 2 +- test/Transforms/InstCombine/2006-12-15-Range-Test.ll | 7 +++++-- test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll | 2 +- test/Transforms/InstCombine/shl-trunc.ll | 2 +- test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll | 2 +- test/Transforms/SCCP/2006-12-19-UndefBug.ll | 3 ++- test/Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll | 2 +- test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll | 2 +- 41 files changed, 78 insertions(+), 62 deletions(-) diff --git a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx index d1cf73b6ab..82212af0c6 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-as < %s | opt -dse | llvm-dis | grep 'store int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store int 0' void %test({int,int }* %P) { %Q = getelementptr {int,int}* %P, int 1 diff --git a/test/Analysis/LoadVN/casts.ll b/test/Analysis/LoadVN/casts.ll index 462338d0d8..5dd3bc60ab 100644 --- a/test/Analysis/LoadVN/casts.ll +++ b/test/Analysis/LoadVN/casts.ll @@ -1,6 +1,7 @@ ; Check to make sure that Value Numbering doesn't merge casts of different ; flavors. -; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | grep '[sz]ext' | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | \ +; RUN: grep '[sz]ext' | wc -l | grep 2 declare void %external(int) diff --git a/test/Assembler/2002-07-25-ParserAssertionFailure.llx b/test/Assembler/2002-07-25-ParserAssertionFailure.llx index 9e44afaeab..f7fdae8c82 100644 --- a/test/Assembler/2002-07-25-ParserAssertionFailure.llx +++ b/test/Assembler/2002-07-25-ParserAssertionFailure.llx @@ -1,6 +1,6 @@ ; Make sure we don't get an assertion failure, even though this is a parse ; error -; RUN: llvm-as < %s 2>&1 | grep 'No arguments' +; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | grep 'No arguments' %ty = type void (int) diff --git a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx index 79bd0b3829..a3d4590d1a 100644 --- a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx +++ b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx @@ -3,3 +3,4 @@ %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 } +implementation diff --git a/test/Assembler/2004-06-07-VerifierBug.llx b/test/Assembler/2004-06-07-VerifierBug.llx index 88d25e40a4..49c2703a00 100644 --- a/test/Assembler/2004-06-07-VerifierBug.llx +++ b/test/Assembler/2004-06-07-VerifierBug.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s > /dev/null +; RUN: llvm-upgrade < %s | llvm-as > /dev/null void %t() { entry: ret void diff --git a/test/Assembler/2004-09-29-VerifierIsReallySlow.llx b/test/Assembler/2004-09-29-VerifierIsReallySlow.llx index 5076a24b6c..6de3767ca6 100644 --- a/test/Assembler/2004-09-29-VerifierIsReallySlow.llx +++ b/test/Assembler/2004-09-29-VerifierIsReallySlow.llx @@ -1,6 +1,6 @@ ; Check to see that the verifier does not take an outrageous amount of time on ; this testcase. -; RUN: llvm-as < %s -o /dev/null -f +; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f "complex long double" = type { double, double } "struct.std::dcomplex" = type { "complex long double" } diff --git a/test/BugPoint/crash-basictest.ll b/test/BugPoint/crash-basictest.ll index 3c5804ced7..77eb6ecdc5 100644 --- a/test/BugPoint/crash-basictest.ll +++ b/test/BugPoint/crash-basictest.ll @@ -1,5 +1,7 @@ ; Basic test for bugpoint. -; RUN: bugpoint %s -domset -idom -domset -bugpoint-crashcalls -domset -idom -domset +; RUN: llvm-upgrade < %s > %t1.ll +; RUN: bugpoint %t1.ll -domset -idom -domset -bugpoint-crashcalls \ +; RUN: -domset -idom -domset int %test() { call int %test() diff --git a/test/BugPoint/crash-narrowfunctiontest.ll b/test/BugPoint/crash-narrowfunctiontest.ll index 8927ba1905..197e42f59d 100644 --- a/test/BugPoint/crash-narrowfunctiontest.ll +++ b/test/BugPoint/crash-narrowfunctiontest.ll @@ -1,6 +1,7 @@ ; Test that bugpoint can narrow down the testcase to the important function ; -; RUN: bugpoint %s -bugpoint-crashcalls +; RUN: llvm-upgrade < %s > %t1.ll +; RUN: bugpoint %t1.ll -bugpoint-crashcalls int %foo() { ret int 1 } diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll index 76363dfb1f..66cc53f42e 100644 --- a/test/BugPoint/misopt-basictest.ll +++ b/test/BugPoint/misopt-basictest.ll @@ -1,6 +1,5 @@ -; RUN: PATH=/usr/bin:/bin/:${PATH} -; RUN: export PATH -; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg +; RUN: llvm-upgrade < %s > %t1.ll +; RUN: bugpoint %t1.ll -dce -bugpoint-deletecalls -simplifycfg %.LC0 = internal global [13 x sbyte] c"Hello World\0A\00" diff --git a/test/BugPoint/remove_arguments_test.ll b/test/BugPoint/remove_arguments_test.ll index 5a0bd6f009..ed77da7cb8 100644 --- a/test/BugPoint/remove_arguments_test.ll +++ b/test/BugPoint/remove_arguments_test.ll @@ -1,4 +1,5 @@ -; RUN: bugpoint %s -bugpoint-crashcalls +; RUN: llvm-upgrade < %s > %t1.ll +; RUN: bugpoint %t1.ll -bugpoint-crashcalls ; Test to make sure that arguments are removed from the function if they are unnecessary. diff --git a/test/Bytecode/2006-12-11-Cast-ConstExpr.ll b/test/Bytecode/2006-12-11-Cast-ConstExpr.ll index 6bd1603b0a..aa2cf9306f 100644 --- a/test/Bytecode/2006-12-11-Cast-ConstExpr.ll +++ b/test/Bytecode/2006-12-11-Cast-ConstExpr.ll @@ -1,6 +1,6 @@ ; This test ensures that we get a bitcast constant expression in and out, ; not a sitofp constant expression. -; RUN: llvm-as < %s | llvm-dis | grep 'bitcast (' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'bitcast (' %G = external global int float %tryit(int %A) { diff --git a/test/CodeGen/ARM/arm-asm.ll b/test/CodeGen/ARM/arm-asm.ll index 46c57db50b..6b8ce9a9fa 100644 --- a/test/CodeGen/ARM/arm-asm.ll +++ b/test/CodeGen/ARM/arm-asm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm void %frame_dummy() { entry: diff --git a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll index 53db1f58ba..bf846545c9 100644 --- a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll +++ b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll @@ -1,5 +1,6 @@ -; RUN: llvm-as < %s | llc -march=c && -; RUN: llvm-as < %s | llc -march=c | grep '__BITCAST' | wc -l | grep 14 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | \ +; RUN: grep '__BITCAST' | wc -l | grep 14 int %test1(float %F) { %X = bitcast float %F to int diff --git a/test/CodeGen/Generic/2002-04-16-StackFrameSizeAlignment.ll b/test/CodeGen/Generic/2002-04-16-StackFrameSizeAlignment.ll index f00aad7900..d7e138abd9 100644 --- a/test/CodeGen/Generic/2002-04-16-StackFrameSizeAlignment.ll +++ b/test/CodeGen/Generic/2002-04-16-StackFrameSizeAlignment.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as -f %s -o - | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; Compiling this file produces: ; Sparc.cpp:91: failed assertion `(offset - OFFSET) % getStackFrameSizeAlignment() == 0' diff --git a/test/CodeGen/Generic/2006-12-16-InlineAsmCrash.ll b/test/CodeGen/Generic/2006-12-16-InlineAsmCrash.ll index f8663c39f1..c8467ec1e7 100644 --- a/test/CodeGen/Generic/2006-12-16-InlineAsmCrash.ll +++ b/test/CodeGen/Generic/2006-12-16-InlineAsmCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 ; PR1049 target datalayout = "e-p:32:32" target endian = little diff --git a/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll b/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll index a45991c234..8816ca003c 100644 --- a/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll +++ b/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc64 && -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc void %bitap() { entry: diff --git a/test/CodeGen/X86/2006-12-19-IntelSyntax.ll b/test/CodeGen/X86/2006-12-19-IntelSyntax.ll index b79700afd0..6985bd0e7a 100644 --- a/test/CodeGen/X86/2006-12-19-IntelSyntax.ll +++ b/test/CodeGen/X86/2006-12-19-IntelSyntax.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel ; PR1061 target datalayout = "e-p:32:32" diff --git a/test/CodeGen/X86/bitcast.ll b/test/CodeGen/X86/bitcast.ll index d0d3bd4bcb..d7c78edb62 100644 --- a/test/CodeGen/X86/bitcast.ll +++ b/test/CodeGen/X86/bitcast.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc && -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86-64 +; RUN: llvm-upgrade < %s | llvm-as | llc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 ; PR1033 long %test1(double %t) { diff --git a/test/CodeGen/X86/packed_struct.ll b/test/CodeGen/X86/packed_struct.ll index d027937b08..94548b892f 100644 --- a/test/CodeGen/X86/packed_struct.ll +++ b/test/CodeGen/X86/packed_struct.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=x86 |grep "foos+5" && -; RUN: llvm-as < %s | llc -march=x86 |grep "foos+1" && -; RUN: llvm-as < %s | llc -march=x86 |grep "foos+9" && -; RUN: llvm-as < %s | llc -march=x86 |grep "bara+19" && -; RUN: llvm-as < %s | llc -march=x86 |grep "bara+4" +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+5" && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+1" && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+9" && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "bara+19" && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "bara+4" ; make sure we compute the correct offset for a packed structure diff --git a/test/CodeGen/X86/vec_ins_extract.ll b/test/CodeGen/X86/vec_ins_extract.ll index eee8d22ebb..9d9f17e746 100644 --- a/test/CodeGen/X86/vec_ins_extract.ll +++ b/test/CodeGen/X86/vec_ins_extract.ll @@ -1,5 +1,7 @@ -; RUN: llvm-as< %s | opt -scalarrepl -instcombine | llc -march=x86 -mcpu=yonah && -; RUN: llvm-as< %s | opt -scalarrepl -instcombine | llc -march=x86 -mcpu=yonah | not grep sub.*esp +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -instcombine | \ +; 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 ; This checks that various insert/extract idiom work without going to the ; stack. diff --git a/test/CodeGen/X86/x86-64-asm.ll b/test/CodeGen/X86/x86-64-asm.ll index e5b293e304..0814684bcd 100644 --- a/test/CodeGen/X86/x86-64-asm.ll +++ b/test/CodeGen/X86/x86-64-asm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; PR1029 target datalayout = "e-p:64:64" diff --git a/test/DebugInfo/funccall.ll b/test/DebugInfo/funccall.ll index 3243f90719..cb5dab62ca 100644 --- a/test/DebugInfo/funccall.ll +++ b/test/DebugInfo/funccall.ll @@ -1,4 +1,4 @@ -;; RUN: llvm-as < %s | llc +;; RUN: llvm-upgrade < %s | llvm-as | llc ;; Debugger type declarations %llvm.dbg.anchor.type = type { uint, uint } diff --git a/test/Linker/2003-01-30-LinkerRename.ll b/test/Linker/2003-01-30-LinkerRename.ll index cf9c4ae54d..724a2a88b0 100644 --- a/test/Linker/2003-01-30-LinkerRename.ll +++ b/test/Linker/2003-01-30-LinkerRename.ll @@ -1,8 +1,9 @@ ; This fails because the linker renames the external symbol not the internal ; one... -; RUN: echo "implementation internal int %foo() { ret int 7 }" | llvm-as > %t.1.bc -; RUN: llvm-as < %s > %t.2.bc +; RUN: echo "implementation internal int %foo() { ret int 7 }" | llvm-upgrade |\ +; RUN: llvm-as > %t.1.bc +; RUN: llvm-upgrade < %s | llvm-as -o %t.2.bc -f ; RUN: llvm-link %t.[12].bc | llvm-dis | grep '%foo()' | grep -v internal implementation diff --git a/test/Linker/2003-04-21-Linkage.ll b/test/Linker/2003-04-21-Linkage.ll index 6071d0b394..742faa8c99 100644 --- a/test/Linker/2003-04-21-Linkage.ll +++ b/test/Linker/2003-04-21-Linkage.ll @@ -1,5 +1,5 @@ -; RUN: echo "%X = linkonce global int 5 implementation linkonce int %foo() { ret int 7 }" | llvm-as > %t.1.bc -; RUN: llvm-as < %s > %t.2.bc +; RUN: echo "%X = linkonce global int 5 implementation linkonce int %foo() { ret int 7 }" | llvm-upgrade | llvm-as > %t.1.bc +; RUN: llvm-upgrade < %s | llvm-as -o %t.2.bc -f ; RUN: llvm-link %t.[12].bc %X = external global int diff --git a/test/Linker/2003-04-23-LinkOnceLost.ll b/test/Linker/2003-04-23-LinkOnceLost.ll index add9981f16..3996cc40b7 100644 --- a/test/Linker/2003-04-23-LinkOnceLost.ll +++ b/test/Linker/2003-04-23-LinkOnceLost.ll @@ -1,8 +1,9 @@ ; This fails because the linker renames the non-opaque type not the opaque ; one... -; RUN: echo "implementation linkonce void %foo() { ret void } " | llvm-as > %t.2.bc -; RUN: llvm-as < %s > %t.1.bc +; RUN: echo "implementation linkonce void %foo() { ret void } " | llvm-upgrade|\ +; RUN: llvm-as -o %t.2.bc -f +; RUN: llvm-upgrade < %s | llvm-as -o %t.1.bc -f ; RUN: llvm-link %t.[12].bc | llvm-dis | grep foo | grep linkonce declare void %foo() diff --git a/test/Linker/2003-08-28-TypeResolvesGlobal.ll b/test/Linker/2003-08-28-TypeResolvesGlobal.ll index 54d0a6fa24..5e90682dc1 100644 --- a/test/Linker/2003-08-28-TypeResolvesGlobal.ll +++ b/test/Linker/2003-08-28-TypeResolvesGlobal.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s > %t.out1.bc -; RUN: echo "%S = type int" | llvm-as > %t.out2.bc +; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc +; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc ; RUN: llvm-link %t.out[21].bc %S = type opaque diff --git a/test/Linker/2003-08-28-TypeResolvesGlobal2.ll b/test/Linker/2003-08-28-TypeResolvesGlobal2.ll index e83d232017..619c8444ad 100644 --- a/test/Linker/2003-08-28-TypeResolvesGlobal2.ll +++ b/test/Linker/2003-08-28-TypeResolvesGlobal2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s > %t.out1.bc -; RUN: echo "%S = type int" | llvm-as > %t.out2.bc +; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc +; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc ; RUN: llvm-link %t.out[21].bc %S = type opaque diff --git a/test/Linker/2003-08-28-TypeResolvesGlobal3.ll b/test/Linker/2003-08-28-TypeResolvesGlobal3.ll index 3190099844..40023fd660 100644 --- a/test/Linker/2003-08-28-TypeResolvesGlobal3.ll +++ b/test/Linker/2003-08-28-TypeResolvesGlobal3.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s > %t.out1.bc -; RUN: echo "%S = type int" | llvm-as > %t.out2.bc +; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc +; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc ; RUN: llvm-link %t.out[21].bc %S = type opaque diff --git a/test/Linker/2004-05-07-TypeResolution1.ll b/test/Linker/2004-05-07-TypeResolution1.ll index 94ce3d02c0..94c5af0f95 100644 --- a/test/Linker/2004-05-07-TypeResolution1.ll +++ b/test/Linker/2004-05-07-TypeResolution1.ll @@ -1,5 +1,6 @@ -; RUN: llvm-as -f < %s > %t1.bc -; RUN: llvm-as -f < `dirname %s`/2004-05-07-TypeResolution2.ll > %t2.bc +; RUN: llvm-upgrade < %s | llvm-as -f -o %t1.bc +; RUN: llvm-upgrade < `dirname %s`/2004-05-07-TypeResolution2.ll | \ +; RUN: llvm-as -o %t2.bc -f ; RUN: llvm-link -f -o %t3.bc %t1.bc %t2.bc target endian = little diff --git a/test/Linker/AppendingLinkage.ll b/test/Linker/AppendingLinkage.ll index 4126b8882b..84c09d81a3 100644 --- a/test/Linker/AppendingLinkage.ll +++ b/test/Linker/AppendingLinkage.ll @@ -1,7 +1,8 @@ ; Test that appending linkage works correctly. -; 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 | \ +; RUN: 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 4 | grep 8 %X = appending global [2 x int] [int 7, int 4] diff --git a/test/Linker/testlink1.ll b/test/Linker/testlink1.ll index 91d983374d..ccdd5f3b0b 100644 --- a/test/Linker/testlink1.ll +++ b/test/Linker/testlink1.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s > %t.bc -; RUN: llvm-as < `dirname %s`/testlink2.ll > %t2.bc +; RUN: llvm-upgrade < %s | llvm-as > %t.bc +; RUN: llvm-upgrade < `dirname %s`/testlink2.ll | llvm-as > %t2.bc ; RUN: llvm-link %t.bc %t2.bc %MyVar = external global int diff --git a/test/Transforms/ADCE/2002-07-29-Segfault.ll b/test/Transforms/ADCE/2002-07-29-Segfault.ll index 4eae83eaa1..0c0e2afde4 100644 --- a/test/Transforms/ADCE/2002-07-29-Segfault.ll +++ b/test/Transforms/ADCE/2002-07-29-Segfault.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce void "test"() begin diff --git a/test/Transforms/IndVarsSimplify/2006-12-10-BitCast.ll b/test/Transforms/IndVarsSimplify/2006-12-10-BitCast.ll index b584539339..4d2a29b22b 100644 --- a/test/Transforms/IndVarsSimplify/2006-12-10-BitCast.ll +++ b/test/Transforms/IndVarsSimplify/2006-12-10-BitCast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll b/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll index ca552a5d87..4661dfe55b 100644 --- a/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll +++ b/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep zext +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep zext ; Never merge these two conversions, even though it's possible: this is ; significantly more expensive than the two conversions on some targets diff --git a/test/Transforms/InstCombine/2006-12-15-Range-Test.ll b/test/Transforms/InstCombine/2006-12-15-Range-Test.ll index f7cf7e890a..30ea4ee445 100644 --- a/test/Transforms/InstCombine/2006-12-15-Range-Test.ll +++ b/test/Transforms/InstCombine/2006-12-15-Range-Test.ll @@ -1,5 +1,8 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'icmp' | wc -l | grep 1 -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'icmp ugt' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \ +; RUN: grep 'icmp' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \ +; RUN: grep 'icmp ugt' | wc -l | grep 1 +; ; ModuleID = 'bugpoint-tooptimize.bc' target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll b/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll index 80e31a727d..b9881e3624 100644 --- a/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll +++ b/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll @@ -1,6 +1,6 @@ ; For PR1065. This causes an assertion in instcombine if a select with two cmp ; operands is encountered. -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ; ModuleID = 'PR1065.bc' target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/InstCombine/shl-trunc.ll b/test/Transforms/InstCombine/shl-trunc.ll index fae0ce3d42..bfd41a87fc 100644 --- a/test/Transforms/InstCombine/shl-trunc.ll +++ b/test/Transforms/InstCombine/shl-trunc.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl bool %test(int %X, ubyte %A) { %B = lshr int %X, ubyte %A diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll index f9176c9829..d26b0570d3 100644 --- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll @@ -2,7 +2,7 @@ ; LevelRaise should eliminate all cast instructions from this testcase. ; ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast %Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } * %hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } diff --git a/test/Transforms/SCCP/2006-12-19-UndefBug.ll b/test/Transforms/SCCP/2006-12-19-UndefBug.ll index 7ab14366eb..388b9abb29 100644 --- a/test/Transforms/SCCP/2006-12-19-UndefBug.ll +++ b/test/Transforms/SCCP/2006-12-19-UndefBug.ll @@ -1,4 +1,5 @@ -; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret bool false' +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | \ +; RUN: grep 'ret bool false' bool %foo() { %X = and bool false, undef diff --git a/test/Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll b/test/Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll index dbabe29995..0b87a63e39 100644 --- a/test/Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll +++ b/test/Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output ; PR1045 target datalayout = "e-p:32:32" 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 845530d0b0..2063d9f4ae 100644 --- a/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll +++ b/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis ; ModuleID = 'bugpoint-tooptimize.bc' target datalayout = "e-p:32:32" target endian = little -- cgit v1.2.3