commit: eec258ed051320629c4c74f24ba56ca7eb33de94 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 15 21:05:36 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 18:11:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec258ed
dev-libs/rocm-comgr: drop 5.7.1, 6.1.1, 6.1.2, 6.3.2-r1, 6.4.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/rocm-comgr/Manifest | 5 - ...Specify-clang-exe-path-in-Driver-Creation.patch | 52 ---------- .../files/rocm-comgr-5.0-rocm_path.patch | 14 --- .../files/rocm-comgr-5.7.0-disassembly.patch | 20 ---- .../rocm-comgr/files/rocm-comgr-5.7.0-lld.patch | 39 ------- .../files/rocm-comgr-5.7.0-metadata.patch | 73 ------------- .../files/rocm-comgr-5.7.0-optional.patch | 113 --------------------- .../files/rocm-comgr-5.7.0-symbolizer.patch | 39 ------- ...m-comgr-5.7.1-correct-license-install-dir.patch | 16 --- .../rocm-comgr-5.7.1-fix-tests-rocm-path.patch | 12 --- .../files/rocm-comgr-5.7.1-fix-tests.patch | 50 --------- .../rocm-comgr-6.1.0-enforce-oop-compiler.patch | 26 ----- .../rocm-comgr-6.1.0-fix-comgr-default-flags.patch | 51 ---------- .../files/rocm-comgr-6.1.0-llvm-18-compat.patch | 79 -------------- .../files/rocm-comgr-6.3.2-rocm_path.patch | 14 --- dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild | 66 ------------ dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild | 88 ---------------- dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild | 88 ---------------- dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild | 90 ---------------- dev-libs/rocm-comgr/rocm-comgr-6.4.1.ebuild | 95 ----------------- 20 files changed, 1030 deletions(-) diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index d3511da76f23..25ce599d73ad 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,7 +1,2 @@ -DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818 -DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0 -DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c DIST llvm-project-rocm-6.3.3.tar.gz 206663912 BLAKE2B 939527dbbcd0c4b4785e5cdbd7144149f169120506c2b5b00e84e8208e3877109e24cf58501a1317d1f9dcce0614cf47a0290cb2e0e10aa7b164bcb064c2ffbc SHA512 380d6ca72dd215b1996b14fe9b54f4981bd1d275aae22ed89f4f3efc46ec2988054cc98dcc45e1c678812c2bd3488ed6cf375ca193af4ad272a6cff7f2388872 -DIST llvm-project-rocm-6.4.1.tar.gz 218905831 BLAKE2B 188ec436e5ab6e50fee66ebc3a30c5e5703ca8770f309cca580c919567090bbdb23a5de51d36dabf9cb54f1142ab00d9756bec379670029c57d0f7a49fab2f13 SHA512 e0fd29953cfe7ae4b3f60aa25c1ec0f6071715afc8e275d62901dbd575b96afc673d61996300d3f7672005274fe84c7f934070614ac3deafcfa103d9514b3e41 DIST llvm-project-rocm-6.4.3.tar.gz 218920681 BLAKE2B 85c29c1f66f9d23fa7fb6d98baf60cb08a8507a7b3a4c0a5054d9d4d3bc1fb7de56ddae583e37a36c7a3f17f9e57bd49777deca7560ca8b4882c1eea1db5b421 SHA512 b6b4149c6426793f4497dfd1200079b0caef4d5a6f49c1f3a301d70f5f7b322b850085ff2f89d55df1dfab6d6a97948fe4084d4ec14654ee97cdab26e71a45c0 -DIST rocm-comgr-5.7.1.tar.gz 137923 BLAKE2B e215f51137fd0c4b67e85496bf289dc0afde6ebc9efb9416f5fc4cf312b2be9be26da35cb70965bf4857a0f1434d750bcc03ce83095173098487ef7805948735 SHA512 cdd2609b858d9503c30122a2d328d36baa8a930a05bcb6c38e30723909c492b4d47eaaf4884dbb7aa82053e7cda6c22ee1aa16fc5ba266e272d98ff772c5079d diff --git a/dev-libs/rocm-comgr/files/0001-Specify-clang-exe-path-in-Driver-Creation.patch b/dev-libs/rocm-comgr/files/0001-Specify-clang-exe-path-in-Driver-Creation.patch deleted file mode 100644 index a1ce8cae50b8..000000000000 --- a/dev-libs/rocm-comgr/files/0001-Specify-clang-exe-path-in-Driver-Creation.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e0fb8aca856eb61d2f774a0893e2243742eed341 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu <[email protected]> -Date: Fri, 18 Nov 2022 15:41:53 +0800 -Subject: [PATCH] Specify clang exe path in Driver Creation - -By doing so, TheDriver can get the correct resource dir. - -Closes: #48 -Reference: #49 ---- - lib/comgr/src/comgr-compiler.cpp | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 80849d4..67fe82b 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -660,7 +660,7 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) { - IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs); - DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagClient); - ProcessWarningOptions(Diags, *DiagOpts, /*ReportDiags=*/false); -- Driver TheDriver("", "", Diags); -+ Driver TheDriver((Twine(env::getLLVMPath()) + "/bin/clang").str(), "", Diags); - TheDriver.setTitle("AMDGPU Code Object Manager"); - TheDriver.setCheckInputsExist(false); - -@@ -998,11 +998,6 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { - HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); - // HIP headers depend on hsa.h which is in ROCM_DIR/include. - ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); -- ClangIncludePath = -- (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str(); -- ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" + -- CLANG_VERSION_STRING + "/include") -- .str(); - - Args.push_back("-x"); - -@@ -1028,10 +1023,6 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { - Args.push_back(ROCMIncludePath.c_str()); - Args.push_back("-isystem"); - Args.push_back(HIPIncludePath.c_str()); -- Args.push_back("-isystem"); -- Args.push_back(ClangIncludePath.c_str()); -- Args.push_back("-isystem"); -- Args.push_back(ClangIncludePath2.c_str()); - break; - default: - return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; --- -2.39.0 - diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch deleted file mode 100644 index 6e908847a54f..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: comgr/src/comgr-env.cpp -=================================================================== ---- comgr.orig/src/comgr-env.cpp -+++ comgr/src/comgr-env.cpp -@@ -247,6 +247,9 @@ InstallationDetector *getDetectorImpl() - if (EnvROCMPath) { - ROCmInstallPath = EnvROCMPath; - } -+ else { -+ ROCmInstallPath = "@GENTOO_PORTAGE_EPREFIX@/usr"; -+ } - - InstallationDetector *Detector; - if (ROCmInstallPath == "") { diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-disassembly.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-disassembly.patch deleted file mode 100644 index 6c1052b0b968..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-disassembly.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 446d142de276a8ca1039798726a2b81937ece952 -Author: Ron Lieberman <[email protected]> -Date: Thu Jul 13 19:42:47 2023 -0500 - - add #include llvm/ADT/StringExtras.h to comgr-disassembly.cpp - - Change-Id: Id0086adec6e33db55769a12f6a886202c8afd9e0 - -diff --git a/src/comgr-disassembly.cpp b/src/comgr-disassembly.cpp -index 8703c0d..31e9634 100644 ---- a/src/comgr-disassembly.cpp -+++ b/src/comgr-disassembly.cpp -@@ -34,6 +34,7 @@ - ******************************************************************************/ - - #include "comgr-disassembly.h" -+#include "llvm/ADT/StringExtras.h" - #include "llvm/MC/TargetRegistry.h" - - using namespace llvm; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-lld.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-lld.patch deleted file mode 100644 index ee21b87fb782..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-lld.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 3f4486f33bdeff6d705431b7a3b6cb5d064cc2b2 -Author: Scott Linder <[email protected]> -Date: Mon Jun 19 19:24:26 2023 +0000 - - Update to use lld::lldMain introduced in D119049 - - Change-Id: I9dd8de3f599fab14b62f482352ae43874ff87373 - -diff --git a/src/comgr-compiler.cpp b/src/comgr-compiler.cpp -index 30e838c..7b51d3f 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -85,6 +85,8 @@ - - #include <csignal> - -+LLD_HAS_DRIVER(elf) -+ - using namespace llvm; - using namespace llvm::opt; - using namespace llvm::sys; -@@ -614,13 +616,14 @@ static amd_comgr_status_t linkWithLLD(llvm::ArrayRef<const char *> Args, - llvm::raw_ostream &LogE) { - ArgStringList LLDArgs(llvm::iterator_range<ArrayRef<const char *>::iterator>( - Args.begin(), Args.end())); -- LLDArgs.insert(LLDArgs.begin(), "lld"); -+ LLDArgs.insert(LLDArgs.begin(), "ld.lld"); - LLDArgs.push_back("--threads=1"); - - ArrayRef<const char *> ArgRefs = llvm::ArrayRef(LLDArgs); -- bool LLDRet = lld::elf::link(ArgRefs, LogS, LogE, false, false); -+ lld::Result LLDRet = -+ lld::lldMain(ArgRefs, LogS, LogE, {{lld::Gnu, &lld::elf::link}}); - lld::CommonLinkerContext::destroy(); -- if (!LLDRet) { -+ if (LLDRet.retCode || !LLDRet.canRunAgain) { - return AMD_COMGR_STATUS_ERROR; - } - return AMD_COMGR_STATUS_SUCCESS; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-metadata.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-metadata.patch deleted file mode 100644 index 78fc4f34f45c..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-metadata.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit edea3631e2c1cd49c93f6fff883fea2affdfa2d1 -Author: Konstantin Zhuravlyov <[email protected]> -Date: Wed May 10 15:52:09 2023 -0400 - - Update getDesc* functions due to 689715fx - - Change-Id: I0e8058ceb8a04550fe6c17d74babcf5fe0ee609d - -diff --git a/src/comgr-metadata.cpp b/src/comgr-metadata.cpp -index a3375b4..72aeb01 100644 ---- a/src/comgr-metadata.cpp -+++ b/src/comgr-metadata.cpp -@@ -223,7 +223,7 @@ static bool mergeNoteRecords(llvm::msgpack::DocNode &From, - template <class ELFT> - static bool processNote(const Elf_Note<ELFT> &Note, DataMeta *MetaP, - llvm::msgpack::DocNode &Root) { -- auto DescString = Note.getDescAsStringRef(); -+ auto DescString = Note.getDescAsStringRef(4); - - if (Note.getName() == "AMD" && Note.getType() == ELF::NT_AMD_HSA_METADATA) { - -@@ -557,7 +557,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj, - - switch (Note.getType()) { - case ELF::NT_AMD_HSA_CODE_OBJECT_VERSION: { -- if (Note.getDesc().size() < -+ if (Note.getDesc(4).size() < - sizeof(amdgpu_hsa_note_code_object_version_s)) { - IsError = true; - return true; -@@ -565,7 +565,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj, - - const auto *NoteCodeObjectVersion = - reinterpret_cast<const amdgpu_hsa_note_code_object_version_s *>( -- Note.getDesc().data()); -+ Note.getDesc(4).data()); - - // Only code objects up to version 2 used note records. - if (NoteCodeObjectVersion->major_version > 2) { -@@ -578,7 +578,7 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj, - } - - case ELF::NT_AMD_HSA_HSAIL: { -- if (Note.getDesc().size() < sizeof(amdgpu_hsa_note_hsail_s)) { -+ if (Note.getDesc(4).size() < sizeof(amdgpu_hsa_note_hsail_s)) { - IsError = true; - return true; - } -@@ -588,21 +588,21 @@ getElfIsaNameFromElfNotes(const ELFObjectFile<ELFT> *Obj, - } - - case ELF::NT_AMD_HSA_ISA_VERSION: { -- if (Note.getDesc().size() < -+ if (Note.getDesc(4).size() < - offsetof(amdgpu_hsa_note_isa_s, vendor_and_architecture_name)) { - IsError = true; - return true; - } - - const auto *NoteIsa = reinterpret_cast<const amdgpu_hsa_note_isa_s *>( -- Note.getDesc().data()); -+ Note.getDesc(4).data()); - - if (!NoteIsa->vendor_name_size || !NoteIsa->architecture_name_size) { - IsError = true; - return true; - } - -- if (Note.getDesc().size() < -+ if (Note.getDesc(4).size() < - offsetof(amdgpu_hsa_note_isa_s, vendor_and_architecture_name) + - NoteIsa->vendor_name_size + NoteIsa->architecture_name_size) { - IsError = true; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-optional.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-optional.patch deleted file mode 100644 index ed52186d98ae..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-optional.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 9417620c9802331c4abf0cf4c57f40ec4b38a5e7 Mon Sep 17 00:00:00 2001 -From: Ron Lieberman <[email protected]> -Date: Thu, 1 Jun 2023 13:19:28 -0500 -Subject: [PATCH] [llvm] change from Optional to std::optional in support of - pending llvm patch - -Change-Id: If8a03245dc88e7b7e4a628d7ce7e28c71c3268c6 ---- - lib/comgr/src/comgr-env.cpp | 2 +- - lib/comgr/src/comgr-env.h | 3 +-- - lib/comgr/src/comgr-objdump.cpp | 5 ++--- - lib/comgr/src/comgr.cpp | 2 +- - lib/comgr/src/time-stat/time-stat.cpp | 3 +-- - 5 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/comgr-env.cpp b/src/comgr-env.cpp -index 6ab6f0f..7575394 100644 ---- a/src/comgr-env.cpp -+++ b/src/comgr-env.cpp -@@ -50,7 +50,7 @@ bool shouldSaveTemps() { - return SaveTemps && StringRef(SaveTemps) != "0"; - } - --Optional<StringRef> getRedirectLogs() { -+std::optional<StringRef> getRedirectLogs() { - static char *RedirectLogs = getenv("AMD_COMGR_REDIRECT_LOGS"); - if (!RedirectLogs || StringRef(RedirectLogs) == "0") { - return std::nullopt; -diff --git a/src/comgr-env.h b/src/comgr-env.h -index aef57b3..7ca644e 100644 ---- a/src/comgr-env.h -+++ b/src/comgr-env.h -@@ -36,7 +36,6 @@ - #ifndef COMGR_ENV_H - #define COMGR_ENV_H - --#include "llvm/ADT/Optional.h" - #include "llvm/ADT/StringRef.h" - - namespace COMGR { -@@ -47,7 +46,7 @@ bool shouldSaveTemps(); - - /// If the environment requests logs be redirected, return the string identifier - /// of where to redirect. Otherwise return @p None. --llvm::Optional<llvm::StringRef> getRedirectLogs(); -+std::optional<llvm::StringRef> getRedirectLogs(); - - /// Return whether the environment requests verbose logging. - bool shouldEmitVerboseLogs(); -diff --git a/src/comgr-objdump.cpp b/src/comgr-objdump.cpp -index ff3f996..cae7aa3 100644 ---- a/src/comgr-objdump.cpp -+++ b/src/comgr-objdump.cpp -@@ -39,7 +39,6 @@ - #include "comgr-objdump.h" - #include "comgr.h" - #include "lld/Common/TargetOptionsCommandFlags.h" --#include "llvm/ADT/Optional.h" - #include "llvm/ADT/STLExtras.h" - #include "llvm/ADT/StringExtras.h" - #include "llvm/CodeGen/CommandFlags.h" -@@ -2145,7 +2144,7 @@ void llvm::DisassemHelper::printRawClangAST(const ObjectFile *Obj) { - ClangASTSectionName = "clangast"; - } - -- Optional<object::SectionRef> ClangASTSection; -+ std::optional<object::SectionRef> ClangASTSection; - for (auto Sec : toolSectionFilter(*Obj)) { - StringRef Name; - auto NameOrErr = Sec.getName(); -@@ -2188,7 +2187,7 @@ void llvm::DisassemHelper::printFaultMaps(const ObjectFile *Obj) { - return; - } - -- Optional<object::SectionRef> FaultMapSection; -+ std::optional<object::SectionRef> FaultMapSection; - - for (auto Sec : toolSectionFilter(*Obj)) { - StringRef Name; -diff --git a/src/comgr.cpp b/src/comgr.cpp -index e421414..9e89dc2 100644 ---- a/src/comgr.cpp -+++ b/src/comgr.cpp -@@ -1293,7 +1293,7 @@ amd_comgr_status_t AMD_COMGR_API - // Pointer to the currently selected log stream. - raw_ostream *LogP = &LogS; - -- if (Optional<StringRef> RedirectLogs = env::getRedirectLogs()) { -+ if (std::optional<StringRef> RedirectLogs = env::getRedirectLogs()) { - StringRef RedirectLog = *RedirectLogs; - if (RedirectLog == "stdout") { - LogP = &outs(); -diff --git a/src/time-stat/time-stat.cpp b/src/time-stat/time-stat.cpp -index 1df3f0e..9b24983 100644 ---- a/src/time-stat/time-stat.cpp -+++ b/src/time-stat/time-stat.cpp -@@ -5,7 +5,6 @@ - #include <system_error> - - #include "comgr-env.h" --#include "llvm/ADT/Optional.h" - #include "llvm/ADT/StringRef.h" - #include "llvm/Support/Debug.h" - #include "llvm/Support/FileSystem.h" -@@ -29,7 +28,7 @@ static std::unique_ptr<PerfStats> PS = nullptr; - static void dump() { PS->dumpPerfStats(); } - - void GetLogFile(std::string &PerfLog) { -- if (Optional<StringRef> RedirectLogs = env::getRedirectLogs()) { -+ if (std::optional<StringRef> RedirectLogs = env::getRedirectLogs()) { - PerfLog = (*RedirectLogs).str(); - return; - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-symbolizer.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-symbolizer.patch deleted file mode 100644 index 9c8079042bab..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.0-symbolizer.patch +++ /dev/null @@ -1,39 +0,0 @@ - -commit 13dfb8f01ded137f634b8b6aa8a5ce2bc3e65daf -Author: Ron Lieberman <[email protected]> -Date: Sun Apr 23 07:12:23 2023 -0500 - - [symbolizer] API evolution for ErrorHandler - - Change-Id: I438358dc79195444aed0658942b23869eda8117e - -diff --git a/src/comgr-symbolizer.cpp b/src/comgr-symbolizer.cpp -index cfdeee8..36643cf 100644 ---- a/src/comgr-symbolizer.cpp -+++ b/src/comgr-symbolizer.cpp -@@ -57,6 +57,16 @@ static llvm::symbolize::PrinterConfig getDefaultPrinterConfig() { - return Config; - } - -+static llvm::symbolize::ErrorHandler symbolize_error_handler( -+ llvm::raw_string_ostream &OS) { -+ return -+ [&](const llvm::ErrorInfoBase &ErrorInfo, llvm::StringRef ErrorBanner) { -+ OS << ErrorBanner; -+ ErrorInfo.log(OS); -+ OS << '\n'; -+ }; -+} -+ - Symbolizer::Symbolizer(std::unique_ptr<ObjectFile> &&CodeObject, - PrintSymbolCallback PrintSymbol) - : CodeObject(std::move(CodeObject)), PrintSymbol(PrintSymbol) {} -@@ -93,7 +103,7 @@ amd_comgr_status_t Symbolizer::symbolize(uint64_t Address, bool IsCode, - llvm::raw_string_ostream OS(Result); - llvm::symbolize::PrinterConfig Config = getDefaultPrinterConfig(); - llvm::symbolize::Request Request{"", Address}; -- auto Printer = std::make_unique<llvm::symbolize::LLVMPrinter>(OS, OS, Config); -+ auto Printer = std::make_unique<llvm::symbolize::LLVMPrinter>(OS, symbolize_error_handler(OS), Config); - - if (IsCode) { - auto ResOrErr = SymbolizerImpl.symbolizeInlinedCode( diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch deleted file mode 100644 index 8ec2c710d3ad..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -Do not install same license for -asan, which avoids QA warning -Upstream issue: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/61 -=================================================================== ---- comgr.orig/CMakeLists.txt -+++ comgr/CMakeLists.txt -@@ -281,10 +281,6 @@ install(FILES - "NOTICES.txt" - COMPONENT amd-comgr - DESTINATION ${CMAKE_INSTALL_DOCDIR}) --install(FILES -- "LICENSE.txt" -- COMPONENT asan -- DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan) - - # Generate the install-tree package. - set(AMD_COMGR_PREFIX_CODE " diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests-rocm-path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests-rocm-path.patch deleted file mode 100644 index 30a44577b1aa..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests-rocm-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -Vanilla clang requires either -nogpulib or both --rocm-path and --rocm-device-lib-path flags ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -39,7 +39,7 @@ endmacro() - macro(add_test_input_bitcode name input output) - add_custom_command( - OUTPUT "${output}" -- COMMAND "$<TARGET_FILE:clang>" -c --offload-arch=gfx906 -emit-llvm -fgpu-rdc -+ COMMAND "$<TARGET_FILE:clang>" -c --offload-arch=gfx906 -emit-llvm -fgpu-rdc --rocm-path=@GENTOO_PORTAGE_EPREFIX@/usr --hip-device-lib-path=@GENTOO_PORTAGE_EPREFIX@/usr/lib/amdgcn/bitcode - --gpu-bundle-output ${ARGN} "${CMAKE_CURRENT_SOURCE_DIR}/${input}" - -o "${output}" - VERBATIM diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch deleted file mode 100644 index 80f1f90dbe94..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -Vanilla LLVM does not support calling AMDGPU_KERNEL across different sources/bitcodes. -Without this patch https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/45 occurs. -Reference: https://github.com/llvm/llvm-project/issues/60313 -=================================================================== -Index: comgr/test/source/source1.cl -=================================================================== ---- comgr.orig/test/source/source1.cl -+++ comgr/test/source/source1.cl -@@ -35,7 +35,9 @@ - - #include "include-a.h" - -+void kernel source3(__global int *j) { *j = FOO; } -+ - void kernel source1(__global int *j) { - *j += 2; -- source2(j); -+ source3(j); - } -Index: comgr/test/mangled_names_test.c -=================================================================== ---- comgr.orig/test/mangled_names_test.c -+++ comgr/test/mangled_names_test.c -@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) { - exit(1); - } - -- const char *bcNames[] = {"source1", "source2"}; -+ const char *bcNames[] = {"source3", "source1"}; - - for (size_t I = 0; I < numNames; ++I) { - size_t Size; -@@ -249,14 +249,14 @@ int main(int argc, char *argv[]) { - - Status = amd_comgr_populate_mangled_names(DataExec, &numNames); - -- if (numNames != 4) { -+ if (numNames != 6) { - printf("amd_populate_mangled_names Failed: " -- "produced %zu executable names (expected 4)\n", -+ "produced %zu executable names (expected 6)\n", - Count); - exit(1); - } - -- const char *execNames[] = {"source1", "source1.kd", "source2", "source2.kd"}; -+ const char *execNames[] = {"source3", "source3.kd", "source1", "source1.kd", "source2", "source2.kd"}; - - for (size_t I = 0; I < numNames; ++I) { - size_t Size; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch deleted file mode 100644 index 99cbf2f22ce6..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch +++ /dev/null @@ -1,26 +0,0 @@ -In-process compilation breaks compile_source_to_executable test, as it attempts to -build .so as fatbin, and some options does not work with unpatched LLVM. ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -1226,10 +1226,7 @@ amd_comgr_status_t AMDGPUCompiler::compileToFatBin() { - return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; - } - -- // This is a workaround to support HIP OOP Fatbin Compilation -- CompileOOP = true; - auto Status = processFiles(AMD_COMGR_DATA_KIND_FATBIN, ".fatbin"); -- CompileOOP = false; - - return Status; - } ---- a/src/comgr-compiler.h -+++ b/src/comgr-compiler.h -@@ -102,7 +102,7 @@ class AMDGPUCompiler { - std::string ClangIncludePath; - std::string ClangIncludePath2; - /// Perform out-of-process compilation. -- bool CompileOOP = false; -+ bool CompileOOP = true; - /// Precompiled header file paths. - llvm::SmallVector<llvm::SmallString<128>, 2> PrecompiledHeaders; - /// Arguments common to all driver invocations in the current action. diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch deleted file mode 100644 index d885da08ddae..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch +++ /dev/null @@ -1,51 +0,0 @@ -Remove HIP/ROCM includes ("-isystem /usr/include"), as they break inclusion of <math.h>. -Add inclusion of Clang resource dir (e.g. /usr/lib/clang/17), as it is used in hip runtime like that. -Remove hardcoded target to fix HIP on musl. - -Issues: -* https://github.com/ROCm/clr/issues/82 -* https://github.com/ROCm/llvm-project/issues/92 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -1028,9 +1028,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr, - } - - amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { -- HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); -- // HIP headers depend on hsa.h which is in ROCM_DIR/include. -- ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); -+ // Allow to include <include/cuda_wrappers/algorithm> (used in some hip files) -+ ClangIncludePath = @CLANG_RESOURCE_DIR@; - - Args.push_back("-x"); - -@@ -1051,13 +1050,9 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { - case AMD_COMGR_LANGUAGE_HIP: - Args.push_back("hip"); - Args.push_back("-std=c++11"); -- Args.push_back("-target"); -- Args.push_back("x86_64-unknown-linux-gnu"); - Args.push_back("--cuda-device-only"); - Args.push_back("-isystem"); -- Args.push_back(ROCMIncludePath.c_str()); -- Args.push_back("-isystem"); -- Args.push_back(HIPIncludePath.c_str()); -+ Args.push_back(ClangIncludePath.c_str()); - break; - default: - return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; ---- a/src/comgr-compiler.h -+++ b/src/comgr-compiler.h -@@ -95,12 +95,7 @@ class AMDGPUCompiler { - /// User supplied target GPU Arch. - std::string GPUArch; - std::string OffloadArch; -- /// ROCM include Path -- std::string ROCMIncludePath; -- /// HIP and Clang Include Paths -- std::string HIPIncludePath; - std::string ClangIncludePath; -- std::string ClangIncludePath2; - /// Perform out-of-process compilation. - bool CompileOOP = false; - /// Precompiled header file paths. diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch deleted file mode 100644 index df008e4230d7..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch +++ /dev/null @@ -1,79 +0,0 @@ -ROCm 6.0.0 and 6.0.2 releases use mix between LLVM 17 and 18 -forked as https://github.com/RadeonOpenCompute/llvm-project -which makes some libraries compatible with LLVM 17, -while other require LLVM 18. - -Backports: -* https://github.com/ROCm/llvm-project/commit/6cbc4dc91dfeb1cf2295cb350866e0b3a07dfee4 -* https://github.com/ROCm/llvm-project/commit/179ec2e67bf882c6bccb27f81db3d80f7eb9946e -* https://github.com/ROCm/llvm-project/commit/ee123c3d1706bc4346511b1a9032020782576350 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -205,7 +205,11 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts, - // Parse the arguments. - const OptTable &OptTbl = getDriverOptTable(); - -+#if LLVM_VERSION_MAJOR == 17 - const unsigned IncludedFlagsBitmask = options::CC1AsOption; -+#else -+ llvm::opt::Visibility IncludedFlagsBitmask(options::CC1AsOption); -+#endif - unsigned MissingArgIndex, MissingArgCount; - InputArgList Args = OptTbl.ParseArgs(Argv, MissingArgIndex, MissingArgCount, - IncludedFlagsBitmask); -@@ -1041,11 +1045,15 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { - Args.push_back("cl"); - Args.push_back("-std=cl1.2"); - Args.push_back("-cl-no-stdinc"); -+ Args.push_back("-mllvm"); -+ Args.push_back("-amdgpu-internalize-symbols"); - break; - case AMD_COMGR_LANGUAGE_OPENCL_2_0: - Args.push_back("cl"); - Args.push_back("-std=cl2.0"); - Args.push_back("-cl-no-stdinc"); -+ Args.push_back("-mllvm"); -+ Args.push_back("-amdgpu-internalize-symbols"); - break; - case AMD_COMGR_LANGUAGE_HIP: - Args.push_back("hip"); -@@ -1605,6 +1613,9 @@ amd_comgr_status_t AMDGPUCompiler::assembleToRelocatable() { - Args.push_back("-x"); - Args.push_back("assembler"); - -+ // -nogpulib option not needed for assembling to relocatable -+ NoGpuLib = false; -+ - return processFiles(AMD_COMGR_DATA_KIND_RELOCATABLE, ".o"); - } - ---- a/src/comgr-metadata.cpp -+++ b/src/comgr-metadata.cpp -@@ -1087,7 +1087,12 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP, - } - - BinaryStreamReader Reader(StringRef(DataP->Data, DataP->Size), -- support::little); -+#if LLVM_VERSION_MAJOR == 17 -+ support::little -+#else -+ llvm::endianness::little -+#endif -+ ); - - StringRef Magic; - if (auto EC = Reader.readFixedString(Magic, OffloadBundleMagicLen)) { ---- a/test/compile_log_remarks_test.c -+++ b/test/compile_log_remarks_test.c -@@ -107,7 +107,11 @@ int main(int argc, char *argv[]) { - AMD_COMGR_DATA_KIND_SOURCE, 1); - - checkLogs("AMD_COMGR_ACTION_CODEGEN_BC_TO_ASSEMBLY", DataSetAsm, -+#if LLVM_VERSION_MAJOR == 17 - "remark: <unknown>:0:0: 8 stack bytes in function " -+#else -+ "remark: <unknown>:0:0: 8 stack bytes in function 'f' " -+#endif - "[-Rpass-analysis=prologepilog]"); - - Status = amd_comgr_destroy_data_set(DataSetCl); diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.2-rocm_path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.2-rocm_path.patch deleted file mode 100644 index 14b1d12148f7..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.2-rocm_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: comgr/src/comgr-env.cpp -=================================================================== ---- comgr.orig/src/comgr-env.cpp -+++ comgr/src/comgr-env.cpp -@@ -269,6 +269,9 @@ InstallationDetector *getDetectorImpl() - if (EnvROCMPath) { - ROCmInstallPath = EnvROCMPath; - } -+ else { -+ ROCmInstallPath = "@GENTOO_PORTAGE_EPREFIX@/usr"; -+ } - - InstallationDetector *Detector; - if (ROCmInstallPath == "") { diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild deleted file mode 100644 index 2149df5053b1..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=17 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"; - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.7.0-optional.patch" - "${FILESDIR}/${PN}-5.7.0-lld.patch" - "${FILESDIR}/${PN}-5.7.0-disassembly.patch" - "${FILESDIR}/${PN}-5.7.0-metadata.patch" - "${FILESDIR}/${PN}-5.7.0-symbolizer.patch" - "${FILESDIR}/${PN}-5.7.1-fix-tests.patch" - "${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=" - >=dev-libs/rocm-device-libs-${PV} - <dev-libs/rocm-device-libs-6 - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-runtimes/clang-runtime:= - llvm-core/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.7.1-fix-tests-rocm-path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild deleted file mode 100644 index 1b639b9c571a..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 18 ) - -inherit cmake llvm-r1 prefix - -MY_P=llvm-project-rocm-${PV} -components=( "amd/comgr" ) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport"; -SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}/${components[0]}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" -) - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-runtimes/clang-runtime:= - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/lld:${LLVM_SLOT}= - ') - dev-util/hipcc:${SLOT} -" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_fetch - git-r3_checkout '' . '' "${components[@]}" - else - archive="${MY_P}.tar.gz" - ebegin "Unpacking from ${archive}" - tar -x -z -o \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${MY_P}/}" || die - eend ${?} - fi -} - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - - cmake_src_prepare - - # Replace @CLANG_RESOURCE_DIR@ in patches - local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)" - sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix)" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35 - ) - cmake_src_test -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild deleted file mode 100644 index 1b639b9c571a..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 18 ) - -inherit cmake llvm-r1 prefix - -MY_P=llvm-project-rocm-${PV} -components=( "amd/comgr" ) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport"; -SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}/${components[0]}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" -) - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-runtimes/clang-runtime:= - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/lld:${LLVM_SLOT}= - ') - dev-util/hipcc:${SLOT} -" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_fetch - git-r3_checkout '' . '' "${components[@]}" - else - archive="${MY_P}.tar.gz" - ebegin "Unpacking from ${archive}" - tar -x -z -o \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${MY_P}/}" || die - eend ${?} - fi -} - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - - cmake_src_prepare - - # Replace @CLANG_RESOURCE_DIR@ in patches - local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)" - sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix)" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35 - ) - cmake_src_test -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild deleted file mode 100644 index 86ddc9879074..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 19 ) - -inherit cmake llvm-r1 prefix - -MY_P=llvm-project-rocm-${PV} -components=( "amd/comgr" ) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr"; -SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}/${components[0]}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" - "${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch" - "${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch" -) - -RDEPEND=" - dev-libs/rocm-device-libs:${SLOT} - llvm-runtimes/clang-runtime:= - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/lld:${LLVM_SLOT}= - ') - dev-util/hipcc:${SLOT} -" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_fetch - git-r3_checkout '' . '' "${components[@]}" - else - archive="${MY_P}.tar.gz" - ebegin "Unpacking from ${archive}" - tar -x -z -o \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${MY_P}/}" || die - eend ${?} - fi -} - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-6.3.2-rocm_path.patch) - - cmake_src_prepare - - # Replace @CLANG_RESOURCE_DIR@ in patches - local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)" - sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix)" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - # Prevent CMake from finding systemwide hip, which breaks tests - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_hip=ON ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35 - ) - cmake_src_test -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.4.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.4.1.ebuild deleted file mode 100644 index e6da9e2c4f50..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.4.1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 20 ) - -inherit cmake llvm-r1 prefix - -MY_P=llvm-project-rocm-${PV} -components=( "amd/comgr" ) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr"; -SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}/${components[0]}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-6.4.1-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.4.1-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" - "${FILESDIR}/${PN}-6.4.1-bypass-device-libs-copy.patch" - "${FILESDIR}/${PN}-6.4.1-llvm-20-compat.patch" -) - -RDEPEND=" - dev-libs/rocm-device-libs:${SLOT} - llvm-runtimes/clang-runtime:= - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/lld:${LLVM_SLOT}= - ') - dev-util/hipcc:${SLOT} -" -DEPEND="${RDEPEND}" - -# Circular dependency: to build tests, hip compiler must be functional -BDEPEND="test? ( dev-util/hip:${SLOT} )" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_fetch - git-r3_checkout '' . '' "${components[@]}" - else - archive="${MY_P}.tar.gz" - ebegin "Unpacking from ${archive}" - tar -x -z -o \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${MY_P}/}" || die - eend ${?} - fi -} - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-6.3.2-rocm_path.patch) - - cmake_src_prepare - - # Replace @CLANG_RESOURCE_DIR@ in patches - local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)" - sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die -} - -src_configure() { - llvm_prepend_path "${LLVM_SLOT}" - - local mycmakeargs=( - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - -DCOMGR_DISABLE_SPIRV=ON # requires ROCm/SPIRV-LLVM-Translator (fork of dev-util/spirv-llvm-translator) - ) - # Prevent CMake from finding systemwide hip, which breaks tests - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_hip=ON ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35 - ) - cmake_src_test -}
