[lli] Make -jit-kind=orc the default JIT engine

[sgraenitz]

Summary

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.

[sgraenitz]

Run tests for common JIT tasks against both, MCJIT and Orc

[sgraenitz]

Patch tests for MCJIT-specific behavior

[sgraenitz]

Patch 5 other tests that slipped through

[mehdi_amini]

This change was overdue, thanks!

[lhames]

LGTM. This is great stuff -- thanks Stefan!

[sgraenitz]

For now keep eh-lg-pic.ll a MCJIT-only test

[sgraenitz]

Fix error No callback manager available on powerpc64le-unknown-linux-gnu with eccd7ae2fdb3

[thakis]

This breaks tests on windows: http://45.33.8.238/win/35564/step_11.txt

Please take a look, and revert for now if it takes a while to fix.

[nemanjai]

In D98931#2644050, @sgraenitz wrote:

Fix error No callback manager available on powerpc64le-unknown-linux-gnu with eccd7ae2fdb3

It has actually taken down most of the PPC bots. Can we get it reverted and we can try to do what we can to help investigate the failures on PowerPC machines?

[sgraenitz]

In D98931#2644236, @nemanjai wrote:

Can we get it reverted and we can try to do what we can to help investigate the failures on PowerPC machines?

I think 5949bd91253672ea8599a7a234b18e78972d3aa1 will fix the PowerPC bots

In D98931#2644162, @thakis wrote:

This breaks tests on windows: http://45.33.8.238/win/35564/step_11.txt

These have all in common a strange exit code 3221225477 but otherwise don't provide any details. There is one more here: https://lab.llvm.org/buildbot#builders/123/builds/3554

[sgraenitz]

In D98931#2644686, @sgraenitz wrote:

I think 5949bd91253672ea8599a7a234b18e78972d3aa1 will fix the PowerPC bots

Ok at first it introduced some more trouble by breaking unit tests that expected an error coming out of this function. Reverted that too. So, everything should be back to default for now.

[sgraenitz]

Don't apply lazy-MCJIT tests to the default (greedy) mode for Orc. They probably work well with OrcLazy, but that's a different story.

[sgraenitz]

Rebase patch

llvm/test/CodeGen/Generic/bswap.ll

 ; 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
 ; CHECK: 0x1001000000000000
 ; CHECK: 0x100
 ; CHECK: 0x10000
 ; CHECK: 0x1001000000000000
 

llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll

-; RUN: %lli -force-interpreter=true %s
+; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s
 
 define i32 @main() {
        %a = add i32 0, undef
        %b = fadd float 0.0, undef
        %c = fadd double 0.0, undef
        ret i32 0
 }

llvm/test/ExecutionEngine/Interpreter/alias.ll

-; RUN: %lli -force-interpreter %s
+; RUN: %lli -jit-kind=mcjit -force-interpreter %s
 
 define i32 @func() {
 entry:
   ret i32 0
 }
 
 @alias = alias i32 (), i32 ()* @func
 
 define i32 @main() {
 entry:
   %call = call i32 @alias()
   ret i32 %call
 }

llvm/test/ExecutionEngine/Interpreter/call-no-args.ll

-; RUN: %lli -force-interpreter %s
+; RUN: %lli -jit-kind=mcjit -force-interpreter %s
 
 declare void @exit(i32)
 declare i32 @rand()
 
 define i32 @main() {
   %ret = call i32 @rand()
   call void @exit(i32 0)
   ret i32 %ret
 }

llvm/test/ExecutionEngine/Interpreter/intrinsics.ll

-; 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)
 declare double @llvm.sin.f64(double)
 declare float  @llvm.cos.f32(float)
 declare double @llvm.cos.f64(double)
 declare float  @llvm.floor.f32(float)
 declare double @llvm.floor.f64(double)

llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll

