[Clang-Repl] Add Lambda Support, PID Retrieval, and Dynamic liborc_rt Path in Clang-Repl #155140

kr-2003 · 2025-08-24T05:03:06Z

This PR builds upon the changes introduced in #152562.

Introduces:

Custom lambda function in launchExecutor.
Fetching PID of the launched out-of-process(OOP) JIT executor.
Dynamic fetching of liborc_rt path.

…into redirection

…rection

vgvassilev · 2025-08-25T09:35:35Z

clang/tools/clang-repl/ClangRepl.cpp

+    if (::OffloadArch.empty()) {
+      ::OffloadArch = "sm_35";
    }
-    CB.SetOffloadArch(OffloadArch);
+    CB.SetOffloadArch(::OffloadArch);


Are these changes relevant to the current PR?

yes. if not done, it gives following error:

error: reference to 'OffloadArch' is ambiguous

Which compiler is this? Why it works upstream?

clang/tools/clang-repl/ClangRepl.cpp

github-actions · 2025-08-25T14:47:58Z

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff origin/main HEAD --extensions h,cpp -- clang/include/clang/Interpreter/OutOfProcessJITConfig.h clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp clang/include/clang/Interpreter/Interpreter.h clang/include/clang/Interpreter/RemoteJITUtils.h clang/lib/Driver/ToolChain.cpp clang/lib/Interpreter/IncrementalExecutor.cpp clang/lib/Interpreter/IncrementalExecutor.h clang/lib/Interpreter/Interpreter.cpp clang/lib/Interpreter/RemoteJITUtils.cpp clang/tools/clang-repl/ClangRepl.cpp clang/unittests/Interpreter/InterpreterTest.cpp

⚠️
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing origin/main to the base branch/commit you want to compare against.
⚠️

View the diff from clang-format here.

diff --git a/clang/include/clang/Interpreter/Interpreter.h b/clang/include/clang/Interpreter/Interpreter.h
index 33117c65e..afa0688e6 100644
--- a/clang/include/clang/Interpreter/Interpreter.h
+++ b/clang/include/clang/Interpreter/Interpreter.h
@@ -121,7 +121,8 @@ protected:
   // Derived classes can use an extended interface of the Interpreter.
   Interpreter(std::unique_ptr<CompilerInstance> Instance, llvm::Error &Err,
               std::unique_ptr<llvm::orc::LLJITBuilder> JITBuilder = nullptr,
-              std::unique_ptr<clang::ASTConsumer> Consumer = nullptr, OutOfProcessJITConfig OOPConfig = {});
+              std::unique_ptr<clang::ASTConsumer> Consumer = nullptr,
+              OutOfProcessJITConfig OOPConfig = {});
 
   // Create the internal IncrementalExecutor, or re-create it after calling
   // ResetExecutor().
@@ -142,7 +143,8 @@ public:
   static llvm::Expected<std::unique_ptr<llvm::orc::LLJITBuilder>>
   createLLJITBuilder(std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC,
                      llvm::StringRef OrcRuntimePath);
-  static llvm::Expected<std::pair<std::unique_ptr<llvm::orc::LLJITBuilder>, pid_t>>
+  static llvm::Expected<
+      std::pair<std::unique_ptr<llvm::orc::LLJITBuilder>, pid_t>>
   outOfProcessJITBuilder(OutOfProcessJITConfig OutOfProcessConfig);
   static llvm::Expected<std::string>
   getOrcRuntimePath(const driver::ToolChain &TC);
diff --git a/clang/lib/Interpreter/IncrementalExecutor.cpp b/clang/lib/Interpreter/IncrementalExecutor.cpp
index 6f77b18b5..bc1c8e684 100644
--- a/clang/lib/Interpreter/IncrementalExecutor.cpp
+++ b/clang/lib/Interpreter/IncrementalExecutor.cpp
@@ -15,29 +15,28 @@
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/TargetOptions.h"
 #include "clang/Interpreter/PartialTranslationUnit.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/Orc/CompileUtils.h"
