diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 20:10:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 20:10:31 +0100 |
commit | 944b3df0f275eea0fd7808913d72a0b280df0c33 (patch) | |
tree | ec33697fafd5ce7028b7619baef7a6d27bb74362 /dev-libs/rocm-comgr | |
parent | 7e17b5aabc330abb894f2b90bef0e3fcbcd180d2 (diff) |
gentoo auto-resync : 06:08:2022 - 20:10:30
Diffstat (limited to 'dev-libs/rocm-comgr')
7 files changed, 244 insertions, 0 deletions
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 10cb21734b84..2ed565ba7248 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,7 +1,12 @@ +AUX 0001-COMGR-changes-needed-for-upstream-llvm.patch 2391 BLAKE2B 2873fa0aad01ad90c9140e54219e40ada995ed69ae9ebe83d79b8a8e674f23bf63a49457d6795cc78260df63ceed8407512edb205d8a3378a217cd3286c8de1f SHA512 83b1b0b2b2baf2ff36ef2d8aadf4083ba8c83f9df56753850780bbb025fde8f4714ac9437c78116d374577b9183f7c7ac9f3f9215ab576359720905900469789 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef AUX rocm-comgr-4.3.0_strip-usr-include.patch 820 BLAKE2B c6f30de65db0dc690a41d1563bab100d1bc3503101867092e45480d256408d77a1104f49bbea9e38be41fd9b693d7a4e6a0d81ff9b6879681b3f07342abbbb73 SHA512 2c58214bbab369365b8bf38565bb141362041f3e56035e5f4e31b839d7440a62eec627c2fdd87ab1d3f5409a9d49844d14a293887acab5cdb2c53cfac3994761 AUX rocm-comgr-4.5.2-dependencies.patch 1255 BLAKE2B 544a23e8066a2b308e2f90bfaf7e538ebe9b4becd5d84f3c4e8d563c01148e298c556fcec8639861749ba4cf838bf73e98a8231e0d19faeda6ea5d7df8459629 SHA512 4f7be98945217fca917b788f3ac93f9d5356d410d3c17f5fadda753d6bd5121c57ecc2c758c430f6d4a2997bc61b5d54b3b8be6f6af1d575c0190c635cb64426 AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a +AUX rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch 3434 BLAKE2B d5841e32974bb8750ff7d9d32256c13823b26a7d200c603162c66b04dc55ae0e5ee795a449f2e6f35a2bd2efddb5c67b03499d2aa4e441fbe54a5f8178e167a5 SHA512 d0da78fbbbdc9ee3bb4f0d4f98b2321913f9ad197edd1c0128c4785d14134646a5f8b9a1b75e268111dcb4dff872c0b8db398b475fa8b28c83324ae5801bd279 +AUX rocm-comgr-5.1.3-clang-fix-include.patch 298 BLAKE2B 2cb424491481445a29fff40cfc95284fbf8dce155c65d5cf2ee950fc5c876b3c78660691878ff45846904a9db54f7f5db7581fbd1665156c97f660bd0b69fc48 SHA512 a3b024899d9b0d59b4c8d9dd498349775e25cd428437d97da1de689e14bc8cebd1b3434d9ab034b5c894945f743426abae2ba3ec129084ce9fc176b3cd8befc4 +AUX rocm-comgr-5.1.3-clang-link.patch 380 BLAKE2B a6de9401ff4c668745f49e898546108163c1cb370e2591b6b512e70e4ab63edc4256baca7d9a6a62c6263397764053d22791cc85278d5eb4ef3a766b69bba96c SHA512 1738fb93087c24c05fc8c025e2c39b019cd71534e2878a430a8ab9381d18284053c76f646d29314b33ec80ecdba71c4ac583ab40a5478b607242518aaa198e26 +AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d93b1c7d0db7aa02a2dae0fa0b70b44b75056fe720fea8919c5315c5804289c30d6b476e43aa7aeaf25cc5c2430431f7a9a SHA512 6d1d2cfac7f2b70409e8cc3cb1556f516f495c4a217e85408fbd99587697912d82fc6a8745c37d2fe392ddbd0e8503489c353f26b3fbc6bce640c567f4230e89 DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549 @@ -10,6 +15,7 @@ DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 6796ab4fc7139224af9e26f6adc5ac3ef260 DIST rocm-comgr-4.3.0.tar.gz 106250 BLAKE2B 40a3a69147ae4fc96d3713331d35ae65d952dbf92fb3c92bee75bbef394342b11f383cb51c6def85c256326905c5067b1da816e853f793fd3c40a5af9a6e0122 SHA512 5961720bdc78c6d3fc626bd83f52be0aa32b01178bf4db0a503a0639fe05c5c589b7feb2dcbeb78021d36a40ac6f936cb1262cd5ab5cda4689e8e642ab7eddc3 DIST rocm-comgr-4.5.2.tar.gz 108521 BLAKE2B 9fe238a17bac5739d2d103d859a8dd16cb95d0333f9f85e7fd94463c4ee8bd88801b7b1d1278d978fda7425f391de5e9043a3539583ed3b8d45393a613c19bba SHA512 c466a9bb1b725b79d056673824c6dd79919866f42db88b611e4ac24b0624b12c078affe8bfc7ad7c1373ce0ca60607904c46f13751b47c9f4deaf4105e2c7cd3 DIST rocm-comgr-5.0.2.tar.gz 117092 BLAKE2B 1ffcb74f9716a8f050d722f569cced66e8e9fa5a23a7156edd1b4dfd7dd7b09a175f3555bbf29ef452d7e4371f65ebe4c6fac30c583468a5563dd59fa92b53e4 SHA512 d2cf4517fc1da1adc367aaa6f53cc099547a931be30cc261d68c8174a5a9ffe3af937fbb298987abbdd7fd5d80364bef6ea9112dcaaf326a410fdd215e568f2f +DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7 EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7 @@ -19,4 +25,5 @@ EBUILD rocm-comgr-4.3.0-r1.ebuild 1291 BLAKE2B 841c0cc81d46ab8180a572de5ab911cac EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6 EBUILD rocm-comgr-4.5.2.ebuild 1097 BLAKE2B 2a8ec9f20371b7c86295dea6a044da83c96a0774c55f774b4b01118fb3c27185beb7b09a94144b43d95e75eed3ac2fae780314244ec7e2f55b7b3f82303a8969 SHA512 7fc5a888c252736f1777580208d6f2701a8b52690ce1753a10f259e5534d0027e09161a12b7d8bb9717c921fd0b1d31a89fda787ce9fb1f605d78d9ab5af2a07 EBUILD rocm-comgr-5.0.2.ebuild 1633 BLAKE2B e0d150a3926662b7347a57994cadd835c8083215c56536b1eaae3d1fca13b601a59528da12c600c44edbe9ae78918fdc5ee2f32224a59293a30df9e7603e7d7d SHA512 7ae43bbbcf647d5a8c781b7ed0df41e34b7847776bfc4258f4bda4dace11512ddfee18f48c99cbc47124c7e6ad7984d332dee56edc3ac5688c3857408bd1c92f +EBUILD rocm-comgr-5.1.3.ebuild 1881 BLAKE2B ab58a7c0b4ed1614050f6512fcc78d68808d4a4021536d1abdc1bdac8cd556458e58c08a5474ebc5ec14a37ee14720fc4ce35dfd833da5d93fdb53e7e8cddc99 SHA512 fdadec621540301b320d4a4a63d035c8c9e1a69d56c6be01d1c582a4348f895626c40e46802c4b68cf0163c987cfb2372c8d87e01b8021916aa5e1e30845cbae MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590 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 new file mode 100644 index 000000000000..8200d4414f8b --- /dev/null +++ b/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch @@ -0,0 +1,66 @@ +From be2bcaaea228cdcb5981b261046175275c402fb9 Mon Sep 17 00:00:00 2001 +From: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> +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<const char *> Args, + ArrayRef<const char *> 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<std::unique_ptr<MemoryBuffer>> BufOrErr = + MemoryBuffer::getMemBuffer(Input); +-- +2.35.1 + diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch new file mode 100644 index 000000000000..362f5fcf16ca --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch @@ -0,0 +1,71 @@ +From 4c01c63a49af5748a8ee698553aa107803b60362 Mon Sep 17 00:00:00 2001 +From: Yiyang Wu <xgreenlandforwyy@gmail.com> +Date: Tue, 14 Jun 2022 20:21:22 +0800 +Subject: [PATCH] Find CLANG_RESOURCE_DIR using clang -print-resource-dir + +Suggested-By: https://reviews.llvm.org/D49486 +Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com> +--- + lib/comgr/cmake/opencl_pch.cmake | 24 +++--------------------- + 1 file changed, 3 insertions(+), 21 deletions(-) + +Index: comgr/cmake/opencl_pch.cmake +=================================================================== +--- comgr.orig/cmake/opencl_pch.cmake ++++ comgr/cmake/opencl_pch.cmake +@@ -1,26 +1,8 @@ + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + find_package(Clang REQUIRED CONFIG) +- +- # FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but +- # really there is no way to reliably discover this header. +- # +- # We effectively back up to the Clang output directory (for the case of a build +- # tree) or install prefix (for the case of an installed copy), and then search +- # for a file named opencl-c.h anywhere below that. We take the first result in +- # the case where there are multiple (e.g. if there is an installed copy nested +- # in a build directory). This is a bit imprecise, but it covers cases like MSVC +- # adding some additional configuration-specific subdirectories to the build +- # tree but not to an installed copy. +- file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h") +- +- list(GET OPENCL_C_H_LIST 0 OPENCL_C_H) +- +- if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}") +- message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.") +- endif() +-else() +- get_target_property(clang_build_header_dir clang-resource-headers RUNTIME_OUTPUT_DIRECTORY) +- set(OPENCL_C_H "${clang_build_header_dir}/opencl-c.h") ++ execute_process(COMMAND "${CLANG_INSTALL_PREFIX}/bin/clang" -print-resource-dir OUTPUT_VARIABLE CLANG_RESOURCE_DIR) ++ string(STRIP ${CLANG_RESOURCE_DIR} CLANG_RESOURCE_DIR) ++ set(OPENCL_C_H "${CLANG_RESOURCE_DIR}/include/opencl-c.h") + endif() + + # Macro to create and install a custom target for generating PCH for given +Index: comgr/src/comgr-compiler.cpp +=================================================================== +--- comgr.orig/src/comgr-compiler.cpp ++++ comgr/src/comgr-compiler.cpp +@@ -42,6 +42,7 @@ + #include "lld/Common/Driver.h" + #include "clang/Basic/Version.h" + #include "clang/CodeGen/CodeGenAction.h" ++#include "clang/Config/config.h" + #include "clang/Driver/Compilation.h" + #include "clang/Driver/DriverDiagnostic.h" + #include "clang/Driver/Job.h" +@@ -988,11 +989,8 @@ amd_comgr_status_t AMDGPUCompiler::addCo + 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(); ++ ClangIncludePath = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR).str(); ++ ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR + "/include").str(); + + Args.push_back("-x"); + 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 new file mode 100644 index 000000000000..6bf47c610dfc --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..0e2a9a668216 --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch @@ -0,0 +1,17 @@ +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-rocm-path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-rocm-path.patch new file mode 100644 index 000000000000..c6d39715e864 --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-rocm-path.patch @@ -0,0 +1,14 @@ +Add --rocm-path=/usr argument in runtime because our rocm path is not in default seach list. +--- comgr/src/comgr-compiler.cpp ++++ comgr.orig/src/comgr-compiler.cpp +@@ -1096,6 +1096,10 @@ + } + } + } ++ else { ++ llvm::SmallString<128> RealRocmDir = env::getLLVMPath(); ++ Args.push_back(Saver.save(Twine("--rocm-path=") + RealRocmDir).data()); ++ } + + return processFiles(AMD_COMGR_DATA_KIND_BC, ".bc"); + } diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild new file mode 100644 index 000000000000..8f03fe89a883 --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake llvm prefix + +LLVM_MAX_SLOT=14 + +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" +) + +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} + sys-devel/clang:${LLVM_MAX_SLOT}= + sys-devel/clang-runtime:= + sys-devel/lld" +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 +} |