+; 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]
 
 declare i32 @puts(i8*)
 
 define void @getoptions(i32* %argc) {
 bb0:

llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @foo(i32 %X, i32 %Y, double %A) {
   %cond212 = fcmp une double %A, 1.000000e+00    ; <i1> [#uses=1]
   %cast110 = zext i1 %cond212 to i32    ; <i32> [#uses=1]
   ret i32 %cast110
 }
 
 define i32 @main() {
   %reg212 = call i32 @foo( i32 0, i32 1, double 1.000000e+00 )    ; <i32> [#uses=1]
   ret i32 %reg212
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   call i32 @mylog( i32 4 )    ; <i32>:1 [#uses=0]
   ret i32 0
 }
 
 define internal i32 @mylog(i32 %num) {

llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
   br label %Loop
 Loop:   ; preds = %Loop, %0
   %X = phi i32 [ 0, %0 ], [ 1, %Loop ]    ; <i32> [#uses=1]
   br i1 true, label %Out, label %Loop
 Out:    ; preds = %Loop
   ret i32 %X
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; We were accidentally inverting the signedness of right shifts.  Whoops.
 
 define i32 @main() {
   %X = ashr i32 -1, 16    ; <i32> [#uses=1]
   %Y = ashr i32 %X, 16    ; <i32> [#uses=1]
   %Z = add i32 %Y, 1    ; <i32> [#uses=1]
   ret i32 %Z
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   %X = fadd double 0.000000e+00, 1.000000e+00    ; <double> [#uses=1]
   %Y = fsub double 0.000000e+00, 1.000000e+00    ; <double> [#uses=2]
   %Z = fcmp oeq double %X, %Y    ; <i1> [#uses=0]
   fadd double %Y, 0.000000e+00    ; <double>:1 [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @bar(i8* %X) {
         ; pointer should be 4 byte aligned!
   %P = alloca double    ; <double*> [#uses=1]
   %R = ptrtoint double* %P to i32    ; <i32> [#uses=1]
   %A = and i32 %R, 3    ; <i32> [#uses=1]
   ret i32 %A

llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll

 ; 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]
 
 define internal i64 @test.upgrd.1() {
   %tmp.0 = load i64, i64* @test    ; <i64> [#uses=1]
   %tmp.1 = add i64 %tmp.0, 1    ; <i64> [#uses=1]
   ret i64 %tmp.1

llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll

+; RUN: %lli -jit-kind=mcjit %s test
 ; RUN: %lli %s test
 
 declare i32 @puts(i8*)
 
 define i32 @main(i32 %argc.1, i8** %argv.1) {
   %tmp.5 = getelementptr i8*, i8** %argv.1, i64 1    ; <i8**> [#uses=1]
   %tmp.6 = load i8*, i8** %tmp.5    ; <i8*> [#uses=1]
   %tmp.0 = call i32 @puts( i8* %tmp.6 )    ; <i32> [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 entry:
   br label %endif
 then:   ; No predecessors!
   br label %endif
 endif:    ; preds = %then, %entry
   %x = phi i32 [ 4, %entry ], [ 27, %then ]    ; <i32> [#uses=0]
   %result = phi i32 [ 32, %then ], [ 0, %entry ]    ; <i32> [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
 define i32 @main() {
 entry:
   br label %loopentry.0
 loopentry.0:    ; preds = %loopentry.0, %entry

llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
 define i32 @main() {
 entry:
   %X = add i32 1, -1    ; <i32> [#uses=3]
   br label %Next
 Next:   ; preds = %entry
   %A = phi i32 [ %X, %entry ]    ; <i32> [#uses=0]
   %B = phi i32 [ %X, %entry ]    ; <i32> [#uses=0]
   %C = phi i32 [ %X, %entry ]    ; <i32> [#uses=1]
   ret i32 %C
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll

+; 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
 ; local register allocator.
 
 define i32 @main(i32 %X) {
   %A = alloca i32, i32 %X   ; <i32*> [#uses=0]
   %B = alloca float, i32 %X   ; <float*> [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll

-; RUN: %lli %s > /dev/null
+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 
 ;
 ; Regression Test: EnvironmentTest.ll
 ;
 ; Description:
 ; This is a regression test that verifies that the JIT passes the
 ; environment to the main() function.
 ;

llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll

+; 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
 ; of registers (due to too many overlapping live ranges), but then attempts to
 ; use the ESP register (which is not allocatable) to hold a value.
 
 define i32 @main(i32 %A) {
         ; ESP gets used again...

llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 @A = global i32 0   ; <i32*> [#uses=1]
 
 define i32 @main() {
   %Ret = call i32 @test( i1 true, i32 0 )    ; <i32> [#uses=1]
   ret i32 %Ret
 }

llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll

 ; PR672
+; RUN: %lli -jit-kind=mcjit %s
 ; RUN: %lli %s
 ; XFAIL: mcjit-ia32
 
 define i32 @main() {
   %f = bitcast i32 (i32, i32*, i32)* @check_tail to i32*    ; <i32*> [#uses=1]
   %res = tail call fastcc i32 @check_tail( i32 10, i32* %f, i32 10 )    ; <i32> [#uses=1]
   ret i32 %res
 }

llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll

-; RUN: %lli -force-interpreter %s
+; RUN: %lli -jit-kind=mcjit -force-interpreter %s
 ; PR1836
 
 define i32 @main() {
 entry:
     %retval = alloca i32        ; <i32*> [#uses=2]
     %tmp = alloca i32       ; <i32*> [#uses=2]
     %x = alloca i75, align 16       ; <i75*> [#uses=1]
     %"alloca point" = bitcast i32 0 to i32      ; <i32> [#uses=0]

llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll

-; 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"
 target triple = "i686-pc-linux-gnu"
 @.str = internal constant [10 x i8] c"MSB = %d\0A\00"    ; <[10 x i8]*> [#uses=1]
 
 define i65 @foo(i65 %x) {
 entry:

llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll

+; RUN: %lli -jit-kind=mcjit %s
 ; RUN: %lli %s
 ;
 ; Verify relocations to global symbols with addend work correctly.
 ;
 ; Compiled from this C code:
 ;
 ; int test[2] = { -1, 0 };
 ; int *p = &test[1];

llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll

+; 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()
 
 define i32 @FA() {
   ret i32 0
 }
 
 define i32 @main() {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll

 ; 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()
 
 define i32 @FA() {
   ret i32 0
 }
 
 define i32 @main() {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll

 ; 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*)
 declare i32 @__gxx_personality_v0(...)
 declare void @__cxa_end_catch()
 declare i8* @__cxa_begin_catch(i8*)
 
 @_ZTIi = external constant i8*

llvm/test/ExecutionEngine/MCJIT/eh.ll

 ; 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)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
 declare void @__cxa_end_catch()
 declare i8* @__cxa_begin_catch(i8*)
 

llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll

-; 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) {
 entry:
   %x46.i = bitcast double %x to i64 
   %tmp343.i = lshr i64 %x46.i, 32 
   %tmp344.i = trunc i64 %tmp343.i to i32
         ret i32 %tmp344.i

llvm/test/ExecutionEngine/MCJIT/hello.ll

+; 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]
 
 declare i32 @puts(i8*)
 
 define i32 @main() {
   %reg210 = call i32 @puts( i8* getelementptr ([12 x i8], [12 x i8]* @.LC0, i64 0, i64 0) )    ; <i32> [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/hello2.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 @X = global i32 7   ; <i32*> [#uses=0]
 @msg = internal global [13 x i8] c"Hello World\0A\00"    ; <[13 x i8]*> [#uses=1]
 
 declare void @printf([13 x i8]*, ...)
 
 define void @bar() {

llvm/test/ExecutionEngine/MCJIT/load-object-a.ll

 ; 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
 ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-b.o
 ; 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()
 
 define i32 @main() {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }

llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll

+; 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()
 
 define i32 @main() {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll

 ; 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)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
 declare void @__cxa_end_catch()
 declare i8* @__cxa_begin_catch(i8*)
 

llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll

 ; 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()
 
 define i32 @main() {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @foo(i32 %x, i32 %y, double %d) {
 entry:
   %d.int64 = bitcast double %d to i64
   %d.top64 = lshr i64 %d.int64, 32
   %d.top   = trunc i64 %d.top64 to i32
   %d.bottom = trunc i64 %d.int64 to i32

llvm/test/ExecutionEngine/MCJIT/pr13727.ll

-; 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.
 ;
 ; Compiled from this C code:
 ;
 ; int zero_int;
 ; double zero_double;

llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll

-; 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
 
 declare i32 @FB()
 
 define i32 @FA() nounwind {
   ret i32 0
 }
 
 define i32 @main() nounwind {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }

llvm/test/ExecutionEngine/MCJIT/remote/eh.ll

 ; 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
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
 declare void @__cxa_end_catch()
 declare i8* @__cxa_begin_catch(i8*)

llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll

-; 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
 
 declare i32 @FB()
 
 define i32 @main() nounwind {
   %r = call i32 @FB( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll

-; 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
 
 define i32 @bar() nounwind {
   ret i32 0
 }
 
 define i32 @main() nounwind {
   %r = call i32 @bar( )   ; <i32> [#uses=1]
   ret i32 %r
 }

llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll

-; 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
 
 define i32 @main() nounwind {
 entry:
   call void @lazily_compiled_address_is_consistent()
   ret i32 0

llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll

-; 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.
 
 define i32 @main() nounwind {
 entry:
   call void @lazily_compiled_address_is_consistent()
   ret i32 0
 }

llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll

-; 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
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
 ;
 ; Compiled from this C code:

llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll

-; 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
 
 ; Check that a variable is always aligned as specified.
 
 @var = global i32 0, align 32
 define i32 @main() nounwind {

llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll

-; 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
 
 define double @test(double* %DP, double %Arg) nounwind {
   %D = load double, double* %DP    ; <double> [#uses=1]
   %V = fadd double %D, 1.000000e+00   ; <double> [#uses=2]
   %W = fsub double %V, %V   ; <double> [#uses=3]

llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll

-; 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
 
 @count = global i32 1, align 4
 
 define i32 @main() nounwind {
 entry:

llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll

-; 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
 ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
 
 @count = global i32 1, align 4
 
 define i32 @main() nounwind uwtable {

llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll

-; 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
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
 @.str1 = private unnamed_addr constant [6 x i8] c"data2\00", align 1
 @ptr2 = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str1, i32 0, i32 0), align 4

llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll

-; 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
 ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
 @.str1 = private unnamed_addr constant [6 x i8] c"data2\00", align 1

llvm/test/ExecutionEngine/MCJIT/simplesttest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/simpletest.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @bar() {
   ret i32 0
 }
 
 define i32 @main() {
   %r = call i32 @bar( )   ; <i32> [#uses=1]
   ret i32 %r
 }
 

llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll

-; 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 {
 entry:
   call void @lazily_compiled_address_is_consistent()
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/stubs.ll

-; RUN: %lli -disable-lazy-compilation=false %s
+; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false %s
 
 define i32 @main() nounwind {
 entry:
   call void @lazily_compiled_address_is_consistent()
   ret i32 0
 }
 
 ; Test PR3043: @test should have the same address before and after

llvm/test/ExecutionEngine/MCJIT/test-arith.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   %A = add i8 0, 12   ; <i8> [#uses=1]
   %B = sub i8 %A, 1   ; <i8> [#uses=2]
   %C = mul i8 %B, %B    ; <i8> [#uses=2]
   %D = sdiv i8 %C, %C   ; <i8> [#uses=2]
   %E = srem i8 %D, %D   ; <i8> [#uses=0]

llvm/test/ExecutionEngine/MCJIT/test-branch.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; test unconditional branch
 define i32 @main() {
   br label %Test
 Test:   ; preds = %Test, %0
   %X = icmp eq i32 0, 4   ; <i1> [#uses=1]
   br i1 %X, label %Test, label %Label
 Label:    ; preds = %Test
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @_Z14func_exit_codev() nounwind uwtable {
 entry:
   ret i32 0
 }
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   store i32 0, i32* %retval
   %call = call i32 @_Z14func_exit_codev()
   ret i32 %call
 }

llvm/test/ExecutionEngine/MCJIT/test-call.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 declare void @exit(i32)
 
 define i32 @test(i8 %C, i16 %S) {
   %X = trunc i16 %S to i8   ; <i8> [#uses=1]
   %Y = zext i8 %X to i32    ; <i32> [#uses=1]
   ret i32 %Y

llvm/test/ExecutionEngine/MCJIT/test-cast.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @foo() {
   ret i32 0
 }
 
 define i32 @main() {
   icmp ne i1 true, false    ; <i1>:1 [#uses=0]

llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll

+; RUN: %lli -jit-kind=mcjit -O0 %s
 ; RUN: %lli -O0 %s
 
 ; This test checks that common symbols have been allocated addresses honouring
 ; the alignment requirement.
 
 @CS1 = common global i32 0, align 16
 @CS2 = common global i8 0, align 1
 @CS3 = common global i32 0, align 16

llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll

-; 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.
 ;
 ; Compiled from this C code:
 ;
 ; int zero_int;
 ; double zero_double;

llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll

+; 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
 
 @A = global i32 5   ; <i32*> [#uses=1]
 @B = global i32 6   ; <i32*> [#uses=1]
 
 define i32 @main() {
   %A = or i1 false, icmp slt (i32* @A, i32* @B)    ; <i1> [#uses=0]
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/test-data-align.ll

+; RUN:  %lli -jit-kind=mcjit -O0 %s
 ; RUN:  %lli -O0 %s
 
 ; Check that a variable is always aligned as specified.
 
 @var = global i32 0, align 32
 define i32 @main() {
   %addr = ptrtoint i32* @var to i64
   %mask = and i64 %addr, 31
   %tst = icmp eq i64 %mask, 0
   br i1 %tst, label %good, label %bad
 good:
   ret i32 0
 bad:
   ret i32 1
 }

llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
   %D = load double, double* %DP    ; <double> [#uses=1]
   %V = fadd double %D, 1.000000e+00   ; <double> [#uses=2]
   %W = fsub double %V, %V   ; <double> [#uses=3]
   %X = fmul double %W, %W   ; <double> [#uses=2]
   %Y = fdiv double %X, %X   ; <double> [#uses=2]

llvm/test/ExecutionEngine/MCJIT/test-fp.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
   %D = load double, double* %DP    ; <double> [#uses=1]
   %V = fadd double %D, 1.000000e+00   ; <double> [#uses=2]
   %W = fsub double %V, %V   ; <double> [#uses=3]
   %X = fmul double %W, %W   ; <double> [#uses=2]
   %Y = fdiv double %X, %X   ; <double> [#uses=2]

llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 ; XFAIL: darwin
 @var = global i32 1, align 4
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @ctor_func, i8* null }]
 @llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @dtor_func, i8* null }]
 
 define i32 @main() nounwind {
 entry:

llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll

 ; 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
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   %i = alloca i32, align 4

llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 @count = global i32 1, align 4
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   %i = alloca i32, align 4

llvm/test/ExecutionEngine/MCJIT/test-global.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 @count = global i32 0, align 4
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   %i = alloca i32, align 4

llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll

+; 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) {
   %V = load i8, i8* %P    ; <i8> [#uses=1]
   store i8 %V, i8* %P
   %V.upgrd.4 = load i16, i16* %P.upgrd.1    ; <i16> [#uses=1]
   store i16 %V.upgrd.4, i16* %P.upgrd.1
   %V.upgrd.5 = load i32, i32* %P.upgrd.2    ; <i32> [#uses=1]

llvm/test/ExecutionEngine/MCJIT/test-local.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   %count = alloca i32, align 4
   %i = alloca i32, align 4
   store i32 0, i32* %retval

llvm/test/ExecutionEngine/MCJIT/test-logical.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   %A = and i8 4, 8    ; <i8> [#uses=2]
   %B = or i8 %A, 7    ; <i8> [#uses=1]
   %C = xor i8 %B, %A    ; <i8> [#uses=0]
   %A.upgrd.1 = and i16 4, 8   ; <i16> [#uses=2]
   %B.upgrd.2 = or i16 %A.upgrd.1, 7   ; <i16> [#uses=1]

llvm/test/ExecutionEngine/MCJIT/test-loop.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
   br label %Loop
 Loop:   ; preds = %Loop, %0
   %I = phi i32 [ 0, %0 ], [ %i2, %Loop ]    ; <i32> [#uses=1]
   %i2 = add i32 %I, 1   ; <i32> [#uses=2]
   %C = icmp eq i32 %i2, 10    ; <i1> [#uses=1]
   br i1 %C, label %Out, label %Loop
 Out:    ; preds = %Loop
   ret i32 0
 }
 

llvm/test/ExecutionEngine/MCJIT/test-phi.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; test phi node
 @Y = global i32 6   ; <i32*> [#uses=1]
 
 define void @blah(i32* %X) {
 ; <label>:0
   br label %T

llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll

 ; 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
 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
 @.str1 = private unnamed_addr constant [6 x i8] c"data2\00", align 1
 @ptr2 = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str1, i32 0, i32 0), align 4
 
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind readonly {
 entry:
   %0 = load i8*, i8** @ptr, align 4
   %1 = load i8*, i8** @ptr2, align 4
   %cmp = icmp eq i8* %0, %1
   %. = zext i1 %cmp to i32
   ret i32 %.
 }
 

llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll

+; RUN: %lli -jit-kind=mcjit -O0 %s
 ; RUN: %lli -O0 %s
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
 @.str1 = private unnamed_addr constant [6 x i8] c"data2\00", align 1
 @ptr2 = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str1, i32 0, i32 0), align 4
 
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind readonly {
 entry:
   %0 = load i8*, i8** @ptr, align 4
   %1 = load i8*, i8** @ptr2, align 4
   %cmp = icmp eq i8* %0, %1
   %. = zext i1 %cmp to i32
   ret i32 %.
 }
 

llvm/test/ExecutionEngine/MCJIT/test-ret.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 ; test return instructions
 define void @test1() {
   ret void
 }
 
 define i8 @test2() {

llvm/test/ExecutionEngine/MCJIT/test-return.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
   %retval = alloca i32, align 4
   store i32 0, i32* %retval
   ret i32 0
 }

llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 
 define i32 @main() {
   %double1 = fadd double 0.000000e+00, 0.000000e+00    ; <double> [#uses=6]
   %double2 = fadd double 0.000000e+00, 0.000000e+00    ; <double> [#uses=6]
   %float1 = fadd float 0.000000e+00, 0.000000e+00    ; <float> [#uses=6]
   %float2 = fadd float 0.000000e+00, 0.000000e+00    ; <float> [#uses=6]

llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   %int1 = add i32 0, 0    ; <i32> [#uses=6]
   %int2 = add i32 0, 0    ; <i32> [#uses=6]
   %long1 = add i64 0, 0   ; <i64> [#uses=6]
   %long2 = add i64 0, 0   ; <i64> [#uses=6]
   %sbyte1 = add i8 0, 0   ; <i8> [#uses=6]

llvm/test/ExecutionEngine/MCJIT/test-shift.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
   %shamt = add i8 0, 1    ; <i8> [#uses=8]
   %shift.upgrd.1 = zext i8 %shamt to i32    ; <i32> [#uses=1]
   %t1.s = shl i32 1, %shift.upgrd.1   ; <i32> [#uses=0]
   %t2.s = shl i32 1, 4    ; <i32> [#uses=0]
   %shift.upgrd.2 = zext i8 %shamt to i32    ; <i32> [#uses=1]

llvm/test/ExecutionEngine/MCJIT/weak-function.ll

 ; 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 different modules agree on the address of weak
 ; function 'baz'
 ; Testing on COFF platforms is disabled as COFF has no representation of 'weak'
 ; linkage.
 
 define weak i32 @baz() {

llvm/test/ExecutionEngine/fma3-jit.ll

+; RUN: %lli -jit-kind=mcjit %s | FileCheck %s
 ; RUN: %lli %s | FileCheck %s
 ; REQUIRES: fma3
 ; CHECK: 12.000000
 
 @msg_double = internal global [4 x i8] c"%f\0A\00"
 
 declare i32 @printf(i8*, ...)
 

llvm/test/ExecutionEngine/frem.ll

 ; LLI.exe used to crash on Windows\X86 when certain single precession
 ; 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 -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"
 
 declare i32 @printf(i8* nocapture, ...) nounwind
 declare i32 @fflush(i8*) nounwind
 
 define i32 @main() {

llvm/test/ExecutionEngine/mov64zext32.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i64 @foo() {
   ret i64 42
 }
 
 define i32 @main() {
   %val = call i64 @foo()

llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 
 define i32 @main() {
 
     %A_float = fadd <4 x float> <float 0.0, float 11.0, float 22.0, float 33.0>, <float 44.0, float 55.0, float 66.0, float 77.0>
     %B_float = fsub <4 x float> %A_float, <float 88.0, float 99.0, float 100.0, float 111.0>
     %C_float = fmul <4 x float> %B_float, %B_float

llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
     %A_i8 = add <5 x i8> <i8 0, i8 1, i8 2, i8 3, i8 4>, <i8 12, i8 34, i8 56, i8 78, i8 89>
     %B_i8 = sub <5 x i8> %A_i8, <i8 11, i8 22, i8 33, i8 44, i8 55>
     %C_i8 = mul <5 x i8> %B_i8, %B_i8
     %D_i8 = sdiv <5 x i8> %C_i8, %C_i8
     %E_i8 = srem <5 x i8> %D_i8, %D_i8

llvm/test/ExecutionEngine/test-interp-vec-cast.ll

-; 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>
     zext <3 x i1> <i1 true,i1 true,i1 true> to <3 x i8>
     zext <2 x i1> <i1 true,i1 true> to <2 x i16>
     zext <3 x i1> <i1 true,i1 true,i1 true> to <3 x i16>
     zext <2 x i1> <i1 true,i1 true> to <2 x i32>
     zext <3 x i1> <i1 true,i1 true,i1 true> to <3 x i32>

llvm/test/ExecutionEngine/test-interp-vec-insertelement.ll

- ; 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
  %v1 = insertelement <3 x i8> zeroinitializer, i8 2, i32 2
  %v2 = insertelement <4 x i8> zeroinitializer, i8 3, i32 3
  %v3 = insertelement <8 x i8> zeroinitializer, i8 4, i32 4
  %v4 = insertelement <16 x i8> zeroinitializer, i8 5, i32 7
 

llvm/test/ExecutionEngine/test-interp-vec-insertextractvalue.ll

- ; RUN: %lli -force-interpreter=true %s > /dev/null
+ ; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
 
 define i32 @main() {
 
     %s1 = insertvalue { i32, { float, double} } undef, i32 9, 0
     %s2 = insertvalue { i32, { float, double} } %s1, float 3.0, 1, 0
     %s3 = insertvalue { i32, { float, double} } %s2, double 5.0, 1, 1
 
     %s4 = extractvalue { i32, { float, double} } %s3, 1

llvm/test/ExecutionEngine/test-interp-vec-loadstore.ll

-; 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
 
 @msg_int = internal global [17 x i8] c"int test passed\0A\00"
 @msg_double = internal global [20 x i8] c"double test passed\0A\00"
 @msg_float = internal global [19 x i8] c"float test passed\0A\00"
 

llvm/test/ExecutionEngine/test-interp-vec-logical.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
     %A_i8 = and <5 x i8> <i8 4, i8 4, i8 4, i8 4, i8 4>, <i8 8, i8 8, i8 8, i8 8, i8 8>
     %B_i8 = or <5 x i8> %A_i8, <i8 7, i8 7, i8 7, i8 7, i8 7>
     %C_i8 = xor <5 x i8> %B_i8, %A_i8
 
     %A_i16 = and <4 x i16> <i16 4, i16 4, i16 4, i16 4>, <i16 8, i16 8, i16 8, i16 8>

llvm/test/ExecutionEngine/test-interp-vec-select.ll

-; RUN: %lli -force-interpreter=true %s > /dev/null
+; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
 
 define i32 @main() {
 
   ; Vector values
   %a2_i8 = add <2 x i8> zeroinitializer, <i8 0, i8 1>
   %a3_i8 = add <3 x i8> zeroinitializer, <i8 0, i8 1, i8 2>
   %a4_i8 = add <4 x i8> zeroinitializer, <i8 0, i8 1, i8 2, i8 3>
   %a8_i8 = add <8 x i8> zeroinitializer, <i8 0, i8 1, i8 2, i8 3, i8 4, i8 5, i8 6, i8 7>

llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
     %double1 = fadd <2 x double> <double 0.0, double 0.0>, <double 0.0, double 0.0>
     %double2 = fadd <2 x double> <double 0.0, double 0.0>, <double 0.0, double 0.0>
     %float1 = fadd <3 x float> <float 0.0, float 0.0, float 0.0>, <float 0.0, float 0.0, float 0.0>
     %float2 = fadd <3 x float> <float 0.0, float 0.0, float 0.0>, <float 0.0, float 0.0, float 0.0>
     %test49 = fcmp oeq <3 x float> %float1, %float2

llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll

+; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
 define i32 @main() {
     %int1 = add <3 x i32> <i32 0, i32 0, i32 0>, <i32 0, i32 0, i32 0>
     %int2 = add <3 x i32> <i32 0, i32 0, i32 0>, <i32 0, i32 0, i32 0>
     %long1 = add <2 x i64> <i64 0, i64 0>, <i64 0, i64 0>
     %long2 = add <2 x i64> <i64 0, i64 0>, <i64 0, i64 0>
     %sbyte1 = add <5 x i8> <i8 0, i8 0, i8 0, i8 0, i8 0>, <i8 0, i8 0, i8 0, i8 0, i8 0>

llvm/test/ExecutionEngine/test-interp-vec-shift.ll

-; 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>
     %shift.upgrd.1 = zext <2 x i8> %shamt to <2 x i32>
     %t1.s = shl <2 x i32> <i32 1, i32 2>, %shift.upgrd.1
     %t2.s = shl <2 x i32> <i32 1, i32 2>, <i32 3, i32 4>
     %shift.upgrd.2 = zext <2 x i8> %shamt to <2 x i32>
     %t1 = shl <2 x i32> <i32 1, i32 2>, %shift.upgrd.2

llvm/test/ExecutionEngine/test-interp-vec-shuffle.ll

-; RUN: %lli -force-interpreter=true %s > /dev/null
+; RUN: %lli -jit-kind=mcjit -force-interpreter=true %s > /dev/null
 
 define i32 @main() {
 
   ; Vector values
   %a2_i8 = add <2 x i8> zeroinitializer, <i8 0, i8 1>
   %a3_i8 = add <3 x i8> zeroinitializer, <i8 0, i8 1, i8 2>
   %a4_i8 = add <4 x i8> zeroinitializer, <i8 0, i8 1, i8 2, i8 3>
   %a8_i8 = add <8 x i8> zeroinitializer, <i8 0, i8 1, i8 2, i8 3, i8 4, i8 5, i8 6, i8 7>

llvm/test/Integer/2007-01-19-TruncSext.ll

 ; 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
 @FORMAT  = constant [ 4 x i8 ] c"%d\0A\00"
 
 declare i32 @printf(i8* %format, ...)
 
 define void @multiply(i32 %index, i32 %X, i32 %Y) {

llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll

-; RUN: opt < %s -licm | lli -force-interpreter
+; RUN: opt < %s -licm | lli -jit-kind=mcjit -force-interpreter
 
 define i32 @main() {
 entry:
   br label %Loop
 Loop:   ; preds = %LoopCont, %entry
   br i1 true, label %LoopCont, label %Out
 LoopCont:   ; preds = %Loop
   %X = add i32 1, 0   ; <i32> [#uses=1]
   br i1 true, label %Out, label %Loop
 Out:    ; preds = %LoopCont, %Loop
   %V = phi i32 [ 2, %Loop ], [ %X, %LoopCont ]    ; <i32> [#uses=1]
   %V2 = sub i32 %V, 1   ; <i32> [#uses=1]
   ret i32 %V2
 }
 

llvm/tools/lli/lli.cpp

namespace {
   InputArgv(cl::ConsumeAfter, cl::desc("<program arguments>..."));
 
   cl::opt<bool> ForceInterpreter("force-interpreter",
                                  cl::desc("Force interpretation: disable JIT"),
                                  cl::init(false));
 
   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",
                             "Orc-based lazy JIT.")));
 
   cl::opt<JITLinkerKind>
       JITLinker("jit-linker", cl::desc("Choose the dynamic linker/loader."),
                 cl::init(JITLinkerKind::Default),