+#include "llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h"
 #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h"
+#include "llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h"
+#include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"
 #include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
 #include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
 #include "llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h"
 #include "llvm/ExecutionEngine/Orc/LLJIT.h"
-#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
-#include "llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h"
-#include "llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h"
-#include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"
 #include "llvm/ExecutionEngine/Orc/MapperJITLinkMemoryManager.h"
+#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
 #include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
 #include "llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h"
 #include "llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h"
+#include "llvm/ExecutionEngine/SectionMemoryManager.h"
+#include "llvm/IR/Module.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/TargetSelect.h"
 
 #ifdef LLVM_ON_UNIX
 #include <netdb.h>
@@ -90,8 +89,7 @@ IncrementalExecutor::IncrementalExecutor(llvm::orc::ThreadSafeContext &TSC,
 
 IncrementalExecutor::IncrementalExecutor(llvm::orc::ThreadSafeContext &TSC,
                                          llvm::orc::LLJITBuilder &JITBuilder,
-                                         llvm::Error &Err,
-                                         pid_t ChildPid)
+                                         llvm::Error &Err, pid_t ChildPid)
     : TSCtx(TSC), OutOfProcessChildPid(ChildPid) {
   using namespace llvm::orc;
   llvm::ErrorAsOutParameter EAO(&Err);
@@ -210,10 +208,9 @@ createSharedMemoryManager(SimpleRemoteEPC &SREPC,
       SlabSize, SREPC, SAs);
 }
 
