Skip to content

Commit 534999c

Browse files
committed
[LLVM][RUNTIME] Make ORCJIT LLVM executor the default one
1 parent 6fc0598 commit 534999c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/target/llvm/llvm_instance.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ LLVMTargetInfo::LLVMTargetInfo(LLVMInstance& instance, const TargetJSON& target)
269269
if ((value == "mcjit") || (value == "orcjit")) {
270270
jit_engine_ = value;
271271
} else {
272-
LOG(FATAL) << "invalid jit option " << value << " (can be `mcjit` or `orcjit`).";
272+
LOG(FATAL) << "invalid jit option " << value << " (can be `orcjit` or `mcjit`).";
273273
}
274274
}
275275

@@ -530,7 +530,7 @@ std::string LLVMTargetInfo::str() const {
530530
os << quote << Join(",", opts) << quote;
531531
}
532532

533-
if (jit_engine_ != "mcjit") {
533+
if (jit_engine_ != "orcjit") {
534534
os << " -jit=" << jit_engine_;
535535
}
536536

src/target/llvm/llvm_instance.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class LLVMTargetInfo {
232232
llvm::FastMathFlags GetFastMathFlags() const { return fast_math_flags_; }
233233
/*!
234234
* \brief Get the LLVM JIT engine type
235-
* \return the type name of the JIT engine (default "mcjit" or "orcjit")
235+
* \return the type name of the JIT engine (default "orcjit" or "mcjit")
236236
*/
237237
const std::string GetJITEngine() const { return jit_engine_; }
238238
/*!
@@ -348,7 +348,7 @@ class LLVMTargetInfo {
348348
llvm::Reloc::Model reloc_model_ = llvm::Reloc::PIC_;
349349
llvm::CodeModel::Model code_model_ = llvm::CodeModel::Small;
350350
std::shared_ptr<llvm::TargetMachine> target_machine_;
351-
std::string jit_engine_ = "mcjit";
351+
std::string jit_engine_ = "orcjit";
352352
};
353353

354354
/*!

src/target/llvm/llvm_module.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ TVM_REGISTER_GLOBAL("target.llvm_version_major").set_body_typed([]() -> int {
755755
TVM_REGISTER_GLOBAL("runtime.module.loadfile_ll")
756756
.set_body_typed([](std::string filename, std::string fmt) -> runtime::Module {
757757
auto n = make_object<LLVMModuleNode>();
758-
n->SetJITEngine("mcjit");
758+
n->SetJITEngine("orcjit");
759759
n->LoadIR(filename);
760760
return runtime::Module(n);
761761
});

tests/python/runtime/test_runtime_module_based_interface.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def verify(data):
5454

5555

5656
@tvm.testing.requires_llvm
57-
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=orcjit"])
57+
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=mcjit"])
5858
def test_legacy_compatibility(target):
5959
mod, params = relay.testing.synthetic.get_workload()
6060
with relay.build_config(opt_level=3):
@@ -70,7 +70,7 @@ def test_legacy_compatibility(target):
7070

7171

7272
@tvm.testing.requires_llvm
73-
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=orcjit"])
73+
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=mcjit"])
7474
def test_cpu(target):
7575
mod, params = relay.testing.synthetic.get_workload()
7676
with relay.build_config(opt_level=3):
@@ -113,7 +113,7 @@ def test_cpu_get_graph_json():
113113

114114

115115
@tvm.testing.requires_llvm
116-
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=orcjit"])
116+
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=mcjit"])
117117
def test_cpu_get_graph_params_run(target):
118118
mod, params = relay.testing.synthetic.get_workload()
119119
with tvm.transform.PassContext(opt_level=3):
@@ -592,7 +592,7 @@ def verify_rpc_gpu_remove_package_params(obj_format):
592592

593593

594594
@tvm.testing.requires_llvm
595-
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=orcjit"])
595+
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=mcjit"])
596596
def test_debug_graph_executor(target):
597597
mod, params = relay.testing.synthetic.get_workload()
598598
with relay.build_config(opt_level=3):

tests/python/runtime/test_runtime_module_load.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545

4646
@tvm.testing.requires_llvm
47-
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=orcjit"])
47+
@pytest.mark.parametrize("target", ["llvm", "llvm -jit=mcjit"])
4848
def test_dso_module_load(target):
4949
dtype = "int64"
5050
temp = utils.tempdir()

0 commit comments

Comments
 (0)