OSDN Git Service

[Orc][lli] Add a very simple Orc-based lazy JIT to lli.
authorLang Hames <lhames@gmail.com>
Wed, 25 Mar 2015 12:11:48 +0000 (12:11 +0000)
committerLang Hames <lhames@gmail.com>
Wed, 25 Mar 2015 12:11:48 +0000 (12:11 +0000)
This ensures that we're building and testing the CompileOnDemand layer, at least
in a basic way.

Currently x86-64 only, and with limited to no library calls enabled (depending
on host platform). Patches welcome. ;)

To enable access to the lazy JIT, this patch replaces the '-use-orcmcjit' lli
option with a new option:
'-jit-kind={ mcjit | orc-mcjit | orc-lazy }'.

All regression tests are updated to use the new option, and one trivial test of
the new lazy JIT is added.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233182 91177308-0d34-0410-b5e6-96231b3b80d8

103 files changed:
include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
test/ExecutionEngine/OrcJIT/multi-module-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/multi-module-sm-pic-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll [deleted file]
test/ExecutionEngine/OrcJIT/simplesttest.ll [deleted file]
test/ExecutionEngine/OrcLazy/lit.local.cfg [new file with mode: 0644]
test/ExecutionEngine/OrcLazy/trivial_retval_1.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/2002-12-16-ArgTest.ll [moved from test/ExecutionEngine/OrcJIT/2002-12-16-ArgTest.ll with 96% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-04-ArgumentBug.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-04-ArgumentBug.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-04-LoopTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-04-LoopTest.ll with 91% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-04-PhiTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-04-PhiTest.ll with 81% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-09-SARTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-09-SARTest.ll with 83% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-10-FUCOM.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-10-FUCOM.ll with 85% similarity]
test/ExecutionEngine/OrcMCJIT/2003-01-15-AlignmentTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-01-15-AlignmentTest.ll with 89% similarity]
test/ExecutionEngine/OrcMCJIT/2003-05-06-LivenessClobber.ll [moved from test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll with 90% similarity]
test/ExecutionEngine/OrcMCJIT/2003-05-07-ArgumentTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-05-07-ArgumentTest.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/2003-05-11-PHIRegAllocBug.ll [moved from test/ExecutionEngine/OrcJIT/2003-05-11-PHIRegAllocBug.ll with 84% similarity]
test/ExecutionEngine/OrcMCJIT/2003-06-04-bzip2-bug.ll [moved from test/ExecutionEngine/OrcJIT/2003-06-04-bzip2-bug.ll with 90% similarity]
test/ExecutionEngine/OrcMCJIT/2003-06-05-PHIBug.ll [moved from test/ExecutionEngine/OrcJIT/2003-06-05-PHIBug.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/2003-08-15-AllocaAssertion.ll [moved from test/ExecutionEngine/OrcJIT/2003-08-15-AllocaAssertion.ll with 83% similarity]
test/ExecutionEngine/OrcMCJIT/2003-08-21-EnvironmentTest.ll [moved from test/ExecutionEngine/OrcJIT/2003-08-21-EnvironmentTest.ll with 90% similarity]
test/ExecutionEngine/OrcMCJIT/2003-08-23-RegisterAllocatePhysReg.ll [moved from test/ExecutionEngine/OrcJIT/2003-08-23-RegisterAllocatePhysReg.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll [moved from test/ExecutionEngine/OrcJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/2005-12-02-TailCallBug.ll [moved from test/ExecutionEngine/OrcJIT/2005-12-02-TailCallBug.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/2007-12-10-APIntLoadStore.ll [moved from test/ExecutionEngine/OrcJIT/2007-12-10-APIntLoadStore.ll with 91% similarity]
test/ExecutionEngine/OrcMCJIT/2008-06-05-APInt-OverAShr.ll [moved from test/ExecutionEngine/OrcJIT/2008-06-05-APInt-OverAShr.ll with 96% similarity]
test/ExecutionEngine/OrcMCJIT/2013-04-04-RelocAddend.ll [moved from test/ExecutionEngine/OrcJIT/2013-04-04-RelocAddend.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/Inputs/cross-module-b.ll [moved from test/ExecutionEngine/OrcJIT/Inputs/cross-module-b.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/Inputs/multi-module-b.ll [moved from test/ExecutionEngine/OrcJIT/Inputs/multi-module-b.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/Inputs/multi-module-c.ll [moved from test/ExecutionEngine/OrcJIT/Inputs/multi-module-c.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/Inputs/multi-module-eh-b.ll [moved from test/ExecutionEngine/OrcJIT/Inputs/multi-module-eh-b.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/cross-module-a.ll [moved from test/ExecutionEngine/OrcJIT/cross-module-a.ll with 60% similarity]
test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll [moved from test/ExecutionEngine/OrcJIT/cross-module-sm-pic-a.ll with 55% similarity]
test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll [moved from test/ExecutionEngine/OrcJIT/eh-lg-pic.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/eh-sm-pic.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/eh.ll [moved from test/ExecutionEngine/OrcJIT/eh.ll with 96% similarity]
test/ExecutionEngine/OrcMCJIT/fpbitcast.ll [moved from test/ExecutionEngine/OrcJIT/fpbitcast.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/hello-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/hello-sm-pic.ll with 77% similarity]
test/ExecutionEngine/OrcMCJIT/hello.ll [moved from test/ExecutionEngine/OrcJIT/hello.ll with 84% similarity]
test/ExecutionEngine/OrcMCJIT/hello2.ll [moved from test/ExecutionEngine/OrcJIT/hello2.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/lit.local.cfg [moved from test/ExecutionEngine/OrcJIT/lit.local.cfg with 100% similarity]
test/ExecutionEngine/OrcMCJIT/load-object-a.ll [moved from test/ExecutionEngine/OrcJIT/load-object-a.ll with 64% similarity]
test/ExecutionEngine/OrcMCJIT/multi-module-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/multi-module-eh-a.ll [moved from test/ExecutionEngine/OrcJIT/multi-module-eh-a.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/non-extern-addend.ll [moved from test/ExecutionEngine/OrcJIT/non-extern-addend.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/pr13727.ll [moved from test/ExecutionEngine/OrcJIT/pr13727.ll with 97% similarity]
test/ExecutionEngine/OrcMCJIT/remote/Inputs/cross-module-b.ll [moved from test/ExecutionEngine/OrcJIT/remote/Inputs/cross-module-b.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/remote/Inputs/multi-module-b.ll [moved from test/ExecutionEngine/OrcJIT/remote/Inputs/multi-module-b.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/remote/Inputs/multi-module-c.ll [moved from test/ExecutionEngine/OrcJIT/remote/Inputs/multi-module-c.ll with 100% similarity]
test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/remote/lit.local.cfg [moved from test/ExecutionEngine/OrcJIT/remote/lit.local.cfg with 100% similarity]
test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/remote/simpletest-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll with 54% similarity]
test/ExecutionEngine/OrcMCJIT/remote/stubs-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll with 88% similarity]
test/ExecutionEngine/OrcMCJIT/remote/stubs-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll with 88% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-common-symbols-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-common-symbols-remote.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-data-align-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll with 74% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-fp-no-external-funcs-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-fp-no-external-funcs-remote.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-remote.ll with 89% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-sm-pic.ll with 90% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-remote.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll with 84% similarity]
test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/simplesttest.ll [new file with mode: 0644]
test/ExecutionEngine/OrcMCJIT/simpletest.ll [moved from test/ExecutionEngine/OrcJIT/simpletest.ll with 70% similarity]
test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/stubs-sm-pic.ll with 89% similarity]
test/ExecutionEngine/OrcMCJIT/stubs.ll [moved from test/ExecutionEngine/OrcJIT/stubs.ll with 93% similarity]
test/ExecutionEngine/OrcMCJIT/test-arith.ll [moved from test/ExecutionEngine/OrcJIT/test-arith.ll with 96% similarity]
test/ExecutionEngine/OrcMCJIT/test-branch.ll [moved from test/ExecutionEngine/OrcJIT/test-branch.ll with 81% similarity]
test/ExecutionEngine/OrcMCJIT/test-call-no-external-funcs.ll [moved from test/ExecutionEngine/OrcJIT/test-call-no-external-funcs.ll with 83% similarity]
test/ExecutionEngine/OrcMCJIT/test-call.ll [moved from test/ExecutionEngine/OrcJIT/test-call.ll with 88% similarity]
test/ExecutionEngine/OrcMCJIT/test-cast.ll [moved from test/ExecutionEngine/OrcJIT/test-cast.ll with 98% similarity]
test/ExecutionEngine/OrcMCJIT/test-common-symbols-alignment.ll [moved from test/ExecutionEngine/OrcJIT/test-common-symbols-alignment.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-common-symbols.ll [moved from test/ExecutionEngine/OrcJIT/test-common-symbols.ll with 97% similarity]
test/ExecutionEngine/OrcMCJIT/test-constantexpr.ll [moved from test/ExecutionEngine/OrcJIT/test-constantexpr.ll with 84% similarity]
test/ExecutionEngine/OrcMCJIT/test-data-align.ll [moved from test/ExecutionEngine/OrcJIT/test-data-align.ll with 87% similarity]
test/ExecutionEngine/OrcMCJIT/test-fp-no-external-funcs.ll [moved from test/ExecutionEngine/OrcJIT/test-fp-no-external-funcs.ll with 93% similarity]
test/ExecutionEngine/OrcMCJIT/test-fp.ll [moved from test/ExecutionEngine/OrcJIT/test-fp.ll with 94% similarity]
test/ExecutionEngine/OrcMCJIT/test-global-ctors.ll [moved from test/ExecutionEngine/OrcJIT/test-global-ctors.ll with 92% similarity]
test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/test-global-init-nonzero-sm-pic.ll with 91% similarity]
test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero.ll [moved from test/ExecutionEngine/OrcJIT/test-global-init-nonzero.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-global.ll [moved from test/ExecutionEngine/OrcJIT/test-global.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-loadstore.ll [moved from test/ExecutionEngine/OrcJIT/test-loadstore.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-local.ll [moved from test/ExecutionEngine/OrcJIT/test-local.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-logical.ll [moved from test/ExecutionEngine/OrcJIT/test-logical.ll with 93% similarity]
test/ExecutionEngine/OrcMCJIT/test-loop.ll [moved from test/ExecutionEngine/OrcJIT/test-loop.ll with 86% similarity]
test/ExecutionEngine/OrcMCJIT/test-phi.ll [moved from test/ExecutionEngine/OrcJIT/test-phi.ll with 93% similarity]
test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll [moved from test/ExecutionEngine/OrcJIT/test-ptr-reloc-sm-pic.ll with 88% similarity]
test/ExecutionEngine/OrcMCJIT/test-ptr-reloc.ll [moved from test/ExecutionEngine/OrcJIT/test-ptr-reloc.ll with 93% similarity]
test/ExecutionEngine/OrcMCJIT/test-ret.ll [moved from test/ExecutionEngine/OrcJIT/test-ret.ll with 90% similarity]
test/ExecutionEngine/OrcMCJIT/test-return.ll [moved from test/ExecutionEngine/OrcJIT/test-return.ll with 71% similarity]
test/ExecutionEngine/OrcMCJIT/test-setcond-fp.ll [moved from test/ExecutionEngine/OrcJIT/test-setcond-fp.ll with 95% similarity]
test/ExecutionEngine/OrcMCJIT/test-setcond-int.ll [moved from test/ExecutionEngine/OrcJIT/test-setcond-int.ll with 98% similarity]
test/ExecutionEngine/OrcMCJIT/test-shift.ll [moved from test/ExecutionEngine/OrcJIT/test-shift.ll with 96% similarity]
tools/lli/CMakeLists.txt
tools/lli/OrcLazyJIT.cpp [new file with mode: 0644]
tools/lli/OrcLazyJIT.h [new file with mode: 0644]
tools/lli/lli.cpp

index 3dd1a37..77b0c48 100644 (file)
@@ -193,8 +193,8 @@ public:
   ///        below this one.
   JITSymbol findSymbolIn(ModuleSetHandleT H, const std::string &Name,
                          bool ExportedSymbolsOnly) {
-    BaseLayerModuleSetHandleListT &BaseLayerHandles = H->second;
-    for (auto &BH : BaseLayerHandles) {
+
+    for (auto &BH : H->BaseLayerModuleSetHandles) {
       if (auto Symbol = BaseLayer.findSymbolIn(BH, Name, ExportedSymbolsOnly))
         return Symbol;
     }
diff --git a/test/ExecutionEngine/OrcJIT/multi-module-a.ll b/test/ExecutionEngine/OrcJIT/multi-module-a.ll
deleted file mode 100644 (file)
index 587a1e8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-; RUN: %lli -use-orcmcjit -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
-}
-
diff --git a/test/ExecutionEngine/OrcJIT/multi-module-sm-pic-a.ll b/test/ExecutionEngine/OrcJIT/multi-module-sm-pic-a.ll
deleted file mode 100644 (file)
index b5ee3d1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-; RUN: %lli -use-orcmcjit -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, i686, i386
-
-declare i32 @FB()
-
-define i32 @main() {
-  %r = call i32 @FB( )   ; <i32> [#uses=1]
-  ret i32 %r
-}
-
diff --git a/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll b/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll
deleted file mode 100644 (file)
index cc48fd4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
-
-declare i32 @FB()
-
-define i32 @FA() nounwind {
-  ret i32 0
-}
-
-define i32 @main() nounwind {
-  %r = call i32 @FB( )   ; <i32> [#uses=1]
-  ret i32 %r
-}
diff --git a/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll b/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll
deleted file mode 100644 (file)
index d6209d7..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips, i686, i386, arm
-
-declare i32 @FB()
-
-define i32 @FA() {
-  ret i32 0
-}
-
-define i32 @main() {
-  %r = call i32 @FB( )   ; <i32> [#uses=1]
-  ret i32 %r
-}
-
diff --git a/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll b/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll
deleted file mode 100644 (file)
index 9ae0e06..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-; RUN: %lli -use-orcmcjit -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
-
-declare i32 @FB()
-
-define i32 @main() nounwind {
-  %r = call i32 @FB( )   ; <i32> [#uses=1]
-  ret i32 %r
-}
-
diff --git a/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll b/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll
deleted file mode 100644 (file)
index a1d4b81..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-; RUN: %lli -use-orcmcjit -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 -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips, i686, i386, arm
-
-declare i32 @FB()
-
-define i32 @main() {
-  %r = call i32 @FB( )   ; <i32> [#uses=1]
-  ret i32 %r
-}
-
diff --git a/test/ExecutionEngine/OrcJIT/simplesttest.ll b/test/ExecutionEngine/OrcJIT/simplesttest.ll
deleted file mode 100644 (file)
index c2f24f6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
-
-define i32 @main() {
-       ret i32 0
-}
-
diff --git a/test/ExecutionEngine/OrcLazy/lit.local.cfg b/test/ExecutionEngine/OrcLazy/lit.local.cfg
new file mode 100644 (file)
index 0000000..bf63c4f
--- /dev/null
@@ -0,0 +1,2 @@
+if config.root.host_arch not in ['x86_64']:
+    config.unsupported = True
diff --git a/test/ExecutionEngine/OrcLazy/trivial_retval_1.ll b/test/ExecutionEngine/OrcLazy/trivial_retval_1.ll
new file mode 100644 (file)
index 0000000..b1234f9
--- /dev/null
@@ -0,0 +1,25 @@
+; RUN: lli -jit-kind=orc-lazy %s; [ $? -eq 30 ]
+define i32 @baz() {
+entry:
+  ret i32 2
+}
+
+define i32 @bar() {
+entry:
+  %call = call i32 @baz()
+  %mul = mul nsw i32 3, %call
+  ret i32 %mul
+}
+
+define i32 @foo() {
+entry:
+  %call = call i32 @bar()
+  %mul = mul nsw i32 5, %call
+  ret i32 %mul
+}
+
+define i32 @main(i32 %argc, i8** %argv) {
+entry:
+  %call = call i32 @foo()
+  ret i32 %call
+}
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 @.LC0 = internal global [10 x i8] c"argc: %d\0A\00"            ; <[10 x i8]*> [#uses=1]
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @foo(i32 %X, i32 %Y, double %A) {
        %cond212 = fcmp une double %A, 1.000000e+00             ; <i1> [#uses=1]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        call i32 @mylog( i32 4 )                ; <i32>:1 [#uses=0]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; We were accidentally inverting the signedness of right shifts.  Whoops.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        %X = fadd double 0.000000e+00, 1.000000e+00             ; <double> [#uses=1]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @bar(i8* %X) {
         ; pointer should be 4 byte aligned!
@@ -1,6 +1,6 @@
 ; This testcase should return with an exit code of 1.
 ;
-; RUN: not %lli -use-orcmcjit %s
+; RUN: not %lli -jit-kind=orc-mcjit %s
 
 @test = global i64 0           ; <i64*> [#uses=1]
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; This testcase failed to work because two variable sized allocas confused the
 ; local register allocator.
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ;
 ; Regression Test: EnvironmentTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %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
@@ -1,5 +1,5 @@
 ; PR672
-; RUN: %lli -use-orcmcjit %s
+; RUN: %lli -jit-kind=orc-mcjit %s
 ; XFAIL: mcjit-ia32
 
 define i32 @main() {
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -force-interpreter %s
+; RUN: %lli -jit-kind=orc-mcjit -force-interpreter %s
 ; PR1836
 
 define i32 @main() {
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -force-interpreter=true %s | FileCheck %s
+; RUN: %lli -jit-kind=orc-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"
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s
+; RUN: %lli -jit-kind=orc-mcjit %s
 ;
 ; Verify relocations to global symbols with addend work correctly.
 ;
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
 
 declare i32 @FB()
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386
 
 declare i32 @FB()
similarity index 92%
rename from test/ExecutionEngine/OrcJIT/eh-lg-pic.ll
rename to test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
index e5fa22c..32b53c4 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -relocation-model=pic -code-model=large %s
+; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
 ; XFAIL: cygwin, win32, mingw, mips, i686, i386, aarch64, arm, asan, msan
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
similarity index 92%
rename from test/ExecutionEngine/OrcJIT/eh-sm-pic.ll
rename to test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
index f22cea9..a54795e 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -relocation-model=pic -code-model=small %s
+; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s
 ; XFAIL: cygwin, win32, mingw, mips, i686, i386, darwin, aarch64, arm, asan, msan
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
similarity index 96%
rename from test/ExecutionEngine/OrcJIT/eh.ll
rename to test/ExecutionEngine/OrcMCJIT/eh.ll
index 130146b..2de6a51 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s
+; RUN: %lli -jit-kind=orc-mcjit %s
 ; XFAIL: arm, cygwin, win32, mingw, asan, msan
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
similarity index 86%
rename from test/ExecutionEngine/OrcJIT/fpbitcast.ll
rename to test/ExecutionEngine/OrcMCJIT/fpbitcast.ll
index 3f074f8..767b580 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -force-interpreter=true %s | FileCheck %s
+; RUN: %lli -jit-kind=orc-mcjit -force-interpreter=true %s | FileCheck %s
 ; CHECK: 40091eb8
 
 define i32 @test(double %x) {
similarity index 77%
rename from test/ExecutionEngine/OrcJIT/hello-sm-pic.ll
rename to test/ExecutionEngine/OrcMCJIT/hello-sm-pic.ll
index 52c91d5..59b47af 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, darwin, aarch64, arm
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"            ; <[12 x i8]*> [#uses=1]
similarity index 84%
rename from test/ExecutionEngine/OrcJIT/hello.ll
rename to test/ExecutionEngine/OrcMCJIT/hello.ll
index c315a15..08413c2 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"            ; <[12 x i8]*> [#uses=1]
 
similarity index 86%
rename from test/ExecutionEngine/OrcJIT/hello2.ll
rename to test/ExecutionEngine/OrcMCJIT/hello2.ll
index 9e7cf5b..8f071cd 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %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]
@@ -1,20 +1,20 @@
 ; 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 -use-orcmcjit -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 -jit-kind=orc-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
 
 ; 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 -use-orcmcjit -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s
+; RUN: %lli -jit-kind=orc-mcjit -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 -use-orcmcjit -extra-archive=%t.cachedir3/load-object.a %s
+; RUN: %lli -jit-kind=orc-mcjit -extra-archive=%t.cachedir3/load-object.a %s
 
 declare i32 @FB()
 
diff --git a/test/ExecutionEngine/OrcMCJIT/multi-module-a.ll b/test/ExecutionEngine/OrcMCJIT/multi-module-a.ll
new file mode 100644 (file)
index 0000000..d622efc
--- /dev/null
@@ -0,0 +1,9 @@
+; RUN: %lli -jit-kind=orc-mcjit -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
+}
+
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
+; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
 ; XFAIL: arm, cygwin, win32, mingw, asan, msan
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
diff --git a/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll b/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
new file mode 100644 (file)
index 0000000..80b8e16
--- /dev/null
@@ -0,0 +1,10 @@
+; RUN: %lli -jit-kind=orc-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
+; XFAIL: mips, i686, i386
+
+declare i32 @FB()
+
+define i32 @main() {
+  %r = call i32 @FB( )   ; <i32> [#uses=1]
+  ret i32 %r
+}
+
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @foo(i32 %x, i32 %y, double %d) {
 entry:
similarity index 97%
rename from test/ExecutionEngine/OrcJIT/pr13727.ll
rename to test/ExecutionEngine/OrcMCJIT/pr13727.ll
index 163fa79..a48c573 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 -disable-lazy-compilation=false %s
+; RUN: %lli -jit-kind=orc-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/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll b/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll
new file mode 100644 (file)
index 0000000..16553eb
--- /dev/null
@@ -0,0 +1,12 @@
+; RUN: %lli -jit-kind=orc-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
+
+declare i32 @FB()
+
+define i32 @FA() nounwind {
+  ret i32 0
+}
+
+define i32 @main() nounwind {
+  %r = call i32 @FB( )   ; <i32> [#uses=1]
+  ret i32 %r
+}
diff --git a/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll b/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
new file mode 100644 (file)
index 0000000..c897904
--- /dev/null
@@ -0,0 +1,14 @@
+; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
+; XFAIL: mips, i686, i386, arm
+
+declare i32 @FB()
+
+define i32 @FA() {
+  ret i32 0
+}
+
+define i32 @main() {
+  %r = call i32 @FB( )   ; <i32> [#uses=1]
+  ret i32 %r
+}
+
diff --git a/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll b/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll
new file mode 100644 (file)
index 0000000..aa34348
--- /dev/null
@@ -0,0 +1,9 @@
+; RUN: %lli -jit-kind=orc-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
+
+declare i32 @FB()
+
+define i32 @main() nounwind {
+  %r = call i32 @FB( )   ; <i32> [#uses=1]
+  ret i32 %r
+}
+
diff --git a/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll b/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
new file mode 100644 (file)
index 0000000..41812d2
--- /dev/null
@@ -0,0 +1,10 @@
+; RUN: %lli -jit-kind=orc-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 -relocation-model=pic -code-model=small %s > /dev/null
+; XFAIL: mips, i686, i386, arm
+
+declare i32 @FB()
+
+define i32 @main() {
+  %r = call i32 @FB( )   ; <i32> [#uses=1]
+  ret i32 %r
+}
+
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 define i32 @bar() nounwind {
        ret i32 0
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
 ; XFAIL: *
 ; This test should fail until remote symbol resolution is supported.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli -jit-kind=orc-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.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
@@ -1,4 +1,4 @@
-; RUN:  %lli -use-orcmcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN:  %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
 
 ; Check that a variable is always aligned as specified.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 define double @test(double* %DP, double %Arg) nounwind {
        %D = load double, double* %DP           ; <double> [#uses=1]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 @count = global i32 1, align 4
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @count = global i32 1, align 4
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %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
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
diff --git a/test/ExecutionEngine/OrcMCJIT/simplesttest.ll b/test/ExecutionEngine/OrcMCJIT/simplesttest.ll
new file mode 100644 (file)
index 0000000..4a47131
--- /dev/null
@@ -0,0 +1,6 @@
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
+
+define i32 @main() {
+       ret i32 0
+}
+
similarity index 70%
rename from test/ExecutionEngine/OrcJIT/simpletest.ll
rename to test/ExecutionEngine/OrcMCJIT/simpletest.ll
index e99f615..be1148b 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @bar() {
        ret i32 0
similarity index 89%
rename from test/ExecutionEngine/OrcJIT/stubs-sm-pic.ll
rename to test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
index 73c265f..f354a0d 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 define i32 @main() nounwind {
similarity index 93%
rename from test/ExecutionEngine/OrcJIT/stubs.ll
rename to test/ExecutionEngine/OrcMCJIT/stubs.ll
index 66d0762..c096f5f 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -disable-lazy-compilation=false %s
+; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false %s
 
 define i32 @main() nounwind {
 entry:
similarity index 96%
rename from test/ExecutionEngine/OrcJIT/test-arith.ll
rename to test/ExecutionEngine/OrcMCJIT/test-arith.ll
index b662567..c4331bf 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        %A = add i8 0, 12               ; <i8> [#uses=1]
similarity index 81%
rename from test/ExecutionEngine/OrcJIT/test-branch.ll
rename to test/ExecutionEngine/OrcMCJIT/test-branch.ll
index b66cfaf..b3ef86a 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; test unconditional branch
 define i32 @main() {
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @_Z14func_exit_codev() nounwind uwtable {
 entry:
similarity index 88%
rename from test/ExecutionEngine/OrcJIT/test-call.ll
rename to test/ExecutionEngine/OrcMCJIT/test-call.ll
index 8f50bdc..5345856 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 declare void @exit(i32)
 
similarity index 98%
rename from test/ExecutionEngine/OrcJIT/test-cast.ll
rename to test/ExecutionEngine/OrcMCJIT/test-cast.ll
index 4efd760..f1a521f 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @foo() {
        ret i32 0
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 %s
+; RUN: %lli -jit-kind=orc-mcjit -O0 %s
 
 ; This test checks that common symbols have been allocated addresses honouring
 ; the alignment requirement.
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 -disable-lazy-compilation=false %s
+; RUN: %lli -jit-kind=orc-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.
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; This tests to make sure that we can evaluate weird constant expressions
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 %s
+; RUN: %lli -jit-kind=orc-mcjit -O0 %s
 
 ; Check that a variable is always aligned as specified.
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
        %D = load double, double* %DP           ; <double> [#uses=1]
similarity index 94%
rename from test/ExecutionEngine/OrcJIT/test-fp.ll
rename to test/ExecutionEngine/OrcMCJIT/test-fp.ll
index 6129f7e..6d56e69 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
        %D = load double, double* %DP           ; <double> [#uses=1]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 ; XFAIL: darwin
 @var = global i32 1, align 4
 @llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @ctor_func }]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @count = global i32 1, align 4
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 @count = global i32 1, align 4
 
similarity index 95%
rename from test/ExecutionEngine/OrcJIT/test-global.ll
rename to test/ExecutionEngine/OrcMCJIT/test-global.ll
index 96036e0..3e42cae 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 @count = global i32 0, align 4
 
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %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]
similarity index 95%
rename from test/ExecutionEngine/OrcJIT/test-local.ll
rename to test/ExecutionEngine/OrcMCJIT/test-local.ll
index 5a08e47..1e63d9f 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
similarity index 93%
rename from test/ExecutionEngine/OrcJIT/test-logical.ll
rename to test/ExecutionEngine/OrcMCJIT/test-logical.ll
index aa8e5de..9d53ac9 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        %A = and i8 4, 8                ; <i8> [#uses=2]
similarity index 86%
rename from test/ExecutionEngine/OrcJIT/test-loop.ll
rename to test/ExecutionEngine/OrcMCJIT/test-loop.ll
index 5cb9353..dfb62d3 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
similarity index 93%
rename from test/ExecutionEngine/OrcJIT/test-phi.ll
rename to test/ExecutionEngine/OrcMCJIT/test-phi.ll
index 880a916..70bf8c8 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; test phi node
 @Y = global i32 6              ; <i32*> [#uses=1]
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit -O0 %s
+; RUN: %lli -jit-kind=orc-mcjit -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
similarity index 90%
rename from test/ExecutionEngine/OrcJIT/test-ret.ll
rename to test/ExecutionEngine/OrcMCJIT/test-ret.ll
index 71ff452..000bea0 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 ; test return instructions
 define void @test1() {
similarity index 71%
rename from test/ExecutionEngine/OrcJIT/test-return.ll
rename to test/ExecutionEngine/OrcMCJIT/test-return.ll
index 07e74b0..f7a1cdd 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 
 define i32 @main() {
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        %int1 = add i32 0, 0            ; <i32> [#uses=6]
similarity index 96%
rename from test/ExecutionEngine/OrcJIT/test-shift.ll
rename to test/ExecutionEngine/OrcMCJIT/test-shift.ll
index 500987c..2d06421 100644 (file)
@@ -1,4 +1,4 @@
-; RUN: %lli -use-orcmcjit %s > /dev/null
+; RUN: %lli -jit-kind=orc-mcjit %s > /dev/null
 
 define i32 @main() {
        %shamt = add i8 0, 1            ; <i8> [#uses=8]
index 60c731b..f98275b 100644 (file)
@@ -35,6 +35,7 @@ endif( LLVM_USE_INTEL_JITEVENTS )
 
 add_llvm_tool(lli
   lli.cpp
+  OrcLazyJIT.cpp
   RemoteMemoryManager.cpp
   RemoteTarget.cpp
   RemoteTargetExternal.cpp
diff --git a/tools/lli/OrcLazyJIT.cpp b/tools/lli/OrcLazyJIT.cpp
new file mode 100644 (file)
index 0000000..4a8d3b9
--- /dev/null
@@ -0,0 +1,53 @@
+//===------ OrcLazyJIT.cpp - Basic Orc-based JIT for lazy execution -------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "OrcLazyJIT.h"
+#include "llvm/ExecutionEngine/Orc/OrcTargetSupport.h"
+
+using namespace llvm;
+
+std::unique_ptr<OrcLazyJIT::CompileCallbackMgr>
+OrcLazyJIT::createCallbackMgr(Triple T, LLVMContext &Context) {
+  switch (T.getArch()) {
+    default:
+      // Flag error.
+      Error = true;
+      return nullptr;
+
+    case Triple::x86_64: {
+      typedef orc::JITCompileCallbackManager<CompileLayerT,
+                                             orc::OrcX86_64> CCMgrT;
+      return make_unique<CCMgrT>(CompileLayer, Context, 0, 64);
+    }
+  }
+}
+
+int llvm::runOrcLazyJIT(std::unique_ptr<Module> M, int ArgC, char* ArgV[]) {
+  OrcLazyJIT J(std::unique_ptr<TargetMachine>(EngineBuilder().selectTarget()),
+               getGlobalContext());
+
+  if (!J.Ok()) {
+    errs() << "Could not construct JIT.\n";
+    return 1;
+  }
+
+  auto MainHandle = J.addModule(std::move(M));
+  auto MainSym = J.findSymbolIn(MainHandle, "main");
+
+  if (!MainSym) {
+    errs() << "Could not find main function.\n";
+    return 1;
+  }
+
+  typedef int (*MainFnPtr)(int, char*[]);
+  auto Main = reinterpret_cast<MainFnPtr>(
+                static_cast<uintptr_t>(MainSym.getAddress()));
+
+  return Main(ArgC, ArgV);
+}
diff --git a/tools/lli/OrcLazyJIT.h b/tools/lli/OrcLazyJIT.h
new file mode 100644 (file)
index 0000000..577c171
--- /dev/null
@@ -0,0 +1,97 @@
+//===--- OrcLazyJIT.h - Basic Orc-based JIT for lazy execution --*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Simple Orc-based JIT. Uses the compile-on-demand layer to break up and
+// lazily compile modules.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLI_ORCLAZYJIT_H
+#define LLVM_TOOLS_LLI_ORCLAZYJIT_H
+
+#include "llvm/ADT/Triple.h"
+#include "llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h"
+#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
+#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
+#include "llvm/ExecutionEngine/Orc/LazyEmittingLayer.h"
+#include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
+#include "llvm/IR/LLVMContext.h"
+
+namespace llvm {
+
+class OrcLazyJIT {
+public:
+
+  typedef orc::JITCompileCallbackManagerBase CompileCallbackMgr;
+  typedef orc::ObjectLinkingLayer<> ObjLayerT;
+  typedef orc::IRCompileLayer<ObjLayerT> CompileLayerT;
+  typedef orc::LazyEmittingLayer<CompileLayerT> LazyEmitLayerT;
+  typedef orc::CompileOnDemandLayer<LazyEmitLayerT,
+                                    CompileCallbackMgr> CODLayerT;
+  typedef typename CODLayerT::ModuleSetHandleT ModuleHandleT;
+
+  OrcLazyJIT(std::unique_ptr<TargetMachine> TM, LLVMContext &Context)
+    : Error(false), TM(std::move(TM)),
+      Mang(this->TM->getDataLayout()),
+      ObjectLayer([](){ return llvm::make_unique<SectionMemoryManager>(); }),
+      CompileLayer(ObjectLayer, orc::SimpleCompiler(*this->TM)),
+      LazyEmitLayer(CompileLayer),
+      CCMgr(createCallbackMgr(Triple(this->TM->getTargetTriple()), Context)),
+      CODLayer(LazyEmitLayer, *CCMgr) { }
+
+  bool Ok() const { return !Error; }
+
+  ModuleHandleT addModule(std::unique_ptr<Module> M) {
+    // Attach a data-layout if one isn't already present.
+    if (M->getDataLayout().isDefault())
+      M->setDataLayout(*TM->getDataLayout());
+
+    std::vector<std::unique_ptr<Module>> S;
+    S.push_back(std::move(M));
+    return CODLayer.addModuleSet(std::move(S));
+  }
+
+  orc::JITSymbol findSymbol(const std::string &Name) {
+    return CODLayer.findSymbol(mangle(Name), true);
+  }
+
+  orc::JITSymbol findSymbolIn(ModuleHandleT H, const std::string &Name) {
+    return CODLayer.findSymbolIn(H, mangle(Name), true);
+  }
+
+private:
+
+  std::unique_ptr<CompileCallbackMgr>
+  createCallbackMgr(Triple T, LLVMContext &Context);
+
+  std::string mangle(const std::string &Name) {
+    std::string MangledName;
+    {
+      raw_string_ostream MangledNameStream(MangledName);
+      Mang.getNameWithPrefix(MangledNameStream, Name);
+    }
+    return MangledName;
+  }
+
+  bool Error;
+  std::unique_ptr<TargetMachine> TM;
+  Mangler Mang;
+
+  ObjLayerT ObjectLayer;
+  CompileLayerT CompileLayer;
+  LazyEmitLayerT LazyEmitLayer;
+  std::unique_ptr<CompileCallbackMgr> CCMgr;
+  CODLayerT CODLayer;
+};
+
+int runOrcLazyJIT(std::unique_ptr<Module> M, int ArgC, char* ArgV[]);
+
+} // end namespace llvm
+
+#endif
index cc8117d..47ce2c0 100644 (file)
@@ -14,6 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IR/LLVMContext.h"
+#include "OrcLazyJIT.h"
 #include "RemoteMemoryManager.h"
 #include "RemoteTarget.h"
 #include "RemoteTargetExternal.h"
@@ -66,6 +67,9 @@ using namespace llvm;
 #define DEBUG_TYPE "lli"
 
 namespace {
+
+  enum class JITKind { MCJIT, OrcMCJITReplacement, OrcLazy };
+
   cl::opt<std::string>
   InputFile(cl::desc("<input bitcode>"), cl::Positional, cl::init("-"));
 
@@ -76,12 +80,19 @@ namespace {
                                  cl::desc("Force interpretation: disable JIT"),
                                  cl::init(false));
 
-  cl::opt<bool> UseOrcMCJITReplacement("use-orcmcjit",
-                                       cl::desc("Use the experimental "
-                                                "OrcMCJITReplacement as a "
-                                                "drop-in replacement for "
-                                                "MCJIT."),
-                                       cl::init(false));
+  cl::opt<JITKind> UseJITKind("jit-kind",
+                              cl::desc("Choose underlying JIT kind."),
+                              cl::init(JITKind::MCJIT),
+                              cl::values(
+                                clEnumValN(JITKind::MCJIT, "mcjit",
+                                           "MCJIT"),
+                                clEnumValN(JITKind::OrcMCJITReplacement,
+                                           "orc-mcjit",
+                                           "Orc-based MCJIT replacement"),
+                                clEnumValN(JITKind::OrcLazy,
+                                           "orc-lazy",
+                                           "Orc-based lazy JIT."),
+                                clEnumValEnd));
 
   // The MCJIT supports building for a target address space separate from
   // the JIT compilation process. Use a forked process and a copying
@@ -404,6 +415,9 @@ int main(int argc, char **argv, char * const *envp) {
     return 1;
   }
 
+  if (UseJITKind == JITKind::OrcLazy)
+    return runOrcLazyJIT(std::move(Owner), argc, argv);
+
   if (EnableCacheManager) {
     std::string CacheName("file:");
     CacheName.append(InputFile);
@@ -430,7 +444,7 @@ int main(int argc, char **argv, char * const *envp) {
   builder.setEngineKind(ForceInterpreter
                         ? EngineKind::Interpreter
                         : EngineKind::JIT);
-  builder.setUseOrcMCJITReplacement(UseOrcMCJITReplacement);
+  builder.setUseOrcMCJITReplacement(UseJITKind == JITKind::OrcMCJITReplacement);
 
   // If we are supposed to override the target triple, do so now.
   if (!TargetTriple.empty())