-
 llvm::Expected<std::pair<std::unique_ptr<llvm::orc::SimpleRemoteEPC>, pid_t>>
 IncrementalExecutor::launchExecutor(llvm::StringRef ExecutablePath,
-                                   bool UseSharedMemory,
+                                    bool UseSharedMemory,
                                     llvm::StringRef SlabAllocateSizeString,
                                     std::function<void()> CustomizeFork) {
 #ifndef LLVM_ON_UNIX
@@ -348,7 +345,7 @@ static Expected<int> connectTCPSocketImpl(std::string Host,
 
 llvm::Expected<std::unique_ptr<SimpleRemoteEPC>>
 IncrementalExecutor::connectTCPSocket(llvm::StringRef NetworkAddress,
-                                     bool UseSharedMemory,
+                                      bool UseSharedMemory,
                                       llvm::StringRef SlabAllocateSizeString) {
 #ifndef LLVM_ON_UNIX
   // FIXME: Add TCP support for Windows.
diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp
index 41ccb106c..e189284c6 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -253,7 +253,8 @@ IncrementalCompilerBuilder::CreateCudaHost() {
 Interpreter::Interpreter(std::unique_ptr<CompilerInstance> Instance,
                          llvm::Error &ErrOut,
                          std::unique_ptr<llvm::orc::LLJITBuilder> JITBuilder,
-                         std::unique_ptr<clang::ASTConsumer> Consumer, OutOfProcessJITConfig OOPConfig)
+                         std::unique_ptr<clang::ASTConsumer> Consumer,
+                         OutOfProcessJITConfig OOPConfig)
     : JITBuilder(std::move(JITBuilder)) {
   CI = std::move(Instance);
   llvm::ErrorAsOutParameter EAO(&ErrOut);
@@ -355,18 +356,20 @@ Interpreter::outOfProcessJITBuilder(OutOfProcessJITConfig OutOfProcessConfig) {
   pid_t childPid = -1;
   if (OutOfProcessConfig.OOPExecutor != "") {
     // Launch an out-of-process executor locally in a child process.
-    auto ResultOrErr = IncrementalExecutor::launchExecutor(OutOfProcessConfig.OOPExecutor,
-                                   OutOfProcessConfig.UseSharedMemory,
-                                   OutOfProcessConfig.SlabAllocateSizeString, OutOfProcessConfig.CustomizeFork);
+    auto ResultOrErr = IncrementalExecutor::launchExecutor(
+        OutOfProcessConfig.OOPExecutor, OutOfProcessConfig.UseSharedMemory,
+        OutOfProcessConfig.SlabAllocateSizeString,
+        OutOfProcessConfig.CustomizeFork);
     if (!ResultOrErr)
       return ResultOrErr.takeError();
     childPid = ResultOrErr->second;
     auto EPCOrErr = std::move(ResultOrErr->first);
     EPC = std::move(EPCOrErr);
   } else if (OutOfProcessConfig.OOPExecutorConnect != "") {
-    auto EPCOrErr = IncrementalExecutor::connectTCPSocket(OutOfProcessConfig.OOPExecutorConnect,
-                                     OutOfProcessConfig.UseSharedMemory,
-                                     OutOfProcessConfig.SlabAllocateSizeString);
+    auto EPCOrErr = IncrementalExecutor::connectTCPSocket(
+        OutOfProcessConfig.OOPExecutorConnect,
+        OutOfProcessConfig.UseSharedMemory,
+        OutOfProcessConfig.SlabAllocateSizeString);
     if (!EPCOrErr)
       return EPCOrErr.takeError();
     EPC = std::move(*EPCOrErr);
@@ -423,8 +426,7 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI,
     const llvm::Triple &Triple = TI.getTriple();
 
     DiagnosticsEngine &Diags = CI->getDiagnostics();
-    std::string BinaryName =
-        llvm::sys::fs::getMainExecutable(nullptr, nullptr);
+    std::string BinaryName = llvm::sys::fs::getMainExecutable(nullptr, nullptr);
     driver::Driver Driver(BinaryName, Triple.str(), Diags);
     std::vector<const char *> Args = {"clang", "--version"};
     std::unique_ptr<clang::driver::Compilation> C(
@@ -444,13 +446,11 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI,
 
       OutOfProcessConfig->OrcRuntimePath = *OrcRuntimePathOrErr;
     }
-
   }
 
-  auto Interp = std::unique_ptr<Interpreter>(
-      new Interpreter(std::move(CI), Err, JB ? std::move(JB) : nullptr, nullptr,
-                      OutOfProcessConfig ? *OutOfProcessConfig
-                                        : OutOfProcessJITConfig()));
+  auto Interp = std::unique_ptr<Interpreter>(new Interpreter(
+      std::move(CI), Err, JB ? std::move(JB) : nullptr, nullptr,
+      OutOfProcessConfig ? *OutOfProcessConfig : OutOfProcessJITConfig()));
   if (auto E = std::move(Err))
     return std::move(E);
 
@@ -539,7 +539,6 @@ size_t Interpreter::getEffectivePTUSize() const {
   return PTUs.size() - InitPTUSize;
 }
 
-
 PartialTranslationUnit &
 Interpreter::RegisterPTU(TranslationUnitDecl *TU,
                          std::unique_ptr<llvm::Module> M /*={}*/,
@@ -677,8 +676,8 @@ llvm::Error Interpreter::CreateExecutor(OutOfProcessJITConfig OOPConfig) {
 #ifdef __EMSCRIPTEN__
   auto Executor = std::make_unique<WasmIncrementalExecutor>(*TSCtx);
 #else
-  auto Executor =
-      std::make_unique<IncrementalExecutor>(*TSCtx, *JITBuilder, Err, OOPChildPid);
+  auto Executor = std::make_unique<IncrementalExecutor>(*TSCtx, *JITBuilder,
+                                                        Err, OOPChildPid);
 #endif
   if (!Err)
     IncrExecutor = std::move(Executor);
diff --git a/clang/tools/clang-repl/ClangRepl.cpp b/clang/tools/clang-repl/ClangRepl.cpp
index 126312fba..044a93b4b 100644
--- a/clang/tools/clang-repl/ClangRepl.cpp
+++ b/clang/tools/clang-repl/ClangRepl.cpp
@@ -279,8 +279,8 @@ int main(int argc, const char **argv) {
   ExitOnErr(sanitizeOopArguments(argv[0]));
 
   clang::OutOfProcessJITConfig OutOfProcessConfig;
-  OutOfProcessConfig.IsOutOfProcess = !OOPExecutor.empty() ||
-                                      !OOPExecutorConnect.empty();
+  OutOfProcessConfig.IsOutOfProcess =
+      !OOPExecutor.empty() || !OOPExecutorConnect.empty();
   OutOfProcessConfig.OOPExecutor = OOPExecutor;
   OutOfProcessConfig.SlabAllocateSizeString = SlabAllocateSizeString;
   OutOfProcessConfig.UseSharedMemory = UseSharedMemory;
diff --git a/clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp b/clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp
index 81f44ee59..be0e25bc0 100644
--- a/clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp
+++ b/clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp
@@ -146,8 +146,7 @@ createInterpreterWithRemoteExecution(const Args &ExtraArgs = {},
   OutOfProcessConfig.IsOutOfProcess = true;
   OutOfProcessConfig.OrcRuntimePath = getOrcRuntimePath();
 
-  std::cout << "OrcRuntimePath: " << OutOfProcessConfig.OrcRuntimePath
-            << "\n";
+  std::cout << "OrcRuntimePath: " << OutOfProcessConfig.OrcRuntimePath << "\n";
 
   std::unique_ptr<llvm::orc::LLJITBuilder> JB;

clang/tools/clang-repl/ClangRepl.cpp

vgvassilev · 2025-08-25T17:05:15Z

clang/lib/Interpreter/RemoteJITUtils.cpp

@@ -33,6 +33,10 @@
 using namespace llvm;
 using namespace llvm::orc;

+#if LLVM_ON_UNIX
+static std::vector<pid_t> LaunchedExecutorPID;


That should be a member of the Interpreter class I think.

This vector is updated in launchExecutor. And launchExecutor is called before creation of interpreter. I can define it as static but I don't think it is related enough to be in interpreter class.

We need a home for this. The process is not the right home. Either the Interpreter class or the IncrementalExecutor should be good options.

clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp

vgvassilev · 2025-08-28T07:49:43Z

clang/include/clang/Interpreter/OutOfProcessJITConfig.h

+namespace clang {
+
+/// \brief Configuration options for out-of-process JIT execution.
+struct OutOfProcessJITConfig {


That struct can go as a nested Interpreter class.

vgvassilev · 2025-08-28T07:50:36Z

clang/include/clang/Interpreter/OutOfProcessJITConfig.h

+  bool UseSharedMemory;
+
+  /// String representing the slab allocation size for memory management.
+  std::string SlabAllocateSizeString;


This should be an unsigned int I think. All of these should have good default values.

vgvassilev · 2025-08-28T07:51:24Z

clang/lib/Interpreter/Interpreter.cpp

@@ -55,6 +57,8 @@
 #include "llvm/TargetParser/Host.h"
 #include "llvm/Transforms/Utils/Cloning.h" // for CloneModule

+#include <iostream>


We probably do not need this include.

vgvassilev · 2025-08-28T07:52:21Z

clang/lib/Interpreter/Interpreter.cpp

+  std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC;
+  if (OutOfProcessConfig.OOPExecutor != "") {
+    // Launch an out-of-process executor locally in a child process.
+    EPC = ExitOnErr(launchExecutor(OutOfProcessConfig.OOPExecutor,


Remember this is the library, it must not abort the process. Instead the interface should return llvm::Expected<std::unique_ptr<llvm::orc::LLJITBuilder>> and propagate the error up.

vgvassilev · 2025-08-28T07:54:05Z

clang/lib/Interpreter/Interpreter.cpp

+  llvm::SmallString<256> BasePath(llvm::sys::fs::getMainExecutable(
+      "clang-repl", reinterpret_cast<void *>(&getOrcRuntimePath)));


That does not work when we are in a library. Why do we need the BasePath at all? I'd think we can ask the TC and that is mostly it. Do you try to get somehow to the source directory?

vgvassilev · 2025-08-28T07:55:02Z

clang/lib/Interpreter/RemoteJITUtils.cpp

@@ -33,6 +33,10 @@
 using namespace llvm;
 using namespace llvm::orc;

+#if LLVM_ON_UNIX
+static std::vector<pid_t> LaunchedExecutorPID;


We need a home for this. The process is not the right home. Either the Interpreter class or the IncrementalExecutor should be good options.

vgvassilev · 2025-08-28T07:55:55Z

clang/tools/clang-repl/ClangRepl.cpp

 #include <optional>

+#include <iostream>


We don't need that.

vgvassilev · 2025-08-28T07:56:18Z

clang/tools/clang-repl/ClangRepl.cpp

+    if (::OffloadArch.empty()) {
+      ::OffloadArch = "sm_35";
    }
-    CB.SetOffloadArch(OffloadArch);
+    CB.SetOffloadArch(::OffloadArch);


Which compiler is this? Why it works upstream?

vgvassilev · 2025-08-28T07:56:46Z

clang/tools/clang-repl/ClangRepl.cpp

+  } else {
+    Interp = ExitOnErr(
+        clang::Interpreter::create(std::move(CI), OutOfProcessConfig));
+  }


kr-2003 and others added 21 commits July 29, 2025 13:34

pipes for redirection in oop jit

79849c3

Merge branch 'main' into redirection

825f005

refactoring

52b0902

refactoring

3b4fcad

commenting & refactoring

e174e98

compiler-rt conditional addition

b744a9f

Merge branch 'main' into redirection

0c6c995

removed compiler-rt dep

2cf71ed

Merge branch 'redirection' of https://github.com/kr-2003/llvm-project …

7c29008

…into redirection

separate file for oop tests

41f8e54

separate file for oop tests

4f1d203

separate file for oop tests

a6a4369

test file rename

63de886

test file rename

c24e84e

test file rename

b114bb8

resolving comments & InterpreterRemoteTest

850b953

resolving comments

956f393

resolving comments

14e5afd

Custom lambda in launchExecutor and pid retrieval

65afbff

Merge branch 'main' of https://github.com/llvm/llvm-project into redi…

7dc6590

…rection

Dynamic path resolution

095a63b

vgvassilev reviewed Aug 25, 2025

View reviewed changes

vgvassilev requested a review from lhames August 25, 2025 12:07

kr-2003 added 2 commits August 25, 2025 18:52

Dynamic path resolution using IncrementalCB

2b6dc6c

Dynamic path resolution using IncrementalCB

7ad10a6

vgvassilev reviewed Aug 25, 2025

View reviewed changes

clang/tools/clang-repl/ClangRepl.cpp Outdated Show resolved Hide resolved

vgvassilev reviewed Aug 25, 2025

View reviewed changes

Addressing reviews

6a58d5f

kr-2003 requested a review from vgvassilev August 26, 2025 15:12

vgvassilev reviewed Aug 26, 2025

View reviewed changes

clang/unittests/Interpreter/OutOfProcessInterpreterTests.cpp Outdated Show resolved Hide resolved

Sinking JitBuilder into Interpreter

f1b9135

kr-2003 requested a review from vgvassilev August 27, 2025 16:12

vgvassilev reviewed Aug 28, 2025

View reviewed changes

kr-2003 and others added 2 commits August 31, 2025 19:01

RemoteJITUtils shifted to IncrementalExecutor

dd73052

Merge branch 'main' into redirection

fda875f

		llvm::SmallString<256> BasePath(llvm::sys::fs::getMainExecutable(
		"clang-repl", reinterpret_cast<void *>(&getOrcRuntimePath)));

[Clang-Repl] Add Lambda Support, PID Retrieval, and Dynamic liborc_rt Path in Clang-Repl #155140

Are you sure you want to change the base?

[Clang-Repl] Add Lambda Support, PID Retrieval, and Dynamic liborc_rt Path in Clang-Repl #155140

Conversation

kr-2003 commented Aug 24, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Aug 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Aug 25, 2025 •

edited

Loading