Adds out-of-process JIT execution in CppInterOp #4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -205,10 +205,22 @@ inline void codeComplete(std::vector<std::string>& Results, | |||||||
|
|
||||||||
| #include "llvm/Support/Error.h" | ||||||||
|
|
||||||||
| #include <vector> | ||||||||
|
|
||||||||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||||||||
| #include "clang/Basic/Version.h" | ||||||||
|
There was a problem hiding this comment. warning: #includes are not sorted properly [llvm-include-order]
Suggested change
|
||||||||
| #include "clang/Interpreter/RemoteJITUtils.h" | ||||||||
| #include "llvm/TargetParser/Host.h" | ||||||||
|
|
||||||||
| #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h" | ||||||||
| #endif | ||||||||
|
|
||||||||
| static const llvm::ExitOnError ExitOnError; | ||||||||
|
|
||||||||
| namespace compat { | ||||||||
|
|
||||||||
| inline std::unique_ptr<clang::Interpreter> | ||||||||
| createClangInterpreter(std::vector<const char*>& args, bool outOfProcess) { | ||||||||
|
There was a problem hiding this comment. warning: no header providing "std::vector" is directly included [misc-include-cleaner] lib/CppInterOp/Compatibility.h:10: + #include <vector> |
||||||||
| auto has_arg = [](const char* x, llvm::StringRef match = "cuda") { | ||||||||
| llvm::StringRef Arg = x; | ||||||||
| Arg = Arg.trim().ltrim('-'); | ||||||||
|
|
@@ -246,16 +258,62 @@ createClangInterpreter(std::vector<const char*>& args) { | |||||||
| (*ciOrErr)->LoadRequestedPlugins(); | ||||||||
| if (CudaEnabled) | ||||||||
| DeviceCI->LoadRequestedPlugins(); | ||||||||
|
|
||||||||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||||||||
| std::unique_ptr<llvm::orc::LLJITBuilder> JB; | ||||||||
|
|
||||||||
| if (outOfProcess) { | ||||||||
| std::string OOPExecutor = | ||||||||
| std::string(LLVM_SOURCE_DIR) + "/build/bin/llvm-jitlink-executor"; | ||||||||
| bool UseSharedMemory = false; | ||||||||
| std::string SlabAllocateSizeString = ""; | ||||||||
| std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC; | ||||||||
| EPC = ExitOnError( | ||||||||
| launchExecutor(OOPExecutor, UseSharedMemory, SlabAllocateSizeString)); | ||||||||
|
|
||||||||
| #ifdef __APPLE__ | ||||||||
| std::string OrcRuntimePath = | ||||||||
| std::string(LLVM_SOURCE_DIR) + | ||||||||
| "/build/lib/clang/20/lib/darwin/liborc_rt_osx.a"; | ||||||||
| #else | ||||||||
| std::string OrcRuntimePath = | ||||||||
| std::string(LLVM_SOURCE_DIR) + | ||||||||
| "/build/lib/x86_64-unknown-linux-gnu/liborc_rt.a"; | ||||||||
| #endif | ||||||||
| if (EPC) { | ||||||||
|
|
||||||||
| CB.SetTargetTriple(EPC->getTargetTriple().getTriple()); | ||||||||
| JB = ExitOnError(clang::Interpreter::createLLJITBuilder(std::move(EPC), | ||||||||
| OrcRuntimePath)); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| auto innerOrErr = | ||||||||
| CudaEnabled | ||||||||
| ? clang::Interpreter::createWithCUDA(std::move(*ciOrErr), | ||||||||
| std::move(DeviceCI)) | ||||||||
| : clang::Interpreter::create(std::move(*ciOrErr), std::move(JB)); | ||||||||
| #else | ||||||||
| if (outOfProcess) { | ||||||||
| llvm::errs() | ||||||||
| << "[CreateClangInterpreter]: No compatibility with out-of-process JIT" | ||||||||
| << "(To enable recompile CppInterOp with " | ||||||||
| "`-DCPPINTEROP_WITH_OOP_JIT=ON`)" | ||||||||
| << "\n"; | ||||||||
| return nullptr; | ||||||||
| } | ||||||||
| auto innerOrErr = | ||||||||
| CudaEnabled ? clang::Interpreter::createWithCUDA(std::move(*ciOrErr), | ||||||||
| std::move(DeviceCI)) | ||||||||
| : clang::Interpreter::create(std::move(*ciOrErr)); | ||||||||
| #endif | ||||||||
|
|
||||||||
| if (!innerOrErr) { | ||||||||
| llvm::logAllUnhandledErrors(innerOrErr.takeError(), llvm::errs(), | ||||||||
| "Failed to build Interpreter:"); | ||||||||
| return nullptr; | ||||||||
| } | ||||||||
|
|
||||||||
| if (CudaEnabled) { | ||||||||
| if (auto Err = (*innerOrErr)->LoadDynamicLibrary("libcudart.so")) { | ||||||||
| llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(), | ||||||||
|
|
@@ -371,6 +429,12 @@ inline void codeComplete(std::vector<std::string>& Results, | |||||||
| #endif | ||||||||
| } | ||||||||
|
|
||||||||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||||||||
| inline pid_t getExecutorPID() { | ||||||||
|
There was a problem hiding this comment. warning: no header providing "pid_t" is directly included [misc-include-cleaner] lib/CppInterOp/Compatibility.h:10: + #include <sched.h> |
||||||||
| return getLastLaunchedExecutorPID(); | ||||||||
|
There was a problem hiding this comment. warning: use of undeclared identifier 'getLastLaunchedExecutorPID' [clang-diagnostic-error] return getLastLaunchedExecutorPID();
^ |
||||||||
| } | ||||||||
| #endif // CPPINTEROP_WITH_OOP_JIT | ||||||||
|
|
||||||||
| } // namespace compat | ||||||||
|
|
||||||||
| #include "CppInterOpInterpreter.h" | ||||||||
|
|
@@ -395,7 +459,7 @@ class SynthesizingCodeRAII { | |||||||
| "Failed to generate PTU:"); | ||||||||
| } | ||||||||
| }; | ||||||||
| } // namespace compat | ||||||||
|
|
||||||||
| #endif // CPPINTEROP_USE_REPL | ||||||||
|
|
||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3031,7 +3031,7 @@ static std::string MakeResourcesPath() { | |
| } // namespace | ||
|
|
||
| TInterp_t CreateInterpreter(const std::vector<const char*>& Args /*={}*/, | ||
| const std::vector<const char*>& GpuArgs /*={}*/, bool outOfProcess) { | ||
| std::string MainExecutableName = sys::fs::getMainExecutable(nullptr, nullptr); | ||
| std::string ResourceDir = MakeResourcesPath(); | ||
| std::vector<const char*> ClingArgv = {"-resource-dir", ResourceDir.c_str(), | ||
|
|
@@ -3075,7 +3075,7 @@ TInterp_t CreateInterpreter(const std::vector<const char*>& Args /*={}*/, | |
| auto I = new compat::Interpreter(ClingArgv.size(), &ClingArgv[0]); | ||
| #else | ||
| auto Interp = compat::Interpreter::create(static_cast<int>(ClingArgv.size()), | ||
| ClingArgv.data(), nullptr, {}, nullptr, true, outOfProcess); | ||
| if (!Interp) | ||
| return nullptr; | ||
| auto* I = Interp.release(); | ||
|
|
@@ -3909,4 +3909,10 @@ int Undo(unsigned N) { | |
| #endif | ||
| } | ||
|
|
||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||
| pid_t GetExecutorPID() { | ||
|
There was a problem hiding this comment. warning: no header providing "pid_t" is directly included [misc-include-cleaner] lib/CppInterOp/CppInterOp.cpp:40: - #if CLANG_VERSION_MAJOR >= 19
+ #include <sys/types.h>
+ #if CLANG_VERSION_MAJOR >= 19 |
||
| return compat::getExecutorPID(); | ||
| } | ||
| #endif // CPPINTEROP_WITH_OOP_JIT | ||
|
|
||
| } // end namespace Cpp | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: no header providing "pid_t" is directly included [misc-include-cleaner]
include/CppInterOp/CppInterOp.h:21: