[llvm] c42c67a - Re-apply "[lli] Make -jit-kind=orc the default JIT engine"
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 1 12:17:52 PDT 2021
On Wed, Mar 31, 2021 at 1:50 AM Stefan Gränitz
<stefan.graenitz at gmail.com> wrote:
>
> I thought that's better documented in the differential revision than in the commit message. After the revert, I reopend the review, linked the three required fixes and then reapplied the commit once they had landed:
> https://reviews.llvm.org/rGd9069dd9b5763f72a9ce11aaab1c9ab4f9bf282d
> https://reviews.llvm.org/rGc352a2b8290b0a088ac3442aca89380248f02381
> https://reviews.llvm.org/rG66a8247eb6c021a6a706702fb9eedfb68f4cc94d
>
> You think it's beneficial to have it in both places?
I think so, yeah - post-commit review is already a lot of work &
summarizing things in the commit message can speed it up/make it
easier.
> If there's a convention, I will follow it of course. Thanks for the note.
Yeah, it might just be my own losing battle - it's certainly pretty
common for folks to revert and reapply patches without including a lot
of context, unfortunately. I'm trying to encourage more detail to be
included, but that's just me, not some clear LLVM community
norm/directive. So open to debate/disagreement/divergence, to be sure.
- Dave
>
> On 30/03/2021 21:25, David Blaikie wrote:
>
> What caused the revert/what changed in the recommit to address the issue that caused the revert? (please include that sort of detail (& the hashes of any previous commits/reverts) in the commit message in changes like this)
>
> On Tue, Mar 30, 2021 at 3:08 AM Stefan Gränitz via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>>
>>
>> Author: Stefan Gränitz
>> Date: 2021-03-30T12:08:26+02:00
>> New Revision: c42c67ad60449fe19949f2664c2a5878b3f72b7e
>>
>> URL: https://github.com/llvm/llvm-project/commit/c42c67ad60449fe19949f2664c2a5878b3f72b7e
>> DIFF: https://github.com/llvm/llvm-project/commit/c42c67ad60449fe19949f2664c2a5878b3f72b7e.diff
>>
>> LOG: Re-apply "[lli] Make -jit-kind=orc the default JIT engine"
>>
>> MCJIT served well as the default JIT engine in lli for a long time, but the code is getting old and maintenance efforts don't seem to be in sight. In the meantime Orc became mature enough to fill that gap. The newly added greddy mode is very similar to the execution model of MCJIT. It should work as a drop-in replacement for common JIT tasks.
>>
>> Reviewed By: lhames
>>
>> Differential Revision: https://reviews.llvm.org/D98931
>>
>> 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 bd4f02be2b17..935e8a9b2c73 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 -force-interpreter %s | FileCheck %s
>> +; RUN: lli -jit-kind=mcjit -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 01cb21f4206d..c208490f1be6 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 -force-interpreter=true %s
>> +; RUN: %lli -jit-kind=mcjit -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 4bfdd2ce0602..36e74f0a46a1 100644
>> --- a/llvm/test/ExecutionEngine/Interpreter/alias.ll
>> +++ b/llvm/test/ExecutionEngine/Interpreter/alias.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -force-interpreter %s
>> +; RUN: %lli -jit-kind=mcjit -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 bd1f906fb04e..5f016b6258a4 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 -force-interpreter %s
>> +; RUN: %lli -jit-kind=mcjit -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 468b6b7ab24e..c62c41470690 100644
>> --- a/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
>> +++ b/llvm/test/ExecutionEngine/Interpreter/intrinsics.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: lli -O0 -force-interpreter < %s
>> +; RUN: lli -jit-kind=mcjit -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 7b1cb16def0e..895026195520 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 68fdefefa542..99534c978abb 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
>> @@ -1,3 +1,4 @@
>> +; 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 5a0311dd9393..57b45358772a 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 48576e7c83e6..9cb0867b6d2c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 ed58e1184377..6e38dbc302e5 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 4960e5969005..59d95aea1ac3 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
>> @@ -1,3 +1,4 @@
>> +; 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 038d7500101f..8af17843c413 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 d714bf7367bc..8d43f3c1fa09 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
>> @@ -1,5 +1,6 @@
>> ; 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 0538201326f9..652a6d4b5b37 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 2f9b1439a38a..278daec51619 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
>> @@ -1,3 +1,4 @@
>> +; 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 3a257895b7c4..1eaf7dbe8b8c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
>> @@ -1,3 +1,4 @@
>> +; 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 8a62e0632484..1dd6e1709142 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
>> @@ -1,3 +1,4 @@
>> +; 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 bee409c14411..5aaf22c61823 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
>> @@ -1,3 +1,4 @@
>> +; 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 e2c52b495d9f..13f751929fbe 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 %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit %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 8fb1bbbe9d77..ce5290d1a090 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
>> @@ -1,3 +1,4 @@
>> +; 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 6513540903e8..6ba24ecdf40e 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,3 +1,4 @@
>> +; 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 6a3c0f2a31cb..3cde5e96b352 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
>> @@ -1,4 +1,5 @@
>> ; 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 d557f573dae5..21261c8e2f94 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 -force-interpreter %s
>> +; RUN: %lli -jit-kind=mcjit -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 c0a5d3b4c863..46143b5696c9 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 -force-interpreter=true %s | FileCheck %s
>> +; RUN: %lli -jit-kind=mcjit -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 631cb2f67af0..9026a460c36a 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
>> @@ -1,3 +1,4 @@
>> +; 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 5d4e16fa4a2e..ca0ab6367fe8 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
>> @@ -1,3 +1,4 @@
>> +; 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 e9b14fc71755..24a732f88ecf 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
>> @@ -1,5 +1,5 @@
>> ; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
>> -; RUN: %lli -jit-kind=orc -lljit-platform=Inactive -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
>> +; RUN: %lli -lljit-platform=Inactive -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
>> ; XFAIL: mips-, mipsel-, i686, i386
>>
>> declare i32 @FB()
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
>> index 87fa989917bd..f2d6a54a59d6 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 -relocation-model=pic -code-model=large %s
>> +; RUN: %lli -jit-kind=mcjit -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 283b542a2874..bf5faf2fb2e6 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/eh.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/eh.ll
>> @@ -1,4 +1,5 @@
>> ; 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 670c142c0ffe..209c39f01edb 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -force-interpreter=true %s | FileCheck %s
>> +; RUN: %lli -jit-kind=mcjit -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 516f57a81cd1..4272321c6cee 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/hello.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/hello.ll
>> @@ -1,3 +1,4 @@
>> +; 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 31a1a6e7a74e..452e907c196c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/hello2.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
>> @@ -1,3 +1,4 @@
>> +; 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 080bf6cf5842..fad56dfcebb6 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
>> @@ -1,12 +1,14 @@
>> ; 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
>> @@ -14,6 +16,7 @@
>> ; 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 dc3154c7b303..f52f677151ba 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
>> @@ -1,3 +1,4 @@
>> +; 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 59da314ad8fc..a7ae86eddb58 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
>> @@ -1,4 +1,5 @@
>> ; 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 cba64c488265..c3e52897d5fa 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
>> @@ -1,5 +1,5 @@
>> ; 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 -jit-kind=orc -lljit-platform=Inactive -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 -lljit-platform=Inactive -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
>>
>> declare i32 @FB()
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
>> index 72e67ae93fe3..2d3eed3c35cc 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
>> @@ -1,3 +1,4 @@
>> +; 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 79dd9b4ccc0e..786829f8ed3c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -O0 -disable-lazy-compilation=false %s
>> +; RUN: %lli -jit-kind=mcjit -O0 -disable-lazy-compilation=false %s
>>
>> ; The intention of this test is to verify that symbols mapped to COMMON in ELF
>> ; work as expected.
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
>> index 4ac33597c0b1..7a1731e74ff5 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 -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 -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
>> ; 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 d5acecc88bbf..be60ec730ff1 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
>> +; RUN: %lli -jit-kind=mcjit -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 d75b65f01e85..37b74de29061 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 -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 -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
>> ; 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 83ad7d1d9394..f458ab79f984 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 589a6682b8c3..b8684a17abc1 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 -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
>> +; RUN: %lli -jit-kind=mcjit -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 62e89cad332d..e9673c84144c 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 -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
>> +; RUN: %lli -jit-kind=mcjit -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 eda2c8e86c24..060b5e132ad6 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 -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
>> +; RUN: %lli -jit-kind=mcjit -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 3d2f0e5299a4..d3305420d21d 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 -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
>> +; RUN: %lli -jit-kind=mcjit -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 3399dd413fdc..6e60396e29b4 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 05745e3f7fc0..b6fae4600d8b 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 f7146bd3d075..bfe09fddce00 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
>> +; RUN: %lli -jit-kind=mcjit -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 fae7e04883f5..9e76601c963d 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 -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
>> +; RUN: %lli -jit-kind=mcjit -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 5160aed16c0b..20f232add47d 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 -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
>> +; RUN: %lli -jit-kind=mcjit -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 85c171532752..90b49b1ba9ac 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 167a0fdfd130..8f944a412c06 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
>> @@ -1,3 +1,4 @@
>> +; 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 46545ce53423..76eaefae2433 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
>> +; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
>> ; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
>>
>> define i32 @main() nounwind {
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/stubs.ll b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
>> index 5b7acc71d04c..44255e992d51 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/stubs.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -disable-lazy-compilation=false %s
>> +; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false %s
>>
>> define i32 @main() nounwind {
>> entry:
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
>> index 79f989f7265b..e1c876368ae2 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
>> @@ -1,3 +1,4 @@
>> +; 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 3ae55d069b3d..37e2f1bcc6a8 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
>> @@ -1,3 +1,4 @@
>> +; 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 c3cb93121f6b..a94410579368 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
>> @@ -1,3 +1,4 @@
>> +; 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 313a6c52367d..e20e652316f8 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-call.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
>> @@ -1,3 +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 667fa80a4897..4fe2ed4f2b1d 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
>> @@ -1,3 +1,4 @@
>> +; 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 1bb074498d4a..648922ec49cb 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
>> @@ -1,3 +1,4 @@
>> +; 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 b63c2fea6752..2745279a2d75 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
>> @@ -1,4 +1,4 @@
>> -; RUN: %lli -O0 -disable-lazy-compilation=false %s
>> +; RUN: %lli -jit-kind=mcjit -O0 -disable-lazy-compilation=false %s
>>
>> ; The intention of this test is to verify that symbols mapped to COMMON in ELF
>> ; work as expected.
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
>> index d01479a86cdc..e4dcdaeac937 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
>> @@ -1,3 +1,4 @@
>> +; 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 f21ea2e2a452..bb0f73a97b6c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
>> @@ -1,3 +1,4 @@
>> +; 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 c549a4465979..a8c5a8b83e20 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
>> @@ -1,3 +1,4 @@
>> +; 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 c65b5a6e96a2..6936cac45ced 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
>> @@ -1,3 +1,4 @@
>> +; 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 4d03b3759e47..a0881de51b4f 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
>> @@ -1,3 +1,4 @@
>> +; 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 4eac7177b656..ae02faa361d7 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,5 +1,5 @@
>> ; RUN: %lli -jit-kind=mcjit -relocation-model=pic -code-model=small %s > /dev/null
>> -; RUN: %lli -jit-kind=orc -lljit-platform=Inactive -relocation-model=pic -code-model=small %s > /dev/null
>> +; RUN: %lli -lljit-platform=Inactive -relocation-model=pic -code-model=small %s > /dev/null
>> ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
>>
>> @count = global i32 1, align 4
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
>> index 4595219fd247..fdbd3d293db2 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
>> @@ -1,3 +1,4 @@
>> +; 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 2760ecd03e15..d6f2105414ca 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-global.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
>> @@ -1,3 +1,4 @@
>> +; 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 68c85050f0ba..660e33e3c9eb 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
>> @@ -1,3 +1,4 @@
>> +; 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 832e178de153..f00489bfc01a 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-local.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
>> @@ -1,3 +1,4 @@
>> +; 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 05b381bb53c2..810a0fc4f241 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
>> @@ -1,3 +1,4 @@
>> +; 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 e951a14ed2e9..fbcf7c6b4d7c 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
>> @@ -1,3 +1,4 @@
>> +; 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 c5bdfd513edc..8cee709c756b 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
>> @@ -1,3 +1,4 @@
>> +; 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 d471e877427c..eb312774c5b3 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
>> @@ -1,5 +1,5 @@
>> ; RUN: %lli -jit-kind=mcjit -O0 -relocation-model=pic -code-model=small %s
>> -; RUN: %lli -jit-kind=orc -lljit-platform=Inactive -O0 -relocation-model=pic -code-model=small %s
>> +; RUN: %lli -lljit-platform=Inactive -O0 -relocation-model=pic -code-model=small %s
>> ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
>>
>> @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
>>
>> diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
>> index 9cb427414ec1..854ba40032a5 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
>> @@ -1,3 +1,4 @@
>> +; 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 025f53e5cb9e..ef767994d164 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
>> @@ -1,3 +1,4 @@
>> +; 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 d464a4b72d80..305439833f33 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-return.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
>> @@ -1,3 +1,4 @@
>> +; 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 68276e617a4a..e9a75fffa99e 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
>> @@ -1,3 +1,4 @@
>> +; 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 48dc02198ec0..94a3d6f197ae 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
>> @@ -1,3 +1,4 @@
>> +; 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 590e2620689f..0f2b09d8ce8d 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
>> @@ -1,3 +1,4 @@
>> +; 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 e0e01a816e2f..5dcb1f892a32 100644
>> --- a/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
>> +++ b/llvm/test/ExecutionEngine/MCJIT/weak-function.ll
>> @@ -1,4 +1,5 @@
>> ; 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 b68b7aeb6e4f..be1653a0fd19 100644
>> --- a/llvm/test/ExecutionEngine/fma3-jit.ll
>> +++ b/llvm/test/ExecutionEngine/fma3-jit.ll
>> @@ -1,3 +1,4 @@
>> +; 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 1b7821914425..390e0f9563b8 100644
>> --- a/llvm/test/ExecutionEngine/frem.ll
>> +++ b/llvm/test/ExecutionEngine/frem.ll
>> @@ -3,7 +3,7 @@
>> ; This unit test guards against the failure.
>> ;
>> ; RUN: %lli -jit-kind=mcjit %s | FileCheck %s
>> -; RUN: %lli -jit-kind=orc %s | FileCheck %s
>> +; RUN: %lli %s | FileCheck %s
>>
>> @flt = internal global float 12.0e+0
>> @str = internal constant [18 x i8] c"Double value: %f\0A\00"
>>
>> diff --git a/llvm/test/ExecutionEngine/mov64zext32.ll b/llvm/test/ExecutionEngine/mov64zext32.ll
>> index a5b246170cf0..bba1a1987350 100644
>> --- a/llvm/test/ExecutionEngine/mov64zext32.ll
>> +++ b/llvm/test/ExecutionEngine/mov64zext32.ll
>> @@ -1,3 +1,4 @@
>> +; 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 b01457d82b4a..6f784265a73e 100644
>> --- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
>> +++ b/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
>> @@ -1,3 +1,4 @@
>> +; 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 0ee14fe31ba3..6896af83c44f 100644
>> --- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
>> +++ b/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
>> @@ -1,3 +1,4 @@
>> +; 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 3f9f66640fa1..769ea86673a6 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 -force-interpreter=true %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 814b90533d0c..a6698e60fc3a 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 -force-interpreter=true %s > /dev/null
>> + ; RUN: %lli -jit-kind=mcjit -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 09fbf6abc3fd..18937169d11b 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 -force-interpreter=true %s > /dev/null
>> + ; RUN: %lli -jit-kind=mcjit -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 b66a93505643..f6dc67700f94 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 -force-interpreter=true %s | FileCheck %s
>> +; RUN: %lli -jit-kind=mcjit -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 f8f1f0d8637e..f654120eaf8e 100644
>> --- a/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
>> +++ b/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
>> @@ -1,3 +1,4 @@
>> +; 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 ce086e408dd4..36fbe8cb423d 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 -force-interpreter=true %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 8b9b7c76d3c5..84bdec1cf559 100644
>> --- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
>> +++ b/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
>> @@ -1,3 +1,4 @@
>> +; 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 4c8910910595..5a20fc4f1172 100644
>> --- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
>> +++ b/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
>> @@ -1,3 +1,4 @@
>> +; 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 3aa4f4e54f39..e9945cc2e475 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 -force-interpreter=true %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 e55fa99e3bb1..17559532abea 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 -force-interpreter=true %s > /dev/null
>> +; RUN: %lli -jit-kind=mcjit -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 d8248713dff0..9a6c73efe1df 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 --force-interpreter=true | FileCheck %s
>> +; RUN: llvm-as < %s | lli -jit-kind=mcjit --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 2bf26041626c..d111ff1e67cf 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 -force-interpreter
>> +; RUN: opt < %s -licm | lli -jit-kind=mcjit -force-interpreter
>>
>> define i32 @main() {
>> entry:
>>
>> diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp
>> index 4ddae61ee49f..ced1e2a6d629 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::MCJIT),
>> + cl::init(JITKind::Orc),
>> 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
>
> --
> https://flowcrypt.com/pub/stefan.graenitz@gmail.com
More information about the llvm-commits
mailing list