https://github.com/anutosh491 updated https://github.com/llvm/llvm-project/pull/136404
>From 82a2be2dd0780bd3d57f4a22d61a4b0752696934 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Fri, 18 Apr 2025 18:45:00 +0530 Subject: [PATCH 1/5] Fix cuda flag with clang-repl --- clang/include/clang/Interpreter/Interpreter.h | 3 +- clang/lib/Interpreter/Interpreter.cpp | 43 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/clang/include/clang/Interpreter/Interpreter.h b/clang/include/clang/Interpreter/Interpreter.h index b1b63aedf86ab..20d22c4437a97 100644 --- a/clang/include/clang/Interpreter/Interpreter.h +++ b/clang/include/clang/Interpreter/Interpreter.h @@ -129,7 +129,8 @@ class Interpreter { public: virtual ~Interpreter(); static llvm::Expected<std::unique_ptr<Interpreter>> - create(std::unique_ptr<CompilerInstance> CI); + create(std::unique_ptr<CompilerInstance> CI, + std::unique_ptr<CompilerInstance> DeviceCI = nullptr); static llvm::Expected<std::unique_ptr<Interpreter>> createWithCUDA(std::unique_ptr<CompilerInstance> CI, std::unique_ptr<CompilerInstance> DCI); diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index f8c8d0a425659..2002854daa2a0 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -451,20 +451,40 @@ const char *const Runtimes = R"( )"; llvm::Expected<std::unique_ptr<Interpreter>> -Interpreter::create(std::unique_ptr<CompilerInstance> CI) { +Interpreter::create(std::unique_ptr<CompilerInstance> CI, + std::unique_ptr<CompilerInstance> DeviceCI) { llvm::Error Err = llvm::Error::success(); auto Interp = std::unique_ptr<Interpreter>(new Interpreter(std::move(CI), Err)); if (Err) return std::move(Err); - // Add runtime code and set a marker to hide it from user code. Undo will not - // go through that. + // CUDA-specific logic (only if CUDA mode) + if (DeviceCI) { + // Ensure we initialize Sema on the device CI + // DeviceCI->createSema(Interp->Act->getTranslationUnitKind(), nullptr); + DeviceCI->ExecuteAction(*Interp->Act); + + // Use a custom in-memory VFS for fatbin writing + llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> IMVFS = + std::make_unique<llvm::vfs::InMemoryFileSystem>(); + + // Create the CUDA device parser + auto DeviceParser = std::make_unique<IncrementalCUDADeviceParser>( + std::move(DeviceCI), *Interp->getCompilerInstance(), IMVFS, Err, + Interp->PTUs); + + if (Err) + return std::move(Err); + + Interp->DeviceParser = std::move(DeviceParser); + } + + // Add runtime code and set a marker to hide it from user code. auto PTU = Interp->Parse(Runtimes); if (!PTU) return PTU.takeError(); Interp->markUserCodeStart(); - Interp->ValuePrintingInfo.resize(4); return std::move(Interp); } @@ -481,20 +501,7 @@ Interpreter::createWithCUDA(std::unique_ptr<CompilerInstance> CI, OverlayVFS->pushOverlay(IMVFS); CI->createFileManager(OverlayVFS); - auto Interp = Interpreter::create(std::move(CI)); - if (auto E = Interp.takeError()) - return std::move(E); - - llvm::Error Err = llvm::Error::success(); - auto DeviceParser = std::make_unique<IncrementalCUDADeviceParser>( - std::move(DCI), *(*Interp)->getCompilerInstance(), IMVFS, Err, - (*Interp)->PTUs); - if (Err) - return std::move(Err); - - (*Interp)->DeviceParser = std::move(DeviceParser); - - return Interp; + return Interpreter::create(std::move(CI), std::move(DCI)); } const CompilerInstance *Interpreter::getCompilerInstance() const { >From ae0605f4c2b4c991074d0f91f046b9460ff4eac1 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Fri, 18 Apr 2025 19:33:00 +0530 Subject: [PATCH 2/5] execute action on deviceCI --- clang/lib/Interpreter/Interpreter.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index 2002854daa2a0..b2c33480107d8 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -459,17 +459,30 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI, if (Err) return std::move(Err); - // CUDA-specific logic (only if CUDA mode) if (DeviceCI) { - // Ensure we initialize Sema on the device CI - // DeviceCI->createSema(Interp->Act->getTranslationUnitKind(), nullptr); + // Create a fresh LLVM context for the CUDA device interpreter + // auto DeviceLLVMCtx = std::make_unique<llvm::LLVMContext>(); + // auto DeviceTSCtx = + // std::make_unique<llvm::orc::ThreadSafeContext>(std::move(DeviceLLVMCtx)); + + // llvm::Error DeviceErr = llvm::Error::success(); + // llvm::ErrorAsOutParameter EAO(&DeviceErr); + + // // Create an IncrementalAction for the device CompilerInstance + // auto DeviceAct = std::make_unique<IncrementalAction>( + // *DeviceCI, *DeviceTSCtx->getContext(), DeviceErr, *Interp); + + // if (DeviceErr) + // return std::move(DeviceErr); + + // Execute the device-side action (this will create Sema etc.) DeviceCI->ExecuteAction(*Interp->Act); - // Use a custom in-memory VFS for fatbin writing + // Set up a virtual file system to emit fatbin to memory llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> IMVFS = std::make_unique<llvm::vfs::InMemoryFileSystem>(); - // Create the CUDA device parser + // Create the CUDA device parser using the initialized device CI auto DeviceParser = std::make_unique<IncrementalCUDADeviceParser>( std::move(DeviceCI), *Interp->getCompilerInstance(), IMVFS, Err, Interp->PTUs); >From fef5b992418214f51a977b32aaa5a7502565a168 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Sat, 19 Apr 2025 09:50:55 +0530 Subject: [PATCH 3/5] Fix releasing DeviceInstance --- clang/lib/Interpreter/DeviceOffload.cpp | 3 ++- clang/lib/Interpreter/Interpreter.cpp | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/clang/lib/Interpreter/DeviceOffload.cpp b/clang/lib/Interpreter/DeviceOffload.cpp index 1999d63d1aa04..9a7be006250a0 100644 --- a/clang/lib/Interpreter/DeviceOffload.cpp +++ b/clang/lib/Interpreter/DeviceOffload.cpp @@ -34,14 +34,15 @@ IncrementalCUDADeviceParser::IncrementalCUDADeviceParser( TargetOpts(HostInstance.getTargetOpts()) { if (Err) return; - DeviceCI = std::move(DeviceInstance); StringRef Arch = TargetOpts.CPU; if (!Arch.starts_with("sm_") || Arch.substr(3).getAsInteger(10, SMVersion)) { + DeviceInstance.release(); Err = llvm::joinErrors(std::move(Err), llvm::make_error<llvm::StringError>( "Invalid CUDA architecture", llvm::inconvertibleErrorCode())); return; } + DeviceCI = std::move(DeviceInstance); } llvm::Expected<TranslationUnitDecl *> diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index b2c33480107d8..1daad6c224adf 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -460,7 +460,6 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI, return std::move(Err); if (DeviceCI) { - // Create a fresh LLVM context for the CUDA device interpreter // auto DeviceLLVMCtx = std::make_unique<llvm::LLVMContext>(); // auto DeviceTSCtx = // std::make_unique<llvm::orc::ThreadSafeContext>(std::move(DeviceLLVMCtx)); @@ -468,21 +467,18 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI, // llvm::Error DeviceErr = llvm::Error::success(); // llvm::ErrorAsOutParameter EAO(&DeviceErr); - // // Create an IncrementalAction for the device CompilerInstance // auto DeviceAct = std::make_unique<IncrementalAction>( // *DeviceCI, *DeviceTSCtx->getContext(), DeviceErr, *Interp); // if (DeviceErr) // return std::move(DeviceErr); - // Execute the device-side action (this will create Sema etc.) + //DeviceCI->ExecuteAction(*DeviceAct); DeviceCI->ExecuteAction(*Interp->Act); - // Set up a virtual file system to emit fatbin to memory llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> IMVFS = std::make_unique<llvm::vfs::InMemoryFileSystem>(); - // Create the CUDA device parser using the initialized device CI auto DeviceParser = std::make_unique<IncrementalCUDADeviceParser>( std::move(DeviceCI), *Interp->getCompilerInstance(), IMVFS, Err, Interp->PTUs); >From 5d6c20809821c2ca0635bfe1175ecf2a9e6a6e39 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Sat, 19 Apr 2025 09:53:00 +0530 Subject: [PATCH 4/5] minor changes --- clang/lib/Interpreter/Interpreter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index 1daad6c224adf..1af3f24774028 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -489,11 +489,13 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI, Interp->DeviceParser = std::move(DeviceParser); } - // Add runtime code and set a marker to hide it from user code. + // Add runtime code and set a marker to hide it from user code. Undo will not + // go through that. auto PTU = Interp->Parse(Runtimes); if (!PTU) return PTU.takeError(); Interp->markUserCodeStart(); + Interp->ValuePrintingInfo.resize(4); return std::move(Interp); } >From a27da32f88a4517ef5587c7000d3045bc8473016 Mon Sep 17 00:00:00 2001 From: anutosh491 <andersonbhat...@gmail.com> Date: Sat, 19 Apr 2025 10:13:55 +0530 Subject: [PATCH 5/5] clang tidy reviews --- clang/include/clang/Interpreter/Interpreter.h | 2 +- clang/lib/Interpreter/Interpreter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/include/clang/Interpreter/Interpreter.h b/clang/include/clang/Interpreter/Interpreter.h index 20d22c4437a97..7425797c55297 100644 --- a/clang/include/clang/Interpreter/Interpreter.h +++ b/clang/include/clang/Interpreter/Interpreter.h @@ -130,7 +130,7 @@ class Interpreter { virtual ~Interpreter(); static llvm::Expected<std::unique_ptr<Interpreter>> create(std::unique_ptr<CompilerInstance> CI, - std::unique_ptr<CompilerInstance> DeviceCI = nullptr); + std::unique_ptr<CompilerInstance> DeviceCI = nullptr); static llvm::Expected<std::unique_ptr<Interpreter>> createWithCUDA(std::unique_ptr<CompilerInstance> CI, std::unique_ptr<CompilerInstance> DCI); diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index 1af3f24774028..049cc00cd198f 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -473,7 +473,7 @@ Interpreter::create(std::unique_ptr<CompilerInstance> CI, // if (DeviceErr) // return std::move(DeviceErr); - //DeviceCI->ExecuteAction(*DeviceAct); + // DeviceCI->ExecuteAction(*DeviceAct); DeviceCI->ExecuteAction(*Interp->Act); llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> IMVFS = _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits