This is an archive of the discontinued LLVM Phabricator instance.

Differential D98931

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

Authored by sgraenitz on Mar 19 2021, 2:20 AM.

Details

Reviewers
lhames
dblaikie
serge-sans-paille
Commits
rGc42c67ad6044: Re-apply "[lli] Make -jit-kind=orc the default JIT engine"
rGeaee4f269645: [lli] Make -jit-kind=orc the default JIT engine
Summary

MCJIT served well as the default JIT engine in lli for a long time, but the code is getting old and maintenance efforts don't seem to be in sight. In the meantime Orc became mature enough to fill that gap. The newly added greddy mode is very similar to the execution model of MCJIT. It should work as a drop-in replacement for common JIT tasks.

Diff Detail

Unit TestsFailed

TimeTest
220 msx64 debian > LLVM.CodeGen/Generic::bswap.ll
170 msx64 debian > LLVM.ExecutionEngine/MCJIT::2003-08-21-EnvironmentTest.ll
200 msx64 debian > LLVM.ExecutionEngine/MCJIT::2008-06-05-APInt-OverAShr.ll
20 msx64 debian > LLVM.ExecutionEngine/MCJIT::eh-lg-pic.ll
30 msx64 debian > LLVM.ExecutionEngine/MCJIT/remote::stubs-sm-pic.ll
View Full Test Results (22 Failed)

Event Timeline

sgraenitz requested review of this revision.Mar 19 2021, 2:20 AM
sgraenitz created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2021, 2:20 AM
sgraenitz updated this revision to Diff 331802.Mar 19 2021, 2:23 AM

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

Herald added subscribers: qcolombet, MatzeB. · View Herald TranscriptMar 19 2021, 2:23 AM
sgraenitz updated this revision to Diff 331803.Mar 19 2021, 2:25 AM

Patch tests for MCJIT-specific behavior

Harbormaster completed remote builds in B94645: Diff 331803.Mar 19 2021, 2:59 AM
sgraenitz added subscribers: ftynse, aartbik, springerm, mehdi_amini.Mar 19 2021, 3:07 AM
Harbormaster completed remote builds in B94644: Diff 331802.Mar 19 2021, 3:09 AM
Harbormaster completed remote builds in B94643: Diff 331801.Mar 19 2021, 3:21 AM
sgraenitz updated this revision to Diff 331916.Mar 19 2021, 10:12 AM

Patch 5 other tests that slipped through

Herald added a subscriber: asbirlea. · View Herald TranscriptMar 19 2021, 10:12 AM
mehdi_amini added a comment.Mar 19 2021, 10:14 AM

This change was overdue, thanks!

Harbormaster completed remote builds in B94732: Diff 331916.Mar 19 2021, 12:19 PM
lhames accepted this revision.Mar 19 2021, 8:39 PM

LGTM. This is great stuff -- thanks Stefan!

This revision is now accepted and ready to land.Mar 19 2021, 8:39 PM
sgraenitz updated this revision to Diff 332298.Mar 22 2021, 8:24 AM

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

Harbormaster completed remote builds in B94996: Diff 332298.Mar 22 2021, 9:45 AM
This revision was landed with ongoing or failed builds.Mar 23 2021, 2:23 AM
Closed by commit rGeaee4f269645: [lli] Make -jit-kind=orc the default JIT engine (authored by sgraenitz). · Explain Why
This revision was automatically updated to reflect the committed changes.
sgraenitz added a commit: rGeaee4f269645: [lli] Make -jit-kind=orc the default JIT engine.
sgraenitz added a comment.Mar 23 2021, 2:49 AM

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

thakis added a subscriber: thakis.Mar 23 2021, 3:42 AM

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

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

nemanjai added a subscriber: nemanjai.Mar 23 2021, 4:02 AM
In D98931#2644050, @sgraenitz wrote:

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

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

sgraenitz added a reverting change: rG581adb4f1a6e: Temporarily revert "[lli] Make -jit-kind=orc the default JIT engine".Mar 23 2021, 4:02 AM
sgraenitz added a comment.Mar 23 2021, 6:39 AM
In D98931#2644236, @nemanjai wrote:

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

I think 5949bd91253672ea8599a7a234b18e78972d3aa1 will fix the PowerPC bots

In D98931#2644162, @thakis wrote:

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

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

sgraenitz added a comment.Mar 23 2021, 7:26 AM
In D98931#2644686, @sgraenitz wrote:

I think 5949bd91253672ea8599a7a234b18e78972d3aa1 will fix the PowerPC bots

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

