[llvm] 581adb4 - Temporarily revert "[lli] Make -jit-kind=orc the default JIT engine"

David Blaikie via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 30 14:28:18 PDT 2021


Please include details in the commit message about why a patch is being
reverted - helps folks verify if the revert might address issues they're
dealing with, etc.

On Tue, Mar 23, 2021 at 4:02 AM Stefan Gränitz via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

>
> Author: Stefan Gränitz
> Date: 2021-03-23T12:01:30+01:00
> New Revision: 581adb4f1a6e8af529c0839d3692ca20416b290e
>
> URL:
> https://github.com/llvm/llvm-project/commit/581adb4f1a6e8af529c0839d3692ca20416b290e
> DIFF:
> https://github.com/llvm/llvm-project/commit/581adb4f1a6e8af529c0839d3692ca20416b290e.diff
>
> LOG: Temporarily revert "[lli] Make -jit-kind=orc the default JIT engine"
>
> This reverts commit eaee4f269645094f03f3aaff6b365176d63ab3e8.
>
> Added:
>
>
> Modified:
>     llvm/test/CodeGen/Generic/bswap.ll
>     llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
>     llvm/test/ExecutionEngine/Interpreter/alias.ll
>     llvm/test/ExecutionEngine/Interpreter/call-no-args.ll
>     llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
>     llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
>     llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
>
> llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
>     llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
>     llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
>     llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
>     llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
>     llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
>     llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
>     llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/eh.ll
>     llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
>     llvm/test/ExecutionEngine/MCJIT/hello.ll
>     llvm/test/ExecutionEngine/MCJIT/hello2.ll
>     llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
>     llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
>     llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
>     llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
>     llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
>     llvm/test/ExecutionEngine/MCJIT/pr13727.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
>
> llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
>
> llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
>
> llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
>     llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
>     llvm/test/ExecutionEngine/MCJIT/simpletest.ll
>     llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/stubs.ll
>     llvm/test/ExecutionEngine/MCJIT/test-arith.ll
>     llvm/test/ExecutionEngine/MCJIT/test-branch.ll
>     llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
>     llvm/test/ExecutionEngine/MCJIT/test-call.ll
>     llvm/test/ExecutionEngine/MCJIT/test-cast.ll
>     llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
>     llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
>     llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
>     llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
>     llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
>     llvm/test/ExecutionEngine/MCJIT/test-fp.ll
>     llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
>     llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
>     llvm/test/ExecutionEngine/MCJIT/test-global.ll
>     llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
>     llvm/test/ExecutionEngine/MCJIT/test-local.ll
>     llvm/test/ExecutionEngine/MCJIT/test-logical.ll
>     llvm/test/ExecutionEngine/MCJIT/test-loop.ll
>     llvm/test/ExecutionEngine/MCJIT/test-phi.ll
>     llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
>     llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
>     llvm/test/ExecutionEngine/MCJIT/test-ret.ll
>     llvm/test/ExecutionEngine/MCJIT/test-return.ll
>     llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
>     llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
>     llvm/test/ExecutionEngine/MCJIT/test-shift.ll
>     llvm/test/ExecutionEngine/MCJIT/weak-function.ll
>     llvm/test/ExecutionEngine/fma3-jit.ll
>     llvm/test/ExecutionEngine/frem.ll
>     llvm/test/ExecutionEngine/mov64zext32.ll
>     llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
>     llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
>     llvm/test/ExecutionEngine/test-interp-vec-cast.ll
>     llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll
>     llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll
>     llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll
>     llvm/test/ExecutionEngine/test-interp-vec-logical.ll
>     llvm/test/ExecutionEngine/test-interp-vec-select.ll
>     llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
>     llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
>     llvm/test/ExecutionEngine/test-interp-vec-shift.ll
>     llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll
>     llvm/test/Integer/2007-01-19-TruncSext.ll
>     llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
>     llvm/tools/lli/lli.cpp
>
> Removed:
>
>
>
>
> ################################################################################
> diff  --git a/llvm/test/CodeGen/Generic/bswap.ll
> b/llvm/test/CodeGen/Generic/bswap.ll
> index 935e8a9b2c739..bd4f02be2b178 100644
> --- a/llvm/test/CodeGen/Generic/bswap.ll
> +++ b/llvm/test/CodeGen/Generic/bswap.ll
> @@ -1,5 +1,5 @@
>  ; tests lowering of vector bswap
> -; RUN: lli -jit-kind=mcjit -force-interpreter %s | FileCheck %s
> +; RUN: lli -force-interpreter %s | FileCheck %s
>
>  ; CHECK: 0x100
>  ; CHECK: 0x10000
>
> diff  --git a/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
> b/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
> index c208490f1be6b..01cb21f4206dd 100644
> --- a/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
> +++ b/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s
> +; RUN: %lli -force-interpreter=true %s
>
>  define i32 @main() {
>         %a = add i32 0, undef
>
> diff  --git a/llvm/test/ExecutionEngine/Interpreter/alias.ll
> b/llvm/test/ExecutionEngine/Interpreter/alias.ll
> index 36e74f0a46a12..4bfdd2ce06027 100644
> --- a/llvm/test/ExecutionEngine/Interpreter/alias.ll
> +++ b/llvm/test/ExecutionEngine/Interpreter/alias.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter %s
> +; RUN: %lli -force-interpreter %s
>
>  define i32 @func() {
>  entry:
>
> diff  --git a/llvm/test/ExecutionEngine/Interpreter/call-no-args.ll
> b/llvm/test/ExecutionEngine/Interpreter/call-no-args.ll
> index 5f016b6258a4b..bd1f906fb04e6 100644
> --- a/llvm/test/ExecutionEngine/Interpreter/call-no-args.ll
> +++ b/llvm/test/ExecutionEngine/Interpreter/call-no-args.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter %s
> +; RUN: %lli -force-interpreter %s
>
>  declare void @exit(i32)
>  declare i32 @rand()
>
> diff  --git a/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
> b/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
> index c62c41470690e..468b6b7ab24eb 100644
> --- a/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
> +++ b/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
> @@ -1,4 +1,4 @@
> -; RUN: lli -jit-kind=mcjit -O0 -force-interpreter < %s
> +; RUN: lli -O0 -force-interpreter < %s
>
>  ; libffi does not support fp128 so we don’t test it
>  declare float  @llvm.sin.f32(float)
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
> index 8950261955207..7b1cb16def0e1 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @.LC0 = internal global [10 x i8] c"argc: %d\0A\00"            ; <[10 x
> i8]*> [#uses=1]
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
> index 99534c978abbb..68fdefefa5422 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @foo(i32 %X, i32 %Y, double %A) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
> index 57b45358772a3..5a0311dd93936 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
> index 9cb0867b6d2cb..48576e7c83e68 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
> index 6e38dbc302e5a..ed58e11843776 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; We were accidentally inverting the signedness of right shifts.  Whoops.
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
> index 59d95aea1ac3c..4960e5969005a 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
> index 8af17843c4130..038d7500101f4 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @bar(i8* %X) {
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
> index 8d43f3c1fa09a..d714bf7367bc0 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
> @@ -1,6 +1,5 @@
>  ; This testcase should return with an exit code of 1.
>  ;
> -; RUN: not %lli -jit-kind=mcjit %s
>  ; RUN: not %lli %s
>
>  @test = global i64 0           ; <i64*> [#uses=1]
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
> index 652a6d4b5b379..0538201326f9c 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s test
>  ; RUN: %lli %s test
>
>  declare i32 @puts(i8*)
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
> index 278daec516194..2f9b1439a38ac 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
> index 1eaf7dbe8b8c8..3a257895b7c45 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; Testcase distilled from 256.bzip2.
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
> index 1dd6e17091426..8a62e0632484c 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; Testcase distilled from 256.bzip2.
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
> index 5aaf22c618235..bee409c144114 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; This testcase failed to work because two variable sized allocas
> confused the
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
> index 13f751929fbe1..e2c52b495d9fe 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
> +; RUN: %lli %s > /dev/null
>
>  ;
>  ; Regression Test: EnvironmentTest.ll
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
> index ce5290d1a0904..8fb1bbbe9d776 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; This testcase exposes a bug in the local register allocator where it
> runs out
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
> b/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
> index 6ba24ecdf40ee..6513540903e84 100644
> ---
> a/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
> +++
> b/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @A = global i32 0              ; <i32*> [#uses=1]
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
> b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
> index 3cde5e96b3525..6a3c0f2a31cba 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
> @@ -1,5 +1,4 @@
>  ; PR672
> -; RUN: %lli -jit-kind=mcjit %s
>  ; RUN: %lli %s
>  ; XFAIL: mcjit-ia32
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
> b/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
> index 21261c8e2f947..d557f573dae53 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter %s
> +; RUN: %lli -force-interpreter %s
>  ; PR1836
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
> b/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
> index 46143b5696c94..c0a5d3b4c8638 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s | FileCheck %s
> +; RUN: %lli -force-interpreter=true %s | FileCheck %s
>  ; CHECK: 1
>
>  target datalayout =
> "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
> b/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
> index 9026a460c36a4..631cb2f67af09 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s
>  ; RUN: %lli %s
>  ;
>  ; Verify relocations to global symbols with addend work correctly.
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
> index ca0ab6367fe80..5d4e16fa4a2e0 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/cross-module-b.ll %s
> > /dev/null
>  ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
>
>  declare i32 @FB()
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
> index b7555944cf3e9..04331990db338 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/cross-module-b.ll
> -relocation-model=pic -code-model=small %s > /dev/null
>  ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll
> -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips-, mipsel-, i686, i386
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
> index f2d6a54a59d61..87fa989917bda 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
> @@ -1,5 +1,5 @@
>  ; REQUIRES: cxx-shared-library
> -; RUN: %lli -jit-kind=mcjit -relocation-model=pic -code-model=large %s
> +; RUN: %lli -relocation-model=pic -code-model=large %s
>  ; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386,
> aarch64, arm
>  declare i8* @__cxa_allocate_exception(i64)
>  declare void @__cxa_throw(i8*, i8*, i8*)
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/eh.ll
> b/llvm/test/ExecutionEngine/MCJIT/eh.ll
> index bf5faf2fb2e69..283b542a28746 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/eh.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/eh.ll
> @@ -1,5 +1,4 @@
>  ; REQUIRES: cxx-shared-library
> -; RUN: %lli -jit-kind=mcjit %s
>  ; RUN: %lli %s
>  ; XFAIL: arm, cygwin, windows-msvc, windows-gnu
>  declare i8* @__cxa_allocate_exception(i64)
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
> b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
> index 209c39f01edb7..670c142c0ffe5 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s | FileCheck %s
> +; RUN: %lli -force-interpreter=true %s | FileCheck %s
>  ; CHECK: 40091eb8
>
>  define i32 @test(double %x) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/hello.ll
> b/llvm/test/ExecutionEngine/MCJIT/hello.ll
> index 4272321c6ceef..516f57a81cd12 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/hello.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/hello.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @.LC0 = internal global [12 x i8] c"Hello World\00"            ; <[12 x
> i8]*> [#uses=1]
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/hello2.ll
> b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
> index 452e907c196c7..31a1a6e7a74e8 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/hello2.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @X = global i32 7              ; <i32*> [#uses=0]
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
> index fad56dfcebb6a..080bf6cf58428 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
> @@ -1,14 +1,12 @@
>  ; This first line will generate the .o files for the next run line
>  ; RUN: rm -rf %t.cachedir %t.cachedir2 %t.cachedir3
>  ; RUN: mkdir -p %t.cachedir %t.cachedir2 %t.cachedir3
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager
> -object-cache-dir=%t.cachedir %s
>  ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager
> -object-cache-dir=%t.cachedir %s
>
>  ; Collect generated objects.
>  ; RUN: find %t.cachedir -type f -name 'multi-module-?.o' -exec mv -v '{}'
> %t.cachedir2 ';'
>
>  ; This line tests MCJIT object loading
> -; RUN: %lli -jit-kind=mcjit -extra-object=%t.cachedir2/multi-module-b.o
> -extra-object=%t.cachedir2/multi-module-c.o %s
>  ; RUN: %lli -extra-object=%t.cachedir2/multi-module-b.o
> -extra-object=%t.cachedir2/multi-module-c.o %s
>
>  ; These lines put the object files into an archive
> @@ -16,7 +14,6 @@
>  ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-c.o
>
>  ; This line test MCJIT archive loading
> -; RUN: %lli -jit-kind=mcjit -extra-archive=%t.cachedir3/load-object.a %s
>  ; RUN: %lli -extra-archive=%t.cachedir3/load-object.a %s
>
>  declare i32 @FB()
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
> index f52f677151ba8..dc3154c7b3031 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll %s > /dev/null
>  ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll %s > /dev/null
>
>  declare i32 @FB()
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
> index a7ae86eddb584..59da314ad8fc6 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
> @@ -1,5 +1,4 @@
>  ; REQUIRES: cxx-shared-library
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll
> %s
>  ; RUN: %lli -extra-module=%p/Inputs/multi-module-eh-b.ll %s
>  ; XFAIL: arm, cygwin, windows-msvc, windows-gnu
>  declare i8* @__cxa_allocate_exception(i64)
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
> index 935044b1fdba4..7e5710dbf9c98 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic
> -code-model=small %s > /dev/null
>  ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic
> -code-model=small %s > /dev/null
>  ; XFAIL: mips-, mipsel-, i686, i386
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
> b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
> index 2d3eed3c35cc4..72e67ae93fe3b 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @foo(i32 %x, i32 %y, double %d) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
> b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
> index 416d143c3aa22..79dd9b4ccc0ee 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -O0 -disable-lazy-compilation=false %s
>  ; RUN: %lli -O0 -disable-lazy-compilation=false %s
>
>  ; The intention of this test is to verify that symbols mapped to COMMON
> in ELF
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
> index 7a1731e74ff50..4ac33597c0b1f 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/cross-module-b.ll
> -disable-lazy-compilation=true -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
> +; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll
> -disable-lazy-compilation=true -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
> index be60ec730ff10..d5acecc88bbf9 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
> @@ -1,5 +1,5 @@
>  ; REQUIRES: cxx-shared-library
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
>  ; XFAIL: arm, cygwin, windows-msvc, windows-gnu
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
> index 37b74de29061c..d75b65f01e85d 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true
> -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
> +; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll
> -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true
> -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
> index f458ab79f9843..83ad7d1d93946 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext
> %s > /dev/null
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
> index b8684a17abc14..589a6682b8c3a 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit -disable-lazy-compilation=false
> -mcjit-remote-process=lli-child-target%exeext %s
> +; RUN: %lli -remote-mcjit -disable-lazy-compilation=false
> -mcjit-remote-process=lli-child-target%exeext %s
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
> index e9673c84144cd..62e89cad332d4 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit -disable-lazy-compilation=false
> -relocation-model=pic -code-model=small %s
> +; RUN: %lli -remote-mcjit -disable-lazy-compilation=false
> -relocation-model=pic -code-model=small %s
>  ; XFAIL: *
>  ; This function should fail until remote symbol resolution is supported.
>
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
> index 060b5e132ad62..eda2c8e86c249 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit -O0
> -disable-lazy-compilation=false
> -mcjit-remote-process=lli-child-target%exeext %s
> +; RUN: %lli -remote-mcjit -O0 -disable-lazy-compilation=false
> -mcjit-remote-process=lli-child-target%exeext %s
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
> index d3305420d21da..3d2f0e5299a43 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN:  %lli -jit-kind=mcjit -remote-mcjit -O0
> -mcjit-remote-process=lli-child-target%exeext %s
> +; RUN:  %lli -remote-mcjit -O0
> -mcjit-remote-process=lli-child-target%exeext %s
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
> index 6e60396e29b4f..3399dd413fdcb 100644
> ---
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
> +++
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext
> %s > /dev/null
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
> index b6fae4600d8bb..05745e3f7fc00 100644
> ---
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
> +++
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext
> %s > /dev/null
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
> index bfe09fddce00d..f7146bd3d075c 100644
> ---
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
> +++
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext \
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
>  ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu,
> windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
> index 9e76601c963da..fae7e04883f54 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit -O0
> -mcjit-remote-process=lli-child-target%exeext %s
> +; RUN: %lli -remote-mcjit -O0
> -mcjit-remote-process=lli-child-target%exeext %s
>  ; XFAIL: windows-gnu,windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by
> r266663 is fixed
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
> index 20f232add47dd..5160aed16c0bf 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -remote-mcjit
> -mcjit-remote-process=lli-child-target%exeext \
> +; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
>  ; RUN:   -O0 -relocation-model=pic -code-model=small %s
>  ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu,
> windows-msvc
>  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
> b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
> index 90b49b1ba9ac8..85c171532752f 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
> b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
> index 8f944a412c063..167a0fdfd1307 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @bar() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
> index 5207c4e744663..46545ce534237 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false
> -relocation-model=pic -code-model=small %s
>  ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic
> -code-model=small %s
>  ; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/stubs.ll
> b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
> index 44cfcd75b771b..5b7acc71d04c3 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/stubs.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false %s
>  ; RUN: %lli -disable-lazy-compilation=false %s
>
>  define i32 @main() nounwind {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
> index e1c876368ae2c..79f989f7265b7 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
> index 37e2f1bcc6a84..3ae55d069b3de 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; test unconditional branch
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
> index a944105793688..c3cb93121f6b2 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @_Z14func_exit_codev() nounwind uwtable {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-call.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
> index 68acaed3bb69e..313a6c52367d8 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-call.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
> +; RUN: %lli %s > /dev/null
>
>  declare void @exit(i32)
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
> index 4fe2ed4f2b1de..667fa80a48971 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @foo() {
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
> index 648922ec49cb2..1bb074498d4ab 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -O0 %s
>  ; RUN: %lli -O0 %s
>
>  ; This test checks that common symbols have been allocated addresses
> honouring
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
> index ae37b6cf63ffc..b63c2fea67521 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -O0 -disable-lazy-compilation=false %s
>  ; RUN: %lli -O0 -disable-lazy-compilation=false %s
>
>  ; The intention of this test is to verify that symbols mapped to COMMON
> in ELF
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
> index e4dcdaeac9378..d01479a86cdc8 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; This tests to make sure that we can evaluate weird constant expressions
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
> index bb0f73a97b6cf..f21ea2e2a4528 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
> @@ -1,4 +1,3 @@
> -; RUN:  %lli -jit-kind=mcjit -O0 %s
>  ; RUN:  %lli -O0 %s
>
>  ; Check that a variable is always aligned as specified.
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
> index a8c5a8b83e202..c549a44659798 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define double @test(double* %DP, double %Arg) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
> index 6936cac45cedb..c65b5a6e96a27 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define double @test(double* %DP, double %Arg) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
> index a0881de51b4f0..4d03b3759e472 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>  ; XFAIL: darwin
>  @var = global i32 1, align 4
>
> diff  --git
> a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
> index 4ab2f8e86d549..e54135fc7cbc4 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -relocation-model=pic -code-model=small %s >
> /dev/null
>  ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
> index fdbd3d293db22..4595219fd2478 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @count = global i32 1, align 4
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-global.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
> index d6f2105414cae..2760ecd03e15f 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-global.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  @count = global i32 0, align 4
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
> index 660e33e3c9ebc..68c85050f0bab 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define void @test(i8* %P, i16* %P.upgrd.1, i32* %P.upgrd.2, i64*
> %P.upgrd.3) {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-local.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
> index f00489bfc01a6..832e178de153a 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-local.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() nounwind uwtable {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
> index 810a0fc4f2410..05b381bb53c22 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
> index fbcf7c6b4d7cd..e951a14ed2e94 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
> index 8cee709c756b2..c5bdfd513edca 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; test phi node
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
> index a4023a8cc6aad..eea6fde2e2caf 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -O0 -relocation-model=pic -code-model=small %s
>  ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
>  ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
> index 854ba40032a50..9cb427414ec1f 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit -O0 %s
>  ; RUN: %lli -O0 %s
>
>  @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
> index ef767994d1645..025f53e5cb9e4 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  ; test return instructions
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-return.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
> index 305439833f33b..d464a4b72d80f 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-return.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() nounwind uwtable {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
> index e9a75fffa99e2..68276e617a4a1 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
> index 94a3d6f197ae1..48dc02198ec0e 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
> b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
> index 0f2b09d8ce8d1..590e2620689f1 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
> b/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
> index 5dcb1f892a32b..e0e01a816e2f2 100644
> --- a/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
> +++ b/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
> @@ -1,5 +1,4 @@
>  ; RUN: lli -jit-kind=mcjit -extra-module %p/Inputs/weak-function-2.ll %s
> -; RUN: lli -extra-module %p/Inputs/weak-function-2.ll %s
>  ; UNSUPPORTED: uses_COFF
>  ;
>  ; Check that functions in two
> diff erent modules agree on the address of weak
>
> diff  --git a/llvm/test/ExecutionEngine/fma3-jit.ll
> b/llvm/test/ExecutionEngine/fma3-jit.ll
> index be1653a0fd19f..b68b7aeb6e4f0 100644
> --- a/llvm/test/ExecutionEngine/fma3-jit.ll
> +++ b/llvm/test/ExecutionEngine/fma3-jit.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s | FileCheck %s
>  ; RUN: %lli %s | FileCheck %s
>  ; REQUIRES: fma3
>  ; CHECK: 12.000000
>
> diff  --git a/llvm/test/ExecutionEngine/frem.ll
> b/llvm/test/ExecutionEngine/frem.ll
> index 390e0f9563b85..aedaae38baac0 100644
> --- a/llvm/test/ExecutionEngine/frem.ll
> +++ b/llvm/test/ExecutionEngine/frem.ll
> @@ -2,7 +2,6 @@
>  ; floating point intrinsics (defined as macros) are used.
>  ; This unit test guards against the failure.
>  ;
> -; RUN: %lli -jit-kind=mcjit %s | FileCheck %s
>  ; RUN: %lli %s | FileCheck %s
>
>  @flt = internal global float 12.0e+0
>
> diff  --git a/llvm/test/ExecutionEngine/mov64zext32.ll
> b/llvm/test/ExecutionEngine/mov64zext32.ll
> index bba1a1987350a..a5b246170cf0a 100644
> --- a/llvm/test/ExecutionEngine/mov64zext32.ll
> +++ b/llvm/test/ExecutionEngine/mov64zext32.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i64 @foo() {
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
> index 6f784265a73e1..b01457d82b4a6 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
> index 6896af83c44fb..0ee14fe31ba30 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-cast.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-cast.ll
> index 769ea86673a6a..3f9f66640fa12 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-cast.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-cast.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> +; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>      zext <2 x i1> <i1 true,i1 true> to <2 x i8>
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll
> index a6698e60fc3a0..814b90533d0cf 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll
> @@ -1,4 +1,4 @@
> - ; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> + ; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>   %v0 = insertelement <2 x i8> zeroinitializer, i8 1, i32 1
>
> diff  --git
> a/llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll
> index 18937169d11b8..09fbf6abc3fd7 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll
> @@ -1,4 +1,4 @@
> - ; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> + ; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll
> index f6dc67700f944..b66a935056438 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s | FileCheck %s
> +; RUN: %lli -force-interpreter=true %s | FileCheck %s
>  ; CHECK: int test passed
>  ; CHECK: double test passed
>  ; CHECK: float test passed
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
> index f654120eaf8e0..f8f1f0d8637e5 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-select.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-select.ll
> index 36fbe8cb423d3..ce086e408dd43 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-select.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-select.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> +; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
> index 84bdec1cf5597..8b9b7c76d3c53 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
> index 5a20fc4f11721..4c89109105951 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
> @@ -1,4 +1,3 @@
> -; RUN: %lli -jit-kind=mcjit %s > /dev/null
>  ; RUN: %lli %s > /dev/null
>
>  define i32 @main() {
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-shift.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-shift.ll
> index e9945cc2e475d..3aa4f4e54f39f 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-shift.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-shift.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> +; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>      %shamt = add <2 x i8> <i8 0, i8 0>, <i8 1, i8 2>
>
> diff  --git a/llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll
> b/llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll
> index 17559532abea9..e55fa99e3bb19 100644
> --- a/llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll
> +++ b/llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll
> @@ -1,4 +1,4 @@
> -; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
> +; RUN: %lli -force-interpreter=true %s > /dev/null
>
>  define i32 @main() {
>
>
> diff  --git a/llvm/test/Integer/2007-01-19-TruncSext.ll
> b/llvm/test/Integer/2007-01-19-TruncSext.ll
> index 9a6c73efe1dfa..d8248713dff01 100644
> --- a/llvm/test/Integer/2007-01-19-TruncSext.ll
> +++ b/llvm/test/Integer/2007-01-19-TruncSext.ll
> @@ -1,7 +1,7 @@
>  ; RUN: llvm-as %s -o - | llvm-dis > %t1.ll
>  ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
>  ; RUN:
> diff  %t1.ll %t2.ll
> -; RUN: llvm-as < %s | lli -jit-kind=mcjit --force-interpreter=true |
> FileCheck %s
> +; RUN: llvm-as < %s | lli --force-interpreter=true | FileCheck %s
>  ; CHECK: -255
>
>  @ARRAY   = global [ 20 x i17 ] zeroinitializer
>
> diff  --git a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
> b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
> index d111ff1e67cf9..2bf26041626c4 100644
> --- a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
> +++ b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
> @@ -1,4 +1,4 @@
> -; RUN: opt < %s -licm | lli -jit-kind=mcjit -force-interpreter
> +; RUN: opt < %s -licm | lli -force-interpreter
>
>  define i32 @main() {
>  entry:
>
> diff  --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp
> index 7f5ead0e44738..32df0711f2fd1 100644
> --- a/llvm/tools/lli/lli.cpp
> +++ b/llvm/tools/lli/lli.cpp
> @@ -99,7 +99,7 @@ namespace {
>
>    cl::opt<JITKind> UseJITKind(
>        "jit-kind", cl::desc("Choose underlying JIT kind."),
> -      cl::init(JITKind::Orc),
> +      cl::init(JITKind::MCJIT),
>        cl::values(clEnumValN(JITKind::MCJIT, "mcjit", "MCJIT"),
>                   clEnumValN(JITKind::Orc, "orc", "Orc JIT"),
>                   clEnumValN(JITKind::OrcLazy, "orc-lazy",
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210330/abb55ca3/attachment-0001.html>


More information about the llvm-commits mailing list