Jit oop exec dummy #5
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -665,7 +665,7 @@ CPPINTEROP_API void GetOperator(TCppScope_t scope, Operator op, | |
| ///\returns nullptr on failure. | ||
| CPPINTEROP_API TInterp_t | ||
| CreateInterpreter(const std::vector<const char*>& Args = {}, | ||
| const std::vector<const char*>& GpuArgs = {}, bool outOfProcess = false); | ||
|
|
||
| /// Deletes an instance of an interpreter. | ||
| ///\param[in] I - the interpreter to be deleted, if nullptr, deletes the last. | ||
|
|
@@ -901,6 +901,10 @@ CPPINTEROP_API void CodeComplete(std::vector<std::string>& Results, | |
| ///\returns 0 on success, non-zero on failure. | ||
| CPPINTEROP_API int Undo(unsigned N = 1); | ||
|
|
||
| CPPINTEROP_API pid_t GetExecutorPID(); | ||
|
There was a problem hiding this comment. warning: no header providing "pid_t" is directly included [misc-include-cleaner] include/CppInterOp/CppInterOp.h:21: - #include <vector>
+ #include <sys/types.h>
+ #include <vector> |
||
|
|
||
| // CPPINTEROP_API void SendInputToChild(const std::string& input); | ||
|
There was a problem hiding this comment. If this is not yet implemented, it should not be part of the PR. Even as a comment. |
||
|
|
||
| } // end namespace Cpp | ||
|
|
||
| #endif // CPPINTEROP_CPPINTEROP_H | ||
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,27 @@ inline void codeComplete(std::vector<std::string>& Results, | |||||
|
|
||||||
| #include "llvm/Support/Error.h" | ||||||
|
|
||||||
| #include <vector> | ||||||
|
There was a problem hiding this comment. warning: #includes are not sorted properly [llvm-include-order] #include <vector>
^this fix will not be applied because it overlaps with another fix |
||||||
| #include <unistd.h> | ||||||
|
|
||||||
|
There was a problem hiding this comment. warning: included header unistd.h is not used directly [misc-include-cleaner]
Suggested change
|
||||||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||||||
| #include "clang/Basic/Version.h" | ||||||
| #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 { | ||||||
|
|
||||||
| static int m_child_stdout_fd = -1; | ||||||
|
There was a problem hiding this comment. warning: variable 'm_child_stdout_fd' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables] static int m_child_stdout_fd = -1;
^ |
||||||
| static int m_child_stderr_fd = -1; | ||||||
|
There was a problem hiding this comment. warning: variable 'm_child_stderr_fd' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables] static int m_child_stderr_fd = -1;
^ |
||||||
| // static int m_child_stdin_fd = -1; | ||||||
|
|
||||||
| inline std::unique_ptr<clang::Interpreter> | ||||||
| createClangInterpreter(std::vector<const char*>& args, bool outOfProcess) { | ||||||
| auto has_arg = [](const char* x, llvm::StringRef match = "cuda") { | ||||||
| llvm::StringRef Arg = x; | ||||||
| Arg = Arg.trim().ltrim('-'); | ||||||
|
|
@@ -246,16 +263,78 @@ 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; | ||||||
|
|
||||||
| // Create pipes for child process I/O control | ||||||
| int stdout_pipe[2], stderr_pipe[2], stdin_pipe[2]; | ||||||
| if (pipe(stdout_pipe) != 0 || pipe(stderr_pipe) != 0 || pipe(stdin_pipe)) { | ||||||
| llvm::errs() << "Failed to create pipes for child process I/O\n"; | ||||||
| return nullptr; | ||||||
| } | ||||||
|
|
||||||
| EPC = ExitOnError( | ||||||
| launchExecutor(OOPExecutor, UseSharedMemory, SlabAllocateSizeString, | ||||||
| /*stdin_pipe[0]*/0, stdout_pipe[1], stderr_pipe[1])); | ||||||
|
There was a problem hiding this comment. Why are you not yet using the stdin pipe? |
||||||
|
|
||||||
| close(stdout_pipe[1]); | ||||||
| close(stderr_pipe[1]); | ||||||
| // close(stdin_pipe[1]); | ||||||
|
|
||||||
| m_child_stdout_fd = stdout_pipe[0]; | ||||||
| m_child_stderr_fd = stderr_pipe[0]; | ||||||
| // m_child_stdin_fd = stdin_pipe[1]; | ||||||
|
|
||||||
| #ifdef __APPLE__ | ||||||
| std::string OrcRuntimePath = | ||||||
| std::string(LLVM_SOURCE_DIR) + | ||||||
| "/build/lib/clang/20/lib/darwin/liborc_rt_osx.a"; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| #else | ||||||
| std::string OrcRuntimePath = | ||||||
| std::string(LLVM_SOURCE_DIR) + | ||||||
| "/build/lib/x86_64-unknown-linux-gnu/liborc_rt.a"; | ||||||
|
There was a problem hiding this comment. The path on my Linux machine is:
Suggested change
|
||||||
| #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 +450,12 @@ inline void codeComplete(std::vector<std::string>& Results, | |||||
| #endif | ||||||
| } | ||||||
|
|
||||||
| #ifdef CPPINTEROP_WITH_OOP_JIT | ||||||
| inline pid_t getExecutorPID() { | ||||||
| return getLastLaunchedExecutorPID(); | ||||||
|
There was a problem hiding this comment. Can we specify the namespace to make it clear that |
||||||
| } | ||||||
| #endif // CPPINTEROP_WITH_OOP_JIT | ||||||
|
|
||||||
| } // namespace compat | ||||||
|
|
||||||
| #include "CppInterOpInterpreter.h" | ||||||
|
|
@@ -395,7 +480,7 @@ class SynthesizingCodeRAII { | |||||
| "Failed to generate PTU:"); | ||||||
| } | ||||||
| }; | ||||||
| } // namespace compat | ||||||
|
|
||||||
| #endif // CPPINTEROP_USE_REPL | ||||||
|
|
||||||
|
|
||||||
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.