llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: theRonShark (ronlieb) <details> <summary>Changes</summary> Reverts llvm/llvm-project#<!-- -->218337 buildbot failures --- Full diff: https://github.com/llvm/llvm-project/pull/226679.diff 9 Files Affected: - (modified) clang/include/clang/CodeGen/CodeGenAction.h (-5) - (modified) clang/include/clang/Interpreter/Interpreter.h (+2-2) - (modified) clang/lib/CodeGen/BackendConsumer.h (-8) - (modified) clang/lib/CodeGen/CodeGenAction.cpp (-9) - (modified) clang/lib/Interpreter/DeviceOffload.cpp (+8-209) - (modified) clang/lib/Interpreter/DeviceOffload.h (+9-55) - (modified) clang/lib/Interpreter/Interpreter.cpp (+6-1) - (modified) clang/unittests/Basic/CMakeLists.txt (-1) - (removed) clang/unittests/Basic/TargetIDTest.cpp (-50) ``````````diff diff --git a/clang/include/clang/CodeGen/CodeGenAction.h b/clang/include/clang/CodeGen/CodeGenAction.h index 319cc8f2b14a1e..84fa4549d50336 100644 --- a/clang/include/clang/CodeGen/CodeGenAction.h +++ b/clang/include/clang/CodeGen/CodeGenAction.h @@ -63,11 +63,6 @@ class CodeGenAction : public ASTFrontendAction { CodeGenerator *getCodeGenerator() const; - /// Reload the -mlink-builtin-bitcode modules into the backend consumer. - /// LinkInModules() consumes them, so incremental compilation must reload them - /// before each translation unit (e.g. to re-link HIP device libraries). - void reloadLinkModules(CompilerInstance &CI); - BackendConsumer *BEConsumer = nullptr; }; diff --git a/clang/include/clang/Interpreter/Interpreter.h b/clang/include/clang/Interpreter/Interpreter.h index b45c61a199f357..4504b679504e0d 100644 --- a/clang/include/clang/Interpreter/Interpreter.h +++ b/clang/include/clang/Interpreter/Interpreter.h @@ -44,7 +44,7 @@ class CompilerInstance; class CXXRecordDecl; class Decl; class IncrementalParser; -class IncrementalDeviceParser; +class IncrementalCUDADeviceParser; enum class OffloadType { CUDA, HIP }; @@ -131,7 +131,7 @@ class Interpreter { std::unique_ptr<IncrementalExecutor> IncrExecutor; // An optional parser for CUDA offloading - std::unique_ptr<IncrementalDeviceParser> DeviceParser; + std::unique_ptr<IncrementalCUDADeviceParser> DeviceParser; // An optional action for CUDA offloading std::unique_ptr<IncrementalAction> DeviceAct; diff --git a/clang/lib/CodeGen/BackendConsumer.h b/clang/lib/CodeGen/BackendConsumer.h index d6d713844a195c..708658d206bafa 100644 --- a/clang/lib/CodeGen/BackendConsumer.h +++ b/clang/lib/CodeGen/BackendConsumer.h @@ -92,14 +92,6 @@ class BackendConsumer : public ASTConsumer { // Links each entry in LinkModules into our module. Returns true on error. bool LinkInModules(llvm::Module *M); - /// Replace the set of modules to link in. LinkInModules() consumes the - /// modules, so incremental compilation (clang-repl) must reload and reseed - /// them before each translation unit; otherwise later inputs would miss the - /// linked-in bitcode (e.g. HIP device libraries). - void setLinkModules(SmallVector<LinkModule, 4> LMs) { - LinkModules = std::move(LMs); - } - /// Get the best possible source location to represent a diagnostic that /// may have associated debug info. const FullSourceLoc getBestLocationFromDebugLoc( diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp index c6020dc04a9c28..21e58c4aea8c81 100644 --- a/clang/lib/CodeGen/CodeGenAction.cpp +++ b/clang/lib/CodeGen/CodeGenAction.cpp @@ -983,15 +983,6 @@ CodeGenerator *CodeGenAction::getCodeGenerator() const { return BEConsumer->getCodeGenerator(); } -void CodeGenAction::reloadLinkModules(CompilerInstance &CI) { - if (!BEConsumer) - return; - SmallVector<LinkModule, 4> LMs; - if (clang::loadLinkModules(CI, *VMContext, LMs)) - return; - BEConsumer->setLinkModules(std::move(LMs)); -} - bool CodeGenAction::BeginSourceFileAction(CompilerInstance &CI) { if (CI.getFrontendOpts().GenReducedBMI) CI.getLangOpts().setCompilingModule(LangOptions::CMK_ModuleInterface); diff --git a/clang/lib/Interpreter/DeviceOffload.cpp b/clang/lib/Interpreter/DeviceOffload.cpp index 8f59b569600bef..bf7653c518c309 100644 --- a/clang/lib/Interpreter/DeviceOffload.cpp +++ b/clang/lib/Interpreter/DeviceOffload.cpp @@ -6,228 +6,32 @@ // //===----------------------------------------------------------------------===// // -// This file implements offloading to HIP and CUDA devices. +// This file implements offloading to CUDA devices. // //===----------------------------------------------------------------------===// #include "DeviceOffload.h" -#include "IncrementalAction.h" -#include "clang/Basic/TargetID.h" #include "clang/Basic/TargetOptions.h" -#include "clang/CodeGen/BackendUtil.h" -#include "clang/CodeGen/CodeGenAction.h" -#include "clang/Driver/OffloadBundler.h" +#include "clang/CodeGen/ModuleBuilder.h" #include "clang/Frontend/CompilerInstance.h" -#include "clang/Frontend/FrontendAction.h" #include "clang/Interpreter/PartialTranslationUnit.h" -#include "llvm/ADT/StringExtras.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Module.h" #include "llvm/MC/TargetRegistry.h" -#include "llvm/Support/FileSystem.h" -#include "llvm/Support/FileUtilities.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/Path.h" -#include "llvm/Support/Program.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/TargetParser/AMDGPUTargetParser.h" -#include "llvm/TargetParser/Host.h" namespace clang { -IncrementalDeviceParser::IncrementalDeviceParser( - CompilerInstance &DeviceInstance, CompilerInstance &HostInstance, - IncrementalAction *DeviceAct, - llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS, - llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs) - : IncrementalParser(DeviceInstance, DeviceAct, Err, PTUs), - DeviceCI(DeviceInstance), VFS(FS), - CodeGenOpts(HostInstance.getCodeGenOpts()), - TargetOpts(DeviceInstance.getTargetOpts()) {} - -IncrementalDeviceParser::~IncrementalDeviceParser() {} - -IncrementalHIPDeviceParser::IncrementalHIPDeviceParser( - CompilerInstance &DeviceInstance, CompilerInstance &HostInstance, - IncrementalAction *DeviceAct, - llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS, - llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs) - : IncrementalDeviceParser(DeviceInstance, HostInstance, DeviceAct, FS, Err, - PTUs) { - if (Err) - return; - StringRef Arch = TargetOpts.CPU; - if (!Arch.starts_with("gfx")) { - Err = llvm::joinErrors(std::move(Err), llvm::make_error<llvm::StringError>( - "Invalid HIP architecture", - llvm::inconvertibleErrorCode())); - return; - } -} - -llvm::Expected<TranslationUnitDecl *> -IncrementalHIPDeviceParser::Parse(llvm::StringRef Input) { - if (FrontendAction *WrappedAct = Act->getWrapped()) - if (WrappedAct->hasIRSupport()) - static_cast<CodeGenAction *>(WrappedAct)->reloadLinkModules(DeviceCI); - - return IncrementalParser::Parse(Input); -} - -llvm::Expected<llvm::StringRef> IncrementalHIPDeviceParser::GenerateHSACO() { - auto &PTU = PTUs.back(); - - CodeGenOptions CodeGenOptsForObj = DeviceCI.getCodeGenOpts(); - CodeGenOptsForObj.DisableLLVMPasses = true; - - llvm::SmallVector<char, 0> Object; - auto ObjOS = std::make_unique<llvm::raw_svector_ostream>(Object); - clang::emitBackendOutput(DeviceCI, CodeGenOptsForObj, PTU.TheModule.get(), - Backend_EmitObj, DeviceCI.getVirtualFileSystemPtr(), - std::move(ObjOS)); - - if (DeviceCI.getDiagnostics().hasErrorOccurred()) - return llvm::make_error<llvm::StringError>( - "Backend code generation failed for HIP device code.", - llvm::inconvertibleErrorCode()); - - std::string Exe = llvm::sys::fs::getMainExecutable(nullptr, nullptr); - llvm::StringRef ExeDir = llvm::sys::path::parent_path(Exe); - llvm::ErrorOr<std::string> LLDPath = - llvm::sys::findProgramByName("ld.lld", {ExeDir}); - if (!LLDPath) - LLDPath = llvm::sys::findProgramByName("ld.lld"); - if (!LLDPath) - return llvm::make_error<llvm::StringError>( - "Could not find ld.lld next to the executable or on PATH.", - llvm::inconvertibleErrorCode()); - - int ObjFD = -1; - llvm::SmallString<128> ObjFile; - if (llvm::sys::fs::createTemporaryFile("kernel", "o", ObjFD, ObjFile)) - return llvm::make_error<llvm::StringError>( - "Failed to create a temporary object file.", - llvm::inconvertibleErrorCode()); - llvm::FileRemover ObjRemover(ObjFile); - { - llvm::raw_fd_ostream OS(ObjFD, /*shouldClose=*/true); - OS << llvm::StringRef(Object.data(), Object.size()); - } - - llvm::SmallString<128> HsacoFile; - if (llvm::sys::fs::createTemporaryFile("kernel", "hsaco", HsacoFile)) - return llvm::make_error<llvm::StringError>( - "Failed to create a temporary code object file.", - llvm::inconvertibleErrorCode()); - llvm::FileRemover HsacoRemover(HsacoFile); - - llvm::StringRef Args[] = {"ld.lld", "-shared", "--no-undefined", - ObjFile, "-o", HsacoFile}; - if (llvm::sys::ExecuteAndWait(*LLDPath, Args) != 0) - return llvm::make_error<llvm::StringError>("ld.lld invocation failed.", - llvm::inconvertibleErrorCode()); - - auto HsacoBuf = llvm::MemoryBuffer::getFile(HsacoFile, /*IsText=*/false); - if (!HsacoBuf) - return llvm::make_error<llvm::StringError>( - "Failed to read the code object.", llvm::inconvertibleErrorCode()); - - llvm::StringRef Buffer = (*HsacoBuf)->getBuffer(); - HSACOContent.assign(Buffer.begin(), Buffer.end()); - return llvm::StringRef(HSACOContent.data(), HSACOContent.size()); -} - -llvm::Error IncrementalHIPDeviceParser::GenerateOffloadBundle() { - static constexpr unsigned CodeObjectAlign = 4096; - - const PartialTranslationUnit &PTU = PTUs.back(); - - llvm::SmallString<128> HostFile; - if (llvm::sys::fs::createTemporaryFile("hip-host", "", HostFile)) - return llvm::make_error<llvm::StringError>( - "Failed to create a temporary host bundle input.", - llvm::inconvertibleErrorCode()); - llvm::FileRemover HostRemover(HostFile); - - llvm::SmallString<128> DeviceFile; - int DeviceFD = -1; - if (llvm::sys::fs::createTemporaryFile("hip-device", "hsaco", DeviceFD, - DeviceFile)) - return llvm::make_error<llvm::StringError>( - "Failed to create a temporary code object file.", - llvm::inconvertibleErrorCode()); - llvm::FileRemover DeviceRemover(DeviceFile); - { - llvm::raw_fd_ostream OS(DeviceFD, /*shouldClose=*/true); - OS << llvm::StringRef(HSACOContent.data(), HSACOContent.size()); - } - - llvm::SmallString<128> BundleFile; - if (llvm::sys::fs::createTemporaryFile("hip-bundle", "hipfb", BundleFile)) - return llvm::make_error<llvm::StringError>( - "Failed to create a temporary offload bundle file.", - llvm::inconvertibleErrorCode()); - llvm::FileRemover BundleRemover(BundleFile); - - std::string TargetID = llvm::AMDGPU::TargetID::createFromSubtargetFeatures( - DeviceCI.getTarget().getTriple(), TargetOpts.CPU, - llvm::join(TargetOpts.Features, ",")) - .getCanonicalFeatureString(); - - llvm::StringRef OffloadKind = - (TargetOpts.CodeObjectVersion == llvm::CodeObjectVersionKind::COV_2 || - TargetOpts.CodeObjectVersion == llvm::CodeObjectVersionKind::COV_3) - ? "hip" - : "hipv4"; - - std::string HostTriple = "host-" + llvm::sys::getProcessTriple() + "-"; - std::string DeviceTriple = - OffloadKind.str() + "-" + - normalizeForBundler(PTU.TheModule->getTargetTriple(), TargetID) + "-" + - TargetID; - - OffloadBundlerConfig Config; - Config.FilesType = "o"; - Config.BundleAlignment = CodeObjectAlign; - Config.HostInputIndex = 0; - Config.TargetNames = {HostTriple, DeviceTriple}; - Config.InputFileNames = {std::string(HostFile), std::string(DeviceFile)}; - Config.OutputFileNames = {std::string(BundleFile)}; - - if (llvm::Error Err = OffloadBundler(Config).BundleFiles()) - return Err; - - auto BundleBuf = llvm::MemoryBuffer::getFile(BundleFile, /*IsText=*/false); - if (!BundleBuf) - return llvm::make_error<llvm::StringError>( - "Failed to read the offload bundle.", llvm::inconvertibleErrorCode()); - - std::string BundleFileName = "/" + PTU.TheModule->getName().str() + ".hipfb"; - VFS->addFile(BundleFileName, 0, - llvm::MemoryBuffer::getMemBufferCopy((*BundleBuf)->getBuffer())); - - CodeGenOpts.OffloadBinaryToEmbedFile = std::move(BundleFileName); - return llvm::Error::success(); -} - -llvm::Error IncrementalHIPDeviceParser::GenerateOffloadBinary() { - llvm::Expected<llvm::StringRef> HSACO = GenerateHSACO(); - if (!HSACO) - return HSACO.takeError(); - return GenerateOffloadBundle(); -} - -IncrementalHIPDeviceParser::~IncrementalHIPDeviceParser() {} - IncrementalCUDADeviceParser::IncrementalCUDADeviceParser( CompilerInstance &DeviceInstance, CompilerInstance &HostInstance, IncrementalAction *DeviceAct, llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS, llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs) - : IncrementalDeviceParser(DeviceInstance, HostInstance, DeviceAct, FS, Err, - PTUs) { + : IncrementalParser(DeviceInstance, DeviceAct, Err, PTUs), VFS(FS), + CodeGenOpts(HostInstance.getCodeGenOpts()), + TargetOpts(DeviceInstance.getTargetOpts()) { if (Err) return; StringRef Arch = TargetOpts.CPU; @@ -264,7 +68,9 @@ llvm::Expected<llvm::StringRef> IncrementalCUDADeviceParser::GeneratePTX() { llvm::inconvertibleErrorCode()); } - PM.run(*PTU.TheModule); + if (!PM.run(*PTU.TheModule)) + return llvm::make_error<llvm::StringError>("Failed to emit PTX code.", + llvm::inconvertibleErrorCode()); PTXCode += '\0'; while (PTXCode.size() % 8) @@ -352,13 +158,6 @@ llvm::Error IncrementalCUDADeviceParser::GenerateFatbinary() { return llvm::Error::success(); } -llvm::Error IncrementalCUDADeviceParser::GenerateOffloadBinary() { - llvm::Expected<llvm::StringRef> PTX = GeneratePTX(); - if (!PTX) - return PTX.takeError(); - return GenerateFatbinary(); -} - IncrementalCUDADeviceParser::~IncrementalCUDADeviceParser() {} } // namespace clang diff --git a/clang/lib/Interpreter/DeviceOffload.h b/clang/lib/Interpreter/DeviceOffload.h index 45a3fc17c065e9..a31bd5a0499b82 100644 --- a/clang/lib/Interpreter/DeviceOffload.h +++ b/clang/lib/Interpreter/DeviceOffload.h @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// This file implements classes required for offloading to HIP and CUDA devices. +// This file implements classes required for offloading to CUDA devices. // //===----------------------------------------------------------------------===// @@ -14,11 +14,9 @@ #define LLVM_CLANG_LIB_INTERPRETER_DEVICE_OFFLOAD_H #include "IncrementalParser.h" -#include "llvm/Support/Error.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/VirtualFileSystem.h" -#include <memory> - namespace clang { struct PartialTranslationUnit; class CompilerInstance; @@ -26,52 +24,7 @@ class CodeGenOptions; class TargetOptions; class IncrementalAction; -class IncrementalDeviceParser : public IncrementalParser { - -public: - IncrementalDeviceParser( - CompilerInstance &DeviceInstance, CompilerInstance &HostInstance, - IncrementalAction *DeviceAct, - llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS, - llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs); - - virtual llvm::Error GenerateOffloadBinary() = 0; - - ~IncrementalDeviceParser() override; - -protected: - CompilerInstance &DeviceCI; - llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS; - CodeGenOptions &CodeGenOpts; - const TargetOptions &TargetOpts; -}; - -class IncrementalHIPDeviceParser : public IncrementalDeviceParser { - -public: - IncrementalHIPDeviceParser( - CompilerInstance &DeviceInstance, CompilerInstance &HostInstance, - IncrementalAction *DeviceAct, - llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS, - llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs); - - llvm::Expected<TranslationUnitDecl *> Parse(llvm::StringRef Input) override; - - llvm::Error GenerateOffloadBinary() override; - - ~IncrementalHIPDeviceParser(); - -protected: - // Generate the HSACO code object for the last PTU. - llvm::Expected<llvm::StringRef> GenerateHSACO(); - - // Bundle the HSACO into a HIP offload bundle in memory. - llvm::Error GenerateOffloadBundle(); - - llvm::SmallVector<char, 1024> HSACOContent; -}; - -class IncrementalCUDADeviceParser : public IncrementalDeviceParser { +class IncrementalCUDADeviceParser : public IncrementalParser { public: IncrementalCUDADeviceParser( @@ -80,20 +33,21 @@ class IncrementalCUDADeviceParser : public IncrementalDeviceParser { llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS, llvm::Error &Err, std::list<PartialTranslationUnit> &PTUs); - llvm::Error GenerateOffloadBinary() override; - - ~IncrementalCUDADeviceParser(); - -protected: // Generate PTX for the last PTU. llvm::Expected<llvm::StringRef> GeneratePTX(); // Generate fatbinary contents in memory llvm::Error GenerateFatbinary(); + ~IncrementalCUDADeviceParser(); + +protected: int SMVersion; llvm::SmallString<1024> PTXCode; llvm::SmallVector<char, 1024> FatbinContent; + llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS; + CodeGenOptions &CodeGenOpts; // Intentionally a reference. + const TargetOptions &TargetOpts; }; } // namespace clang diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp index 8aafbc867ddaf4..655db32477a0c8 100644 --- a/clang/lib/Interpreter/Interpreter.cpp +++ b/clang/lib/Interpreter/Interpreter.cpp @@ -576,7 +576,12 @@ Interpreter::Parse(llvm::StringRef Code) { DeviceParser->RegisterPTU(*DeviceTU); - if (llvm::Error Err = DeviceParser->GenerateOffloadBinary()) + llvm::Expected<llvm::StringRef> PTX = DeviceParser->GeneratePTX(); + if (!PTX) + return PTX.takeError(); + + llvm::Error Err = DeviceParser->GenerateFatbinary(); + if (Err) return std::move(Err); } diff --git a/clang/unittests/Basic/CMakeLists.txt b/clang/unittests/Basic/CMakeLists.txt index 3cd843736eb9b3..32dce09866892b 100644 --- a/clang/unittests/Basic/CMakeLists.txt +++ b/clang/unittests/Basic/CMakeLists.txt @@ -13,7 +13,6 @@ add_distinct_clang_unittest(BasicTests SanitizersTest.cpp SarifTest.cpp SourceManagerTest.cpp - TargetIDTest.cpp CLANG_LIBS clangBasic clangLex diff --git a/clang/unittests/Basic/TargetIDTest.cpp b/clang/unittests/Basic/TargetIDTest.cpp deleted file mode 100644 index a4eaa06b074f8b..00000000000000 --- a/clang/unittests/Basic/TargetIDTest.cpp +++ /dev/null @@ -1,50 +0,0 @@ -//===- unittests/Basic/TargetIDTest.cpp - Test TargetID -----------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "clang/Basic/TargetID.h" -#include "llvm/TargetParser/AMDGPUTargetParser.h" -#include "llvm/TargetParser/Triple.h" -#include "gtest/gtest.h" - -namespace { - -static std::string bundleEntryID(const llvm::Triple &T, llvm::StringRef CPU, - llvm::StringRef Features, - llvm::StringRef OffloadKind) { - std::string TargetID = - llvm::AMDGPU::TargetID::createFromSubtargetFeatures(T, CPU, Features) - .getCanonicalFeatureString(); - return OffloadKind.str() + "-" + clang::normalizeForBundler(T, TargetID) + - "-" + TargetID; -} - -TEST(TargetIDTest, HIPBundleEntryPreservesXnack) { - llvm::Triple T("amdgcn-amd-amdhsa"); - EXPECT_EQ(bundleEntryID(T, "gfx90a", "+xnack,+wavefrontsize64", "hipv4"), - "hipv4-amdgcn-amd-amdhsa--gfx90a:xnack+"); -} - -TEST(TargetIDTest, HIPBundleEntryPreservesDisabledFeature) { - llvm::Triple T("amdgcn-amd-amdhsa"); - EXPECT_EQ(bundleEntryID(T, "gfx90a", "-xnack", "hipv4"), - "hipv4-amdgcn-amd-amdhsa--gfx90a:xnack-"); -} - -TEST(TargetIDTest, HIPBundleEntryWithoutFeatures) { - llvm::Triple T("amdgcn-amd-amdhsa"); - EXPECT_EQ(bundleEntryID(T, "gfx90a", "", "hipv4"), - "hipv4-amdgcn-amd-amdhsa--gfx90a"); -} - -TEST(TargetIDTest, HIPBundleEntryLegacyKind) { - llvm::Triple T("amdgcn-amd-amdhsa"); - EXPECT_EQ(bundleEntryID(T, "gfx908", "+sramecc", "hip"), - "hip-amdgcn-amd-amdhsa--gfx908:sramecc+"); -} - -} // namespace `````````` </details> https://github.com/llvm/llvm-project/pull/226679 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
