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