diff options
author | Peter Collingbourne <peter@pcc.me.uk> | 2017-04-11 18:12:00 +0000 |
---|---|---|
committer | Peter Collingbourne <peter@pcc.me.uk> | 2017-04-11 18:12:00 +0000 |
commit | be0ad757ca983d9b275023777f6dea711ba9e11e (patch) | |
tree | 7eb7891cf761c5903bf0e20171d7c522559f7bfc /test/LTO | |
parent | 3a60ccfe457b5dbebdb1bc8a25c2d9ef1fbb547d (diff) |
llvm-lto2: Move the LTO::run() action behind a subcommand.
Move LTO::run() to a "run" subcommand so that we can introduce new subcommands
for testing different parts of the LTO implementation.
This doesn't use llvm::cl subcommands because it doesn't appear to be currently
possible to pass an argument not associated with a subcommand to a subcommand
(e.g. -lto-use-new-pm, -mcpu=yonah).
Differential Revision: https://reviews.llvm.org/D31410
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299967 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/LTO')
-rw-r--r-- | test/LTO/Resolution/X86/alias.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/asm-output.ll | 4 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/comdat.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/common2.ll | 16 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/commons.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/diagnostic-handler-remarks.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/empty-bitcode.test | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/intrinsic.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/link-odr-availextern.ll | 14 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/lowertypetests.ll | 2 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/mixed_lto.ll | 4 | ||||
-rw-r--r-- | test/LTO/Resolution/X86/multi-thinlto.ll | 2 | ||||
-rw-r--r-- | test/LTO/X86/symver-asm.ll | 2 | ||||
-rw-r--r-- | test/LTO/X86/symver-asm2.ll | 2 |
15 files changed, 30 insertions, 30 deletions
diff --git a/test/LTO/Resolution/X86/alias.ll b/test/LTO/Resolution/X86/alias.ll index 2056112e145..886eadcfc82 100644 --- a/test/LTO/Resolution/X86/alias.ll +++ b/test/LTO/Resolution/X86/alias.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as %s -o %t1.o ; RUN: llvm-as %p/Inputs/alias-1.ll -o %t2.o -; RUN: llvm-lto2 -o %t3.o %t2.o %t1.o -r %t2.o,a,px -r %t1.o,a, -r %t1.o,b,px -save-temps +; RUN: llvm-lto2 run -o %t3.o %t2.o %t1.o -r %t2.o,a,px -r %t1.o,a, -r %t1.o,b,px -save-temps ; RUN: llvm-dis < %t3.o.0.0.preopt.bc -o - | FileCheck %s ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt diff --git a/test/LTO/Resolution/X86/asm-output.ll b/test/LTO/Resolution/X86/asm-output.ll index 68a7a5c5fc6..41d293501dd 100644 --- a/test/LTO/Resolution/X86/asm-output.ll +++ b/test/LTO/Resolution/X86/asm-output.ll @@ -2,9 +2,9 @@ ; ; RUN: llvm-as < %s > %t1.bc ; -; RUN: llvm-lto2 -filetype=asm -r %t1.bc,main,px -o %t2 %t1.bc +; RUN: llvm-lto2 run -filetype=asm -r %t1.bc,main,px -o %t2 %t1.bc ; RUN: FileCheck --check-prefix=ASM %s < %t2.0 -; RUN: llvm-lto2 -filetype=obj -r %t1.bc,main,px -o %t2 %t1.bc +; RUN: llvm-lto2 run -filetype=obj -r %t1.bc,main,px -o %t2 %t1.bc ; RUN: llvm-objdump -d %t2.0 | FileCheck --check-prefix=ASM %s ; ; ASM: main: diff --git a/test/LTO/Resolution/X86/comdat.ll b/test/LTO/Resolution/X86/comdat.ll index 5124b951bed..60d082b3e0f 100644 --- a/test/LTO/Resolution/X86/comdat.ll +++ b/test/LTO/Resolution/X86/comdat.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as %s -o %t.o ; RUN: llvm-as %p/Inputs/comdat.ll -o %t2.o -; RUN: llvm-lto2 -save-temps -o %t3.o %t.o %t2.o \ +; RUN: llvm-lto2 run -save-temps -o %t3.o %t.o %t2.o \ ; RUN: -r=%t.o,f1,plx \ ; RUN: -r=%t.o,v1,px \ ; RUN: -r=%t.o,r11,px \ diff --git a/test/LTO/Resolution/X86/common2.ll b/test/LTO/Resolution/X86/common2.ll index 3328d7c5ec3..3cb0a992d9a 100644 --- a/test/LTO/Resolution/X86/common2.ll +++ b/test/LTO/Resolution/X86/common2.ll @@ -4,7 +4,7 @@ ; Test that the common merging (size + alignment) is properly handled ; Client marked the "large with little alignment" one as prevailing -; RUN: llvm-lto2 %t1.bc %t2.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,x \ ; RUN: -r %t2.bc,v,px \ ; RUN: -r %t1.bc,foo,px \ @@ -12,7 +12,7 @@ ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=LARGE-PREVAILED ; Same as before, but reversing the order of the inputs -; RUN: llvm-lto2 %t2.bc %t1.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t2.bc %t1.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,x \ ; RUN: -r %t2.bc,v,px \ ; RUN: -r %t1.bc,foo,px \ @@ -20,7 +20,7 @@ ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=LARGE-PREVAILED ; Client marked the "small with large alignment" one as prevailing -; RUN: llvm-lto2 %t1.bc %t2.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,px \ ; RUN: -r %t2.bc,v,x \ ; RUN: -r %t1.bc,foo,px \ @@ -28,7 +28,7 @@ ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=SMALL-PREVAILED ; Same as before, but reversing the order of the inputs -; RUN: llvm-lto2 %t2.bc %t1.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t2.bc %t1.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,px \ ; RUN: -r %t2.bc,v,x \ ; RUN: -r %t1.bc,foo,px \ @@ -37,7 +37,7 @@ ; Client didn't mark any as prevailing, we keep the first one we see as "external" -; RUN: llvm-lto2 %t1.bc %t2.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,x \ ; RUN: -r %t2.bc,v,x \ ; RUN: -r %t1.bc,foo,px \ @@ -45,7 +45,7 @@ ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=NONE-PREVAILED1 ; Same as before, but reversing the order of the inputs -; RUN: llvm-lto2 %t2.bc %t1.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t2.bc %t1.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,x \ ; RUN: -r %t2.bc,v,x \ ; RUN: -r %t1.bc,foo,px \ @@ -55,7 +55,7 @@ ; Client marked both as prevailing -; RUN: llvm-lto2 %t1.bc %t2.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,px \ ; RUN: -r %t2.bc,v,px \ ; RUN: -r %t1.bc,foo,px \ @@ -63,7 +63,7 @@ ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=BOTH-PREVAILED1 ; Same as before, but reversing the order of the inputs -; RUN: llvm-lto2 %t2.bc %t1.bc -o %t.o -save-temps \ +; RUN: llvm-lto2 run %t2.bc %t1.bc -o %t.o -save-temps \ ; RUN: -r %t1.bc,v,px \ ; RUN: -r %t2.bc,v,px \ ; RUN: -r %t1.bc,foo,px \ diff --git a/test/LTO/Resolution/X86/commons.ll b/test/LTO/Resolution/X86/commons.ll index b3e504835af..28bf1ada4a8 100644 --- a/test/LTO/Resolution/X86/commons.ll +++ b/test/LTO/Resolution/X86/commons.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as -o %t1.bc %s ; RUN: llvm-as -o %t2.bc %p/Inputs/commons.ll -; RUN: llvm-lto2 %t1.bc -r=%t1.bc,x,l %t2.bc -r=%t2.bc,x,pl -o %t.out -save-temps +; RUN: llvm-lto2 run %t1.bc -r=%t1.bc,x,l %t2.bc -r=%t2.bc,x,pl -o %t.out -save-temps ; RUN: llvm-dis -o - %t.out.0.0.preopt.bc | FileCheck %s ; A strong definition should override the common diff --git a/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll b/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll index 4c0d6161094..2469570c26b 100644 --- a/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll +++ b/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s >%t.bc ; RUN: rm -f %t.yaml -; RUN: llvm-lto2 -pass-remarks-output=%t.yaml \ +; RUN: llvm-lto2 run -pass-remarks-output=%t.yaml \ ; RUN: -pass-remarks-with-hotness \ ; RUN: -r %t.bc,tinkywinky,p \ ; RUN: -r %t.bc,patatino,px \ diff --git a/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll b/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll index 0ad4ea63db5..eb1bca3670c 100644 --- a/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll +++ b/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s >%t.bc ; RUN: rm -f %t.yaml -; RUN: llvm-lto2 -pass-remarks-output=%t.yaml \ +; RUN: llvm-lto2 run -pass-remarks-output=%t.yaml \ ; RUN: -r %t.bc,tinkywinky,p \ ; RUN: -r %t.bc,patatino,px \ ; RUN: -r %t.bc,main,px -o %t.o %t.bc diff --git a/test/LTO/Resolution/X86/empty-bitcode.test b/test/LTO/Resolution/X86/empty-bitcode.test index c98c54499ef..c05c5e3824b 100644 --- a/test/LTO/Resolution/X86/empty-bitcode.test +++ b/test/LTO/Resolution/X86/empty-bitcode.test @@ -1,3 +1,3 @@ RUN: llvm-cat -o %t.o -RUN: not llvm-lto2 -o %t2 %t.o 2>&1 | FileCheck %s +RUN: not llvm-lto2 run -o %t2 %t.o 2>&1 | FileCheck %s CHECK: Bitcode file does not contain any modules diff --git a/test/LTO/Resolution/X86/intrinsic.ll b/test/LTO/Resolution/X86/intrinsic.ll index f785f8f4f71..dc287ace0f8 100644 --- a/test/LTO/Resolution/X86/intrinsic.ll +++ b/test/LTO/Resolution/X86/intrinsic.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as %s -o %t1.o ; RUN: llvm-as %p/Inputs/intrinsic.ll -o %t2.o -; RUN: llvm-lto2 -o %t3.o %t1.o %t2.o -r %t1.o,foo +; RUN: llvm-lto2 run -o %t3.o %t1.o %t2.o -r %t1.o,foo target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/LTO/Resolution/X86/link-odr-availextern.ll b/test/LTO/Resolution/X86/link-odr-availextern.ll index 5a3cc3884db..cc360338d6d 100644 --- a/test/LTO/Resolution/X86/link-odr-availextern.ll +++ b/test/LTO/Resolution/X86/link-odr-availextern.ll @@ -5,25 +5,25 @@ ; RUN: llvm-as %S/Inputs/link-odr-availextern-ae.ll -o %t2ae ; RUN: llvm-as %S/Inputs/link-odr-availextern-odr.ll -o %t2odr -; RUN: llvm-lto2 -o %t3 %t1 %t2ae -r %t1,f,p -r %t2ae,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t1 %t2ae -r %t1,f,p -r %t2ae,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=PREVAILING %s -; RUN: llvm-lto2 -o %t3 %t1 %t2odr -r %t1,f,p -r %t2odr,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t1 %t2odr -r %t1,f,p -r %t2odr,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=PREVAILING %s -; RUN: llvm-lto2 -o %t3 %t2ae %t1 -r %t1,f,p -r %t2ae,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t2ae %t1 -r %t1,f,p -r %t2ae,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=PREVAILING %s -; RUN: llvm-lto2 -o %t3 %t2odr %t1 -r %t1,f,p -r %t2odr,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t2odr %t1 -r %t1,f,p -r %t2odr,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=PREVAILING %s -; RUN: llvm-lto2 -o %t3 %t2ae -r %t2ae,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t2ae -r %t2ae,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=NONPREVAILING %s -; RUN: llvm-lto2 -o %t3 %t2odr -r %t2odr,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t2odr -r %t2odr,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=NONPREVAILING %s -; RUN: llvm-lto2 -o %t3 %t2odr %t1 -r %t1,f, -r %t2odr,f, -save-temps +; RUN: llvm-lto2 run -o %t3 %t2odr %t1 -r %t1,f, -r %t2odr,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=NONPREVAILING %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/test/LTO/Resolution/X86/lowertypetests.ll b/test/LTO/Resolution/X86/lowertypetests.ll index 3753689a699..c84a786e66f 100644 --- a/test/LTO/Resolution/X86/lowertypetests.ll +++ b/test/LTO/Resolution/X86/lowertypetests.ll @@ -1,5 +1,5 @@ ; RUN: opt -thinlto-bc -o %t %s -; RUN: llvm-lto2 -r %t,f,plx -r %t,foo,lx -r %t,foo,plx -o %t1 %t +; RUN: llvm-lto2 run -r %t,f,plx -r %t,foo,lx -r %t,foo,plx -o %t1 %t ; RUN: llvm-nm %t1.0 | FileCheck --check-prefix=MERGED %s ; RUN: llvm-nm %t1.1 | FileCheck %s diff --git a/test/LTO/Resolution/X86/mixed_lto.ll b/test/LTO/Resolution/X86/mixed_lto.ll index 02b15c61154..aa686a8114c 100644 --- a/test/LTO/Resolution/X86/mixed_lto.ll +++ b/test/LTO/Resolution/X86/mixed_lto.ll @@ -2,7 +2,7 @@ ; RUN: opt %s -o %t1.o ; RUN: opt -module-summary %p/Inputs/mixed_lto.ll -o %t2.o -; RUN: llvm-lto2 -o %t3.o %t2.o %t1.o -r %t2.o,main,px -r %t2.o,g, -r %t1.o,g,px +; RUN: llvm-lto2 run -o %t3.o %t2.o %t1.o -r %t2.o,main,px -r %t2.o,g, -r %t1.o,g,px ; Task 0 is the regular LTO file (this file) ; RUN: llvm-nm %t3.o.0 | FileCheck %s --check-prefix=NM0 @@ -15,7 +15,7 @@ ; Do the same test again, but with the regular and thin LTO modules in the same file. ; RUN: llvm-cat -b -o %t4.o %t2.o %t1.o -; RUN: llvm-lto2 -o %t5.o %t4.o -r %t4.o,main,px -r %t4.o,g, -r %t4.o,g,px +; RUN: llvm-lto2 run -o %t5.o %t4.o -r %t4.o,main,px -r %t4.o,g, -r %t4.o,g,px ; RUN: llvm-nm %t5.o.0 | FileCheck %s --check-prefix=NM0 ; RUN: llvm-nm %t5.o.1 | FileCheck %s --check-prefix=NM1 diff --git a/test/LTO/Resolution/X86/multi-thinlto.ll b/test/LTO/Resolution/X86/multi-thinlto.ll index 8af73a328a1..06150e44a16 100644 --- a/test/LTO/Resolution/X86/multi-thinlto.ll +++ b/test/LTO/Resolution/X86/multi-thinlto.ll @@ -1,6 +1,6 @@ ; RUN: opt -module-summary %s -o %t.o ; RUN: llvm-cat -b -o %t2.o %t.o %t.o -; RUN: not llvm-lto2 -o %t3.o %t2.o 2>&1 | FileCheck %s +; RUN: not llvm-lto2 run -o %t3.o %t2.o 2>&1 | FileCheck %s ; CHECK: Expected at most one ThinLTO module per bitcode file target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/test/LTO/X86/symver-asm.ll b/test/LTO/X86/symver-asm.ll index 0b0b3334896..4841892724a 100644 --- a/test/LTO/X86/symver-asm.ll +++ b/test/LTO/X86/symver-asm.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s >%t1 ; RUN: llvm-lto -exported-symbol=io_cancel_0_4 -exported-symbol=io_cancel_weak_0_4 -exported-symbol=foo -o %t2 %t1 ; RUN: llvm-nm %t2 | FileCheck %s -; RUN: llvm-lto2 -r %t1,io_cancel_0_4,plx -r %t1,io_cancel_0_4,plx -r %t1,io_cancel_local_0_4,plx -r %t1,io_cancel_weak_0_4,plx -r %t1,io_cancel_weak_0_4,plx -r %t1,io_cancel@@LIBAIO_0.4,plx -r %t1,io_cancel_weak@@LIBAIO_0.4,plx -r %t1,io_cancel_weak@@LIBAIO_0.4.1,plx -r %t1,foo,plx -r %t1,foo,plx -r %t1,foo@@VER1,plx -o %t3 %t1 -save-temps +; RUN: llvm-lto2 run -r %t1,io_cancel_0_4,plx -r %t1,io_cancel_0_4,plx -r %t1,io_cancel_local_0_4,plx -r %t1,io_cancel_weak_0_4,plx -r %t1,io_cancel_weak_0_4,plx -r %t1,io_cancel@@LIBAIO_0.4,plx -r %t1,io_cancel_weak@@LIBAIO_0.4,plx -r %t1,io_cancel_weak@@LIBAIO_0.4.1,plx -r %t1,foo,plx -r %t1,foo,plx -r %t1,foo@@VER1,plx -o %t3 %t1 -save-temps ; RUN: llvm-nm %t3.0 | FileCheck %s ; RUN: llvm-dis %t3.0.2.internalize.bc -o - | FileCheck %s --check-prefix=INTERN diff --git a/test/LTO/X86/symver-asm2.ll b/test/LTO/X86/symver-asm2.ll index f02f5f7938d..42d6e54bd06 100644 --- a/test/LTO/X86/symver-asm2.ll +++ b/test/LTO/X86/symver-asm2.ll @@ -6,7 +6,7 @@ ; RUN: llvm-as < %s >%t1 ; RUN: llvm-lto -o %t2 %t1 ; RUN: llvm-nm %t2 | FileCheck %s -; RUN: llvm-lto2 -r %t1,_start,plx -r %t1,_start3,plx -r %t1,foo@@SOME_VERSION -r %t1,foo@SOME_VERSION3 -o %t3 %t1 -save-temps +; RUN: llvm-lto2 run -r %t1,_start,plx -r %t1,_start3,plx -r %t1,foo@@SOME_VERSION -r %t1,foo@SOME_VERSION3 -o %t3 %t1 -save-temps ; RUN: llvm-nm %t3.0 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" |