From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 564CE1582EF for ; Thu, 13 Feb 2025 08:39:25 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 362143431B7 for ; Thu, 13 Feb 2025 08:39:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E4EEA11042D; Thu, 13 Feb 2025 08:38:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DB600110487 for ; Thu, 13 Feb 2025 08:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 634C3343176 for ; Thu, 13 Feb 2025 08:38:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F5EA2811 for ; Thu, 13 Feb 2025 08:38:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1739435731.2ff54a47ffce807d2a1dc08f23a7453b5dc6ed18.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/, dev-libs/rocm-comgr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch dev-libs/rocm-com gr/rocm-comgr-5.1.3-r3.ebuild dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild X-VCS-Directories: dev-libs/rocm-comgr/files/ dev-libs/rocm-comgr/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2ff54a47ffce807d2a1dc08f23a7453b5dc6ed18 X-VCS-Branch: master Date: Thu, 13 Feb 2025 08:38:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d2fc763-619a-4252-a2f7-192c41ad9afc X-Archives-Hash: b85335846fdd7b02bf43b5113ba2b8f3 commit: 2ff54a47ffce807d2a1dc08f23a7453b5dc6ed18 Author: Sv. Lockal gmail com> AuthorDate: Thu Jan 30 15:19:55 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Feb 13 08:35:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff54a47 dev-libs/rocm-comgr: drop 5.1.3-r3, 5.3.3-r2, 5.4.3-r1, 5.5.1 Signed-off-by: Sv. Lockal gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40388 Signed-off-by: Sam James gentoo.org> ...01-COMGR-changes-needed-for-upstream-llvm.patch | 66 ---------------------- .../files/rocm-comgr-4.5.2-dependencies.patch | 53 ----------------- .../files/rocm-comgr-5.1.3-clang-fix-include.patch | 12 ---- .../files/rocm-comgr-5.1.3-clang-link.patch | 17 ------ .../files/rocm-comgr-5.1.3-llvm-15-args-changed | 20 ------- .../files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu | 17 ------ ...ocm-comgr-5.3.3-HIPIncludePath-not-needed.patch | 15 ----- .../files/rocm-comgr-5.3.3-fix-tests.patch | 17 ------ .../rocm-comgr-5.3.3-fno-stack-protector.patch | 14 ----- .../files/rocm-comgr-5.3.3-remove-h-option.patch | 43 -------------- .../files/rocm-comgr-5.5.1-fix-tests.patch | 17 ------ .../files/rocm-comgr-5.5.1-lld-include.patch | 22 -------- .../files/rocm-comgr-5.5.1-nullopt.patch | 23 -------- .../files/rocm-comgr-5.5.1-opt_mrelax.patch | 23 -------- .../files/rocm-comgr-5.5.1-subtargetfeatures.patch | 26 --------- dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild | 60 -------------------- dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild | 62 -------------------- dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild | 61 -------------------- dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild | 64 --------------------- 19 files changed, 632 deletions(-) diff --git a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch b/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch deleted file mode 100644 index 8200d4414f8b..000000000000 --- a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch +++ /dev/null @@ -1,66 +0,0 @@ -From be2bcaaea228cdcb5981b261046175275c402fb9 Mon Sep 17 00:00:00 2001 -From: Konstantin Zhuravlyov -Date: Wed, 26 Jan 2022 12:02:52 -0500 -Subject: [PATCH] COMGR changes needed for - https://github.com/llvm/llvm-project/commit/83d59e05b201760e3f364ff6316301d347cbad95 - -Change-Id: Iac01d024463865734879faf5f814e0862c26f7a1 ---- - lib/comgr/src/comgr-compiler.cpp | 3 ++- - lib/comgr/src/comgr-env.h | 1 + - lib/comgr/src/comgr-objdump.cpp | 4 +++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 6c2cba2..db4c8d5 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -605,7 +605,8 @@ static amd_comgr_status_t linkWithLLD(llvm::ArrayRef Args, - ArrayRef ArgRefs = llvm::makeArrayRef(LLDArgs); - static std::mutex MScreen; - MScreen.lock(); -- bool LLDRet = lld::elf::link(ArgRefs, false, LogS, LogE); -+ bool LLDRet = lld::elf::link(ArgRefs, LogS, LogE, false, false); -+ lld::CommonLinkerContext::destroy(); - MScreen.unlock(); - if (!LLDRet) { - return AMD_COMGR_STATUS_ERROR; -diff --git a/lib/comgr/src/comgr-env.h b/lib/comgr/src/comgr-env.h -index eb13e61..aef57b3 100644 ---- a/src/comgr-env.h -+++ b/src/comgr-env.h -@@ -36,6 +36,7 @@ - #ifndef COMGR_ENV_H - #define COMGR_ENV_H - -+#include "llvm/ADT/Optional.h" - #include "llvm/ADT/StringRef.h" - - namespace COMGR { -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 094bbac..b41e6c1 100644 ---- a/src/comgr-objdump.cpp -+++ b/src/comgr-objdump.cpp -@@ -43,6 +43,7 @@ - #include "llvm/ADT/STLExtras.h" - #include "llvm/ADT/StringExtras.h" - #include "llvm/ADT/Triple.h" -+#include "llvm/CodeGen/CommandFlags.h" - #include "llvm/DebugInfo/DWARF/DWARFContext.h" - #include "llvm/DebugInfo/Symbolize/Symbolize.h" - #include "llvm/MC/MCAsmInfo.h" -@@ -2395,9 +2396,10 @@ llvm::DisassemHelper::disassembleAction(StringRef Input, - size_t ArgC = ArgV.size(); - ArgV.push_back(nullptr); - COMGR::clearLLVMOptions(); -+ llvm::codegen::RegisterCodeGenFlags CGF; - cl::ParseCommandLineOptions(ArgC, ArgV.data(), "llvm object file dumper\n", - &ErrS); -- MCPU = lld::getCPUStr(); -+ MCPU = llvm::codegen::getCPUStr(); - - ErrorOr> BufOrErr = - MemoryBuffer::getMemBuffer(Input); --- -2.35.1 - diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch deleted file mode 100644 index 13cff2e52dfe..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/25 - -From c65cba2e73f9118e128b9ab7e655ee0f8a7798e7 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Sun, 1 Mar 2020 19:24:22 -0500 -Subject: [PATCH] Link additional required LLVM libraries - -Without these additional required dependencies, linking fails with errors such as: -`undefined reference to llvm::errs()'` ---- - CMakeLists.txt | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1794a07..c7b852a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,7 +207,11 @@ install(FILES - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") - - set(CLANG_LIBS -- clangFrontendTool) -+ clangFrontendTool -+ clangFrontend -+ clangBasic -+ clangDriver -+ clangSerialization) - - set(LLD_LIBS - lldELF -@@ -218,8 +222,21 @@ if (LLVM_LINK_LLVM_DYLIB) - else() - llvm_map_components_to_libnames(LLVM_LIBS - ${LLVM_TARGETS_TO_BUILD} -+ Option - DebugInfoDWARF -- Symbolize) -+ Symbolize -+ Support -+ Object -+ BitWriter -+ MC -+ MCParser -+ MCDisassembler -+ Core -+ IRReader -+ CodeGen -+ Linker -+ Demangle -+ BinaryFormat) - endif() - - target_link_libraries(amd_comgr diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch deleted file mode 100644 index 6bf47c610dfc..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: comgr/src/comgr-env.h -=================================================================== ---- comgr.orig/src/comgr-env.h -+++ comgr/src/comgr-env.h -@@ -37,6 +37,7 @@ - #define COMGR_ENV_H - - #include "llvm/ADT/StringRef.h" -+#include "llvm/ADT/Optional.h" - - namespace COMGR { - namespace env { diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch deleted file mode 100644 index 0e2a9a668216..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: comgr/CMakeLists.txt -=================================================================== ---- comgr.orig/CMakeLists.txt -+++ comgr/CMakeLists.txt -@@ -283,11 +283,7 @@ install(FILES - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") - - set(CLANG_LIBS -- clangFrontendTool -- clangFrontend -- clangBasic -- clangDriver -- clangSerialization) -+ clang-cpp) - - set(LLD_LIBS - lldELF diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed deleted file mode 100644 index 545b1c632182..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -453,7 +453,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, - std::unique_ptr MCE; - std::unique_ptr MAB; - if (Opts.ShowEncoding) { -- MCE.reset(TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx)); -+ MCE.reset(TheTarget->createMCCodeEmitter(*MCII, Ctx)); - MCTargetOptions Options; - MAB.reset(TheTarget->createMCAsmBackend(*STI, *MRI, Options)); - } -@@ -472,7 +472,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, - Out = BOS.get(); - } - -- MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx); -+ MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, Ctx); - MCTargetOptions Options; - MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*STI, *MRI, Options); - Triple T(Opts.Triple); diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu deleted file mode 100644 index 41e51a407ba9..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -244,13 +244,12 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts, - OPT_compress_debug_sections_EQ)) { - if (A->getOption().getID() == OPT_compress_debug_sections) { - // TODO: be more clever about the compression type auto-detection -- Opts.CompressDebugSections = llvm::DebugCompressionType::GNU; -+ Opts.CompressDebugSections = llvm::DebugCompressionType::Z; - } else { - Opts.CompressDebugSections = - llvm::StringSwitch(A->getValue()) - .Case("none", llvm::DebugCompressionType::None) - .Case("zlib", llvm::DebugCompressionType::Z) -- .Case("zlib-gnu", llvm::DebugCompressionType::GNU) - .Default(llvm::DebugCompressionType::None); - } - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch deleted file mode 100644 index 54b98726026f..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch +++ /dev/null @@ -1,15 +0,0 @@ -ROCM and HIPIncludePath is now /usr, which disturb the include order -=================================================================== ---- comgr.orig/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -1010,10 +1010,6 @@ amd_comgr_status_t AMDGPUCompiler::addCo - Args.push_back("x86_64-unknown-linux-gnu"); - Args.push_back("--cuda-device-only"); - Args.push_back("-nogpulib"); -- Args.push_back("-isystem"); -- Args.push_back(ROCMIncludePath.c_str()); -- Args.push_back("-isystem"); -- Args.push_back(HIPIncludePath.c_str()); - break; - default: - return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch deleted file mode 100644 index 08a40460c762..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch +++ /dev/null @@ -1,17 +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 -=================================================================== ---- comgr.orig/test/source1.cl -+++ comgr/test/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); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch deleted file mode 100644 index c8d078ee8946..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch +++ /dev/null @@ -1,14 +0,0 @@ -This add -fno-stack-protector to all compilation, since -f-stack-protector is currently unsupported by ROCm -Reference: https://bugs.gentoo.org/890377 -index 465187e..0baf925 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -850,6 +850,8 @@ amd_comgr_status_t AMDGPUCompiler::processFile(const char *InputFilePath, - Argv.push_back(Arg); - } - -+ Argv.push_back("-fno-stack-protector"); -+ - for (auto &Option : ActionInfo->getOptions()) { - Argv.push_back(Option.c_str()); - if (Option.rfind("--rocm-path", 0) == 0) { diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch deleted file mode 100644 index 1346ba4ef04d..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f -Reference: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/52 -Reference: https://bugs.gentoo.org/851702#c37 -This unblocks building blender with HIP cycles support -====================================================================== -From 2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f Mon Sep 17 00:00:00 2001 -From: Jacob Lambert -Date: Thu, 12 Jan 2023 08:45:38 -0800 -Subject: [PATCH] Remove -h option from comgr-objdump - -The -h option (short for -headers) is a legal objdump option. -However registering this as an LLVM option by Comgr prevents other -LLVM tools or instances from registering a -h option in the same -process, which is an issue because -h is a common short form for --help. - -A long term solution will be to libraryize llvm-obj dump, and -call it in Comgr via an API instead of re-implementation, which -will eliminate the need for Comgr to register any LLVM options for -objdump. - -Change-Id: Ieb1981aeb1826422647fd301c4827e2bfb370560 ---- - lib/comgr/src/comgr-objdump.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 6d20a3c..ead69fe 100644 ---- a/src/comgr-objdump.cpp -+++ b/src/comgr-objdump.cpp -@@ -175,9 +175,9 @@ cl::opt SectionHeaders("section-headers", - static cl::alias SectionHeadersShort("headers", - cl::desc("Alias for --section-headers"), - cl::aliasopt(SectionHeaders)); --static cl::alias SectionHeadersShorter("h", -- cl::desc("Alias for --section-headers"), -- cl::aliasopt(SectionHeaders)); -+// The following option has been removed to avoid conflicts with -+// other llvm tools/instances also attempting to register a -h option -+// static cl::alias SectionHeadersShorter("h", ...) - - cl::list - FilterSections("section", diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch deleted file mode 100644 index 9fd14df196a2..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch +++ /dev/null @@ -1,17 +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 -=================================================================== ---- 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); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch deleted file mode 100644 index 96df9291eb86..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 271fddf65f43675e675f0cb4e9aaa3d27d34c58a Mon Sep 17 00:00:00 2001 -From: Ron Lieberman -Date: Thu, 29 Dec 2022 05:17:41 -0600 -Subject: [PATCH] [llvm merge] add include of lld/Common/CommonLinkerContext.h - -Change-Id: I5767b4c1e683e9df9146804ba23ef3c0c0b6c07a ---- - lib/comgr/src/comgr-compiler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 2a7362a..bb1c9d3 100644 ---- comgr/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -39,6 +39,7 @@ - #include "comgr-compiler.h" - #include "comgr-device-libs.h" - #include "comgr-env.h" -+#include "lld/Common/CommonLinkerContext.h" - #include "lld/Common/Driver.h" - #include "clang/Basic/Version.h" - #include "clang/CodeGen/CodeGenAction.h" diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch deleted file mode 100644 index 8bb07b55a3ab..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e1da67c6acb2b0e4a8f9c05c89e3778252ea5aa7 Mon Sep 17 00:00:00 2001 -From: Ron Lieberman -Date: Sat, 17 Dec 2022 19:58:26 -0600 -Subject: [PATCH] None -> std::nullopt - -Change-Id: I1cc241aa47de538f9f5b1c12cb5655aca8a4502f ---- - lib/comgr/src/comgr-env.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-env.cpp b/lib/comgr/src/comgr-env.cpp -index 742f4d4..6ab6f0f 100644 ---- comgr/src/comgr-env.cpp -+++ comgr/src/comgr-env.cpp -@@ -53,7 +53,7 @@ bool shouldSaveTemps() { - Optional getRedirectLogs() { - static char *RedirectLogs = getenv("AMD_COMGR_REDIRECT_LOGS"); - if (!RedirectLogs || StringRef(RedirectLogs) == "0") { -- return None; -+ return std::nullopt; - } - return StringRef(RedirectLogs); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch deleted file mode 100644 index aa3e7c370a53..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b582dfb33fdb51065c22800fe02dd83207185664 Mon Sep 17 00:00:00 2001 -From: Ron Lieberman -Date: Sun, 1 Jan 2023 10:35:49 -0600 -Subject: [PATCH] [llvm] move to inverted OPT_mrelax_relocations_no - -Change-Id: I95e48e8acf5b9124d25e5e7b86c418f1a0d9389d ---- - lib/comgr/src/comgr-compiler.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index bb1c9d3..95c1bb4 100644 ---- comgr/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -259,7 +259,7 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts, - } - } - -- Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations); -+ Opts.RelaxELFRelocations = !Args.hasArg(OPT_mrelax_relocations_no); - Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2, Diags); - Opts.DwarfDebugFlags = - std::string(Args.getLastArgValue(OPT_dwarf_debug_flags)); diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch deleted file mode 100644 index 340df3852fc2..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 48c682d577a7955256d0bfac5d497b3feebff11c Mon Sep 17 00:00:00 2001 -From: Ron Lieberman -Date: Mon, 16 Jan 2023 14:29:05 -0600 -Subject: [PATCH] [llvm merge] Move to Expected on SubtargetFeatures - -Change-Id: I060ceaa2b51eaa6ed1b472ea42c6788b98001088 ---- - lib/comgr/src/comgr-objdump.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 86a5d7f..6d20a3c 100644 ---- comgr/src/comgr-objdump.cpp -+++ comgr/src/comgr-objdump.cpp -@@ -1270,7 +1270,10 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj, - const Target *TheTarget = getTarget(Obj); - - // Package up features to be passed to target/subtarget -- SubtargetFeatures Features = Obj->getFeatures(); -+ Expected FeaturesValue = Obj->getFeatures(); -+ if (!FeaturesValue) -+ WithColor::error(errs(), ToolName) << FeaturesValue.takeError(); -+ SubtargetFeatures Features = *FeaturesValue; - std::vector MAttrs = lld::getMAttrs(); - if (MAttrs.size()) { - for (unsigned I = 0; I != MAttrs.size(); ++I) { diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild deleted file mode 100644 index 3339e71dc276..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -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 - -PATCHES=( - "${FILESDIR}/${PN}-4.5.2-dependencies.patch" - "${FILESDIR}/${PN}-5.1.3-Find-CLANG_RESOURCE_DIR.patch" - "${FILESDIR}/${PN}-5.1.3-clang-link.patch" - "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-COMGR-changes-needed-for-upstream-llvm.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" - "${FILESDIR}/${PN}-5.1.3-llvm-15-args-changed" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.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} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/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 - sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die - sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-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 - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild deleted file mode 100644 index 30112cb3b0c6..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -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-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" - "${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.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.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} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/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) - 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-5.4.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild deleted file mode 100644 index 7863223f7e6a..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -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-clang-fix-include.patch" - "${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.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.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} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/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) - 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-5.5.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild deleted file mode 100644 index 77c1f229941c..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=16 - -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.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.5.1-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.patch" - "${FILESDIR}/${PN}-5.5.1-nullopt.patch" - "${FILESDIR}/${PN}-5.5.1-opt_mrelax.patch" - "${FILESDIR}/${PN}-5.5.1-lld-include.patch" - "${FILESDIR}/${PN}-5.5.1-subtargetfeatures.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} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/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) - 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 -}