sgraenitz mentioned this in rGd9069dd9b576: [lli] Workaround missing architecture support in LazyCallThroughManager for non….Mar 23 2021, 8:37 AM
sgraenitz mentioned this in D99416: [lli] Add option -lljit-platform=Inactive to disable platform support explicitly.Mar 26 2021, 6:56 AM
sgraenitz reopened this revision.Mar 26 2021, 7:26 AM
This revision is now accepted and ready to land.Mar 26 2021, 7:26 AM
sgraenitz updated this revision to Diff 333554.Mar 26 2021, 7:27 AM

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

Harbormaster completed remote builds in B95875: Diff 333554.Mar 26 2021, 8:59 AM
sgraenitz mentioned this in rG66a8247eb6c0: [Orc][tests] Moving one MCJIT test over to Orc to make sure the PowerPC fix….Mar 29 2021, 2:53 AM
sgraenitz updated this revision to Diff 334091.Mar 30 2021, 3:06 AM

Rebase patch

This revision was landed with ongoing or failed builds.Mar 30 2021, 3:08 AM
Closed by commit rGc42c67ad6044: Re-apply "[lli] Make -jit-kind=orc the default JIT engine" (authored by sgraenitz). · Explain Why
This revision was automatically updated to reflect the committed changes.
sgraenitz added a commit: rGc42c67ad6044: Re-apply "[lli] Make -jit-kind=orc the default JIT engine".
sgraenitz mentioned this in rG243fe0da9980: [lli] Leaving two EH frame tests with MCJIT only after PowerPC failure.Mar 30 2021, 3:28 AM
Harbormaster completed remote builds in B96271: Diff 334091.Mar 30 2021, 3:53 AM

Revision Contents

PathSize
llvm/
tools/
lli/
2 lines

Diff 331801

llvm/tools/lli/lli.cpp

//===- lli.cpp - LLVM Interpreter / Dynamic compiler ----------------------===// //===- lli.cpp - LLVM Interpreter / Dynamic compiler ----------------------===//
Lint: Lint
Inline Actions

clang-format suggested style edits found:

Lint: Lint: clang-format suggested style edits found:
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This utility provides a simple wrapper around the LLVM Execution Engines, // This utility provides a simple wrapper around the LLVM Execution Engines,
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Linesnamespace {
cl::list<std::string> cl::list<std::string>
InputArgv(cl::ConsumeAfter, cl::desc("<program arguments>...")); InputArgv(cl::ConsumeAfter, cl::desc("<program arguments>..."));
cl::opt<bool> ForceInterpreter("force-interpreter", cl::opt<bool> ForceInterpreter("force-interpreter",
cl::desc("Force interpretation: disable JIT"), cl::desc("Force interpretation: disable JIT"),
cl::init(false)); cl::init(false));
cl::opt<JITKind> UseJITKind( cl::opt<JITKind> UseJITKind(
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  cl::opt<JITKind> UseJITKind(
-      "jit-kind", cl::desc("Choose underlying JIT kind."),
-      cl::init(JITKind::Orc),
-      cl::values(clEnumValN(JITKind::MCJIT, "mcjit", "MCJIT"),
-                 clEnumValN(JITKind::Orc, "orc", "Orc JIT"),
-                 clEnumValN(JITKind::OrcLazy, "orc-lazy",
-                            "Orc-based lazy JIT.")));
+  cl::opt<JITKind>
+      UseJITKind("jit-kind", cl::desc("Choose underlying JIT kind."),
+                 cl::init(JITKind::Orc),

4 diff lines are omitted. See full path.

Lint: Pre-merge checks: clang-format: please reformat the code ``` - cl::opt<JITKind> UseJITKind( - "jit-kind"…
"jit-kind", cl::desc("Choose underlying JIT kind."), "jit-kind", cl::desc("Choose underlying JIT kind."),
cl::init(JITKind::MCJIT), cl::init(JITKind::Orc),
cl::values(clEnumValN(JITKind::MCJIT, "mcjit", "MCJIT"), cl::values(clEnumValN(JITKind::MCJIT, "mcjit", "MCJIT"),
clEnumValN(JITKind::Orc, "orc", "Orc JIT"), clEnumValN(JITKind::Orc, "orc", "Orc JIT"),
clEnumValN(JITKind::OrcLazy, "orc-lazy", clEnumValN(JITKind::OrcLazy, "orc-lazy",
"Orc-based lazy JIT."))); "Orc-based lazy JIT.")));
cl::opt<JITLinkerKind> cl::opt<JITLinkerKind>
JITLinker("jit-linker", cl::desc("Choose the dynamic linker/loader."), JITLinker("jit-linker", cl::desc("Choose the dynamic linker/loader."),
cl::init(JITLinkerKind::Default), cl::init(JITLinkerKind::Default),
▲ Show 20 Lines • Show All 1,037 Lines • Show Last 20 Lines