From 4fda045f90a4e301329bddb766e2e12a0b4401de Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Feb 2025 00:13:14 +0000 Subject: gentoo auto-resync : 14:02:2025 - 00:13:14 --- dev-util/Manifest.gz | Bin 65119 -> 65135 bytes dev-util/Tensile/Manifest | 12 -- dev-util/Tensile/Tensile-5.1.3-r3.ebuild | 88 --------- dev-util/Tensile/Tensile-5.4.2-r2.ebuild | 119 ----------- .../files/Tensile-5.0.2-fix-arch-parse.patch | 12 -- dev-util/Tensile/files/Tensile-5.0.2-gfx1031.patch | 104 ---------- .../Tensile/files/Tensile-5.0.2-use-ninja.patch | 21 -- .../Tensile/files/Tensile-5.1.3-gentoopath.patch | 75 ------- .../Tensile/files/Tensile-5.4.2-gentoopath.patch | 67 ------- dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch | 88 --------- ...ange-cmake-name-for-msgpack-cxx-6-release.patch | 13 -- dev-util/fuzz/Manifest | 3 +- dev-util/fuzz/files/fuzz-0.6-musl.patch | 34 ++++ dev-util/fuzz/fuzz-0.6-r3.ebuild | 36 ---- dev-util/fuzz/fuzz-0.6-r4.ebuild | 39 ++++ dev-util/hip/Manifest | 55 +----- .../hip-4.2.0-cancel-hcc-header-removal.patch | 18 -- dev-util/hip/files/hip-4.2.0-config-cmake-in.patch | 15 -- dev-util/hip/files/hip-5.0.1-DisableTest.patch | 32 --- .../hip/files/hip-5.0.1-hip_vector_types.patch | 11 -- dev-util/hip/files/hip-5.0.2-correct-ldflag.patch | 18 -- dev-util/hip/files/hip-5.0.2-set-build-id.patch | 20 -- ...0001-SWDEV-316128-HIP-surface-API-support.patch | 35 ---- .../hip/files/hip-5.1.3-clang-include-path.patch | 12 -- ...hip-5.1.3-correct-sample-install-location.patch | 13 -- .../hip/files/hip-5.1.3-fix-hip_prof_gen.patch | 38 ---- .../hip/files/hip-5.1.3-fno-stack-protector.patch | 16 -- .../files/hip-5.1.3-llvm-15-noinline-keyword.patch | 21 -- .../hip-5.1.3-remove-cmake-doxygen-commands.patch | 21 -- dev-util/hip/files/hip-5.1.3-rocm-path.patch | 13 -- ...8-LLVM-pkg-search-directly-using-find_dep.patch | 163 --------------- ...0-hipcc-fails-to-parse-version-of-clang-i.patch | 70 ------- ...DEV-355608-Remove-clang-include-path-2996.patch | 51 ----- ...8-Removed-relative-path-based-CLANG-inclu.patch | 173 ---------------- dev-util/hip/files/hip-5.3.3-correct-ldflag.patch | 20 -- dev-util/hip/files/hip-5.3.3-disable-Werror.patch | 16 -- .../hip-5.3.3-remove-cmake-doxygen-commands.patch | 21 -- dev-util/hip/files/hip-5.4.3-clang-include.patch | 30 --- dev-util/hip/files/hip-5.4.3-clang-version.patch | 70 ------- dev-util/hip/files/hip-5.4.3-correct-ldflag.patch | 20 -- .../hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch | 26 --- dev-util/hip/files/hip-5.5.1-disable-Werror.patch | 18 -- dev-util/hip/files/hipvars-5.1.3.pm | 21 -- dev-util/hip/files/hipvars-5.3.3.pm | 20 -- dev-util/hip/files/hipvars.pm | 20 -- dev-util/hip/files/rocclr-5.3.3-fix-include.patch | 218 --------------------- dev-util/hip/files/rocclr-5.3.3-gcc13.patch | 27 --- dev-util/hip/hip-5.1.3-r4.ebuild | 177 ----------------- dev-util/hip/hip-5.3.3-r3.ebuild | 154 --------------- dev-util/hip/hip-5.4.3.ebuild | 152 -------------- dev-util/hip/hip-5.5.1.ebuild | 152 -------------- dev-util/hip/hip-5.7.1-r2.ebuild | 5 +- dev-util/idea-community/Manifest | 6 +- .../idea-community-2024.3.2.2.ebuild | 180 ----------------- .../idea-community/idea-community-2024.3.3.ebuild | 180 +++++++++++++++++ dev-util/rocm-smi/Manifest | 4 - .../files/rocm-smi-5.0.2-gcc12-memcpy.patch | 19 -- dev-util/rocm-smi/rocm-smi-5.4.2-r1.ebuild | 58 ------ dev-util/rocm-smi/rocm-smi-5.7.1-r2.ebuild | 60 ------ dev-util/rocm_bandwidth_test/Manifest | 4 - .../rocm_bandwidth_test-5.3.3.ebuild | 26 --- .../rocm_bandwidth_test-5.4.3.ebuild | 26 --- dev-util/rocprofiler/Manifest | 5 +- .../files/rocprofiler-5.0.2-gentoo-location.patch | 59 ------ dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild | 60 ------ dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild | 9 +- dev-util/roctracer/Manifest | 14 -- .../files/roctracer-4.3.0-glibc-2.34.patch | 35 ---- .../roctracer/files/roctracer-5.0.2-Werror.patch | 18 -- .../roctracer/files/roctracer-5.0.2-headers.patch | 36 ---- .../files/roctracer-5.0.2-strip-license.patch | 14 -- .../files/roctracer-5.1.3-no-aqlprofile.patch | 39 ---- .../roctracer/files/roctracer-5.3.3-Werror.patch | 15 -- ...roctracer-5.3.3-do-not-install-test-files.patch | 37 ---- .../files/roctracer-5.3.3-flat-lib-layout.patch | 34 ---- dev-util/roctracer/roctracer-5.1.3-r1.ebuild | 78 -------- dev-util/roctracer/roctracer-5.3.3-r1.ebuild | 66 ------- dev-util/rr/Manifest | 4 +- dev-util/rr/rr-5.9.0.ebuild | 100 ++++++++++ dev-util/rr/rr-9999.ebuild | 10 +- dev-util/rt-tests/Manifest | 3 +- dev-util/rt-tests/files/rt-tests-2.8-glibc.patch | 55 ++++++ dev-util/rt-tests/rt-tests-2.8.ebuild | 6 +- 83 files changed, 441 insertions(+), 3492 deletions(-) delete mode 100644 dev-util/Tensile/Tensile-5.1.3-r3.ebuild delete mode 100644 dev-util/Tensile/Tensile-5.4.2-r2.ebuild delete mode 100644 dev-util/Tensile/files/Tensile-5.0.2-fix-arch-parse.patch delete mode 100644 dev-util/Tensile/files/Tensile-5.0.2-gfx1031.patch delete mode 100644 dev-util/Tensile/files/Tensile-5.0.2-use-ninja.patch delete mode 100644 dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch delete mode 100644 dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch delete mode 100644 dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch delete mode 100644 dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch create mode 100644 dev-util/fuzz/files/fuzz-0.6-musl.patch delete mode 100644 dev-util/fuzz/fuzz-0.6-r3.ebuild create mode 100644 dev-util/fuzz/fuzz-0.6-r4.ebuild delete mode 100644 dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch delete mode 100644 dev-util/hip/files/hip-4.2.0-config-cmake-in.patch delete mode 100644 dev-util/hip/files/hip-5.0.1-DisableTest.patch delete mode 100644 dev-util/hip/files/hip-5.0.1-hip_vector_types.patch delete mode 100644 dev-util/hip/files/hip-5.0.2-correct-ldflag.patch delete mode 100644 dev-util/hip/files/hip-5.0.2-set-build-id.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-clang-include-path.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-fno-stack-protector.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-llvm-15-noinline-keyword.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch delete mode 100644 dev-util/hip/files/hip-5.1.3-rocm-path.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-correct-ldflag.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-disable-Werror.patch delete mode 100644 dev-util/hip/files/hip-5.3.3-remove-cmake-doxygen-commands.patch delete mode 100644 dev-util/hip/files/hip-5.4.3-clang-include.patch delete mode 100644 dev-util/hip/files/hip-5.4.3-clang-version.patch delete mode 100644 dev-util/hip/files/hip-5.4.3-correct-ldflag.patch delete mode 100644 dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch delete mode 100644 dev-util/hip/files/hip-5.5.1-disable-Werror.patch delete mode 100644 dev-util/hip/files/hipvars-5.1.3.pm delete mode 100644 dev-util/hip/files/hipvars-5.3.3.pm delete mode 100644 dev-util/hip/files/hipvars.pm delete mode 100644 dev-util/hip/files/rocclr-5.3.3-fix-include.patch delete mode 100644 dev-util/hip/files/rocclr-5.3.3-gcc13.patch delete mode 100644 dev-util/hip/hip-5.1.3-r4.ebuild delete mode 100644 dev-util/hip/hip-5.3.3-r3.ebuild delete mode 100644 dev-util/hip/hip-5.4.3.ebuild delete mode 100644 dev-util/hip/hip-5.5.1.ebuild delete mode 100644 dev-util/idea-community/idea-community-2024.3.2.2.ebuild create mode 100644 dev-util/idea-community/idea-community-2024.3.3.ebuild delete mode 100644 dev-util/rocm-smi/files/rocm-smi-5.0.2-gcc12-memcpy.patch delete mode 100644 dev-util/rocm-smi/rocm-smi-5.4.2-r1.ebuild delete mode 100644 dev-util/rocm-smi/rocm-smi-5.7.1-r2.ebuild delete mode 100644 dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.3.3.ebuild delete mode 100644 dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.4.3.ebuild delete mode 100644 dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch delete mode 100644 dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild delete mode 100644 dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.0.2-Werror.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.0.2-headers.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.3.3-Werror.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch delete mode 100644 dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch delete mode 100644 dev-util/roctracer/roctracer-5.1.3-r1.ebuild delete mode 100644 dev-util/roctracer/roctracer-5.3.3-r1.ebuild create mode 100644 dev-util/rr/rr-5.9.0.ebuild create mode 100644 dev-util/rt-tests/files/rt-tests-2.8-glibc.patch (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 5c9fedfe1d62..2e13283cdd40 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 64ba88f4b941..354ec1f118cb 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,11 +1,5 @@ AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf -AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e776599b384875161233d4a010a53f11a5764fd7a5b4c50ded1762737e9fbe7923b64e9353ee4590fd1b6b9b03ac621af35c9b SHA512 5913e7fc42bc5b43e1dcca531e4ef88b524325b497601171a9844013906c2ffc87469a4c55037c721ace5757c6aaf4d8bf8ca683f659f9d8988555c90425802a -AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec -AUX Tensile-5.0.2-use-ninja.patch 897 BLAKE2B f06a3831a43a4b6c00e7eb231cc13901f7b4a3a924a50d85ba81f9def535951c450a01504506476c1ee88317cbdf0c0c00a57cb5cd198ab44e8e0b94aefda25d SHA512 15404d3cd5dbc7b74e81092d86f9c49cd45fe4df645602849ff515baafa3890fd68ca808cbebd6ae37e951b382ff4446a31089306c950f8549431dfbe75c3b53 -AUX Tensile-5.1.3-gentoopath.patch 3350 BLAKE2B 890ab24fbd99aede187bde67c8d6f586f625c30cff34da39e12b199b022170de8df3087c3581f9e635d5d12f31db0aa944a2628733417322621ab51b0292b01b SHA512 d17a948146e7ef2447ae92b2822f53cd77b0992297fd2a43598434db4f7c2095d269138ce5c0eedda73a34e193fc56401f22471f9eca68ec6026577f07a7fca1 AUX Tensile-5.4.2-fix-arch-parse.patch 538 BLAKE2B 80b83774452c06f4ced24988ed5e988068e4650870db2ea0dc03d083c2d78ee30c0edbd0d4f3d9484d10908d7ad9c427112276b25296e8bc88de8e50cbbc6bed SHA512 4a4b7ea54854aedd0d36396352824b3934452712eadf10853b90fd93f8ea58e8825bf0e3d56d79190d35dfe58a50c1a6bca1f99b007c83a5b53c473f134689f1 -AUX Tensile-5.4.2-gentoopath.patch 3149 BLAKE2B fd033093654683524f4ce51ee36ea1d84d53dc95c0556f9eb86d3f7870728fbac744322c8ce915a6dc13907b2fb249543a791ccf6051701feaeee595e65f32e0 SHA512 ab2afad72ffd04328701462161bec9627bf35a42be7be4775e8601e51b3b50b9cd18acbed547d51621923e3ec33ec4872039025124a2fe593f68145f468df30b -AUX Tensile-5.4.2-gfx1031.patch 5051 BLAKE2B d043b94403069f9b4b4c379cf7c361b30f3c0c145f740d37e5cf787636fa3f5c00ca1b7c375f311c9f067e8e6c7d383fbc34157e4b9d4f65a93ed53e9e14b814 SHA512 53cae079788f0478ba7a0af48ddb279a39496a3238263352ff17f555f588ebc1e9463d5b466f1e819ba29a4857c65a644d7a93fe0c2dca3403f994ade4f2bc0f AUX Tensile-5.4.2-use-ninja.patch 1164 BLAKE2B 41d6dbb68fa41b53d230afd06af95acb014163d14b7f0e61d5a2945ef02c7a3d376f327a3f82fa86085c8eb95820d95883bdc05024e87b69dad61caf39c3b124 SHA512 b73271b637b4b3c045813638b1cebf6c3b4ac50350a62a76351e6fdf3e74b20104bbb135085c96c9c0e99f20f971af316d9686c8347a894361ee90abb66175fa AUX Tensile-5.7.1-expand-isa-compatibility.patch 1632 BLAKE2B 807df38c99852b58801cb84bccf8cdd28b5575a460130e4463b483fb875f7adfb1d7902a47ca7e9f8735285bfaf3aa1a422595e57ec616faf2af423892301384 SHA512 3cf82928780532d32dfd0680a0ea8d8b990055186795ddc6d93a85941eeb9f0968979fe33fc4155f79413c54b8809d52eb3327624d51c187bfb8cd8bfef66bd4 AUX Tensile-5.7.1-fix-msgpack-dependency.patch 1069 BLAKE2B 888447b0e8d3b2314c104b7cbf85fecc7645e681fdd91e325197f016274f3f7bd5c6f0e9a84c84a17ee31611c661a15a5fbf203814a932bfe5bda731af1ee766 SHA512 39198a95351584b1693c714cbe571012e8ad49aafda4c68ba2fe252685314d40213d6c23bae39834cc98207a58fe5881aae08e6bdedfbab63b9e2acf26ee79dc @@ -14,16 +8,10 @@ AUX Tensile-6.0.2-expand-isa-compatibility.patch 1355 BLAKE2B daf73107efc31a4585 AUX Tensile-6.1.1-fix-msgpack-dependency.patch 1221 BLAKE2B 8b3b1f2b94f0a5dfb5e4f4e973410a536c2d3bb306b7d0669fdf2d47d85ce54e2f34eb009843b99234f8bfdd42f20eb940c52db23a8099169d949bb4e3decf1b SHA512 02ca22defae159f13da6e717a94e2708c476012ed370ab46df54f529ae31079b5700afeed7b68a0f63a1d763edfb9ea2898b4ccc98de4fcf540e161aa06c3fbf AUX Tensile-6.1.1-ignore-asm-cap.patch 636 BLAKE2B 77421fa2ca2f3ecb088b7510375a705d8de1235fc98d9b6cc493feda8c3f24537cf5c80d9b91f7357f63d3d2b763e6ab53530068c41d6353d782cc76247b0039 SHA512 00869f06e1038b5d930cf452bce8c23d8a2089d3e70b50caf7682c5296b91f11c6b2a5d0758f8006723a6a0ac782f59f24b4aeab1ffbf922976a28dbca50fa93 AUX Tensile-6.3.0-use-ninja.patch 855 BLAKE2B d6261c72b4db84fe40f083034bcc473b7e0a63d9169e15cf5a06a6b7d055f80c80a0acb87e95a85392490636b25a2c6a348590199a8657b42ad56325ed68cede SHA512 4a238566a83fd3cb1781ed053d45eeb2bf37eb050a029556cec1c9164cf5b61a835a73f9f2a1dd5adc8e63911e9fffeaa887f9e2ef28653e537b9ae19f8d619d -AUX Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch 422 BLAKE2B 791a8041667c29f2cd06d036e6f54530fc88ac4afff9bd2f3f5dd6ab3a6daa6b52ba7459c156e12dae02bd918f740d1e1d22bd6bc7e26bd14269a5ffd877aa13 SHA512 a738be31fd735bf3d8ff17d844771e6113f9868c1d73f1eecd75e1ecfb5d04c743c9463a1e599712b9bc0d7877d8d90fa38fbc7a266add8b61e7fb575693eb4f -DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c -DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 -DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80 DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36 DIST rocm-Tensile-6.1.1.tar.gz 12675289 BLAKE2B dfe3698d7dda14d5b20a6fe1ef6535ac9737ac330b71678a3a94e939adc2350e2dcf33e58c711ee90dae543efba59fe210bfa39fc69b63910ec4537db3f209bf SHA512 cf8b014b1ff7cd5d45236b8a9a6f5604b02e34a9245a163c672847b535d565151bf7e3a5127601681e80e6fe26964a0e544594044efe2fe68e39b0f1128f96e2 DIST rocm-Tensile-6.3.0.tar.gz 12724004 BLAKE2B 83887efe8ab4102b9d33bae1f97a245d40bcc186635760de509079218628fd4d57072c6c2c1726fec6d8603d40e760e37fa1a443eead290d121cac099ae779ff SHA512 4c80a269236690545d8bc9090b799c5b4095ed9152a1e19ff8b2e5decd588545641ccdf3c6c469b12f4de29b3f4c2821a6e4714460771250b05339ac32f57c13 DIST rocm-Tensile-6.3.2.tar.gz 12723907 BLAKE2B aaabae87664340f3e044ac5fdc68331084cd597466f294d60f8ed3d523c0f1ebc0c6e3e353585d4bb85f4fe30c644b1a70f2123b6f62d67a6b7a1904f3d820bb SHA512 df8888d7250f9e3dc6818590c82a3e1dc3ff787e0eac29e45969ef408db92261d39faca29f5ac7a6bae5e5b614365ff6e37d087956697c25c65d9d7e4c1ba74d -EBUILD Tensile-5.1.3-r3.ebuild 2812 BLAKE2B 4c005cc1fcdcc45e74d97b463b1c7aff059a953fb951f2833ac3439e20138ce5d0cd15d20f47db6640a164def7e66c268289d6d1634f9b29ef1930665c77cc47 SHA512 3f1377286dc82e2a0a0797feb5f1223dcefa8367817cd97559c1ef78159ee9854d5be4b0eb0078ef3687702bf67ee708725c76d08dd9ae40e999b3b3aafc61ae -EBUILD Tensile-5.4.2-r2.ebuild 3348 BLAKE2B 45125cb1fcf233eaa847f3f5b565e1aa7e5fb7504ae37de9f16f9755f4bcb1b8bbd97a6cafe54a0a2a3253e21fea1a31b6d1ca6412b34994561eacd996f23088 SHA512 59a34c46a1372a071cc2df45cade4d4183cfb1f13f867cd380a193c1d1525b7ea4d1d4570c64101886787abd6880865432ea8577a241cebdb97807fd6b4ddb79 EBUILD Tensile-5.7.1-r2.ebuild 3534 BLAKE2B 508198211e41ae0e519a0c358e8b6d2b35384da585b947b1c29457ec4a8d91a941fd53e51da44dc5db56fec9749a101dd2598a0189a3953dddf29aced4832263 SHA512 6e41dd66afc8236aaf096eec8f445f59ad152c4b5846edda1b4a583695756dc7fe1743a530454a439d72469984f8038ae20e0fedfad102867c9ce049133aa1fc EBUILD Tensile-6.1.1-r1.ebuild 3613 BLAKE2B bc993857e81720270ccdb3aa68c6a36a07ec32f46a45a8edbdf01af05c069ef58a5ba9349fe9be51fe3204ea8fd894595cc16304708c5d7d0eda76dde84dd1a6 SHA512 2f381562ba1ed3fd38435e519dd58ffe0198428b382d6114b18aadf6f6090e6b477aec1009744413e6e9cfcbb759f569b8a6a6b62c149dab613d449d8615ff0c EBUILD Tensile-6.1.1.ebuild 3561 BLAKE2B cd1cc973261db88e42b84bdfb977bdfe5f3d8053a3cbd564dbb960e7730c6028e984499b7fea9bb091773b4ff5fa1775bd253cba2898d896f4d5e17a67820ee2 SHA512 680cc2e82ad2d393316224c119ec0b04d67f6e4729e412987c1fd449b68cffe570d0389904182020c03330ebd7a12a6bc7467b98c498c57159da21587a7d6550 diff --git a/dev-util/Tensile/Tensile-5.1.3-r3.ebuild b/dev-util/Tensile/Tensile-5.1.3-r3.ebuild deleted file mode 100644 index 63d7d66e8695..000000000000 --- a/dev-util/Tensile/Tensile-5.1.3-r3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 llvm prefix - -LLVM_MAX_SLOT=15 - -DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile" -SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz - https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/${PN}-5.0.2-PR1419.patch.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -# Not compatible with recent versions of pytest -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - >=dev-cpp/msgpack-cxx-6.0.0 - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-util/hip - llvm-core/clang:${LLVM_MAX_SLOT} - >=dev-util/rocm-smi-4.3.0 -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch - "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch - "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch - "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch -) - -CMAKE_USE_DIR="${WORKDIR}/Source" - -src_prepare() { - distutils-r1_src_prepare - sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" "${FILESDIR}"/${PN}-5.1.3-gentoopath.patch > "${S}"/gentoopath.patch || die - eapply $(prefixify_ro "${S}"/gentoopath.patch) - - pushd ${PN} || die - - sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ - -i Source/cmake/FindROCmSMI.cmake || die - sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ - -i Source/CMakeLists.txt || die - sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on - sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly - - local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" - sed -e "/HipClangVersion/s/0,0,0/$(hipconfig -v)/" -i Common.py || die - - sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" -i ReplacementKernels.py Common.py ${PN}.py || die - - sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die - - popd || die - - sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die -} - -python_install() { - distutils-r1_python_install - - python_moduleinto Tensile - pushd Tensile || die - python_domodule Components - python_newexe Utilities/merge.py ${PN}-merge -} - -src_install() { - distutils-r1_src_install - - pushd ${PN} || die - insinto /usr/share/${PN} - doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels - insinto /usr/$(get_libdir)/cmake/${PN} - doins cmake/*.cmake -} diff --git a/dev-util/Tensile/Tensile-5.4.2-r2.ebuild b/dev-util/Tensile/Tensile-5.4.2-r2.ebuild deleted file mode 100644 index 18cb8b339be7..000000000000 --- a/dev-util/Tensile/Tensile-5.4.2-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools -ROCM_VERSION=${PV} -inherit cmake distutils-r1 llvm prefix rocm - -LLVM_MAX_SLOT=15 - -DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile" -SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="client" -REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )" - -# Not compatible with recent versions of pytest -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - >=dev-cpp/msgpack-cxx-6.0.0 - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-util/hip - >=dev-util/rocm-smi-4.3.0 - llvm-core/clang:${LLVM_MAX_SLOT} -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch - "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch - "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch - "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch -) - -CMAKE_USE_DIR="${S}/${PN}/Source" - -src_prepare() { - distutils-r1_src_prepare - sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \ - "${FILESDIR}"/${PN}-5.4.2-gentoopath.patch > "${S}"/gentoopath.patch || die - eapply $(prefixify_ro "${S}"/gentoopath.patch) - - pushd ${PN} || die - - sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ - -i Source/cmake/FindROCmSMI.cmake || die - sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ - -i Source/CMakeLists.txt || die - sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on - - # ${Tensile_ROOT}/bin does not exists; call command directly - sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die - - local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" - sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die - - sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \ - -i ReplacementKernels.py Common.py ${PN}.py || die - - sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die - - popd || die - - sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die - use client && PATCHES= cmake_src_prepare # do not apply patches again in cmake_src_prepare -} - -src_configure() { - distutils-r1_src_configure - if use client; then - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DTENSILE_USE_MSGPACK=ON - -DTENSILE_USE_LLVM=ON - -DTensile_LIBRARY_FORMAT=msgpack - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - ) - CXX=hipcc cmake_src_configure - fi -} - -src_compile() { - distutils-r1_src_compile - use client && cmake_src_compile -} - -python_install() { - distutils-r1_python_install - - python_moduleinto Tensile - pushd Tensile || die - python_domodule Components - python_newexe Utilities/merge.py ${PN}-merge -} - -src_install() { - distutils-r1_src_install - - pushd ${PN} || die - insinto /usr/share/${PN} - doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels - insinto /usr/$(get_libdir)/cmake/${PN} - doins cmake/*.cmake - - if use client; then - pushd "${BUILD_DIR}" || die - dobin client/tensile_client - fi -} diff --git a/dev-util/Tensile/files/Tensile-5.0.2-fix-arch-parse.patch b/dev-util/Tensile/files/Tensile-5.0.2-fix-arch-parse.patch deleted file mode 100644 index 47bee8819c44..000000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-fix-arch-parse.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: Tensile-rocm-5.0.1/Tensile/Tensile.py -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Tensile.py -+++ Tensile-rocm-5.0.1/Tensile/Tensile.py -@@ -97,7 +97,6 @@ def addCommonArguments(argParser): - """ - - (key, value) = par.split("=") -- value = eval(value) - return (key, value) - - argParser.add_argument("-d", "--device", dest="device", type=int, \ diff --git a/dev-util/Tensile/files/Tensile-5.0.2-gfx1031.patch b/dev-util/Tensile/files/Tensile-5.0.2-gfx1031.patch deleted file mode 100644 index 17925cfd49e0..000000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-gfx1031.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: Tensile-rocm-5.0.1/pytest.ini -=================================================================== ---- Tensile-rocm-5.0.1.orig/pytest.ini -+++ Tensile-rocm-5.0.1/pytest.ini -@@ -87,6 +87,7 @@ markers = - xfail-gfx1011: architecture - xfail-gfx1012: architecture - xfail-gfx1030: architecture -+ xfail-gfx1031: architecture - skip-gfx000: architecture - skip-gfx900: architecture - skip-gfx906: architecture -@@ -96,3 +97,4 @@ markers = - skip-gfx1011: architecture - skip-gfx1012: architecture - skip-gfx1030: architecture -+ skip-gfx1031: architecture -Index: Tensile-rocm-5.0.1/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Common.py -+++ Tensile-rocm-5.0.1/Tensile/Common.py -@@ -198,7 +198,7 @@ globalParameters["MergeFiles"] = True - globalParameters["NumMergedFiles"] = 1 # The number of files that kernels should be split between when merging - - globalParameters["MaxFileName"] = 64 # If a file name would be longer than this, shorten it with a hash. --globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0)] # assembly kernels writer supports these architectures -+globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0),(10,3,1)] # assembly kernels writer supports these architectures - - globalParameters["GenerateManifestAndExit"] = False # Output manifest file with list of expected library objects and exit - globalParameters["NewClient"] = 2 # Old client deprecated: NewClient must be set to 2. -@@ -264,7 +264,7 @@ architectureMap = { - 'gfx906':'vega20', 'gfx906:xnack+':'vega20', 'gfx906:xnack-':'vega20', - 'gfx908':'arcturus','gfx908:xnack+':'arcturus', 'gfx908:xnack-':'arcturus', - 'gfx90a':'aldebaran', 'gfx90a:xnack+':'aldebaran', 'gfx90a:xnack-':'aldebaran', -- 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21' -+ 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', 'gfx1031':'navi22' - } - - def getArchitectureName(gfxName): -Index: Tensile-rocm-5.0.1/Tensile/KernelWriterAssembly.py -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/KernelWriterAssembly.py -+++ Tensile-rocm-5.0.1/Tensile/KernelWriterAssembly.py -@@ -2364,7 +2364,7 @@ class KernelWriterAssembly(KernelWriter) - - # integer i8x4 - elif kernel["ProblemType"]["DataType"].isInt8x4(): -- if self.version == (9,0,6) or self.version == (9,0,8) or self.version == (9,0,10) or self.version == (10,3,0): -+ if self.version == (9,0,6) or self.version == (9,0,8) or self.version == (9,0,10) or self.version == (10,3,0) or self.version == (10,3,1): - for b in range(0, kernel["ThreadTile1"]): - for a in range(0, kernel["ThreadTile0"]): - for iui in range(0, innerUnroll): -Index: Tensile-rocm-5.0.1/Tensile/Source/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Source/CMakeLists.txt -+++ Tensile-rocm-5.0.1/Tensile/Source/CMakeLists.txt -@@ -47,7 +47,7 @@ if(NOT DEFINED CXX_VERSION_STRING) - endif() - - if(CMAKE_CXX_COMPILER STREQUAL "hipcc") -- set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 CACHE STRING "GPU architectures") -+ set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 CACHE STRING "GPU architectures") - else() - set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a CACHE STRING "GPU architectures") - endif() -Index: Tensile-rocm-5.0.1/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -+++ Tensile-rocm-5.0.1/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -@@ -62,7 +62,8 @@ namespace Tensile - gfx1010 = 1010, - gfx1011 = 1011, - gfx1012 = 1012, -- gfx1030 = 1030 -+ gfx1030 = 1030, -+ gfx1031 = 1031 - }; - - AMDGPU(); -Index: Tensile-rocm-5.0.1/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -+++ Tensile-rocm-5.0.1/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -@@ -215,6 +215,7 @@ namespace Tensile - iot::enumCase(io, value, "gfx1011", AMDGPU::Processor::gfx1011); - iot::enumCase(io, value, "gfx1012", AMDGPU::Processor::gfx1012); - iot::enumCase(io, value, "gfx1030", AMDGPU::Processor::gfx1030); -+ iot::enumCase(io, value, "gfx1031", AMDGPU::Processor::gfx1031); - } - }; - } // namespace Serialization -Index: Tensile-rocm-5.0.1/Tensile/Source/lib/source/AMDGPU.cpp -=================================================================== ---- Tensile-rocm-5.0.1.orig/Tensile/Source/lib/source/AMDGPU.cpp -+++ Tensile-rocm-5.0.1/Tensile/Source/lib/source/AMDGPU.cpp -@@ -82,6 +82,8 @@ namespace Tensile - return stream << "gfx1012"; - case AMDGPU::Processor::gfx1030: - return stream << "gfx1030"; -+ case AMDGPU::Processor::gfx1031: -+ return stream << "gfx1031"; - } - return stream; - } diff --git a/dev-util/Tensile/files/Tensile-5.0.2-use-ninja.patch b/dev-util/Tensile/files/Tensile-5.0.2-use-ninja.patch deleted file mode 100644 index 485ec992d808..000000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-use-ninja.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Tensile/ClientExecutable.py b/Tensile/ClientExecutable.py -index ca3809f..2d1d83b 100644 ---- a/Tensile/ClientExecutable.py -+++ b/Tensile/ClientExecutable.py -@@ -36,6 +36,7 @@ class CMakeEnvironment: - - args = ['cmake'] - args += itertools.chain.from_iterable([ ['-D', '{}={}'.format(key, value)] for key,value in self.options.items()]) -+ args += itertools.chain.from_iterable([ ['-G', 'Ninja'], [ '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=ON' ] ]) - args += [self.sourceDir] - - Common.print2(' '.join(args)) -@@ -43,7 +44,7 @@ class CMakeEnvironment: - subprocess.check_call(args, cwd=Common.ensurePath(self.buildDir)) - - def build(self): -- args = ['make', '-j'] -+ args = ['ninja'] - Common.print2(' '.join(args)) - with Common.ClientExecutionLock(): - subprocess.check_call(args, cwd=self.buildDir) diff --git a/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch deleted file mode 100644 index 2f41bf3aa715..000000000000 --- a/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix incorrect path in scripts and CMakeLists, in order to build tensile_client -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt -@@ -56,3 +56,5 @@ endif() - foreach(arch IN LISTS TENSILE_GPU_ARCHS) - target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}") - endforeach(arch) -+ -+target_link_libraries(tensile_client PRIVATE LLVMSupport) -Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -@@ -47,7 +47,7 @@ set(tensile_sources ${tensile_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) -Index: Tensile-rocm-5.0.2/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Common.py -+++ Tensile-rocm-5.0.2/Tensile/Common.py -@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ): - else: - print2(" %24s: %8s (unspecified)" % (key, defaultValue)) - -- globalParameters["ROCmPath"] = "/opt/rocm" -+ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" - if "ROCM_PATH" in os.environ: - globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") - if "TENSILE_ROCM_PATH" in os.environ: -Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py -+++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py -@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat - import io - runScriptFile = io.StringIO() - -- callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary" -+ callCreateLibraryCmd = "TensileCreateLibrary" - - - if globalParameters["MergeFiles"]: -Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py -+++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath, - Selection. - """ - -- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") -+ pythonExePath = "TensileCreateLibrary" - args = [pythonExePath, \ - "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \ - "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \ -Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt -+++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -@@ -135,7 +135,7 @@ set(test_sources ${test_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch deleted file mode 100644 index eda9b0307c52..000000000000 --- a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix incorrect path in scripts and CMakeLists, in order to build tensile_client -=================================================================== -Index: Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.4.2.orig/Tensile/Source/lib/CMakeLists.txt -+++ Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt -@@ -51,7 +51,7 @@ set(tensile_sources ${tensile_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) -Index: Tensile-rocm-5.4.2/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.4.2.orig/Tensile/Common.py -+++ Tensile-rocm-5.4.2/Tensile/Common.py -@@ -1950,7 +1950,7 @@ def assignGlobalParameters( config ): - else: - print2(" %24s: %8s (unspecified)" % (key, defaultValue)) - -- globalParameters["ROCmPath"] = "/opt/rocm" -+ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" - if "ROCM_PATH" in os.environ: - globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") - if "TENSILE_ROCM_PATH" in os.environ: -Index: Tensile-rocm-5.4.2/Tensile/ClientWriter.py -=================================================================== ---- Tensile-rocm-5.4.2.orig/Tensile/ClientWriter.py -+++ Tensile-rocm-5.4.2/Tensile/ClientWriter.py -@@ -180,7 +180,7 @@ def runClient(libraryLogicPath, forBench - def getBuildClientLibraryScript(buildPath, libraryLogicPath): - callCreateLibraryCmd = ["python"] if os.name == "nt" else [] - -- callCreateLibraryCmd += [os.path.join(globalParameters["ScriptPath"] , "bin", "TensileCreateLibrary")] -+ callCreateLibraryCmd += ["TensileCreateLibrary"] - - if globalParameters["MergeFiles"]: - callCreateLibraryCmd += ["--merge-files"] -Index: Tensile-rocm-5.4.2/Tensile/GenerateSummations.py -=================================================================== ---- Tensile-rocm-5.4.2.orig/Tensile/GenerateSummations.py -+++ Tensile-rocm-5.4.2/Tensile/GenerateSummations.py -@@ -59,7 +59,7 @@ def createLibraryForBenchmark(logicPath, - Selection. - """ - -- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") -+ pythonExePath = "TensileCreateLibrary" - args = [pythonExePath, \ - "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \ - "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \ -Index: Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.4.2.orig/HostLibraryTests/CMakeLists.txt -+++ Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt -@@ -139,7 +139,7 @@ set(test_sources ${test_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch b/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch deleted file mode 100644 index 1f703c07c3ec..000000000000 --- a/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch +++ /dev/null @@ -1,88 +0,0 @@ -Index: Tensile-rocm-5.3.3/pytest.ini -=================================================================== ---- Tensile-rocm-5.3.3.orig/pytest.ini -+++ Tensile-rocm-5.3.3/pytest.ini -@@ -88,6 +88,7 @@ markers = - xfail-gfx1011: architecture - xfail-gfx1012: architecture - xfail-gfx1030: architecture -+ xfail-gfx1031: architecture - xfail-gfx1100: architecture - xfail-gfx1101: architecture - xfail-gfx1102: architecture -@@ -100,6 +101,7 @@ markers = - skip-gfx1011: architecture - skip-gfx1012: architecture - skip-gfx1030: architecture -+ skip-gfx1031: architecture - skip-gfx1100: architecture - skip-gfx1101: architecture - skip-gfx1102: architecture -Index: Tensile-rocm-5.3.3/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.3.3.orig/Tensile/Common.py -+++ Tensile-rocm-5.3.3/Tensile/Common.py -@@ -201,7 +201,7 @@ globalParameters["MergeFiles"] = True - globalParameters["NumMergedFiles"] = 1 # The number of files that kernels should be split between when merging - - globalParameters["MaxFileName"] = 64 # If a file name would be longer than this, shorten it with a hash. --globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures -+globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (10,3,1), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures - - globalParameters["GenerateManifestAndExit"] = False # Output manifest file with list of expected library objects and exit - globalParameters["NewClient"] = 2 # Old client deprecated: NewClient must be set to 2. -@@ -271,7 +271,7 @@ architectureMap = { - 'gfx906':'vega20', 'gfx906:xnack+':'vega20', 'gfx906:xnack-':'vega20', - 'gfx908':'arcturus','gfx908:xnack+':'arcturus', 'gfx908:xnack-':'arcturus', - 'gfx90a':'aldebaran', 'gfx90a:xnack+':'aldebaran', 'gfx90a:xnack-':'aldebaran', -- 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', -+ 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', 'gfx1031':'navi22', - 'gfx1100':'navi31', 'gfx1101':'navi32', 'gfx1102':'navi33' - } - -Index: Tensile-rocm-5.3.3/Tensile/Source/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.3.3.orig/Tensile/Source/CMakeLists.txt -+++ Tensile-rocm-5.3.3/Tensile/Source/CMakeLists.txt -@@ -51,7 +51,7 @@ if(NOT DEFINED CXX_VERSION_STRING) - endif() - - if(CMAKE_CXX_COMPILER STREQUAL "hipcc") -- set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") -+ set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") - else() - set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a gfx1010 gfx1011 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") - endif() -Index: Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -=================================================================== ---- Tensile-rocm-5.3.3.orig/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -+++ Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/AMDGPU.hpp -@@ -63,6 +63,7 @@ namespace Tensile - gfx1011 = 1011, - gfx1012 = 1012, - gfx1030 = 1030, -+ gfx1031 = 1031, - gfx1100 = 1100, - gfx1101 = 1101, - gfx1102 = 1102 -@@ -90,6 +91,8 @@ namespace Tensile - return "gfx1012"; - case AMDGPU::Processor::gfx1030: - return "gfx1030"; -+ case AMDGPU::Processor::gfx1031: -+ return "gfx1032"; - case AMDGPU::Processor::gfx1100: - return "gfx1100"; - case AMDGPU::Processor::gfx1101: -Index: Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -=================================================================== ---- Tensile-rocm-5.3.3.orig/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -+++ Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp -@@ -215,6 +215,7 @@ namespace Tensile - iot::enumCase(io, value, "gfx1011", AMDGPU::Processor::gfx1011); - iot::enumCase(io, value, "gfx1012", AMDGPU::Processor::gfx1012); - iot::enumCase(io, value, "gfx1030", AMDGPU::Processor::gfx1030); -+ iot::enumCase(io, value, "gfx1031", AMDGPU::Processor::gfx1031); - iot::enumCase(io, value, "gfx1100", AMDGPU::Processor::gfx1100); - iot::enumCase(io, value, "gfx1101", AMDGPU::Processor::gfx1101); - iot::enumCase(io, value, "gfx1102", AMDGPU::Processor::gfx1102); diff --git a/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch b/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch deleted file mode 100644 index d8ac203781da..000000000000 --- a/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch +++ /dev/null @@ -1,13 +0,0 @@ -Yiyang's original patch for msgpack-cxx-5 adapted to version 6. - ---- a/Tensile/Source/lib/CMakeLists.txt -+++ b/Tensile/Source/lib/CMakeLists.txt -@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK) - endif() - - if(TENSILE_USE_MSGPACK) -- find_package(msgpack REQUIRED) -+ find_package(msgpack-cxx REQUIRED) - target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1) - - if(TARGET msgpackc-cxx) diff --git a/dev-util/fuzz/Manifest b/dev-util/fuzz/Manifest index d2144a0f7533..483049ecac7b 100644 --- a/dev-util/fuzz/Manifest +++ b/dev-util/fuzz/Manifest @@ -1,4 +1,5 @@ +AUX fuzz-0.6-musl.patch 1273 BLAKE2B 6c59fd5a194d2d7c1ce1c7f7f512e00f1d1f1265575229f16704746dfe23dc080da7f558d16ff37a669471ea541f069526f0a27e6900aae72334886e9922ab6b SHA512 7f03b0a2562ae40b93eb307b14854b0837b2efdd029324a73250802d575b9da929ba3691e95e0429e13807330fe9b57cda983dcabce4a97e1e8b73f6ffe92805 DIST fuzz-0.6.tar.gz 54431 BLAKE2B 8f9652fbcf13038e066d9eff5bb803a9bb76ded9c9f18f9c39981e40530a8fa2ef2fa1aa39e6196908046e7c3dc9acab8ef2adea9a9c8ef824635b1c02aae248 SHA512 87a9b103bb37c91937e2bd4667a33f3792c464f8464fe1f35b022d9c01a13255c7228ab80ce0bfac4ccfdab9a25238a5e1add00e9380cbeb24f95b686d18151b DIST fuzz_0.6-7.3.diff.gz 3004 BLAKE2B fbbceb60b58e973ceae6485f26297bd843261db8d80d0988ec08eaf275758d32d5e3c992999543db1e3f1cc546dd881f8fa19b6c027bdb79dc3dad84b8f77ae9 SHA512 aef080a908269d44536071bb6d4a91560d7f357fb2145fc0d0369ea5997fa6a5c1b13b3fc673c370a61add5c76f40df3501f5103f2ac35ddce9662c9345e20af -EBUILD fuzz-0.6-r3.ebuild 735 BLAKE2B 0689c7e9416037eb4671bd2acd23ecfcc7efef61eb8d4c1f051918d8d46e55448310fe14c46caa905c2854f8b827991ad015fbc09ef48abe14b2b464c90ebc7f SHA512 21f8b58d7e85d5ca9b97156f9efc05554cde9566e79c88930ff3dfb2bc23b62ebc0a0e9a4ecb1d47009a2b55265a76c6ebbd4d3a375859bf4d10ded36b384379 +EBUILD fuzz-0.6-r4.ebuild 771 BLAKE2B 39afc1e2a7f4ceec84df8644411cd2fdea8fe0a0b82e859c1f3edac742a85371c7963cf9ce99bfb185546dcf9c750af9bcb5c6aa89b756a2fbf62be7b8b01985 SHA512 17823128d272ad5733fe54a0d4582a01d19cff927374e1603ba5c011c54872fd7aa6bf79f1e91e212698852208959b6afb9a3d9590eb5bd749dbab9e1cd71556 MISC metadata.xml 301 BLAKE2B 61c39ed1a6560b4e9a9970fcf226009c5217e57c9d942461b7daa67da0a919cd5dbb34c78da28254480e92fdf4fda1e96758fab40abd3db1a2276cced1ff5850 SHA512 4dcea2d5fb529eb59f4b9d2ce34d83be0f455ddd1215beef09f74a56d8fe3274c7cf0a40dcff11f4e0509bf27dbf928d14b0d08d2e47a9226af4ba5391b3a635 diff --git a/dev-util/fuzz/files/fuzz-0.6-musl.patch b/dev-util/fuzz/files/fuzz-0.6-musl.patch new file mode 100644 index 000000000000..6783e008a8a6 --- /dev/null +++ b/dev-util/fuzz/files/fuzz-0.6-musl.patch @@ -0,0 +1,34 @@ +Fix missing include on musl, as strcmp is not transitively included +Remove arg-less declaration for non-glibc case: we have POSIX here, +getopt has same prototype in glibc and in musl +https://bugs.gentoo.org/934059 +https://bugs.gentoo.org/944111 +--- a/getopt.c ++++ b/getopt.c +@@ -43,6 +43,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C +--- a/getopt.h ++++ b/getopt.h +@@ -99,14 +99,12 @@ + #define optional_argument 2 + + #if defined (__STDC__) && __STDC__ +-#ifdef __GNU_LIBRARY__ + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ ++/* But in Gentoo we have glibc and musl, and they have same POSIX ++ definition */ + extern int getopt (int argc, char *const *argv, const char *shortopts); +-#else /* not __GNU_LIBRARY__ */ +-extern int getopt (); +-#endif /* __GNU_LIBRARY__ */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); + extern int getopt_long_only (int argc, char *const *argv, diff --git a/dev-util/fuzz/fuzz-0.6-r3.ebuild b/dev-util/fuzz/fuzz-0.6-r3.ebuild deleted file mode 100644 index b5e826d55c10..000000000000 --- a/dev-util/fuzz/fuzz-0.6-r3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Stress-tests programs by giving them random input" -HOMEPAGE="http://fuzz.sourceforge.net/" -DEB_P="${PN}_${PV}" -DEB_PR="7.3" -SRC_URI=" - https://downloads.sourceforge.net/${PN}/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="sys-libs/readline:=" -RDEPEND="${DEPEND}" - -PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff ) - -src_prepare() { - default - tc-export CC - # Clang 16, bug #898764 - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install - dodoc NEWS README ChangeLog AUTHORS -} diff --git a/dev-util/fuzz/fuzz-0.6-r4.ebuild b/dev-util/fuzz/fuzz-0.6-r4.ebuild new file mode 100644 index 000000000000..152195a2ab69 --- /dev/null +++ b/dev-util/fuzz/fuzz-0.6-r4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Stress-tests programs by giving them random input" +HOMEPAGE="http://fuzz.sourceforge.net/" +DEB_P="${PN}_${PV}" +DEB_PR="7.3" +SRC_URI=" + https://downloads.sourceforge.net/${PN}/${P}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/readline:=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${WORKDIR}"/"${DEB_P}-${DEB_PR}.diff" + "${FILESDIR}"/"${P}-musl.patch" +) + +src_prepare() { + default + tc-export CC + # Clang 16, bug #898764 + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install + dodoc NEWS README ChangeLog AUTHORS +} diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest index 981c3bcebcf6..99c6eaccf54f 100644 --- a/dev-util/hip/Manifest +++ b/dev-util/hip/Manifest @@ -1,29 +1,3 @@ -AUX hip-4.2.0-cancel-hcc-header-removal.patch 820 BLAKE2B 544f93864fafe38a0ac2456f6301f8076ea24061bd4fe9a5501a366cca6d46edbb50eaac6c71acb3534579cdd9fa5518a687ac7e6d265926db53f0820fdec0f2 SHA512 3e37b761148cc31f78d6beb6bdff4b472fe4171a496b8f76ecbe82900f1483df690f846e0473ae700127482bcc3787af16bcd6217506e1e9dd1ad019408725a5 -AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306ba4d9799abaaccb9bdab40db3e32dd769b07b3c428a22787231e8819e62cd50a33f549f2d1de32f9528036f1abf400cb SHA512 803aae515ee8e2694e5ba1cf6b5d66c98a9e0abf422479c7f599e8bfa38b027062a40e3e9806fa0057fa89a00d019c93d22f1c1ad78f68f1ac3f9bea5ebd93be -AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e -AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a -AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808 -AUX hip-5.0.2-set-build-id.patch 741 BLAKE2B 9d4668ab770fd1ebc93a19a3ddc2916e8feb69a95e54ceb5955c4a162733b8899d43f906c86b0b994add22ab46969ff18aad03035e6285a6492bc9c1405bce38 SHA512 714b2f8e791f0e30a7af567e430e2bba38473725e0d96e42de0c97a2ba939fd83b2f233eebf03cb8a6a82d10c46cfa5ea869af97f35c02da38924250a19e660a -AUX hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch 1156 BLAKE2B 52ff9a2389533ac213055ff8c1d4359cbd490f64699233a6c97dbb54ea8216d94039b016b9dcdde7a304662b9ca5c444ac889a6491e847b0a701e0b0cc0e4b59 SHA512 0c210ac60929a951ce1210b1f76e2e6966cc411834a350e6d01d1eb20cb862056cec881a00978cdbe5bfc61e53128c1cd09c6138cca9469213a6bbf425b8686d -AUX hip-5.1.3-clang-include-path.patch 564 BLAKE2B 8cdfbd9eba9c5e642a8e85aa269b0e369ef11a90c30771e0b1ef21d1ff1bfbb6d9f27cc03693b22b39347d939a11994ffbe4dd2f9edc5583811fff273c304307 SHA512 e6d8dda10155a6d269435f37bf8d4fa25b503861450d474cc01c21ea582857caa9ed26ca04e513b12708ae60348cd32296aaf39c805ee3f925e7d6590cae658c -AUX hip-5.1.3-correct-sample-install-location.patch 537 BLAKE2B 924010e903cf7a27591930f5533bc41591ea7821b1f5f73bbbe5d5659a78a712699bb3be94ec5e473a0a5e0d11140850f7bb8e00f7775688adaa79deb7f2597f SHA512 91d89d403eef7ba460e648f5415f654601147920a81f650c40928733d5dbb8a99ebc00530052bf22bec67d9d325bde867c08e7d24e1e05b734b9e31a909030f7 -AUX hip-5.1.3-fix-hip_prof_gen.patch 1480 BLAKE2B caa3fa9840a8add5a25daaeb6f26eed9da3fe55686f6343e31b836a0b2e12999cd45d9220469cde036c7914f672b6cc46695fce1bfe4a8d6d35c836cdc14e413 SHA512 a588238cb12dc973acc6513bead68439b10b49214d5dceb81a0498510f79269b79897a02dd9e2ee1ef396a762d49310fd0a406d7f8b6c0e85faeba0f69b1de23 -AUX hip-5.1.3-fno-stack-protector.patch 788 BLAKE2B 8f9d01ceeec2098df4d49e116c140fc5c5833d3bb5270df6b1c649e430256f23d5967c0bd7f767a3395d9af28a4ff6bf574d705df3cd0d13bcecec141695c2e6 SHA512 2c77f951ed0909a258581af383020b15a0ae5014ece325d448ed8f61a4b1ad489b85e4dc13e1aea49288c09931fa569cf68110ebf042bf74755808eabe5ddc1d -AUX hip-5.1.3-llvm-15-noinline-keyword.patch 829 BLAKE2B 39b859e90acacd2eccdd60b690e1d882b63cfa66ff1b12effe447b18de72ffd61dd32983552f9ae39b384c3bbfbbcfd59ff2bb47943c1340bf6c1df5cb7d4075 SHA512 1933e883f84451e8512669572ea03dd25c916c6baeafac27b07e3d4a5e89165952a64afaceade4546e7e2d4473aba9811ac21131f283f9680d35e777ad9659a7 -AUX hip-5.1.3-remove-cmake-doxygen-commands.patch 896 BLAKE2B 35640516bf416760db69b736d72c1e78efdbad8a930d621fdaffd13c5c250f5d80a6975c1e4c368389ce8059aee964c36645f420d0844141d09463637ba0bccb SHA512 b1288e1f4b7553c5bf0fe38a46fbdf269ca5c01fd8e0e225b9454d4916092601d565c57eaf9f716e06fee816e41cb3a948884060551b5a9d71da9b1a050765f9 -AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226 -AUX hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch 7304 BLAKE2B 3fca9d44f706250438f1c3f5d44142e1fa3040336eb9ab8b9e7fc54b9473e11957962a9a93cdb3b6980228fffe1a3fd5dab3f8c972340a83723858c12790c1f8 SHA512 7e54d22b0a0924c79d0b31764586891401d1a39f37380d3809e23a60075baacc55468930c30fa5a8ce64083b274701dbc190f67244822191873ae4f831a7fc33 -AUX hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch 2734 BLAKE2B 5580ae24e854a42837979a1f6e688eb7edcfeee554577f41611941aa69d5a0bf3f1eb1916c4c7b2ba0389fc16efc31b229a9b21dbec3bfcf0cccad20241191a7 SHA512 156f650559fdeb625c15a8b94320f0b422b04b883f84a5e74ef03293420292be25c118df67bba1ae11fca6a1ac7429b0254aa32b963f7e09a7d8d923589009fd -AUX hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch 1866 BLAKE2B 89e377104b0bc383f69c10f894ff28cb8282eeaf042fcb27b03a64b78959c147ef6cd4291aef47a25b616ea2b801363d7a382df4d924ba94fcea7e9ffa1b26f6 SHA512 7f73d7a66adc959ef4dd0dc3540b6db472a3650926f315f4c79761a45e619432107898dc58cb15958be4b36823029ccf91e599760a23fd886429789de586db3b -AUX hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch 8063 BLAKE2B c0b7b83682c13bb21e6a152b8c4c2b003024fd2dfc4f5f59e8b91b3d933bbfa888549c1a4471a29a225400f3d900d47023c3394111d41a3ecf52a48647db1694 SHA512 972a249daf692ce847884821a1205608d9ee2941793c474cb36f435eff2ad52dc7cb4f1a3a48a4037df3d62a6e47db84c86014933c94b4bb9bf7b7b12f31cce1 -AUX hip-5.3.3-correct-ldflag.patch 1196 BLAKE2B 93c0e7e92c898cfa5d39d008f8c18d82b9032d3f865725b59fb4c0fef263c9a7c4108ecca9f406c21411d72781b88fcacbd7b1e50cc6dd5483cbe89a37b9a2fc SHA512 7a81444c6f2b1a70a451b13440235ba14e058f9023abfd56502ad2ba12a00e31970873b92313a7888c3794083d0c011ce8a314b43e835e9fe872ad97de4e758f -AUX hip-5.3.3-disable-Werror.patch 621 BLAKE2B 9bcdec821484ac20343e1352e3c3d5a9297f8e7ab81ed135c5b27f11dd0667c68939fe04157ae8b7dacc5cdcbb6631e0a1b66d6cc2cd796f6322b6ded75055c7 SHA512 799c40b5a2524e166aa674c432c7bfb93c03fe00832680a99cd701b2498cd33c52e5582f9754161173f17048b6ae346a7a5b6d59eddce8696670b1f229858fef -AUX hip-5.3.3-remove-cmake-doxygen-commands.patch 976 BLAKE2B edff02ed7b2371739f1659a93ecad9485045091ec48c6aa018d8fde3a9f4a9a48bdcf0cca660e03b4f3ff0e6c4f019068019407f429913f8c3231cdb252b0464 SHA512 f6835f74fb34cd4a9ea0db693eff6e57c742f6912b29046f7b01b87037c014cdeb38f17dd0a6b90dd823656e2957b2d0bc981eb0c71221994ae455cefc03805b -AUX hip-5.4.3-clang-include.patch 1202 BLAKE2B 49cad27f3c9c4d483678686ac25ea89bc85aa40cdbb222970b8d41b4dee9f769bd203cc2a8ac87e59dc8be8f075439a3be03198d7cb2c7b87a869cf7108ae363 SHA512 9d5b6dec7b48a0ce2fc364f8438029cd077ed84620240e68bf77b97d59b982cc18f58b4fec20312cdff0fcb14aedc80148bd1f0b825404ca87faee89291e8170 -AUX hip-5.4.3-clang-version.patch 2711 BLAKE2B f3aff162d849ef5141f3d5b8727106f5f9bb2100001752939871e38ca6437f174241a72500550c25e9b767578e083c8b78ba2dbe75520f0252a9d1d433b07ef7 SHA512 830d1be097b7e1a97b94d937ed64efe97c8715d4177b887883d02310eaa5de56b05c1623589ff491b599d7e270e1afc680fd5468d0f3f04e8b63ff04a9365946 -AUX hip-5.4.3-correct-ldflag.patch 1173 BLAKE2B 170bc09a606fc2cb0cb5e7bb8615b54537c7a63a8f7651abe62e656f3540cc5713dc60afcc1fd0c5f931846b3e1d164ecb741aa948f14739fd21bb72b6b85a9d SHA512 482e5b12cca61a664e48b7d1f090086a3c88b008ecc012e18891140c8a4c2f236d4b717f8d580d96dd92d15822a555f8bd6c9b4a42c54e144f9d974d83ca3cca -AUX hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch 921 BLAKE2B ab06b3ff6d5b005929c42ec49819c09843ab25c31b5d6248938216ca0471034140d4ac289e9496d40140e9b8f0b04f893eab0491c857bc02ba366b3c91447e92 SHA512 96f0fe6806c914c1fd33b832427703684f495158b64c5e831081ecd421043749adb50cbf65b03c2297f9dabf9fb6a22ea931ac8d74db9c31baac31477e4af873 -AUX hip-5.5.1-disable-Werror.patch 748 BLAKE2B 965af2240c72e22706c5b1ecb414954ba7b63ba7a9d3535fb00ad754d10813a054721e80a47246cbf4dc06d6e98f25c67fc7cbd54cd9187e59ae6e8e7691d2d3 SHA512 4f5decfe61fa26da0b2159bd8874c83ff047bc5c7f2b2f023490a6bc3c97f588ec80df90c731a7c03b8ea1443a88dac9fbde1b46c5ac4f4a8a59ec4b35ef1bde AUX hip-5.7.0-install.patch 576 BLAKE2B b3c5437a81bcc901327ba4ee9419ad77ea94aab3f6df49c1ce581fd5dad9321d7ffe4d81e1991476978690811d748ee8600dbdf9d70151cfdfb348130e18efdc SHA512 28301e939b3dc49c47d5db16d11b580dbedd47796a2765afab2b535fcd005d4a909f54865f044f0bacb0470ca2e29e529d1511c8bf4d037987bc046704e8e9eb AUX hip-5.7.1-disable-stack-protector.patch 771 BLAKE2B 46ea4b48ae32c7e120418fec467fedc7c496fec2c0589c04e4b62a0afe9b7e6b6e9aae8a4502d5772eefc07c5f71d39b37e4a47d1796d7688b1804814a0274da SHA512 30b82c3b8e7403e8098d1d564c94a85cd29fbf0d6fb4d4af26874bbc5ed03477933fb61064d57c2e2c724182b4816598752b38b1bb9f9384685be72a774d81af AUX hip-5.7.1-exec-stack.patch 1136 BLAKE2B b45560c1cd3410ba9340d5dea7fc2ab7167126a3dbcee6fdaa5ccdab6140db8a6ce9c9f588451f77a1cd27154551a4cb00743d7b2ac3dcb6c36e87f2bc182fe1 SHA512 66a6a9518975a9702f365ae6e9b09835ff93cde49209714b4cbb19c375052859ac26f3d4d2b61052280eee93e237f930a4b7b2d837245a7d477e30893ca6a0b4 @@ -44,12 +18,6 @@ AUX hip-test-6.0.2-hipcc-system-install.patch 1912 BLAKE2B a20f5bdaf84d7e22ee790 AUX hip-test-6.1.0-disable-hipKerArgOptimization.patch 943 BLAKE2B 1cfc94f9969d28f64c3b2598916669101f4d5704abec8fedb896f3d26403b273a6acdce5a189380da08174f8a5b679f4c7f3a97e4856c9b683dc68fdd72edb47 SHA512 3cb098d8d672801f394e059540846d541eef38f52da5044e29cac0863b473150a8771c12585ddad1e2e2599c667367529649914779df467f1c5e1dd8acfc13b5 AUX hip-test-6.1.1-fix-musl.patch 5506 BLAKE2B 9f6c97491c76d5194b20e8705a645de170d1234dd1422b1857442c5d1a90d33c726b473d35ce673465e3893cb36f4f2cb1babef5f2140b453234131bb5883193 SHA512 173cdb65c24091548a8ec3c994fc393052ccd582e27a9ffb259bedf6fabf543a0e18aa6a5f5d9fd1541834acee470a1d6d2dc7def88d6b1cbe0c916bbc361a21 AUX hip-test-6.3.0-hipcc-system-install.patch 581 BLAKE2B c84f259404b1eb7cd616b2d1e4c5f1a46b5b56e330707530107eb3d7d744dc087c5100310453f734dcd43b17a38cbbcabea79bcdade64d12f66b2e2657b3ea2e SHA512 7634d8fa62cb8db2ae5db821e09ec9944ae94920d40fead3d780ff61c8efe95e2f972469f2c2997de4a5c3d2807e61da20bd7ba5718ddbe6086c71ec51456ecb -AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d -AUX hipvars-5.3.3.pm 581 BLAKE2B edf0c1df5f7f5c57189c76fbcedec8155072a9f8e2c580d637dcfb557a844e7cc276b754d0fd8f5a9f59d2c5bbcfda6c9ac9951ad16d8a12bb48e74f062987ab SHA512 9fd72b000f59ec25a74ef5965f4affc5e866025424211b4d81fbea979ffba9f08319dde0063c8c835507a1b9db990f8f25eea3a8e2e6d88faceaf34d5dd722cb -AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6 -AUX rocclr-5.3.3-fix-include.patch 6053 BLAKE2B e215cefd0f2895beda0e3c029a24e48f4de5060dcc10ccdcb4fdf8771d78a66c59f8b0cfe69d70eed3a80aea2c30e30b41607e1a43a77f4b322fa264dcb539e9 SHA512 636f3b91e6c509d1b34ae0d6757a830bc796429c56d0458137a51b9bf4c8575126de7b8259d761b44bc5888839cdb349fdb35c192d1e92e9ef39a6f671997113 -AUX rocclr-5.3.3-gcc13.patch 776 BLAKE2B f942628db7c91aff27ba6f0cb96ec857b28f6967806aba88473e11a9ab0b6b6169f12f4a1990131709c74da6635e793fafaf2d0bef9759c8f4f816e9777c966c SHA512 72bafbd708a222f03e8f5a89aaaf3050eff9d15202f759298a50995aeb545238107a5c8e00ff5b4d2ba510dad3f71a4061261b20d7dd958632ebae63c2ccb2ca -DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905 DIST hip-6.1.1.tar.gz 247192 BLAKE2B c40bb483fb61b3037693f456e546046598df7e0dd81a1f1c8d222ab0d9c0752092ce85c8533bd355f883dda5ce1f32f7ff2b2a58cebac50d53e0e7f4d85ca3ae SHA512 3e6162938294a74af51bc2161ada38dc4ba19614e182238f320f2052a9025be6ea413e40f00cb80f4e86696793d6c4431e2417ea798a2330886a3f3e66aedf0d DIST hip-6.1.2.tar.gz 247193 BLAKE2B e343bdf233752e40cdefa0c2bbd56858bbb471155045ae1adcf651ddff2ed40dc7c7069998a35e9b26324fdf1c972e13e1222406bc52ae2591c23a45611864c5 SHA512 771f6494c7ff0ddb7d22193dfdbb3fb9461f6e4be347ecb879bb84c5a01a95fb4c4d3f7a0f039265d5369f6c6a5b66949af7bc91ed220f5e81a5b15ec98a68eb @@ -59,34 +27,13 @@ DIST hip-test-6.1.1.tar.gz 1080605 BLAKE2B 7eddf648be31365479baa0cd4fd1c060a682a DIST hip-test-6.1.2.tar.gz 1080493 BLAKE2B ff501ab92c1d3207e330f5e9630e3300aa52f7c2acfae2173a964a2843952db90eea2b4ecf5db1ec6ba65d7764750b9eae3f2a9641d1a3fc71d5172e3a7264a8 SHA512 09fa4243c8b73ddbe163ff4c60f0f8f4182f1a37071e9747bf95ecdc219ba3a0407bdf1e2391481f537b223565a38f16e918667194666558a469d94f88a1e236 DIST hip-test-6.3.0.tar.gz 1446413 BLAKE2B c24c352eb16fc54099329edd94a88f59270c92d87b12f86ca4728ae0afdefe6b774bb59927d7c9ec74bd291ef3754a676ad446574abc01170dd7bdc3e5fcb084 SHA512 b10a437a1eb7a8caa80234b9f9d21fbd1442e9f5c0d0bcb237c10743f40a40aef2675128c97f9592af256bad08c93fcc3288e4a289a7efcc626302aba77f149f DIST hip-test-6.3.2.tar.gz 1446861 BLAKE2B c82f8b52807bdae7ea32bd85cccaaea8e01fda440c36ef68603c3cac5d31032b10a21e3828702fec556fa8c262797f08cc2395e042d5db8c6ae601968d47ed8a SHA512 aa162ab73e0ef2b739a8652cdd34eb4fbef130d75ac7aaece030263d820ef0abfb124a10692937da529ac523c386ba2b8241c9a205c820b41e6b7090770653e2 -DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca -DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924 -DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a -DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925 DIST rocm-clr-6.3.2.tar.gz 2095677 BLAKE2B 2f1122a2058f8ba358fe48a46473f23c46a5413fef16515f103c21a8ae13bb76522fbe587cb9c9e6e3dd06f968402b6a881391823c80381c0c41072597c845ac SHA512 5bade294dc6fc60bf459bfd7124c354f2b0079167d3c8776a9e3d6d8320bb9b1a2a0770a466987e164994293024bf47de158ba207f077968dfccb7bf20fb884b -DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24 -DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87 -DIST rocm-hip-5.4.3.tar.gz 1195173 BLAKE2B 7452ee7a874bc4703b0d3aaaf9fa2a51e223d5650c65c34982a9981dbe14e8ec70c93d7e70c5ad36a8d02c3d2214fa6a393e20502a01418fb3320d8cfe363feb SHA512 1f4100e114576dcbad83aae453e21ab85cf25bd8a6ada380bb11cfc30e5f92ba903055b7257a099321a84b65adb444dd52b8258e82567f4bc882e65d89369b43 -DIST rocm-hip-5.5.1.tar.gz 1235158 BLAKE2B 2bd675c065fbe054a220f65b30834333d9db91fbd864c408f8ee915f3a511a2f607820562e4d6eacc8e5aa5dc3f8f37fe2b5675c9e89784e61c4a46a9357eef3 SHA512 9d57e96ff1d3eb14300d0809049a32dd8403851c70cd6d94cab8d17206a1210fef8b6f713063b041d35de37ef0ae10319e9d9803c65493a54fb59e66d29c9c4d -DIST rocm-hipamd-5.1.3.tar.gz 331996 BLAKE2B 176121fe199d53c02a0fc407015681c2f08c8a72104738b457581fd81b37d16efb8170a46d687fb85a45242ba8564246cdd5746e78d9b73dd0bdc9b24eb8378c SHA512 daa6f4da97f71a5fd1f79d8c9e5fc43324743aec91362a05fa62e08966397a637d794abc7e14230eccf5f1271f9fac58d1336aaad1f2cded6cd10792845a494b -DIST rocm-hipamd-5.3.3.tar.gz 383179 BLAKE2B 45c4fbf28d639095db3cec0632e1b1d872104b3755bdca818ed37ac46caab399fcd2224330e6ac8df7ab155fb146b6272b3ed2efe00d7358b47f31ca2cb1e4f5 SHA512 34c62d915990b6742a2df9b37b6b2bad09f7383e561009519911095e8b65f6f1d79486f7f9b97fa76d7a9755b59fca5a5dff321d8c8b15fd83f2fd22ce08834c -DIST rocm-hipamd-5.4.3.tar.gz 387070 BLAKE2B c5f30b606227692eea4bf9e35d35bff861648ef44357994996b7f1fb798ffe8b3ccf909bedd47d5486049c9742e426002f2d6636daabc679bae1b70e9ee5e89b SHA512 f2e36ceeca2580fd85f6847dc8320640bd43382bcd584f67362b11580a1d429c36596adbde252967a96d3a2dfc2bdca4d34bd23f5fb0d5e5e73e7844f925b03b -DIST rocm-hipamd-5.5.1.tar.gz 401791 BLAKE2B f6d0ce1ae684b51177a2c7b3d7f885cce48314ed7c76d075983e8ab6f1a15421feb11d0a718ea592c9c015c015d99ff92f892d69bee58a543a7fe0f0d476150f SHA512 c979edf358a87abfeddaee0fe809d65c106b188c5684a1f229af962e5c4505f4108b1d14db160485048806d69cf5811ad330711b84a6c995386adb21916851c5 -DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 -DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f -DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d -DIST rocm-opencl-runtime-5.5.1.tar.gz 991802 BLAKE2B 07d955b4a76b11296259287f5878cadc2438350a3abcdb5bd693c02790ff4c330b1d0a2a87f8de5334b3e3459c26b3fdf695886502ec5d2c373d807c242c8f93 SHA512 06786e818002dc43f64e4b0aaae0a0a2bcdad7acdb4662e1215d43277b107d65fb9a7f7441c31e3378c380cac860b1cd2eaefb5753246beffa4d9c10efced85e -DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b -EBUILD hip-5.1.3-r4.ebuild 6651 BLAKE2B 3cf89c512bb6e60b9a0969b7145f75193cf8265bf73ed197b17788db666416a1b121839a9e2d28bff00092fb632912df35cba273d75c9b1c913856b87ef2b884 SHA512 9c11dc9eae17ff3e96ce131db56117555069eadeae0b1bd8b95c6a62509dccdaecd54119cb906c0604b8f9c77aff6c149da00cb9f32b921f5011d78599c3b19a -EBUILD hip-5.3.3-r3.ebuild 5396 BLAKE2B b9203f303eb0bd7884c21bbaebd859e876704d39862a8e8a7d478f570e541e0678cd8faaa994091c8106db97721cba6fae624c85fd6eeec71054324366a9c103 SHA512 a7f1320eeff282ff1d97f50bc857669a47a0c8ec6b450a674a54ab6d7d8fedcc3d2fe6904e883cda8ab08cc5680467fa2d36be786bb90a130ce65ef8906c7fd9 -EBUILD hip-5.4.3.ebuild 5263 BLAKE2B 96361dfba28db620df7069af9ea42cc7add5e1a81900489428ebf961d51bcf30d8093102777ae0f299755580d360f676f5f2178b38eb843fa8066119429dd488 SHA512 5d04fc1f715044819428a5cebc5061bddc8dc009838ef1d460fa263b2c7e874030db5aa9a19581ca1f7d8f635731e22ed543cb51201cb45552997e4d8d53e1dc -EBUILD hip-5.5.1.ebuild 5269 BLAKE2B 9d23e626dcd85ab20eebf7fcbdd4bd56667564141f5ad57fbfb6d2a3a8b33a5a7008662cde0510f990ca9396effeacc67ff80739a402b6657577a2417f379524 SHA512 df7a300346ebf83eedef34230db52bdf812329781b6c7e7056635c41cb789cca4b87105e0c8d89b316521b2d303b76b699ad50bcde0bfc0bdd0e03e1e931838b -EBUILD hip-5.7.1-r2.ebuild 5452 BLAKE2B 18bc692522628f78517622f7201473aa2230d3e05d86efcbf9c476ebe6fc560d46766494288bb85d3cc2a57b0cdcaa8b68d08dd8ce925a9d6920919cd8851972 SHA512 75ace26f26978b0db3b5fd00402b48e84b363649cfb318a82b7dae54fc529c4d79a5b55a1fb0a5282fbe6e6136d8d264d3a3a3f5607e6395e2f8e892d375954b +EBUILD hip-5.7.1-r2.ebuild 5478 BLAKE2B 0f74b620566350e7e4dbc3be3f1c1a475f961521a2c6e00d254578cc681e174a6614ca0001067887f18c9fbd806adc95c07f4e72408c5e941cb57ef0d1934b0d SHA512 d575b6cb55b4468112b44be981029808d35620b0480709e644f6bd821d240650ecec31fbaedb6270faed8a648b8509b2a571500418171235e6a1874def6e8269 EBUILD hip-6.1.1.ebuild 6720 BLAKE2B 85e752a8d1c409fff2bfed9ea139a9130e4de5c953ceb5a6c1e57f784da42d5326434f72fdf04db4a1592e23b3f7dfc48aaf7738492bfaa50a5a7cac65bf185f SHA512 2567f8f8566289f782c322eb6701ad1bd750150cadd29ea0cd061e184e3ba5fcf4a78550457c6e4b92db9c5743ca40c6e201cbb120fc9f546aa3e7b6e0c26478 EBUILD hip-6.1.2.ebuild 6728 BLAKE2B 2353a8dd93b3bccc1f78119b257209ce4bd53f51ebe07d4867b8df3fab43bd3dfb22f025b216f2b9f37cfdf787f7275c4b8c30e2897d6c1345ff13bd4980049c SHA512 9606245500e1c82bff0b6b0e33eaed4ae2bbc68874af66dc4d27f1830f889c225642f52ab9a565a9bc4720d2a02102389676f44565d49fe0ce5d381cb469ca2b EBUILD hip-6.3.0.ebuild 6901 BLAKE2B ba577f9729928d15c232dcabbd9eb8a4a52e954a46656d012505c853bf8c0fe94bcda4793e1b19b8aefae5b0a9b1b1ba11821f76aa069914268c77cd950fe104 SHA512 b5b17cea0a25aff604c0a5be1487d46aa4e20257b478f1ceb63c702f2dc8709a4e8a63078544f37cead4a40b0efac2ee9eb008ec6dd6837fb4b30fb81175e31e diff --git a/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch b/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch deleted file mode 100644 index 08e0f3a3d4e3..000000000000 --- a/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch +++ /dev/null @@ -1,18 +0,0 @@ -hcc now deprecated by ROCm upstream. They use cmake to delete hcc headers for upgrating hip on other distros, -but Gentoo don't need this and the following code causes sandbox violation (#799257). - -github.com/ROCm-Developer-Tools/HIP/commit/c2adc70d4df3d30ef0db84d47be14b99b01aa340 introduce these lines. - ---- orig/CMakeLists.txt -+++ HIP-rocm-4.2.0/CMakeLists.txt -@@ -333,10 +333,6 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0) - endif() - install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS) - -- # The following two lines will be removed after upstream updation -- install(CODE "MESSAGE(\"Removing ${CMAKE_INSTALL_PREFIX}/include\")") -- install(CODE "file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/include)") -- - install(DIRECTORY include DESTINATION .) - install(DIRECTORY cmake DESTINATION .) - endif() diff --git a/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch b/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch deleted file mode 100644 index 12644828af78..000000000000 --- a/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch +++ /dev/null @@ -1,15 +0,0 @@ -since _IMPORT_PREFIX=/opt/gentoo/usr/lib/hip, INTERFACE_INCLUDE_DIRECTORIES should change - ---- orig/hip-config.cmake.in -+++ HIP-rocm-4.2.0/hip-config.cmake.in -@@ -185,8 +185,8 @@ if(HIP_RUNTIME MATCHES "rocclr") - - if(NOT WIN32) - set_target_properties(hip::device PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" -+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - ) - endif() - endif() diff --git a/dev-util/hip/files/hip-5.0.1-DisableTest.patch b/dev-util/hip/files/hip-5.0.1-DisableTest.patch deleted file mode 100644 index d41b06efc8c9..000000000000 --- a/dev-util/hip/files/hip-5.0.1-DisableTest.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: hipamd-rocm-5.0.1/CMakeLists.txt -=================================================================== ---- hipamd-rocm-5.0.1.orig/CMakeLists.txt -+++ hipamd-rocm-5.0.1/CMakeLists.txt -@@ -503,27 +503,6 @@ endif() - if(NOT WIN32) - set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) - set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}) --if(HIP_PLATFORM STREQUAL "nvidia") -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_INCLUDE_DIR}/hip/" "${HIP_ROOT_DIR}/include/hip/" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_DIR}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --if(${RUN_HIT} EQUAL 0) -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_BIN_DIR}" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --if(HIP_CATCH_TEST EQUAL "1") -- enable_testing() -- set(HIP_PATH ${HIP_ROOT_DIR}) -- add_subdirectory(${HIP_COMMON_DIR}/tests/catch ${PROJECT_BINARY_DIR}/catch) --else() -- if(${RUN_HIT} EQUAL 0) -- set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) -- include(${HIP_COMMON_DIR}/tests/hit/HIT.cmake) -- include(${HIP_COMMON_DIR}/tests/Tests.cmake) -- else() -- message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") -- endif() --endif() - endif() - - ############################# diff --git a/dev-util/hip/files/hip-5.0.1-hip_vector_types.patch b/dev-util/hip/files/hip-5.0.1-hip_vector_types.patch deleted file mode 100644 index 7a1a79b2a936..000000000000 --- a/dev-util/hip/files/hip-5.0.1-hip_vector_types.patch +++ /dev/null @@ -1,11 +0,0 @@ -mitigate compilation error ---- a/include/hip/amd_detail/amd_hip_vector_types.h -+++ b/include/hip/amd_detail/amd_hip_vector_types.h -@@ -45,6 +45,7 @@ THE SOFTWARE. - - #if defined(__cplusplus) - #if !defined(__HIPCC_RTC__) -+ #include - #include - #include - #include diff --git a/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch b/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch deleted file mode 100644 index 81d1bc3b8552..000000000000 --- a/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch +++ /dev/null @@ -1,18 +0,0 @@ -This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which -causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm` -Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820 -=================================================================== ---- HIP-rocm-5.1.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.1.3/bin/hipcc.pl -@@ -703,9 +703,9 @@ if ($HIP_PLATFORM eq "amd") { - - if (not $isWindows and not $compileOnly) { - if ($linkType eq 0) { -- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; -+ $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; - } else { -- $toolArgs = " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 " . ${toolArgs}; -+ $toolArgs = " -Wl,--enable-new-dtags -lamdhip64 " . ${toolArgs}; - } - # To support __fp16 and _Float16, explicitly link with compiler-rt - $HIP_CLANG_BUILTIN_LIB="/opt/gentoo/opt/gentoo/usr/lib/llvm/14/bin/../../../../lib/clang/14.0.6/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; diff --git a/dev-util/hip/files/hip-5.0.2-set-build-id.patch b/dev-util/hip/files/hip-5.0.2-set-build-id.patch deleted file mode 100644 index 21dfadf18b61..000000000000 --- a/dev-util/hip/files/hip-5.0.2-set-build-id.patch +++ /dev/null @@ -1,20 +0,0 @@ -If git is not found, HIP_VERSION_BUILD_ID will not be set, causing bug 853718 -=================================================================== ---- hipamd-rocm-5.0.2.orig/CMakeLists.txt -+++ hipamd-rocm-5.0.2/CMakeLists.txt -@@ -89,6 +89,7 @@ list(GET VERSION_LIST 2 HIP_VERSION_PATC - string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH}) - list(GET VERSION_LIST 0 HIP_VERSION_PATCH) - set(HIP_VERSION_GITDATE 0) -+set(HIP_VERSION_BUILD_ID 0) - - find_package(Git) - -@@ -126,7 +127,6 @@ if(GIT_FOUND) - set(HIP_VERSION_GITHASH ${git_output}) - endif() - -- set(HIP_VERSION_BUILD_ID 0) - set(HIP_VERSION_BUILD_NAME "") - if(NOT DEFINED ENV{HIP_OFFICIAL_BUILD} AND NOT HIP_OFFICIAL_BUILD) - # FIXME: Disabling it for ROCm 5.0 diff --git a/dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch b/dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch deleted file mode 100644 index 14af91f9055b..000000000000 --- a/dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4168c6ded4e54602f6fad8b0a483b20ab7f83cd5 Mon Sep 17 00:00:00 2001 -From: haoyuan2 -Date: Mon, 21 Feb 2022 10:10:04 -0800 -Subject: [PATCH] SWDEV-316128 - HIP surface API support - -remove redundant code in host API - -Change-Id: I8fbf894e858642da4198cc7afd2d2e2f1971e738 -Signed-off-by: YiyangWu ---- - src/hip_surface.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/hip_surface.cpp b/src/hip_surface.cpp -index 831df321..a8e7f71d 100644 ---- a/src/hip_surface.cpp -+++ b/src/hip_surface.cpp -@@ -1,4 +1,4 @@ --/* Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. -+/* Copyright (c) 2015 - 2022 Advanced Micro Devices, Inc. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal -@@ -81,8 +81,6 @@ hipError_t hipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject, - } - - hipError_t ihipDestroySurfaceObject(hipSurfaceObject_t surfaceObject) { -- HIP_INIT_API(hipDestroySurfaceObject, surfaceObject); -- - if (surfaceObject == nullptr) { - return hipSuccess; - } --- -2.34.1 - diff --git a/dev-util/hip/files/hip-5.1.3-clang-include-path.patch b/dev-util/hip/files/hip-5.1.3-clang-include-path.patch deleted file mode 100644 index bf1f2dd32ce5..000000000000 --- a/dev-util/hip/files/hip-5.1.3-clang-include-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -pass HIP_CLANG_INCLUDE_PATH which is determined by clang -print-resource-dir -=================================================================== ---- HIP-rocm-5.1.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.1.3/bin/hipcc.pl -@@ -105,6 +105,7 @@ $ROCM_PATH = $hipvars::ROCM_PATH; - $HIP_VERSION = $hipvars::HIP_VERSION; - $HSA_PATH = $hipvars::HSA_PATH; - $HIP_ROCCLR_HOME = $hipvars::HIP_ROCCLR_HOME; -+$HIP_CLANG_INCLUDE_PATH = $hipvars::HIP_CLANG_INCLUDE_PATH; - - if ($HIP_PLATFORM eq "amd") { - # If using ROCclr runtime, need to find HIP_ROCCLR_HOME diff --git a/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch b/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch deleted file mode 100644 index 57ac5cc3e992..000000000000 --- a/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: hipamd-rocm-5.1.3/packaging/CMakeLists.txt -=================================================================== ---- hipamd-rocm-5.1.3.orig/packaging/CMakeLists.txt -+++ hipamd-rocm-5.1.3/packaging/CMakeLists.txt -@@ -106,7 +106,7 @@ endif() - #End doc files install - - #Begin samples files install --install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION . COMPONENT samples) -+install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DOCDIR}/ COMPONENT samples) - #End samples files install - - #Begin test files install diff --git a/dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch b/dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch deleted file mode 100644 index 05b25e7178fa..000000000000 --- a/dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch +++ /dev/null @@ -1,38 +0,0 @@ -Backported fb5a64025bb0e10173a1ee4f3475db322b74b594 -fix an issue in hip_prof_gen.py with GLenum. -diff --git a/src/hip_prof_gen.py b/src/hip_prof_gen.py -index bd32d5bf..a3071a75 100755 ---- a/src/hip_prof_gen.py -+++ b/src/hip_prof_gen.py -@@ -81,7 +81,7 @@ def filtr_api_args(args_str): - args_str = re.sub(r'\s*,\s*', r',', args_str); - args_str = re.sub(r'\s+', r' ', args_str); - args_str = re.sub(r'\s*(\*+)\s*', r'\1 ', args_str); -- args_str = re.sub(r'(enum|struct) ', '', args_str); -+ args_str = re.sub(r'(\benum|struct) ', '', args_str); - return args_str - - # Normalizing types -@@ -129,7 +129,9 @@ def pointer_ck(arg_type): - m = re.match(r'(.*)\*$', arg_type) - if m: - ptr_type = m.group(1) -- ptr_type = re.sub(r'const ', '', ptr_type) -+ n = re.match(r'(.*)\*\*$', arg_type) -+ if not n: -+ ptr_type = re.sub(r'const ', '', ptr_type) - if ptr_type == 'void': ptr_type = '' - return ptr_type - ############################################################# -@@ -613,7 +615,7 @@ if (len(sys.argv) < 4): - " -p - HIP_INIT_API macro patching mode\n" + - "\n" + - " Example:\n" + -- " $ " + sys.argv[0] + " -v -p -t --priv ./include/hip/amd_detail/hip_runtime_api.h" + -+ " $ " + sys.argv[0] + " -v -p -t --priv ../hip/include/hip/hip_runtime_api.h" + - " ./src ./include/hip/amd_detail/hip_prof_str.h ./include/hip/amd_detail/hip_prof_str.h.new"); - - # API header file given as an argument --- -2.34.1 - diff --git a/dev-util/hip/files/hip-5.1.3-fno-stack-protector.patch b/dev-util/hip/files/hip-5.1.3-fno-stack-protector.patch deleted file mode 100644 index c5957edba734..000000000000 --- a/dev-util/hip/files/hip-5.1.3-fno-stack-protector.patch +++ /dev/null @@ -1,16 +0,0 @@ -Since 1e9b3a08b9243daae1bebd6bac3da939d924df1f /etc/clang/gentoo-hardened.cfg -has -fstack-protector-strong which may cause build issues for HIP programs (bug -#890377) Disable this by adding -fno-stack-protector into c/cxx flags in hipcc. -=================================================================== ---- HIP-rocm-5.3.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.3.3/bin/hipcc.pl -@@ -687,6 +687,9 @@ if ($rdc and !$compileOnly and $HIP_PLAT - # pass-through CPP mode. - - if ($HIP_PLATFORM eq "amd") { -+ # Append -fno-stack-protector due to stack protection for HIP is not supported -+ $HIPCXXFLAGS .= " -fno-stack-protector"; -+ $HIPCFLAGS .= " -fno-stack-protector"; - # Set default optimization level to -O3 for hip-clang. - if ($optArg eq "") { - $HIPCXXFLAGS .= " -O3"; diff --git a/dev-util/hip/files/hip-5.1.3-llvm-15-noinline-keyword.patch b/dev-util/hip/files/hip-5.1.3-llvm-15-noinline-keyword.patch deleted file mode 100644 index de61356a5cc6..000000000000 --- a/dev-util/hip/files/hip-5.1.3-llvm-15-noinline-keyword.patch +++ /dev/null @@ -1,21 +0,0 @@ -LLVM 15 adds __noinline__ as a keyword to match behaviour of GCC 12. - -When this macro is left in, it can cause the expression __attribute__((__noinline__)) to be expanded incorrectly. - -When the __noinline__ keyword is available disable the macro. - -Ref: https://reviews.llvm.org/D124866 - https://bugs.gentoo.org/85712 -=================================================================== ---- a/include/hip/amd_detail/host_defines.h -+++ b/include/hip/amd_detail/host_defines.h -@@ -47,7 +47,9 @@ THE SOFTWARE. - #define __constant__ __attribute__((constant)) - #endif // !__CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__ - -+#if !defined(__has_feature) || !__has_feature(cuda_noinline_keyword) - #define __noinline__ __attribute__((noinline)) -+#endif - #define __forceinline__ inline __attribute__((always_inline)) - - #if __HIP_NO_IMAGE_SUPPORT diff --git a/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch b/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch deleted file mode 100644 index 921452b2ba92..000000000000 --- a/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: hipamd-rocm-5.1.3/packaging/CMakeLists.txt -=================================================================== ---- hipamd-rocm-5.1.3.orig/packaging/CMakeLists.txt -+++ hipamd-rocm-5.1.3/packaging/CMakeLists.txt -@@ -88,16 +88,6 @@ install(FILES ${CMAKE_BINARY_DIR}/includ - DESTINATION include/hip COMPONENT dev) - #End dev files install - --#Begin doc files install --find_program(DOXYGEN_EXE doxygen) --if(DOXYGEN_EXE) -- add_custom_target(build_doxygen ALL -- COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RuntimeAPI/html -- DESTINATION docs/RuntimeAPI COMPONENT doc) --endif() --#End doc files install -- - #Begin samples files install - install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DOCDIR}/ COMPONENT samples) - #End samples files install diff --git a/dev-util/hip/files/hip-5.1.3-rocm-path.patch b/dev-util/hip/files/hip-5.1.3-rocm-path.patch deleted file mode 100644 index 2ce68b733577..000000000000 --- a/dev-util/hip/files/hip-5.1.3-rocm-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -explicitly specify `--rocm-path=/usr` because clang does not list -it among the default paths -=================================================================== ---- HIP-rocm-5.1.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.1.3/bin/hipcc.pl -@@ -696,6 +696,7 @@ if ($HIP_PLATFORM eq "amd") { - - if ($hasHIP) { - if ($DEVICE_LIB_PATH ne "$ROCM_PATH/amdgcn/bitcode") { -+ $HIPCXXFLAGS .= " --rocm-path=\"$ROCM_PATH\""; - $HIPCXXFLAGS .= " --hip-device-lib-path=\"$DEVICE_LIB_PATH\""; - } - $HIPCXXFLAGS .= " -fhip-new-launch-api"; diff --git a/dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch b/dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch deleted file mode 100644 index 9dbfe8a55395..000000000000 --- a/dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 6c12b045bc3c434dd13e74bf124ed54afec668c6 Mon Sep 17 00:00:00 2001 -From: AravindanC -Date: Fri, 26 Aug 2022 15:02:09 -0700 -Subject: [PATCH] SWDEV-352878 - LLVM pkg search directly using find_dep() for - CLANG Include path - -Change-Id: I355e39890757be07de8b9332deca159f35039dfd -Signed-off-by: Yiyang Wu ---- - hip-config.cmake.in | 108 ++++++++++++++++++++++++++------------------ - 1 file changed, 64 insertions(+), 44 deletions(-) - -diff --git a/hip-config.cmake.in b/hip-config.cmake.in -index 89d1224e..67d898d8 100755 ---- a/hip-config.cmake.in -+++ b/hip-config.cmake.in -@@ -147,41 +147,62 @@ if(HIP_COMPILER STREQUAL "clang") - if(NOT HIP_CXX_COMPILER) - set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) - endif() -- if(HIP_CXX_COMPILER MATCHES ".*hipcc" OR HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") -- execute_process(COMMAND ${HIP_CXX_COMPILER} --version -+ -+ # Use HIP_CXX_COMPILER option -print-resource-dir -+ # To fetch the clang include path -+ execute_process( -+ COMMAND ${HIP_CXX_COMPILER} -print-resource-dir -+ OUTPUT_VARIABLE HIP_CLANG_INCLUDE_PATH -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ RESULT_VARIABLE CLANG_INCLUDE_PATH_FETCH_EXIT_CODE) -+ -+ if( NOT "${CLANG_INCLUDE_PATH_FETCH_EXIT_CODE}" STREQUAL "0" ) -+ if(HIP_CXX_COMPILER MATCHES ".*hipcc" OR HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") -+ # IF not successful in fetching HIP_CLANG_INCLUDE_PATH using -+ # HIP_CXX_COMPILER binary command options -print-resource-dir -+ # fallback to old method of getting include by finding HIP_CLANG_ROOT -+ # and from predefined relative path of HIP_CLANG_ROOT -+ execute_process(COMMAND ${HIP_CXX_COMPILER} --version - OUTPUT_STRIP_TRAILING_WHITESPACE - OUTPUT_VARIABLE HIP_CXX_COMPILER_VERSION_OUTPUT) -- # Capture the repo, branch and patch level details of the HIP CXX Compiler. -- # Ex. clang version 13.0.0 (https://github.com/ROCm-Developer-Tools/HIP main 12345 COMMIT_HASH) -- # HIP_CLANG_REPO: https://github.com/ROCm-Developer-Tools/HIP -- # HIP_CLANG_BRANCH: main -- # HIP_CLANG_PATCH_LEVEL: 12345 -- if(${HIP_CXX_COMPILER_VERSION_OUTPUT} MATCHES "clang version [0-9]+\\.[0-9]+\\.[0-9]+ \\(([^ \n]*) ([^ \n]*) ([^ \n]*)") -- set(HIP_CLANG_REPO ${CMAKE_MATCH_1}) -- set(HIP_CLANG_BRANCH ${CMAKE_MATCH_2}) -- set(HIP_CLANG_PATCH_LEVEL ${CMAKE_MATCH_3}) -- endif() -- endif() -- if(HIP_CXX_COMPILER MATCHES ".*hipcc") -- if(HIP_CXX_COMPILER_VERSION_OUTPUT MATCHES "InstalledDir:[ \t]*([^\n]*)") -- get_filename_component(HIP_CLANG_ROOT "${CMAKE_MATCH_1}" DIRECTORY) -- endif() -- elseif (HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") -- get_filename_component(_HIP_CLANG_REAL_PATH "${HIP_CXX_COMPILER}" REALPATH) -- get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) -- get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) -- endif() -- file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) -- find_path(HIP_CLANG_INCLUDE_PATH stddef.h -- HINTS -+ # Capture the repo, branch and patch level details of the HIP CXX Compiler. -+ # Ex. clang version 13.0.0 (https://github.com/ROCm-Developer-Tools/HIP main 12345 COMMIT_HASH) -+ # HIP_CLANG_REPO: https://github.com/ROCm-Developer-Tools/HIP -+ # HIP_CLANG_BRANCH: main -+ # HIP_CLANG_PATCH_LEVEL: 12345 -+ if(${HIP_CXX_COMPILER_VERSION_OUTPUT} MATCHES "clang version [0-9]+\\.[0-9]+\\.[0-9]+ \\(([^ \n]*) ([^ \n]*) ([^ \n]*)") -+ set(HIP_CLANG_REPO ${CMAKE_MATCH_1}) -+ set(HIP_CLANG_BRANCH ${CMAKE_MATCH_2}) -+ set(HIP_CLANG_PATCH_LEVEL ${CMAKE_MATCH_3}) -+ endif() -+ if(HIP_CXX_COMPILER MATCHES ".*hipcc") -+ if(HIP_CXX_COMPILER_VERSION_OUTPUT MATCHES "InstalledDir:[ \t]*([^\n]*)") -+ get_filename_component(HIP_CLANG_ROOT "${CMAKE_MATCH_1}" DIRECTORY) -+ endif() -+ elseif (HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") -+ get_filename_component(_HIP_CLANG_REAL_PATH "${HIP_CXX_COMPILER}" REALPATH) -+ get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) -+ get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) -+ endif() -+ -+ -+ file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) -+ find_path(HIP_CLANG_INCLUDE_PATH stddef.h -+ HINTS - ${HIP_CLANG_INCLUDE_SEARCH_PATHS} -- NO_DEFAULT_PATH) -+ NO_DEFAULT_PATH) -+ # Since INTERFACE_INCLUDE_DIRECTORIES need to set the parent directory -+ # of HIP_CLANG_INCLUDE_PATH incase using find_path() of stddefs.h -+ set(HIP_CLANG_INCLUDE_PATH "${HIP_CLANG_INCLUDE_PATH}/..") -+ endif() # HIP_CXX_COMPILER Check -+ endif() # CLANG_INCLUDE_PATH_FETCH_EXIT_CODE Check -+ - if(NOT WIN32) - find_dependency(AMDDeviceLibs) - endif() - set(AMDGPU_TARGETS "gfx900;gfx906;gfx908;gfx90a;gfx1030" CACHE STRING "AMD GPU targets to compile for") - set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "GPU targets to compile for") --endif() -+endif() # HIP_COMPILER check - - if(NOT WIN32) - find_dependency(amd_comgr) -@@ -263,11 +284,11 @@ if(HIP_COMPILER STREQUAL "clang") - hip_add_interface_link_flags(hip::device --hip-link) - - set_property(TARGET hip::device APPEND PROPERTY -- INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.." -+ INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}" - ) - - set_property(TARGET hip::device APPEND PROPERTY -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.." -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}" - ) - - foreach(GPU_TARGET ${GPU_TARGETS}) -@@ -291,25 +312,24 @@ if(HIP_COMPILER STREQUAL "clang") - endif() - endif() - -- file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*") -- find_library(CLANGRT_BUILTINS -- NAMES -- clang_rt.builtins -- clang_rt.builtins-x86_64 -- PATHS -- ${HIP_CLANGRT_LIB_SEARCH_PATHS} -- ${HIP_CLANG_INCLUDE_PATH}/../lib/linux -- ${HIP_CLANG_INCLUDE_PATH}/../lib/windows -- NO_DEFAULT_PATH) -+ -+ # Use HIP_CXX option -print-libgcc-file-name --rtlib=compiler-rt -+ # To fetch the compiler rt library file name. -+ execute_process( -+ COMMAND ${HIP_CXX_COMPILER} -print-libgcc-file-name --rtlib=compiler-rt -+ OUTPUT_VARIABLE CLANGRT_BUILTINS -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ RESULT_VARIABLE CLANGRT_BUILTINS_FETCH_EXIT_CODE) - - # Add support for __fp16 and _Float16, explicitly link with compiler-rt -- if(NOT CLANGRT_BUILTINS) -- message(FATAL_ERROR "clangrt builtins lib not found") -- else() -+ if( "${CLANGRT_BUILTINS_FETCH_EXIT_CODE}" STREQUAL "0" ) -+ # CLANG_RT Builtins found Successfully Set interface link libraries property - set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") - set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") -- endif() --endif() -+ else() -+ message(STATUS "clangrt builtins lib not found: ${CLANGRT_BUILTINS_FETCH_EXIT_CODE}") -+ endif() # CLANGRT_BUILTINS_FETCH_EXIT_CODE Check -+endif() # HIP_COMPILER Check - - set( hip_LIBRARIES hip::host hip::device) - set( hip_LIBRARY ${hip_LIBRARIES}) --- -2.38.1 - diff --git a/dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch b/dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch deleted file mode 100644 index b9a1329e5931..000000000000 --- a/dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 73430b62a5437d1ba6c36a1d812a1434d1ad9df7 Mon Sep 17 00:00:00 2001 -From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> -Date: Tue, 20 Dec 2022 06:51:12 +0530 -Subject: [PATCH 1/3] SWDEV-344620 - hipcc fails to parse version of clang in - some cases (#3119) - -Change-Id: I46f716c82a7500b9a2bcaf5f9ff4ad8a8f982770 -Signed-off-by: Yiyang Wu ---- - bin/hipcc.pl | 22 +++++++--------------- - 1 file changed, 7 insertions(+), 15 deletions(-) - -diff --git a/bin/hipcc.pl b/bin/hipcc.pl -index 645ae62d..2a01dcc3 100755 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -144,7 +144,7 @@ if ($HIP_PLATFORM eq "amd") { - $execExtension = ""; - if($isWindows) { - $execExtension = ".exe"; -- } -+ } - $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension; - - # If $HIPCC clang++ is not compiled, use clang instead -@@ -157,13 +157,10 @@ if ($HIP_PLATFORM eq "amd") { - $HIPLDFLAGS .= " -fuse-ld=lld"; - $HIPLDFLAGS .= " --ld-path=$HIP_CLANG_PATH/lld-link.exe"; - } -- $HIP_CLANG_VERSION = `$HIPCC --version`; -- $HIP_CLANG_VERSION=~/.*clang version (\S+).*/; -- $HIP_CLANG_VERSION=$1; - -- # Figure out the target with which llvm is configured -- $HIP_CLANG_TARGET = `$HIPCC -print-target-triple`; -- $HIP_CLANG_TARGET = chomp($HIP_CLANG_TARGET); -+ # get Clang RT Builtin path -+ $HIP_CLANG_RT_LIB = `$HIPCC --print-runtime-dir`; -+ chomp($HIP_CLANG_RT_LIB); - - if (! defined $HIP_CLANG_INCLUDE_PATH) { - $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); -@@ -184,7 +181,7 @@ if ($HIP_PLATFORM eq "amd") { - print ("HIP_INCLUDE_PATH=$HIP_INCLUDE_PATH\n"); - print ("HIP_LIB_PATH=$HIP_LIB_PATH\n"); - print ("DEVICE_LIB_PATH=$DEVICE_LIB_PATH\n"); -- print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n"); -+ print ("HIP_CLANG_RT_LIB=$HIP_CLANG_RT_LIB\n"); - } - - if ($isWindows) { -@@ -715,13 +712,8 @@ if ($HIP_PLATFORM eq "amd") { - } else { - $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; - } -- # To support __fp16 and _Float16, explicitly link with compiler-rt -- $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; -- if (-e $HIP_CLANG_BUILTIN_LIB) { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " -- } else { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 " -- } -+ -+ $toolArgs .= " -L$HIP_CLANG_RT_LIB -lclang_rt.builtins-x86_64 " - } - } - --- -2.38.1 - diff --git a/dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch b/dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch deleted file mode 100644 index 6d64ad8c9fd8..000000000000 --- a/dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7613e00fe0299d6584d3ee67e5d4010e7fc0866a Mon Sep 17 00:00:00 2001 -From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> -Date: Fri, 14 Oct 2022 16:02:40 +0530 -Subject: [PATCH 2/3] SWDEV-355608 - Remove clang include path (#2996) - -Clang doesn't need to be told where to find the clang headers - -Change-Id: I175781731c43647676d91eedc8a915124f2479ab -Signed-off-by: Yiyang Wu ---- - bin/hipcc.pl | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/bin/hipcc.pl b/bin/hipcc.pl -index 2a01dcc3..7e82cad8 100755 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -162,9 +162,6 @@ if ($HIP_PLATFORM eq "amd") { - $HIP_CLANG_RT_LIB = `$HIPCC --print-runtime-dir`; - chomp($HIP_CLANG_RT_LIB); - -- if (! defined $HIP_CLANG_INCLUDE_PATH) { -- $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); -- } - if (! defined $HIP_INCLUDE_PATH) { - $HIP_INCLUDE_PATH = "$HIP_PATH/include"; - } -@@ -177,20 +174,12 @@ if ($HIP_PLATFORM eq "amd") { - print ("HIP_ROCCLR_HOME=$HIP_ROCCLR_HOME\n"); - } - print ("HIP_CLANG_PATH=$HIP_CLANG_PATH\n"); -- print ("HIP_CLANG_INCLUDE_PATH=$HIP_CLANG_INCLUDE_PATH\n"); - print ("HIP_INCLUDE_PATH=$HIP_INCLUDE_PATH\n"); - print ("HIP_LIB_PATH=$HIP_LIB_PATH\n"); - print ("DEVICE_LIB_PATH=$DEVICE_LIB_PATH\n"); - print ("HIP_CLANG_RT_LIB=$HIP_CLANG_RT_LIB\n"); - } - -- if ($isWindows) { -- $HIPCXXFLAGS .= " -std=c++14 -fms-extensions -fms-compatibility"; -- } else { -- $HIPCXXFLAGS .= " -std=c++11"; -- } -- $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; -- $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; - $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\""; - if ($isWindows) { - $HIPLDFLAGS .= " -lamdhip64"; --- -2.38.1 - diff --git a/dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch b/dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch deleted file mode 100644 index f92cce4cf8d8..000000000000 --- a/dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch +++ /dev/null @@ -1,173 +0,0 @@ -From fddbcef9a5a45ab63d4805c53d1f8fcf5c30d095 Mon Sep 17 00:00:00 2001 -From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> -Date: Fri, 6 Jan 2023 02:37:15 +0530 -Subject: [PATCH 3/3] SWDEV-352878 - Removed relative path based CLANG include, - CLANGRT dependencies (#3124) - -Change-Id: Ifdcd117679bff548a6351ba915a8272689e647de -Signed-off-by: Yiyang Wu ---- - cmake/FindHIP.cmake | 37 ++++++++++++++++++++++++++++- - hip-lang-config.cmake.in | 51 +++++++++++++++++++++------------------- - 2 files changed, 63 insertions(+), 25 deletions(-) - -diff --git a/cmake/FindHIP.cmake b/cmake/FindHIP.cmake -index 8b196dea..109c9f65 100644 ---- a/cmake/FindHIP.cmake -+++ b/cmake/FindHIP.cmake -@@ -48,6 +48,29 @@ mark_as_advanced(HIP_HOST_COMPILATION_CPP) - # FIND: HIP and associated helper binaries - ############################################################################### - -+if(NOT HIP_CXX_COMPILER) -+ set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) -+endif() -+ -+# Approach: To find HIP_CLANG_PATH using HIP_CXX_COMPILER options -+# Using --version option of HIP_CXX_COMPILER get the Install Directory -+# This install directory is set as the HIP_CLANG_PATH. -+# IF not successful in getting the Install Directory using HIP_CXX_COMPILER -+# fallback to Old Method to find HIP_CLANG_PATH from ENV Vars, ROCMPATH, HIPPATH etc. -+execute_process(COMMAND ${HIP_CXX_COMPILER} --version -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ OUTPUT_VARIABLE HIP_CXX_COMPILER_VERSION_OUTPUT) -+if(HIP_CXX_COMPILER MATCHES ".*hipcc") -+ if(HIP_CXX_COMPILER_VERSION_OUTPUT MATCHES "InstalledDir:[ \t]*([^\n]*)") -+ get_filename_component(HIP_CLANG_INSTALL_DIR "${CMAKE_MATCH_1}" DIRECTORY) -+ endif() -+elseif (HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") -+ get_filename_component(_HIP_CLANG_REAL_PATH "${HIP_CXX_COMPILER}" REALPATH) -+ get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) -+ get_filename_component(HIP_CLANG_INSTALL_DIR "${_HIP_CLANG_BIN_PATH}" DIRECTORY) -+endif() -+ -+ - get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../" REALPATH) - - # HIP is currently not supported for apple -@@ -230,6 +253,10 @@ if("${HIP_COMPILER}" STREQUAL "nvcc") - elseif("${HIP_COMPILER}" STREQUAL "clang") - #Set HIP_CLANG_PATH - if("x${HIP_CLANG_PATH}" STREQUAL "x") -+ # IF HIP_CLANG_INSTALL_DIR is Found -+ if( HIP_CLANG_INSTALL_DIR ) -+ set(HIP_CLANG_PATH ${HIP_CLANG_INSTALL_DIR}) -+ else() # IF HIP_CLANG_INSTALL_DIR is not found - if(DEFINED ENV{HIP_CLANG_PATH}) - set(HIP_CLANG_PATH $ENV{HIP_CLANG_PATH}) - elseif(DEFINED ENV{ROCM_PATH}) -@@ -252,7 +279,9 @@ elseif("${HIP_COMPILER}" STREQUAL "clang") - else() - message(FATAL_ERROR "Unable to find the clang compiler path. Set ROCM_PATH or HIP_PATH in env ") - endif() -- endif() -+ endif() # HIP_CLANG_INSTALL_DIR Check -+ endif() # Set HIP_CLANG_PATH -+ - #Number of parallel jobs by default is 1 - if(NOT DEFINED HIP_CLANG_NUM_PARALLEL_JOBS) - set(HIP_CLANG_NUM_PARALLEL_JOBS 1) -@@ -660,6 +689,10 @@ macro(HIP_ADD_EXECUTABLE hip_target) - endif() - if("${HIP_COMPILER}" STREQUAL "clang") - if("x${HIP_CLANG_PATH}" STREQUAL "x") -+ # IF HIP_CLANG_INSTALL_DIR is Found -+ if( HIP_CLANG_INSTALL_DIR ) -+ set(HIP_CLANG_PATH ${HIP_CLANG_INSTALL_DIR}) -+ else() # IF HIP_CLANG_INSTALL_DIR is not found - if(DEFINED ENV{HIP_CLANG_PATH}) - set(HIP_CLANG_PATH $ENV{HIP_CLANG_PATH}) - elseif(DEFINED ENV{ROCM_PATH}) -@@ -682,7 +715,9 @@ macro(HIP_ADD_EXECUTABLE hip_target) - else() - message(FATAL_ERROR "Unable to find the clang compiler path. Set ROCM_PATH or HIP_PATH in env") - endif() -+ endif() # HIP_CLANG_INSTALL_DIR Check - endif() -+ - set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} -o ") - else() - set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} -o ") -diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in -index 9250a68a..1cf4e40f 100644 ---- a/hip-lang-config.cmake.in -+++ b/hip-lang-config.cmake.in -@@ -70,15 +70,6 @@ get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH) - get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) - - --#need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") --find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h -- HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} -- ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -- NO_DEFAULT_PATH) --get_filename_component(HIP_CLANG_INCLUDE_PATH "${HIP_CLANG_INCLUDE_PATH}" DIRECTORY) -- - #If HIP isnot installed under ROCm, need this to find HSA assuming HSA is under ROCm - if( DEFINED ENV{ROCM_PATH} ) - set(ROCM_PATH "$ENV{ROCM_PATH}") -@@ -96,18 +87,10 @@ if (NOT HSA_HEADER) - message (FATAL_ERROR "HSA header not found! ROCM_PATH environment not set") - endif() - --get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) --file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") --find_library(CLANGRT_BUILTINS -- NAMES -- clang_rt.builtins -- clang_rt.builtins-x86_64 -- PATHS -- ${HIP_CLANGRT_LIB_SEARCH_PATHS} -- ${HIP_CLANG_INCLUDE_PATH}/../lib/linux) -+ - set_target_properties(hip-lang::device PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "$<$:${_IMPORT_PREFIX}/include;${HIP_CLANG_INCLUDE_PATH}>" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$:${_IMPORT_PREFIX}/include;${HIP_CLANG_INCLUDE_PATH}>" -+ INTERFACE_INCLUDE_DIRECTORIES "$<$:${_IMPORT_PREFIX}/include>" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$:${_IMPORT_PREFIX}/include>" - ) - - set_target_properties(hip-lang::amdhip64 PROPERTIES -@@ -133,13 +116,33 @@ set_property(TARGET hip-lang::device APPEND PROPERTY - INTERFACE_LINK_OPTIONS "$<$:--hip-link>" - ) - -+# Approach: Check CLANGRT LIB support for CMAKE_HIP_COMPILER -+# Use CMAKE_HIP_COMPILER option -print-libgcc-file-name --rtlib=compiler-rt -+# Note: For Linux add additional option -unwindlib=libgcc also -+# To fetch the compiler rt library file name and confirm. -+# If unsuccessful in getting clangrt using this option then -+# FATAL_ERROR message send since compiler-rt linkage dependency is mandatory. -+# If successful then --rtlib=compiler-rt (and -unwindlib=libgcc for non windows) -+# added to Target's INTERFACE_LINK_LIBRARIES property -+if (NOT WIN32) -+ set(CLANGRT_LINUX_OPTION "-unwindlib=libgcc") -+endif() -+ -+execute_process( -+ COMMAND ${CMAKE_HIP_COMPILER} -print-libgcc-file-name --rtlib=compiler-rt ${CLANGRT_LINUX_OPTION} -+ OUTPUT_VARIABLE CLANGRT_BUILTINS -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ RESULT_VARIABLE CLANGRT_BUILTINS_FETCH_EXIT_CODE) -+ - # Add support for __fp16 and _Float16, explicitly link with compiler-rt --if(NOT CLANGRT_BUILTINS) -- message(FATAL_ERROR "clangrt builtins lib not found") --else() -+if( "${CLANGRT_BUILTINS_FETCH_EXIT_CODE}" STREQUAL "0" ) - set_property(TARGET hip-lang::device APPEND PROPERTY -- INTERFACE_LINK_LIBRARIES "$<$:${CLANGRT_BUILTINS}>" -+ INTERFACE_LINK_OPTIONS $<$:--rtlib=compiler-rt ${CLANGRT_LINUX_OPTION}> - ) -+else() -+ # FATAL_ERROR send if not successfull on compiler-rt linkage dependency -+ message(FATAL_ERROR -+ "${CMAKE_FIND_PACKAGE_NAME} Error:${CLANGRT_BUILTINS_FETCH_EXIT_CODE} - clangrt builtins lib could not be found.") - endif() - - # Approved by CMake to use this name. This is used so that HIP can --- -2.38.1 - diff --git a/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch deleted file mode 100644 index 20d117841c2b..000000000000 --- a/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch +++ /dev/null @@ -1,20 +0,0 @@ -This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which -causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm` -Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820 -=================================================================== -Index: HIP-rocm-5.3.3/bin/hipcc.pl -=================================================================== ---- HIP-rocm-5.3.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.3.3/bin/hipcc.pl -@@ -711,9 +711,9 @@ if ($HIP_PLATFORM eq "amd") { - - if (not $isWindows and not $compileOnly) { - if ($linkType eq 0) { -- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; -+ $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; - } else { -- $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; -+ $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -lamdhip64 "; - } - # To support __fp16 and _Float16, explicitly link with compiler-rt - $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; diff --git a/dev-util/hip/files/hip-5.3.3-disable-Werror.patch b/dev-util/hip/files/hip-5.3.3-disable-Werror.patch deleted file mode 100644 index bed46bd144f4..000000000000 --- a/dev-util/hip/files/hip-5.3.3-disable-Werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: hipamd-rocm-5.3.3/src/CMakeLists.txt -=================================================================== ---- hipamd-rocm-5.3.3.orig/src/CMakeLists.txt -+++ hipamd-rocm-5.3.3/src/CMakeLists.txt -@@ -44,11 +44,6 @@ if(ADDRESS_SANITIZER) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_LINKER_FLAGS} -Wl,--build-id=sha1") - endif() - --if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") --endif() -- - option(DISABLE_DIRECT_DISPATCH "Disable Direct Dispatch" OFF) - - option(BUILD_SHARED_LIBS "Build the shared library" ON) diff --git a/dev-util/hip/files/hip-5.3.3-remove-cmake-doxygen-commands.patch b/dev-util/hip/files/hip-5.3.3-remove-cmake-doxygen-commands.patch deleted file mode 100644 index c4cd955bed90..000000000000 --- a/dev-util/hip/files/hip-5.3.3-remove-cmake-doxygen-commands.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: hipamd-rocm-5.3.3/packaging/CMakeLists.txt -=================================================================== ---- hipamd-rocm-5.3.3.orig/packaging/CMakeLists.txt -+++ hipamd-rocm-5.3.3/packaging/CMakeLists.txt -@@ -94,16 +94,6 @@ install(FILES ${CMAKE_BINARY_DIR}/.hipVe - install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip COMPONENT dev) - #End dev files install - --#Begin doc files install --find_program(DOXYGEN_EXE doxygen) --if(DOXYGEN_EXE) -- add_custom_target(build_doxygen ALL -- COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RuntimeAPI/html -- DESTINATION ${CMAKE_INSTALL_DOCDIR}/RuntimeAPI COMPONENT doc) --endif() --#End doc files install -- - #Begin samples files install - install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DATADIR}/hip COMPONENT samples) - #End samples files install diff --git a/dev-util/hip/files/hip-5.4.3-clang-include.patch b/dev-util/hip/files/hip-5.4.3-clang-include.patch deleted file mode 100644 index 21b2c5bac8e8..000000000000 --- a/dev-util/hip/files/hip-5.4.3-clang-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/bin/hipcc.pl b/bin/hipcc.pl -index a143983..331881e 100755 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -180,9 +180,6 @@ if ($HIP_PLATFORM eq "amd") { - $HIP_CLANG_RT_LIB = `$HIPCC --print-runtime-dir`; - chomp($HIP_CLANG_RT_LIB); - -- if (! defined $HIP_CLANG_INCLUDE_PATH) { -- $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); -- } - if (! defined $HIP_INCLUDE_PATH) { - $HIP_INCLUDE_PATH = "$HIP_PATH/include"; - } -@@ -195,15 +192,12 @@ if ($HIP_PLATFORM eq "amd") { - print ("HIP_ROCCLR_HOME=$HIP_ROCCLR_HOME\n"); - } - print ("HIP_CLANG_PATH=$HIP_CLANG_PATH\n"); -- print ("HIP_CLANG_INCLUDE_PATH=$HIP_CLANG_INCLUDE_PATH\n"); - print ("HIP_INCLUDE_PATH=$HIP_INCLUDE_PATH\n"); - print ("HIP_LIB_PATH=$HIP_LIB_PATH\n"); - print ("DEVICE_LIB_PATH=$DEVICE_LIB_PATH\n"); - print ("HIP_CLANG_RT_LIB=$HIP_CLANG_RT_LIB\n"); - } - -- $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; -- $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; - $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\""; - if ($isWindows) { - $HIPLDFLAGS .= " -lamdhip64"; diff --git a/dev-util/hip/files/hip-5.4.3-clang-version.patch b/dev-util/hip/files/hip-5.4.3-clang-version.patch deleted file mode 100644 index 88290db66af0..000000000000 --- a/dev-util/hip/files/hip-5.4.3-clang-version.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 73430b62a5437d1ba6c36a1d812a1434d1ad9df7 Mon Sep 17 00:00:00 2001 -From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> -Date: Tue, 20 Dec 2022 06:51:12 +0530 -Subject: [PATCH 1/3] SWDEV-344620 - hipcc fails to parse version of clang in - some cases (#3119) - -Change-Id: I46f716c82a7500b9a2bcaf5f9ff4ad8a8f982770 -Signed-off-by: Yiyang Wu ---- - bin/hipcc.pl | 22 +++++++--------------- - 1 file changed, 7 insertions(+), 15 deletions(-) - -diff --git a/bin/hipcc.pl b/bin/hipcc.pl -index 645ae62d..2a01dcc3 100755 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -144,7 +144,7 @@ if ($HIP_PLATFORM eq "amd") { - $execExtension = ""; - if($isWindows) { - $execExtension = ".exe"; -- } -+ } - $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension; - - # If $HIPCC clang++ is not compiled, use clang instead -@@ -176,13 +176,9 @@ if ($HIP_PLATFORM eq "amd") { - $HIPLDFLAGS .= " -fuse-ld=lld"; - $HIPLDFLAGS .= " --ld-path=$HIP_CLANG_PATH/lld-link.exe"; - } -- $HIP_CLANG_VERSION = `$HIPCC --version`; -- $HIP_CLANG_VERSION=~/.*clang version (\S+).*/; -- $HIP_CLANG_VERSION=$1; -- -- # Figure out the target with which llvm is configured -- $HIP_CLANG_TARGET = `$HIPCC -print-target-triple`; -- chomp($HIP_CLANG_TARGET); -+ # get Clang RT Builtin path -+ $HIP_CLANG_RT_LIB = `$HIPCC --print-runtime-dir`; -+ chomp($HIP_CLANG_RT_LIB); - - if (! defined $HIP_CLANG_INCLUDE_PATH) { - $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); -@@ -184,7 +181,7 @@ if ($HIP_PLATFORM eq "amd") { - print ("HIP_INCLUDE_PATH=$HIP_INCLUDE_PATH\n"); - print ("HIP_LIB_PATH=$HIP_LIB_PATH\n"); - print ("DEVICE_LIB_PATH=$DEVICE_LIB_PATH\n"); -- print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n"); -+ print ("HIP_CLANG_RT_LIB=$HIP_CLANG_RT_LIB\n"); - } - - if ($isWindows) { -@@ -715,13 +712,8 @@ if ($HIP_PLATFORM eq "amd") { - } else { - $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; - } -- # To support __fp16 and _Float16, explicitly link with compiler-rt -- $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; -- if (-e $HIP_CLANG_BUILTIN_LIB) { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " -- } else { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 " -- } -+ -+ $toolArgs .= " -L$HIP_CLANG_RT_LIB -lclang_rt.builtins-x86_64 " - } - } - --- -2.38.1 - diff --git a/dev-util/hip/files/hip-5.4.3-correct-ldflag.patch b/dev-util/hip/files/hip-5.4.3-correct-ldflag.patch deleted file mode 100644 index 3dbbb6721f3b..000000000000 --- a/dev-util/hip/files/hip-5.4.3-correct-ldflag.patch +++ /dev/null @@ -1,20 +0,0 @@ -This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which -causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm` -Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820 -=================================================================== -Index: HIP-rocm-5.3.3/bin/hipcc.pl -=================================================================== ---- HIP-rocm-5.3.3.orig/bin/hipcc.pl -+++ HIP-rocm-5.3.3/bin/hipcc.pl -@@ -711,9 +711,9 @@ if ($HIP_PLATFORM eq "amd") { - - if (not $isWindows and not $compileOnly) { - if ($linkType eq 0) { -- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; -+ $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; - } else { -- $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; -+ $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -lamdhip64 "; - } - # To support __fp16 and _Float16, explicitly link with compiler-rt - $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; diff --git a/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch b/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch deleted file mode 100644 index 28277d9d880c..000000000000 --- a/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 03a7fd2937c146142fa95d22a0ee10df40442788 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu -Date: Sun, 19 Mar 2023 22:32:01 +0800 -Subject: [PATCH] FindHIP.cmake: fix HIP_CLANG_PATH detection via - HIP_CLANG_INSTALL_DIR - ---- - cmake/FindHIP.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindHIP.cmake b/cmake/FindHIP.cmake -index 109c9f65..5dc4c632 100644 ---- a/cmake/FindHIP.cmake -+++ b/cmake/FindHIP.cmake -@@ -255,7 +255,7 @@ elseif("${HIP_COMPILER}" STREQUAL "clang") - if("x${HIP_CLANG_PATH}" STREQUAL "x") - # IF HIP_CLANG_INSTALL_DIR is Found - if( HIP_CLANG_INSTALL_DIR ) -- set(HIP_CLANG_PATH ${HIP_CLANG_INSTALL_DIR}) -+ set(HIP_CLANG_PATH "${HIP_CLANG_INSTALL_DIR}/bin") - else() # IF HIP_CLANG_INSTALL_DIR is not found - if(DEFINED ENV{HIP_CLANG_PATH}) - set(HIP_CLANG_PATH $ENV{HIP_CLANG_PATH}) --- -2.40.0 - diff --git a/dev-util/hip/files/hip-5.5.1-disable-Werror.patch b/dev-util/hip/files/hip-5.5.1-disable-Werror.patch deleted file mode 100644 index ee104644fbda..000000000000 --- a/dev-util/hip/files/hip-5.5.1-disable-Werror.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 619d6a0..c520db0 100644 ---- hipamd-rocm-5.5.1.orig/src/CMakeLists.txt -+++ hipamd-rocm-5.5.1/src/CMakeLists.txt -@@ -44,13 +44,6 @@ if(ADDRESS_SANITIZER) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_LINKER_FLAGS} -Wl,--build-id=sha1") - endif() - --if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations") --endif() -- - option(DISABLE_DIRECT_DISPATCH "Disable Direct Dispatch" OFF) - - option(BUILD_SHARED_LIBS "Build the shared library" ON) diff --git a/dev-util/hip/files/hipvars-5.1.3.pm b/dev-util/hip/files/hipvars-5.1.3.pm deleted file mode 100644 index 7de38b7f3c78..000000000000 --- a/dev-util/hip/files/hipvars-5.1.3.pm +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -w -package hipvars; - -$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@"; -$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@"; - -$isWindows = 0; -$HIP_PATH='/usr'; -$ROCM_PATH='/usr'; -$CUDA_PATH='/opt/cuda'; -$HSA_PATH='/usr'; -$HIP_CLANG_PATH='@CLANG_PATH@'; -$HIP_CLANG_INCLUDE_PATH='@CLANG_INCLUDE_PATH@'; -$HIP_ROCCLR_HOME=$HIP_PATH; -$HIP_PLATFORM='amd'; -$HIP_COMPILER = "clang"; -$HIP_RUNTIME = "rocclr"; -$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR; -$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR; -$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@"; -$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; diff --git a/dev-util/hip/files/hipvars-5.3.3.pm b/dev-util/hip/files/hipvars-5.3.3.pm deleted file mode 100644 index fd1403661efb..000000000000 --- a/dev-util/hip/files/hipvars-5.3.3.pm +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl -w -package hipvars; - -$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@"; -$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@"; - -$isWindows = 0; -$HIP_PATH='/usr'; -$ROCM_PATH='/usr'; -$CUDA_PATH='/opt/cuda'; -$HSA_PATH='/usr'; -$HIP_CLANG_PATH='@CLANG_PATH@'; -$HIP_ROCCLR_HOME=$HIP_PATH; -$HIP_PLATFORM='amd'; -$HIP_COMPILER = "clang"; -$HIP_RUNTIME = "rocclr"; -$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR; -$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR; -$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@"; -$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; diff --git a/dev-util/hip/files/hipvars.pm b/dev-util/hip/files/hipvars.pm deleted file mode 100644 index 4c614080a119..000000000000 --- a/dev-util/hip/files/hipvars.pm +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl -w -package hipvars; - -$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@"; -$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@"; - -$isWindows = 0; -$HIP_PATH='/usr/lib/hip'; -$ROCM_PATH='/usr'; -$CUDA_PATH='/opt/cuda'; -$HSA_PATH='/usr'; -$HIP_CLANG_PATH='/usr/lib/llvm/roc/bin'; -$HIP_ROCCLR_HOME=$HIP_PATH; -$HIP_PLATFORM='amd'; -$HIP_COMPILER = "clang"; -$HIP_RUNTIME = "rocclr"; -$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR; -$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR; -$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@"; -$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; diff --git a/dev-util/hip/files/rocclr-5.3.3-fix-include.patch b/dev-util/hip/files/rocclr-5.3.3-fix-include.patch deleted file mode 100644 index e014fe374bec..000000000000 --- a/dev-util/hip/files/rocclr-5.3.3-fix-include.patch +++ /dev/null @@ -1,218 +0,0 @@ -For https://bugs.gentoo.org/893602 -================================== -From 197ea6f76f34e0b3c8ab46d96c2fa5014e467e37 Mon Sep 17 00:00:00 2001 -From: Maneesh Gupta -Date: Fri, 5 Aug 2022 05:42:39 +0000 -Subject: [PATCH] SWDEV-350289 - Fix build warnings due to file re-org - -Change-Id: I0066fa163b9f25fdde4c5b3baed1ef0654390c06 ---- - device/comgrctx.hpp | 2 +- - device/devkernel.hpp | 2 +- - device/devprogram.hpp | 2 +- - device/rocm/pro/prodevice.cpp | 2 +- - device/rocm/pro/prodriver.hpp | 2 +- - device/rocm/roccounters.hpp | 2 +- - device/rocm/rocdevice.hpp | 8 ++++---- - device/rocm/rocglinterop.hpp | 2 +- - device/rocm/rockernel.cpp | 2 +- - device/rocm/rocprogram.cpp | 2 +- - device/rocm/rocsignal.hpp | 4 ++-- - device/rocm/rocvirtual.cpp | 4 ++-- - device/rocm/rocvirtual.hpp | 8 ++++---- - 13 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/device/comgrctx.hpp b/device/comgrctx.hpp -index d69506e2..31ee24e1 100644 ---- a/device/comgrctx.hpp -+++ b/device/comgrctx.hpp -@@ -23,7 +23,7 @@ - #include - #if defined(USE_COMGR_LIBRARY) - #include "top.hpp" --#include "amd_comgr.h" -+#include "amd_comgr/amd_comgr.h" - - namespace amd { - typedef void (*t_amd_comgr_get_version)(size_t *major, size_t *minor); -diff --git a/device/devkernel.hpp b/device/devkernel.hpp -index 19b3212d..b256abf3 100644 ---- a/device/devkernel.hpp -+++ b/device/devkernel.hpp -@@ -105,7 +105,7 @@ struct RuntimeHandle { - uint32_t group_segment_size; //!< From GROUP_SEGMENT_FIXED_SIZE - }; - --#include "amd_comgr.h" -+#include "amd_comgr/amd_comgr.h" - - // for Code Object V3 - enum class ArgField : uint8_t { -diff --git a/device/devprogram.hpp b/device/devprogram.hpp -index 099d6a37..741d81b0 100644 ---- a/device/devprogram.hpp -+++ b/device/devprogram.hpp -@@ -29,7 +29,7 @@ - #include "devwavelimiter.hpp" - - #if defined(USE_COMGR_LIBRARY) --#include "amd_comgr.h" -+#include "amd_comgr/amd_comgr.h" - #endif // defined(USE_COMGR_LIBRARY) - - namespace amd { -diff --git a/device/rocm/pro/prodevice.cpp b/device/rocm/pro/prodevice.cpp -index a0e49461..1e366cd2 100644 ---- a/device/rocm/pro/prodevice.cpp -+++ b/device/rocm/pro/prodevice.cpp -@@ -20,7 +20,7 @@ - - #ifndef WITHOUT_HSA_BACKEND - --#include "hsa_ext_amd.h" -+#include "hsa/hsa_ext_amd.h" - #include "lnxheaders.h" - #include "prodevice.hpp" - #include "amdgpu_drm.h" -diff --git a/device/rocm/pro/prodriver.hpp b/device/rocm/pro/prodriver.hpp -index bc420697..819ade27 100644 ---- a/device/rocm/pro/prodriver.hpp -+++ b/device/rocm/pro/prodriver.hpp -@@ -23,7 +23,7 @@ - #ifndef WITHOUT_HSA_BACKEND - - #include "top.hpp" --#include "hsa.h" -+#include "hsa/hsa.h" - - /*! \addtogroup HSA - * @{ -diff --git a/device/rocm/roccounters.hpp b/device/rocm/roccounters.hpp -index ffc9fad0..45ebbe66 100644 ---- a/device/rocm/roccounters.hpp -+++ b/device/rocm/roccounters.hpp -@@ -24,7 +24,7 @@ - #include "top.hpp" - #include "device/device.hpp" - #include "device/rocm/rocdevice.hpp" --#include "hsa_ven_amd_aqlprofile.h" -+#include "hsa/hsa_ven_amd_aqlprofile.h" - - namespace roc { - -diff --git a/device/rocm/rocdevice.hpp b/device/rocm/rocdevice.hpp -index d8cb4c6c..44339bb9 100644 ---- a/device/rocm/rocdevice.hpp -+++ b/device/rocm/rocdevice.hpp -@@ -40,10 +40,10 @@ - #include "device/rocm/rocprintf.hpp" - #include "device/rocm/rocglinterop.hpp" - --#include "hsa.h" --#include "hsa_ext_image.h" --#include "hsa_ext_amd.h" --#include "hsa_ven_amd_loader.h" -+#include "hsa/hsa.h" -+#include "hsa/hsa_ext_image.h" -+#include "hsa/hsa_ext_amd.h" -+#include "hsa/hsa_ven_amd_loader.h" - - #include - #include -diff --git a/device/rocm/rocglinterop.hpp b/device/rocm/rocglinterop.hpp -index a539cc6f..588d8a6f 100644 ---- a/device/rocm/rocglinterop.hpp -+++ b/device/rocm/rocglinterop.hpp -@@ -34,7 +34,7 @@ typedef __GLXcontextRec* GLXContext; - - #include "device/rocm/mesa_glinterop.h" - #include "device/rocm/rocregisters.hpp" --#include "hsa_ext_amd.h" -+#include "hsa/hsa_ext_amd.h" - - namespace roc { - -diff --git a/device/rocm/rockernel.cpp b/device/rocm/rockernel.cpp -index 76ab76ad..5624c877 100644 ---- a/device/rocm/rockernel.cpp -+++ b/device/rocm/rockernel.cpp -@@ -19,7 +19,7 @@ - THE SOFTWARE. */ - - #include "rockernel.hpp" --#include "amd_hsa_kernel_code.h" -+#include "hsa/amd_hsa_kernel_code.h" - - #include - -diff --git a/device/rocm/rocprogram.cpp b/device/rocm/rocprogram.cpp -index e4559645..4f77026d 100644 ---- a/device/rocm/rocprogram.cpp -+++ b/device/rocm/rocprogram.cpp -@@ -25,7 +25,7 @@ - #include "utils/options.hpp" - #include "rockernel.hpp" - --#include "amd_hsa_kernel_code.h" -+#include "hsa/amd_hsa_kernel_code.h" - - #include - #include -diff --git a/device/rocm/rocsignal.hpp b/device/rocm/rocsignal.hpp -index 3e8c1e6e..fff310d5 100644 ---- a/device/rocm/rocsignal.hpp -+++ b/device/rocm/rocsignal.hpp -@@ -22,7 +22,7 @@ - - #include "device/devsignal.hpp" - --#include -+#include "hsa/hsa.h" - - namespace roc { - -@@ -44,4 +44,4 @@ public: - } - }; - --}; -\ No newline at end of file -+}; -diff --git a/device/rocm/rocvirtual.cpp b/device/rocm/rocvirtual.cpp -index 63b96378..1b6287e9 100644 ---- a/device/rocm/rocvirtual.cpp -+++ b/device/rocm/rocvirtual.cpp -@@ -33,8 +33,8 @@ - #include "platform/sampler.hpp" - #include "utils/debug.hpp" - #include "os/os.hpp" --#include "amd_hsa_kernel_code.h" --#include "amd_hsa_queue.h" -+#include "hsa/amd_hsa_kernel_code.h" -+#include "hsa/amd_hsa_queue.h" - - #include - #include -diff --git a/device/rocm/rocvirtual.hpp b/device/rocm/rocvirtual.hpp -index 6c738776..1bb0868c 100644 ---- a/device/rocm/rocvirtual.hpp -+++ b/device/rocm/rocvirtual.hpp -@@ -24,11 +24,11 @@ - #include "rocdefs.hpp" - #include "rocdevice.hpp" - #include "utils/util.hpp" --#include "hsa.h" --#include "hsa_ext_image.h" --#include "hsa_ext_amd.h" -+#include "hsa/hsa.h" -+#include "hsa/hsa_ext_image.h" -+#include "hsa/hsa_ext_amd.h" - #include "rocprintf.hpp" --#include "hsa_ven_amd_aqlprofile.h" -+#include "hsa/hsa_ven_amd_aqlprofile.h" - #include "rocsched.hpp" - - namespace roc { --- -2.39.1 - diff --git a/dev-util/hip/files/rocclr-5.3.3-gcc13.patch b/dev-util/hip/files/rocclr-5.3.3-gcc13.patch deleted file mode 100644 index 09e8a95d585b..000000000000 --- a/dev-util/hip/files/rocclr-5.3.3-gcc13.patch +++ /dev/null @@ -1,27 +0,0 @@ -For https://bugs.gentoo.org/895396 -================================== -From ca70cd7c3d63b1036e604116f3b269ca123e7904 Mon Sep 17 00:00:00 2001 -From: Jeremy Newton -Date: Wed, 8 Feb 2023 14:03:58 -0500 -Subject: [PATCH] SWDEV-1 - device: Add missing include - -Newer GCC's seem to require this. - -Change-Id: I85926d4fa552b772f2eb9f8ede7863a546c47f54 -Signed-off-by: Jeremy Newton ---- - device/devhcprintf.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/device/devhcprintf.cpp b/device/devhcprintf.cpp -index b36f7758..a5aba4a4 100644 ---- a/device/devhcprintf.cpp -+++ b/device/devhcprintf.cpp -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/dev-util/hip/hip-5.1.3-r4.ebuild b/dev-util/hip/hip-5.1.3-r4.ebuild deleted file mode 100644 index 61cad03b01bc..000000000000 --- a/dev-util/hip/hip-5.1.3-r4.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm prefix python-any-r1 - -LLVM_MAX_SLOT=15 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz - profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/hipamd/files/8991181/hip_prof_str_diff.gz -> ${P}-update-header.patch.gz - )" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -DEPEND=" - >=dev-util/rocminfo-5 - llvm-core/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - llvm-core/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" -BDEPEND="profile? ( $(python_gen_any_dep ' - dev-python/cppheaderparser[${PYTHON_USEDEP}] - ') ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" - "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" - "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" - "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" - "${FILESDIR}/${PN}-5.1.3-fix-hip_prof_gen.patch" - "${FILESDIR}/${PN}-5.1.3-correct-sample-install-location.patch" - "${FILESDIR}/${PN}-5.1.3-remove-cmake-doxygen-commands.patch" - "${FILESDIR}/${PN}-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-noinline-keyword.patch" -) - -python_check_deps() { - if use profile; then - python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" - fi -} - -S="${WORKDIR}/hipamd-rocm-${PV}" -HIP_S="${WORKDIR}"/HIP-rocm-${PV} -OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} -CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} -RTC_S="${WORKDIR}"/roctracer-rocm-${PV} -DOCS_DIR="${HIP_S}"/docs/doxygen-input -DOCS_CONFIG_NAME=doxy.cfg - -src_prepare() { - cmake_src_prepare - use profile && eapply "${WORKDIR}/${P}-update-header.patch" - - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - local CLANG_RESOURCE_DIR=$("${LLVM_PREFIX}/bin/clang" -print-resource-dir) - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die - - # correct libs and cmake install dir - sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \ - -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die - - sed -e "/\.hip/d" \ - -e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \ - -e "/cmake DESTINATION/d" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die - - pushd ${HIP_S} || die - eapply "${FILESDIR}/${PN}-5.1.3-clang-include-path.patch" - eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - eapply "${FILESDIR}/${PN}-5.0.2-correct-ldflag.patch" - eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -e "/rpath/s,--rpath=[^ ]*,," \ - -e "s,\$HIP_CLANG_PATH/../lib/clang/\$HIP_CLANG_VERSION/,${CLANG_RESOURCE_DIR}/,g" \ - -i bin/hipcc.pl || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.1.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ - -e "s,@CLANG_INCLUDE_PATH@,${CLANG_RESOURCE_DIR}/include," \ - -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die - - sed -e "/HIP_CLANG_INCLUDE_SEARCH_PATHS/s,\${_IMPORT_PREFIX}.*/include,${CLANG_RESOURCE_DIR}/include," -i hip-lang-config.cmake.in || die - popd || die - sed -e "/HIP_CLANG_INCLUDE_SEARCH_PATHS/s,\${HIP_CLANG_ROOT}.*/include,${CLANG_RESOURCE_DIR}/include," -i hip-config.cmake.in || die - - pushd ${CLR_S} || die - eapply "${FILESDIR}/rocclr-5.3.3-fix-include.patch" -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DROCCLR_PATH=${CLR_S} - -DHIP_COMMON_DIR=${HIP_S} - -DAMD_OPENCL_PATH=${OCL_S} - ) - - use profile && mycmakeargs+=( -DPROF_API_HEADER_PATH="${RTC_S}"/inc/ext ) - - cmake_src_configure -} - -src_compile() { - HIP_PATH=${HIP_S} docs_compile - cmake_src_compile -} - -src_install() { - - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # Don't install .hipInfo and .hipVersion to bin/lib - rm "${ED}/usr/lib/.hipInfo" "${ED}/usr/bin/.hipVersion" || die -} diff --git a/dev-util/hip/hip-5.3.3-r3.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild deleted file mode 100644 index 3707718e023c..000000000000 --- a/dev-util/hip/hip-5.3.3-r3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm prefix - -LLVM_MAX_SLOT=15 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug" - -DEPEND=" - >=dev-util/rocminfo-5 - llvm-core/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - llvm-core/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" - "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" - "${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch" - "${FILESDIR}/${PN}-5.3.3-disable-Werror.patch" - "${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch" -) - -S="${WORKDIR}/hipamd-rocm-${PV}" -HIP_S="${WORKDIR}"/HIP-rocm-${PV} -OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} -CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} -RTC_S="${WORKDIR}"/roctracer-rocm-${PV} -DOCS_DIR="${HIP_S}"/docs/doxygen-input -DOCS_CONFIG_NAME=doxy.cfg - -pkg_setup() { - # Ignore QA FLAGS check for library compiled from assembly sources - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libhiprtc-builtins.so.$(ver_cut 1-2)" -} - -src_prepare() { - cmake_src_prepare - - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die - - # correct libs and cmake install dir - sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - - sed -e "/\.hip/d" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die - - pushd ${HIP_S} || die - eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" - eapply "${FILESDIR}/${PN}-5.3.3-correct-ldflag.patch" - - eapply "${FILESDIR}/${PN}-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch" - eapply "${FILESDIR}/${PN}-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch" - eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" - - eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch" - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -e "/rpath/s,--rpath=[^ ]*,," -i bin/hipcc.pl || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.3.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ - -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die - popd || die - - pushd ${CLR_S} || die - eapply "${FILESDIR}/rocclr-${PV}-fix-include.patch" - eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch" -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=0 - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCCLR_PATH=${CLR_S} - -DHIP_COMMON_DIR=${HIP_S} - -DAMD_OPENCL_PATH=${OCL_S} - ) - - cmake_src_configure -} - -src_compile() { - HIP_PATH=${HIP_S} docs_compile - cmake_src_compile -} - -src_install() { - - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # Don't install .hipInfo and .hipVersion to bin/lib - rm "${ED}/usr/bin/.hipVersion" || die -} diff --git a/dev-util/hip/hip-5.4.3.ebuild b/dev-util/hip/hip-5.4.3.ebuild deleted file mode 100644 index 5c00db6e76ab..000000000000 --- a/dev-util/hip/hip-5.4.3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm prefix - -LLVM_MAX_SLOT=15 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug" - -DEPEND=" - >=dev-util/rocminfo-5 - llvm-core/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - llvm-core/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" - "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" - "${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch" - "${FILESDIR}/${PN}-5.3.3-disable-Werror.patch" - "${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch" -) - -S="${WORKDIR}/hipamd-rocm-${PV}" -HIP_S="${WORKDIR}"/HIP-rocm-${PV} -OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} -CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} -RTC_S="${WORKDIR}"/roctracer-rocm-${PV} -DOCS_DIR="${HIP_S}"/docs/doxygen-input -DOCS_CONFIG_NAME=doxy.cfg - -pkg_setup() { - # Ignore QA FLAGS check for library compiled from assembly sources - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libhiprtc-builtins.so.$(ver_cut 1-2)" -} - -src_prepare() { - cmake_src_prepare - - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die - - # correct libs and cmake install dir - sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - - sed -e "/\.hip/d" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die - - pushd ${HIP_S} || die - eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" - eapply "${FILESDIR}/${PN}-5.4.3-correct-ldflag.patch" - eapply "${FILESDIR}/${PN}-5.4.3-clang-version.patch" - eapply "${FILESDIR}/${PN}-5.4.3-clang-include.patch" - eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" - eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch" - - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -e "/rpath/s,--rpath=[^ ]*,," -i bin/hipcc.pl || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.3.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ - -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die - popd || die - - pushd ${CLR_S} || die - eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch" -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=0 - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCCLR_PATH=${CLR_S} - -DHIP_COMMON_DIR=${HIP_S} - -DAMD_OPENCL_PATH=${OCL_S} - ) - - cmake_src_configure -} - -src_compile() { - HIP_PATH=${HIP_S} docs_compile - cmake_src_compile -} - -src_install() { - - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # Don't install .hipInfo and .hipVersion to bin/lib - rm "${ED}/usr/bin/.hipVersion" || die -} diff --git a/dev-util/hip/hip-5.5.1.ebuild b/dev-util/hip/hip-5.5.1.ebuild deleted file mode 100644 index 893662d543e2..000000000000 --- a/dev-util/hip/hip-5.5.1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm prefix - -LLVM_MAX_SLOT=16 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug" - -DEPEND=" - >=dev-util/rocminfo-5 - llvm-core/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - llvm-core/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" - "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" - "${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch" - "${FILESDIR}/${PN}-5.5.1-disable-Werror.patch" - # "${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch" -) - -S="${WORKDIR}/hipamd-rocm-${PV}" -HIP_S="${WORKDIR}"/HIP-rocm-${PV} -OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} -CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} -RTC_S="${WORKDIR}"/roctracer-rocm-${PV} -DOCS_DIR="${HIP_S}"/docs/doxygen-input -DOCS_CONFIG_NAME=doxy.cfg - -pkg_setup() { - # Ignore QA FLAGS check for library compiled from assembly sources - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libhiprtc-builtins.so.$(ver_cut 1-2)" -} - -src_prepare() { - cmake_src_prepare - - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die - - # correct libs and cmake install dir - sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - - sed -e "/\.hip/d" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die - - pushd ${HIP_S} || die - eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" - #eapply "${FILESDIR}/${PN}-5.4.3-correct-ldflag.patch" - #eapply "${FILESDIR}/${PN}-5.4.3-clang-version.patch" - #eapply "${FILESDIR}/${PN}-5.4.3-clang-include.patch" - #eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" - eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch" - - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -e "/rpath/s,--rpath=[^ ]*,," -i bin/hipcc.pl || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.3.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ - -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die - popd || die - - pushd ${CLR_S} || die - eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch" -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=0 - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCCLR_PATH=${CLR_S} - -DHIP_COMMON_DIR=${HIP_S} - -DAMD_OPENCL_PATH=${OCL_S} - ) - - cmake_src_configure -} - -src_compile() { - HIP_PATH=${HIP_S} docs_compile - cmake_src_compile -} - -src_install() { - - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # Don't install .hipInfo and .hipVersion to bin/lib - rm "${ED}/usr/bin/.hipVersion" || die -} diff --git a/dev-util/hip/hip-5.7.1-r2.ebuild b/dev-util/hip/hip-5.7.1-r2.ebuild index 2ccbcd019d56..c0fd94adbde2 100644 --- a/dev-util/hip/hip-5.7.1-r2.ebuild +++ b/dev-util/hip/hip-5.7.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,10 +27,11 @@ RESTRICT="!test? ( test )" IUSE="debug test" DEPEND=" - >=dev-util/rocminfo-5 + =dev-util/rocminfo-5* llvm-core/clang:${LLVM_MAX_SLOT} dev-libs/rocm-comgr:${SLOT} >=dev-libs/rocr-runtime-5.6 + "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die - - # remove bundled harfbuzz - rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz" -} diff --git a/dev-util/idea-community/idea-community-2024.3.3.ebuild b/dev-util/idea-community/idea-community-2024.3.3.ebuild new file mode 100644 index 000000000000..41f034fdb482 --- /dev/null +++ b/dev-util/idea-community/idea-community-2024.3.3.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop wrapper + +MY_PV=$(ver_cut 1-3) + +DESCRIPTION="A complete toolset for web, mobile and enterprise development" +HOMEPAGE="https://www.jetbrains.com/idea" + +SRC_URI=" + amd64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}.tar.gz -> ${P}-amd64.tar.gz ) + arm64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}-aarch64.tar.gz -> ${P}-aarch64.tar.gz ) + " + +S="${WORKDIR}/idea-IC-${PV}" +LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 + codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 + GPL-2 GPL-2-with-classpath-exception ISC + JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT + MPL-1.0 MPL-1.1 OFL-1.1 ZLIB" + +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="experimental wayland" +REQUIRED_USE="experimental? ( wayland )" + +DEPEND=" + || ( + >=dev-java/openjdk-17.0.8.1_p1:17 + >=dev-java/openjdk-bin-17.0.8.1_p1:17 + )" + +RDEPEND="${DEPEND} + sys-libs/glibc + media-libs/harfbuzz + dev-java/jansi-native + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXrender + media-libs/freetype + x11-libs/libXext + dev-libs/wayland + x11-libs/libXi + x11-libs/libXtst + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXrandr + media-libs/alsa-lib + app-accessibility/at-spi2-core + x11-libs/cairo + net-print/cups + x11-libs/libdrm + media-libs/mesa + dev-libs/nspr + dev-libs/nss + dev-libs/libdbusmenu + x11-libs/libxkbcommon + x11-libs/libXcursor + x11-libs/pango" + +QA_PREBUILT="opt/${PN}/*" + +BDEPEND="dev-util/patchelf" +RESTRICT="splitdebug" + +src_unpack() { + + default_src_unpack + if [ ! -d "$S" ]; then + einfo "Renaming source directory to predictable name..." + mv $(ls "${WORKDIR}") "idea-IC-${PV}" || die + fi +} + +src_prepare() { + + default_src_prepare + + if use amd64; then + JRE_DIR=jre64 + rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so + else + JRE_DIR=jre + rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-x86-64/libquiche.so + fi + + PLUGIN_DIR="${S}/${JRE_DIR}/lib/" + + # rm LLDBFrontEnd after licensing questions with Gentoo License Team + rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend + rm -vf ${PLUGIN_DIR}/libavplugin* + rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* + rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le + rm -vf "${S}"/bin/libdbm64* + rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so + + if [[ -d "${S}"/"${JRE_DIR}" ]]; then + for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so} + do + if [[ -f "$file" ]]; then + patchelf --set-rpath '$ORIGIN' $file || die + fi + done + fi + + rm -vf "${S}"/lib/pty4j-native/linux/x86-64/libpty.so + + sed -i \ + -e "\$a\\\\" \ + -e "\$a#-----------------------------------------------------------------------" \ + -e "\$a# Disable automatic updates as these are handled through Gentoo's" \ + -e "\$a# package manager. See bug #704494" \ + -e "\$a#-----------------------------------------------------------------------" \ + -e "\$aide.no.platform.update=Gentoo" bin/idea.properties + + patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die + patchelf --set-rpath '$ORIGIN' "jbr/lib/libcef.so" || die + patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die + + if ! use elibc_musl; then + rm plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release + fi + + eapply_user +} + +src_install() { + local dir="/opt/${PN}" + local dst="${D}${dir}" + + insinto "${dir}" + doins -r * + fperms 755 "${dir}"/bin/{format.sh,idea,idea.sh,inspect.sh,restarter,fsnotifier} + + if [[ -d jbr ]]; then + fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver} + + # Fix #763582 + fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper} + fi + + if use amd64; then + JRE_DIR=jre + JRE_DIR=jre + fi + + JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200" + if [[ -d ${JRE_DIR} ]]; then + for jrebin in $JRE_BINARIES; do + fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}" + done + fi + + # bundled script is always lowercase, and doesn't have -ultimate, -professional suffix. + local bundled_script_name="${PN%-*}.sh" + make_wrapper "${PN}" "${dir}/bin/$bundled_script_name" || die + + local pngfile="$(find ${dst}/bin -maxdepth 1 -iname '*.png')" + newicon $pngfile "${PN}.png" || die "we died" + + if use experimental; then + make_desktop_entry "/opt/idea-community/bin/idea -Dawt.toolkit.name=WLToolkit" \ + "IntelliJ Idea Community Edition" "${PN}" "Development;IDE;" + + ewarn "You have enabled the experimental USE flag." + ewarn "This is a Wayland support preview. Expect instability." + else + make_desktop_entry "/opt/idea-community/bin/idea" \ + "IntelliJ Idea Community Edition" "${PN}" "Development;IDE;" + fi + + # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit + mkdir -p "${D}/etc/sysctl.d/" || die + echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die + + # remove bundled harfbuzz + rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz" +} diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest index 642cee1a12d3..193a64c30b97 100644 --- a/dev-util/rocm-smi/Manifest +++ b/dev-util/rocm-smi/Manifest @@ -1,4 +1,3 @@ -AUX rocm-smi-5.0.2-gcc12-memcpy.patch 605 BLAKE2B 8dcf4c74b9f1ccf832d71cc8b54d50aa1c7c2978bd70c359875548b753bcf52b54bfefe30b34aecc211499c9b46a9b0e62661ef8725c1c1ef3cde81da669b581 SHA512 7a39dcae0fd99fc82b92fca0a9080d42f9378065f120712132a42841ed67c056ff469e3b13760181f5d96861c1169fe8c6f0426e5351e5b67d6439605a11c41f AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc AUX rocm-smi-5.4.2-fix-readonly-object.patch 667 BLAKE2B aa29f949c4c5b4a0e09a3345f99d9b6e22820b75f7e53cc8cbad14ae808714a7faa93f5aabb152df2cee7e0b6415a74160c7d7f0bdb6aaf7b50646afda207def SHA512 fb6f5229f0e77fab327812712f8a6f00a04dd46d2ddad0564326be8292ea1ec245c62d549da905e0511f3bfe2d34c6434c6955896e1720d3beabfea9284c97d5 AUX rocm-smi-5.7.1-no-strip.patch 1405 BLAKE2B 703eafdfe552afe3d2d4d67af2e847b42669b09b8b553b7a77e46f39f3a960174380187f5927b3a4c686dded54b4d9fa6be6c5c862ea2a023bf84224de3be5b6 SHA512 60806893c6ae7fe4c66ae927528f0db13c75f74c464885a251ac5e021bf61aaa5f529cca3de72c9c49dd993375039e0052bbccb4c3065a17849852c9283e20c5 @@ -8,13 +7,10 @@ AUX rocm-smi-6.0.2-set-soversion.patch 7897 BLAKE2B 3b18e771001c651b1ab4cb041b7e AUX rocm-smi-6.1.1-fix-const-qualifier.patch 517 BLAKE2B d5a35233910380d6a5bb7931bc7861efb22254ce33f4f015ae27d44bef7afa13b5e66afbe5c33dce228a95bb3d82783d3e95570f0a0ec77f6043c69bfe828bf1 SHA512 03c06d0fc663b9e5c57f970596444cf851047c40c5a2511fa5d1c1d196f20ddcfec013bdf6d7789cb62ec60d858abeac69a35b57784de4dfc92bfb8e4131d5e0 AUX rocm-smi-6.3.0-fix-flags.patch 1363 BLAKE2B 0661f020eaef8afb13223d8a0ea853cd3e9f0e22c98c01638a2aa30518310d24a069670632d4494e84cfc735dac2b06f0fc515e4d3e5b576e68bffe4498b225c SHA512 91523dc9d3250bafc1c3d1d1a5e68d50765956885fa821b6a37ff6a53f3cc7b5bb3515d1d5b44a79ec34e18af625d3e93749dd6e57ac1ec16d578f4668b404ce AUX rocm-smi-6.3.0-set-soversion.patch 4811 BLAKE2B 4522a4b40e474d0d8dc2740b82670fa8e7ea404308158f7cffeed21fffe281ebb407b3d8412f0c9a0e0c189a7fd3e7ee3ecd183ab36e8d32264dc2e393afb011 SHA512 ad18a6147e4da0034e409791026a382951247997cc3a0551df08bac431744809940ef45cf274e4419bbdf12fe5ec8b4082054be587f402a7c6731c77750a38b2 -DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8 DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d DIST rocm-smi-6.1.1.tar.gz 872628 BLAKE2B 35830fd0eb36688b3803bed2059f29ba4d8613112ae4cfff2e0a3b1d7afef9f0d77ec16771e2205ba351df0aa678c3b0d2436940b76d10d020f1a30d14d760e9 SHA512 3e31ff0d94e7f0ea650c985973b27107e3f7293b92857fbf2fe196b61632c530e95c3228ad7550d44f8ee9f5f1abfd17e5c2b19164759728fb6d4b0995455fa7 DIST rocm-smi-6.3.0.tar.gz 902989 BLAKE2B d17a60fd7ea39b2a18828891f50f22efe6a3f875d4f68efd204c49e1f761c690420218852464856f80a6a82eb68cae58c0cb0353c277a621a0a037b1d1a14055 SHA512 2e5079f8387872c126908211f2ceea1d5ba6e4e3e7dc487c1e45387f57e158b0e3ea071cbeaba2f8ffdf70fc6708c33fa19305812e81dbe13335bd7c99638b0e DIST rocm-smi-6.3.2.tar.gz 902982 BLAKE2B 8b9f544d7ab66a8728f8e8fa0e217e2177fc8666c5cce47cdd59246c2309feedb63f59894fa53d5433acd462e5274826d411d5b052f6f61291e76516d3bf4dd5 SHA512 bdd7825a1147452cc9927d446cfb1f10ffa34fb63bdbb842e8e0f6a2126c3a2855e5bca2e6663c103f4b13d46656190b14d13aee3cf1a2f967f72305f15ce338 -EBUILD rocm-smi-5.4.2-r1.ebuild 1507 BLAKE2B 76ea13792d19af4ed76e6ddf11fa45b91a1cf20b4d13dcc14307f6829d0d03ee2a37901aa07ef6b3091adeb1c4e2e5c7a2a25267ce181718208f0d249845618d SHA512 d84c0feaf23ec2d098b45db3e128fb840677d75a0bcef59046b544efc588e7ad7c3b97f6b4d38aa98088428e856cd28438686684e8db89c1d739d5ecbec71a2a -EBUILD rocm-smi-5.7.1-r2.ebuild 1604 BLAKE2B 213d8d92f900537d4b84b419deca531a8b29bbb9d4ce3a6e64368b789aa341af02d8d5a2417acdc5267e370f16cd9b08a98f24156ce5ae93cae3bb648721b77d SHA512 3ad7dc560bad8eae69e3d78cff802f5a00a3984524bf94a7fab8491a1c043691deb61fe02f41b060caf834dd7210442471a72771b96162e7ff643e7ef918ec55 EBUILD rocm-smi-5.7.1-r3.ebuild 1657 BLAKE2B cdd28775af1bf308376a951f46ae70e9f2d7d1b5cb7ee9854c6b6d96aa24cc2964c2f793b1a75b8fd7f9903aefaf493e2913e3681e4a94cb3f2a32cc2e5a9abe SHA512 bd64d50bf9247c1de26808b92374310bc9e9001a62a7277ed1808f8f52bcc509c52120de34e665487552b8f9bee16edab597f67627f3697711c974c7e83528bd EBUILD rocm-smi-6.1.1.ebuild 1479 BLAKE2B 56815b93b97e4e20f0405ce35467b10d8d8c5813044d995f94da8dcff468af8deb17f6cca2ce43cefdf4bdb63baceb4be64c284d5d4862ea03ad076bc6a974c4 SHA512 3627f49d454a34295ed75031f4480e5cb7758a57a641495b8c1abb19139e307db4a3b72c4e7302550817e02899f28c3fee481cd0a3e058fde473375e12810e77 EBUILD rocm-smi-6.3.0.ebuild 1555 BLAKE2B dfbd2841e2f920d88d88a3c9e94ae1244bd27896702aaed33a9a9941e64d81bfb8bf5f15136808391a4c6b80bc844ff47226fd650123c2b108cc3c4ea526b75a SHA512 351520525786b06f9627a46fc01d785909fe718ad62550d50957e0f470e7a2cc0646f89560c6174cad5981fd8fc1c2ecb6ffed981b00572290ed96b936f9c32e diff --git a/dev-util/rocm-smi/files/rocm-smi-5.0.2-gcc12-memcpy.patch b/dev-util/rocm-smi/files/rocm-smi-5.0.2-gcc12-memcpy.patch deleted file mode 100644 index 981efc14c23e..000000000000 --- a/dev-util/rocm-smi/files/rocm-smi-5.0.2-gcc12-memcpy.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/RadeonOpenCompute/rocm_smi_lib/pull/107 -https://bugs.gentoo.org/840149 - -From 447bf22557c875ca7d26a72d20561feb607ed300 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= -Date: Fri, 13 May 2022 11:33:11 +0200 -Subject: [PATCH] Add missing string header for memcpy - ---- a/src/rocm_smi_gpu_metrics.cc -+++ b/src/rocm_smi_gpu_metrics.cc -@@ -53,6 +53,7 @@ - #include // NOLINT - #include - #include -+#include - - #include "rocm_smi/rocm_smi_common.h" // Should go before rocm_smi.h - #include "rocm_smi/rocm_smi_main.h" - diff --git a/dev-util/rocm-smi/rocm-smi-5.4.2-r1.ebuild b/dev-util/rocm-smi/rocm-smi-5.4.2-r1.ebuild deleted file mode 100644 index e77f370cd678..000000000000 --- a/dev-util/rocm-smi/rocm-smi-5.4.2-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib" - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="" -RDEPEND="${PYTHON_DEPS}" -BDEPEND="" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch - "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch - "${FILESDIR}"/${PN}-5.4.2-fix-readonly-object.patch -) - -src_prepare() { - sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die - sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \ - -i python_smi_tools/rsmiBindings.py || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py -} diff --git a/dev-util/rocm-smi/rocm-smi-5.7.1-r2.ebuild b/dev-util/rocm-smi/rocm-smi-5.7.1-r2.ebuild deleted file mode 100644 index ddbcbee3ba91..000000000000 --- a/dev-util/rocm-smi/rocm-smi-5.7.1-r2.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 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-r1 - -DESCRIPTION="ROCm System Management Interface Library" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib" - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" -fi - -LICENSE="MIT NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" - -S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.7.1-set-soversion.patch - "${FILESDIR}"/${PN}-5.7.1-no-strip.patch - "${FILESDIR}"/${PN}-5.7.1-remove-example.patch - "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch -) - -src_prepare() { - cmake_src_prepare - - sed "s/\${PKG_VERSION_STR}/${PV}/" -i CMakeLists.txt || die - sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/ ; s/@VERSION_MINOR@/$(ver_cut 2)/" \ - -i oam/CMakeLists.txt -i rocm_smi/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi - python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py - - mv "${ED}"/usr/share/doc/rocm_smi "${ED}"/usr/share/doc/${PF} || die -} diff --git a/dev-util/rocm_bandwidth_test/Manifest b/dev-util/rocm_bandwidth_test/Manifest index a83773887a6e..d4058b278309 100644 --- a/dev-util/rocm_bandwidth_test/Manifest +++ b/dev-util/rocm_bandwidth_test/Manifest @@ -1,10 +1,6 @@ -DIST rocm_bandwidth_test-5.3.3.tar.gz 38681 BLAKE2B 02a09ae869b507ad117e40e2daadd6e2acb2a365b12e5f601a4c8d6e55d3fb51de32feef9122bd532700b46843310ed83088842728a814f55695a3572e83d1d1 SHA512 155480284cdd1b0e42c62ab49f536ef12f2b9cbfcf0e8d076938cf0cf86872b536506a81e283b656ef1896d7d6e691e06145b2021593542755dd7460d08002c9 -DIST rocm_bandwidth_test-5.4.3.tar.gz 38761 BLAKE2B ab3c8fd15039081f7b42e1c5c82e06f2cf3f5c70c0868bf0c195507dd97669f199ecdaa895d292d225bce7aa069d14836923ff9ffd43d13749ca312ed07d3402 SHA512 676ba7aa26fd5eb2858ff61c8cf49ea3c5d51e87f5fa3bd6389c7c53e02561281d2d4a751369ccc66270f1d04b5ec9e55048ba23e758f0be8ef8e2abfd2026c2 DIST rocm_bandwidth_test-5.7.1.tar.gz 38769 BLAKE2B 5880c4bb50d4daf87581424c2fb208363d2d34f848d3ced163b3809e5dff4e56996abf3edc6f8c8ca75f55d95b92604de6ee0c333930d32c7c52c8bcdb6562e6 SHA512 7da08b7a9bbde34e3b2b799e47e490d34dc69225b9d5efe103fd23f3a417fc7a48dcc813d2669ee4506f6699c4576c549f982a4a76a92d83447d6fab709f5042 DIST rocm_bandwidth_test-6.3.0.tar.gz 45547 BLAKE2B 114d0ef78e90008dc67721a19d12723368eb50b16fb606e8d61597906f64144b66786de61a3e0951d4366c79bcf1150709acee3b21c22640d43ed6878cbff4bf SHA512 482b712d030b826146076e39fd0c27e60b8952879c3f81b5f89cfef388662593bb0007306f1dddbaed36e8b88b11a30171c1695c5f751a671aa230e7bffe694d DIST rocm_bandwidth_test-6.3.2.tar.gz 45543 BLAKE2B e38e448241f4f5b601cd4bd58d2a22f692ee71a5799906d9b3747cf7337cf07d91d140fa19683ef6ce030a6c6c34df1cf47957c2c8c1c4b96cf713c841a91d3e SHA512 d01f35c2331c13fe8c56b110ca2a6d26a6f4ecaaafa13af8ff47a01001fd29605aa44855c0c7d024dde83eec4978e14032ff96b1200b2a95a0c82376755cf91b -EBUILD rocm_bandwidth_test-5.3.3.ebuild 573 BLAKE2B d8d76c19f1abe33baa48533c9fbd32fa3981a49b3530b7ea54770230349df7513f09a4d8cbdfbec9d4339861c769414778ea674e7faa4031609f9b0018eb8062 SHA512 e1726587640d81630af6aa4f701203c78bb5a2ba3cb72d75037d63aa2cba53b9835173a97340b2a56ff56fbab9d9cf0327684605a514d88039a506831be08d69 -EBUILD rocm_bandwidth_test-5.4.3.ebuild 578 BLAKE2B d18f0234d952bcceec1899410342bbad75a1c3be787a08c39476b031ffd9cecf5ae79d0af612bacf00150a3eccbcfb669289f707540004defe5f7a70d5b44d9a SHA512 06d02fd10e1e1dcc504540e49afb9a7c8c821902fd69234f46485c174b273f00e2808f945609b0f155fb155e031c10d91beb545b1e4e9c810b1c0481d01d399f EBUILD rocm_bandwidth_test-5.7.1.ebuild 763 BLAKE2B fb3b6dcb3d2dd8975a74c0c47d569c51e137363d3cc7aef169de1ee1513ccdfe2d8b7f43ca8ded505e54e66a11cc792254f721f99c0fc90102bf8b2d7c10d84f SHA512 c5b1a0639ed6b3f1a95305d129fab4e9a8de08882b60b40f78576dd92641e026c32e32b219207e96fcbf8b9b26dc454e31d3d85dbbe9fc1e1471a3efc361ad13 EBUILD rocm_bandwidth_test-6.3.0.ebuild 450 BLAKE2B 9b5ada7d38543e0641e987e3d1423624a7983e5618be65dd9f942276f3a801b535815e6a51a2ae043531d3a8e86eeafcf834ae84180d612e87ecb29a4167b1fd SHA512 b5273be03e2b089e059d03fda4b410dd6616d3784c7d03bb665e9f718960cd24d0c289a7fe71be96184a5727d3e94cd807fab6715cc6270820be003c1a204692 EBUILD rocm_bandwidth_test-6.3.2.ebuild 450 BLAKE2B b75b4daed7a5717f80717d63c25e6a13e388e313de16ceffbddc11472b9f0205f1543bf9d58ee56e7b735118dc4f8cb1af0564011c657f5c76401175a15cdb7c SHA512 42429781d9d80614b2baaccd182007f7204de93006ebbccf610f2a74f2bf9f50f80bd6a6c21036d6fb0ae1023ef8f003476c68c39d4c4bf88b9e6399e6701f5b diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.3.3.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.3.3.ebuild deleted file mode 100644 index 094ed9071adb..000000000000 --- a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.3.3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Bandwidth test for ROCm" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_bandwidth_test" -SRC_URI="https://github.com/RadeonOpenCompute/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -DEPEND="dev-libs/rocr-runtime:=" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-rocm-${PV}" - -src_install() { - cmake_src_install - - rm -rfv "${ED}"/usr/share/doc/rocm-bandwidth-test -} diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.4.3.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.4.3.ebuild deleted file mode 100644 index 684546f46011..000000000000 --- a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.4.3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Bandwidth test for ROCm" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_bandwidth_test" -SRC_URI="https://github.com/RadeonOpenCompute/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="NCSA-AMD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -DEPEND="dev-libs/rocr-runtime:=" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-rocm-${PV}" - -src_install() { - cmake_src_install - - rm -rfv "${ED}"/usr/share/doc/rocm-bandwidth-test -} diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest index 1dfc932e4c76..20fda3240424 100644 --- a/dev-util/rocprofiler/Manifest +++ b/dev-util/rocprofiler/Manifest @@ -1,12 +1,9 @@ AUX rocprofiler-4.3.0-no-aqlprofile.patch 1708 BLAKE2B ab7054d368332f39fd4ddcb377610001011a279764fb921a2440245ed13ea123024e8c35b26398d3e007089687fc5ec734c6fce1fae58dd03963ad6fc0a02c84 SHA512 cd8c5f1d78e73b75c109d99f2d35fb9815d2360092669337941595698a3326c53266ea6a530faa599d954afaed19d8b41a73e4513ec832899eb17835134de5df AUX rocprofiler-4.3.0-nostrip.patch 540 BLAKE2B 20592fe6ee33effc9feaca9ffcd6d48bef0a46bb7353c4e0b624cfb60b29a168ace763c86775c020ce162dca59886a68068485da19a2a14b35582a3ae33dfbe4 SHA512 a1d2a5d1606e4d2d249e51063f76b96dc460fb6ebe358029182bf9e4de88dd6879332cdff0ee7458b808a4dcc35fcbba3b43f0fc8c5dc2a0cffbbf2ddb05634c -AUX rocprofiler-5.0.2-gentoo-location.patch 2219 BLAKE2B 10237145d132be7b31b311b9f2ed69cb7494da312f980ffcf92eb89ed8a946d15e9312e77bd3997a578e6c33f3ef1efb896e73c597705bf461daf1f73cc77bfa SHA512 dfe21a0e43ecc94e15899e4f2a7ee28ae36d5b666ad6df66892b9d9befc9444111c817861b136aa8973cc426e0f30964909753360bf7fd7da31ffa05029457ba AUX rocprofiler-5.1.3-remove-Werror.patch 665 BLAKE2B d5a906d446e7f348c97ddd1359757c0dbf68bd501e4f60d6536702a154b489ce48c77da28621301cf410cff3d521c29cb0b0be9dc9e0ed7c232d9d3b9d2b1877 SHA512 914a9ab2a9efc539a13afd02b36812bbdd4452f78c7b890925c3a6a3d8ae5a1052506f7f4d2a344a085d2002296136f8f63459166551cee636e0eaf5d97cc38b AUX rocprofiler-5.3.3-fix-python3.12-warning.patch 4011 BLAKE2B 00d438521ae435f5d845cf8ffbc3cf920af061771b733b2b03f4dfcc2d473c650ffd3adaa4a64123e2d67a28905dba2d6921f9213db42c90dc6a554ea2ee32aa SHA512 43226d8f6e3dd0fb94a59907daf5f054c5ccb17cc2529b7b1fa4537bac98db9fafa0d2b071f43c492574de2b92b82272b3ff46eaba11a591a0cb9ccdfd2aa2d2 AUX rocprofiler-5.3.3-gentoo-location.patch 4439 BLAKE2B aa97006a55cb088ddf4f09efa1ef6b866d1840207d6f7d8c36fe08b35885c8e3a979ba5a823abcd47069498a8b5dac7f2b9030c91da8733ce5815fe323d2bd50 SHA512 1f2e10597565cf2011f3319ff5abfeb6374cea9a1bbc672e7ad318f9b434750f3b69dc8ff1132fd44001fa51d54631abf6dc09678361bd97a2279762aa191d20 AUX rocprofiler-5.3.3-remove-aql-in-cmake.patch 644 BLAKE2B 76b2c28d9ea542700f2a327e083b2499559b098117ee44c8d092e00e264573fdc64731cf0839ca459e2650773937019a65765077931befe04d47e8e83ffd8d83 SHA512 6713ff66427592f554e221047b94e5af82aafbf92f3466fe42e1bbd8bff706f4228e02be158d178f577ea37045ff28c946cced9c65083db42ba3b128a39a2623 -DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce DIST rocprofiler-5.3.3.tar.gz 1412740 BLAKE2B 29a63fc9df589787d18a28664002d35ec1b61e6b36f61cc1f2dc2dc14270d0aee4da594f735fceba71a7e29225bd0739b923a05bd36ec2a09a36e1ba95d8d971 SHA512 92b22272229c2c9a91983ded640a1b20f80538800f8e996dbf4e33e9f1f64a286a933f73b975e61c5b321883a11574c71ce91fd6ed7ddac32cd32da3bbea577c -EBUILD rocprofiler-5.1.3-r1.ebuild 1649 BLAKE2B 97cdeea830c09788fa2938473526b1ff65b7fee580bf33fef208a95d9adc1fb83ff00f50a4a837d9a8ada0635b2414a8ce6a040dc35ef122d3d858a66defafc4 SHA512 c352c9537229c9f9b022f7d55a1946e62e6d2c85179a177081cf9e3a74b63e453d210e42ce187d9ceb743eaac1c757fe051d058ae7f3c644789f2c65b09b06c3 -EBUILD rocprofiler-5.3.3-r1.ebuild 1443 BLAKE2B 52fcc0f729b94d420aba9eb4eb516c7b42fd3676616dffb1f819f0d0bd61c3a76c1402b7c0be1b970955708e3e3fb1fa42401a0005d1ac423118b32230308dfd SHA512 fdc36144a9e5d9e14eafa1ea32a054dde201e1587d2c0b6f66873c74f07fb5c74cd22f093042c701352f2640fdcebfe090c190cdaaa49825d38de37016c3baba +EBUILD rocprofiler-5.3.3-r1.ebuild 1452 BLAKE2B 52262c48898666c2ceda7925713890636034ed19fd3d57051730e13989a7823ed62e3e8a2b7bf4e8707d1b69cda699072bc37ec4f0bf82a402b18e3895db3b47 SHA512 87ec333f19c7781bdd2ec34715ef1aecaf7185ba2a6477a45ea8c88b84f2fb05892adbee8939837e8526337c812f2ce274906d08c96328682bea06d1b1b03a3c MISC metadata.xml 477 BLAKE2B 2ace1c4829fe8b4ab056cd60cfc6261d34e0721bfdff4018557102020ff870d3adae611825ba39ef67f30d856bb08a2538bc5057966d75249ec24ba9a8111e52 SHA512 871206ed4cdb4c1951e9ccf9959039767578675c3b527012f68a1d66a647ce5b8236a839f48097f5c2b411d31f3ce3ecf8bf1dbbd05705f77464d88acae51f96 diff --git a/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch deleted file mode 100644 index 56cc79211ff0..000000000000 --- a/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: rocprofiler-rocm-5.0.2/bin/rpl_run.sh -=================================================================== ---- rocprofiler-rocm-5.0.2.orig/bin/rpl_run.sh -+++ rocprofiler-rocm-5.0.2/bin/rpl_run.sh -@@ -25,16 +25,16 @@ - time_stamp=`date +%y%m%d_%H%M%S` - BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) - PKG_DIR=$(dirname $BIN_DIR) --ROOT_DIR=$(dirname $PKG_DIR) --TT_DIR=$ROOT_DIR/roctracer -+ROOT_DIR=$PKG_DIR -+TT_DIR=$ROOT_DIR - RUN_DIR=`pwd` - TMP_DIR="/tmp" - DATA_DIR="rpl_data_${time_stamp}_$$" - --RPL_PATH=$PKG_DIR/lib --TLIB_PATH=$PKG_DIR/tool --TTLIB_PATH=$TT_DIR/tool --ROCM_LIB_PATH=$ROOT_DIR/lib -+RPL_PATH=$PKG_DIR/@LIB_DIR@ -+TLIB_PATH=$PKG_DIR/@LIB_DIR@ -+TTLIB_PATH=$TT_DIR/@LIB_DIR@ -+ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@ - - if [ -z "$ROCP_PYTHON_VERSION" ] ; then - ROCP_PYTHON_VERSION=python3 -@@ -70,7 +70,7 @@ export ROCP_HSA_INTERCEPT=1 - # Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes) - unset ROCP_PROXY_QUEUE - # ROC Profiler metrics definition --export ROCP_METRICS=$PKG_DIR/lib/metrics.xml -+export ROCP_METRICS=$PKG_DIR/share/rocprofiler/metrics.xml - # Disable AQL-profile read API - export AQLPROFILE_READ_API=0 - # ROC Profiler package path -@@ -104,7 +104,7 @@ usage() { - bin_name=`basename $0` - echo "ROCm Profiling Library (RPL) run script, a part of ROCprofiler library package." - echo "Full path: $BIN_DIR/$bin_name" -- echo "Metrics definition: $PKG_DIR/lib/metrics.xml" -+ echo "Metrics definition: $PKG_DIR/share/rocprofiler/metrics.xml" - echo "" - echo "Usage:" - echo " $bin_name [-h] [--list-basic] [--list-derived] [-i ] [-o ] " -@@ -374,11 +374,11 @@ while [ 1 ] ; do - export ROCP_METRICS="$2" - elif [ "$1" = "--list-basic" ] ; then - export ROCP_INFO=b -- HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl" -+ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl" - exit 1 - elif [ "$1" = "--list-derived" ] ; then - export ROCP_INFO=d -- HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl" -+ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl" - exit 1 - elif [ "$1" = "--basenames" ] ; then - if [ "$2" = "on" ] ; then diff --git a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild b/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild deleted file mode 100644 index 4e2774def7f2..000000000000 --- a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.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 - -PYTHON_COMPAT=( python3_10 ) - -inherit cmake python-any-r1 - -DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git" -SRC_URI="https://github.com/ROCm-Developer-Tools/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -RDEPEND="dev-libs/rocr-runtime:${SLOT} - >=dev-util/roctracer-${PV}-r1:${SLOT} - " -DEPEND="${RDEPEND}" -BDEPEND=" - $(python_gen_any_dep ' - dev-python/cppheaderparser[${PYTHON_USEDEP}] - ') -" - -PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch" - "${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch" - "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" - "${FILESDIR}/${PN}-5.1.3-remove-Werror.patch" ) - -python_check_deps() { - python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" -} - -src_prepare() { - sed -e "s,\${DEST_NAME}/lib,$(get_libdir),g" \ - -e "s,\${DEST_NAME}/include,include/\${DEST_NAME},g" \ - -e "s,\${DEST_NAME}/bin,bin,g" \ - -e "/ctrl DESTINATION/s,\${DEST_NAME}/tool,bin,g" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" \ - -e "/libtool.so DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" -i CMakeLists.txt || die - - cmake_src_prepare - - sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa" - -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext - -DUSE_PROF_API=1 - ) - - cmake_src_configure -} diff --git a/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild b/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild index 151613bbfd16..299f5d1633f3 100644 --- a/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild +++ b/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,9 +16,10 @@ LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" KEYWORDS="~amd64" -RDEPEND="dev-libs/rocr-runtime - dev-util/roctracer - " +RDEPEND=" + =dev-libs/rocr-runtime-5* + =dev-util/roctracer-5* +" DEPEND="${RDEPEND}" BDEPEND=" $(python_gen_any_dep ' diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest index e57f5f2da2d7..1a591b083191 100644 --- a/dev-util/roctracer/Manifest +++ b/dev-util/roctracer/Manifest @@ -1,24 +1,10 @@ -AUX roctracer-4.3.0-glibc-2.34.patch 993 BLAKE2B 54f25b35525da414aa3eafd48398e9e1fc28f750b08fdb0193789d6df60866c384434a79b2d52113fd29dd1e261a46f2117a89334ea6839493e33c8541516f0a SHA512 fe9f9a89220ac93a05a1b23f70a24d8522c9809afd90e6c0677d78276a8db66e9bb0d9896b5a0ad751795118cc9dfccd5743108feba027fd8123d39fc20ebc33 -AUX roctracer-5.0.2-Werror.patch 922 BLAKE2B 5644e5450de7372ee1ad6d8158a50e006f1eae666bb62652976f88d0c36b152df59ad4b7a30e98a42fa47322777ffc90edd283c3642ca260fdbd58cf697dd88f SHA512 0b37cd7432f0d9de42c2ca2e669697b782730afc10952349d47612f59122e1a5415c83b795c6ea2fb01c695263304b7e9702e45903a7177d02a48d86734ead9f -AUX roctracer-5.0.2-headers.patch 2452 BLAKE2B b5e34ddef1e61277d01b771b59e345c3ace07ff90f7e53c0bc50d0ebb6a13e07480173ac72b216a3fb54c3af2df5c1277fdc62db7f3e028213f71a889fa725c5 SHA512 073b45703bf37c5df1ed44843b17e08d8ada0373dce5f29a21cdea1d6d7fb73563501461a2b0c33f65c70e2c99d036523d012c7787b399a785f0ded89ad60f66 -AUX roctracer-5.0.2-strip-license.patch 681 BLAKE2B b7c78ca54fb208e1d943d9f217a8d40911a98823ff1b4c58441c87fdf60297200b4d02e5fbe685fea331c3d8f87c395291c19ac2621aa90c9fb1308071e176ba SHA512 56aae25b4c24d0f9a361c10007d0e3d90960191b08e254a0f6ffef9a36fb8d17270f8bed36c36ea866da137297ab96de4e211e8c06ace7ed7444e821f0589322 -AUX roctracer-5.1.3-no-aqlprofile.patch 1902 BLAKE2B 7ac98d5ad052e29313bd038b963763d4dba63c44bc261bd3119a911dfe6fbef99d73f58bf04f9c74a769d37299707c5e04a280db9343a3dbb5d0ab086a0106de SHA512 908f888e6384f3ee734b10553fc8cafb0e302031e21ed3763754e69fe146dbfb0204977c50db698f6f43a50c1a07685e8b86b5e7339ef65ff0634476b8177ee5 -AUX roctracer-5.3.3-Werror.patch 439 BLAKE2B 23c26aafd85d5f8a19c3e3001c091cef5f4c9b101f3fed6005be7aadc26588ec119980fc5f575d929a38130f69ed53c962114aa66b47e739726680e76a3e98d5 SHA512 816df1db92938df8966b2a88b28dcdaecbf02cd675a32a04c85b0ab6a0a2a8a983334dbd91669f2b876b56ceee3d0254f34e519030060ff24cda50624ea65bf2 -AUX roctracer-5.3.3-do-not-install-test-files.patch 1948 BLAKE2B 1eeb7443b4cb4c6947a61ee1b4f9f42bef996cd9623e6864d273de438af8f0d21bd2465e5ad1b62e266d9b0a86b5afdf5a267d79018cbfbc356ed8e2205a2136 SHA512 aa1e556ddd5f070bdc0ca8b47b243dbdbd965de8f98d02964a13897d3cb273fdef08373f12113c9f1645c3333be212092505fd7087f5ab292aedc1365372a021 -AUX roctracer-5.3.3-flat-lib-layout.patch 1842 BLAKE2B dc7f2832e2bd4e04bad75ccd22e8e2e32353cec745521e8baf4d98772d0994efa08289e5563eb3191d78a2fa4deb1681551e582d08e9608b98fe72f599146a2f SHA512 967eab41a909a7369791bd0946ef4304473e2f763d2e4f497f5b7ddba3b81b9eb18ea72a815b2211bcb82ec87eebe817daf1788f7d44f8c4494a06c77be9d902 AUX roctracer-5.3.3-rocm-path.patch 788 BLAKE2B ef0c9025bfb126e437f73149962c04661a5a5c33ee0c36e18854fa93bac591905cdc23e17fc2faf07659c5828de9361139e618752de3818b3b134e3536cd0c4b SHA512 f639b040871a43e23e7bf57a2214bf255032e3a5f9a20e08eae160bb0d371fb26fa147aefce20577935e40274779dbb150d445e044a22c7aeedc4e10b9865350 AUX roctracer-5.7.1-with-tests.patch 199 BLAKE2B 82061cd9966e59c10cb628173aca44cc869840fe8d1c9a0c6c2c9fb81a5b4fef04e2cd83e03188e77eeec305bd5ec598be04a71c6d558b8e3fb361c0a0aa976d SHA512 08b51740c7aee79cc7117e2c41b4dbf7ddf7c2b08326518785cec6687803e7b94f4dfcd70bc5b5e86e8788a2b18b220034262108bae5264e5e7c47c86c4eb9af AUX roctracer-6.3.0-fix-prettyprinter.patch 4079 BLAKE2B 55e9bbef2f9238fa1cc5035bb846495e1fb350ea1e53b68d0d39d25a1aa1943a948b7554e2ea440c547fb5903f8f370c65a2c05098849d36884cc2e5f13a932c SHA512 e1b74f692d765f3a3767ac10cb79e4c5b3bc8d656d0212e731b56955f8e92e8ebacd28d4c8fe1b0464363080c37088829fecc8ff2be0b3f1c7747b6b1a612716 -DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612 -DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b -DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb -DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13 DIST roctracer-6.1.1.tar.gz 396688 BLAKE2B e332c3a6056d1678e3da511878fd2710a4eaa02526cd1e7353dd1dbcba776cb77e6e431d90daf5f238ec7793fc8e9f51afd7f09992f70b26c7e3aab28bb319a9 SHA512 d59c367953b1d5df0daae96746095e2e19f706f43b5ebed3d45c15d23697e9c99c1623bbb8dfa001648fdeda172a3c1d820d884b6da3946addec8f4b9a86e5dc DIST roctracer-6.3.0.tar.gz 397368 BLAKE2B 450e99cd90df80f60ec455a94148258b8fcef4adb1babb795c3e66bca648b51cd0b67a9e8f413e601c5f77d0292e70c443d3695198f2e4dcd6058c9e21485198 SHA512 6f29e5f12e1c499ab57ed3c869801742bf71d645852bebd3a887e34f382e6da6df910ab7921232887ea10e95eafa085794e7795e08d3e73cbe225d5967c59620 DIST roctracer-6.3.2.tar.gz 397366 BLAKE2B 0edc2e6483935dcbc8e905b1eac1d426c3e553491cbe119a8f6cba99cadad5c622ec7a0005e27e66d57f9baf4e3048033185cd38f32b4cfd17277d80673ac225 SHA512 d08657e8424cf2fbdee1caa46140dd90f45b5efe7c71a96c789b0bb350d7c36a9c725ae436bee00fb0948ab0de5fc5356f71082619edae1316922221c19eae1c -EBUILD roctracer-5.1.3-r1.ebuild 2415 BLAKE2B c0737eb18ae261221c98ce271e2125cb6c0a36771cb681fb6a3163c64e73158da9dc1f1bbcdb4e3a51b75b8bea50a69344deaa3b45b33af05908ee276b2f4868 SHA512 088ac0b65323a618703c068bfbceafcf201c97c9d2ec9e87cdb4c819fbe03fb31ea9a528358773ab89c03402a6f04fff5e53190d38a0cea85d0ae53bd657bf46 -EBUILD roctracer-5.3.3-r1.ebuild 1659 BLAKE2B d0ef879f789b5fe49985a09fb23da11386ae2629398741224176e723a88f51ea147429eae036b53fab7c0aea66515e24b8a91f89846099343f434799f182aefa SHA512 dfa1e198644882d2d4b0a31c812c46b5e4b902368a9380986aa0590ad592ef68bda3c341043ad9f11ef08a8e41aa0c4096686cbf9636c8412331ed9b0134ccce EBUILD roctracer-5.7.1-r1.ebuild 2230 BLAKE2B db3912e3ece9c6bd934832e91addab4d896d75ddd59e348c539066b394335f9c83fb081d4225072485eb6cde2fb2b257439b12d953efe51e38c91a32291daa3f SHA512 591ea6fb59e2bbf4a27ba3891d0de346c6a625518cd4bc67c83749abc38db7b95d9bf6ccd653f550676cad01917cae2cb84cbeb57efe942476201ed7bbcd9b4e EBUILD roctracer-6.1.1-r1.ebuild 2711 BLAKE2B e5975296167127f7487280752b16b2daf1a024180cf4a143c48f6bd1462c128a7f385d0ec3885479786ce338065a6aa512fb783e7d8ea6f249a713e8b2a548c8 SHA512 7144c0fdeac1977069257d1e2f4560d2f3c751d6fc862e82da896a56566705bd423ec79331e085cc18d1c1ae1b8dfdf81fbea68540158021f080a5528c1bffad EBUILD roctracer-6.3.0.ebuild 2832 BLAKE2B 9bc2d4f4310b5100e87f3dafe8a0451f7ad9bef22529f16bb27c96fec8ebaaa14e7dfeab06312d95ed5db212990cd2ad1edc484be605057ec4267f1dda5ffbfd SHA512 6f8cb042d64c502799b0108661c935f4844c8fa82f7471296cbc14a47806e24454271079b5fe965e3decea90ec72f2a5483d8ef6c2678c60ce52f0f40287e58c diff --git a/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch b/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch deleted file mode 100644 index e11b1148bb89..000000000000 --- a/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5f4c1c01de8f0da24956c1c931d3ffe7410b5b78 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 30 Oct 2021 18:35:53 +0200 -Subject: [PATCH] pthread_yield -> sched_yield (glibc 2.34) - -Bug: https://bugs.gentoo.org/808049 -Upstream: https://github.com/ROCm-Developer-Tools/roctracer/pull/63 ---- - src/core/memory_pool.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/memory_pool.h b/src/core/memory_pool.h -index fe2f1a6..fbd9060 100644 ---- a/src/core/memory_pool.h -+++ b/src/core/memory_pool.h -@@ -24,6 +24,7 @@ THE SOFTWARE. - #define MEMORY_POOL_H_ - - #include -+#include - #include - - #include -@@ -152,7 +153,7 @@ class MemoryPool { - } - - static void sync_reader(const consumer_arg_t* arg) { -- while(arg->valid.load() == true) PTHREAD_CALL(pthread_yield()); -+ while(arg->valid.load() == true) PTHREAD_CALL(sched_yield()); - } - - static void* reader_fun(void* consumer_arg) { --- -2.33.1 - diff --git a/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch deleted file mode 100644 index ddcfd7d669df..000000000000 --- a/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch +++ /dev/null @@ -1,18 +0,0 @@ -User code should not use the aggressive warning and error flags. - -Index: roctracer-rocm-5.0.2/cmake_modules/env.cmake -=================================================================== ---- roctracer-rocm-5.0.2.orig/cmake_modules/env.cmake -+++ roctracer-rocm-5.0.2/cmake_modules/env.cmake -@@ -39,10 +39,8 @@ add_definitions ( -D__HIP_PLATFORM_HCC__ - - ## Linux Compiler options - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") --set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) --set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" ) --set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" ) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" ) -+set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive" ) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden" ) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno" ) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics" ) diff --git a/dev-util/roctracer/files/roctracer-5.0.2-headers.patch b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch deleted file mode 100644 index 91e48892bc45..000000000000 --- a/dev-util/roctracer/files/roctracer-5.0.2-headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -do not install a second set of header files, strip package name from -libraries and headers. - -Index: roctracer-rocm-5.0.2/CMakeLists.txt -=================================================================== ---- roctracer-rocm-5.0.2.orig/CMakeLists.txt -+++ roctracer-rocm-5.0.2/CMakeLists.txt -@@ -131,16 +131,12 @@ add_custom_target ( so-patch-link ALL WO - COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTRACER_LIBRARY}.so.${LIB_VERSION_STRING} so-patch-link ) - - ## Install information --install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION ${DEST_NAME}/lib ) -+install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION lib ) - foreach ( header ${PUBLIC_HEADERS} ) -- get_filename_component ( header_subdir ${header} DIRECTORY ) -- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} ) -- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} ) -+ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include ) - endforeach () - foreach ( header ${GEN_HEADERS} ) -- get_filename_component ( header_subdir ${header} DIRECTORY ) -- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} ) -- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} ) -+ install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include ) - endforeach () - #install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION include RENAME ${DEST_NAME} ) - install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so ) -@@ -162,7 +158,7 @@ add_custom_target ( so-roctx-major-link - add_custom_target ( so-roctx-patch-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} so-roctx-patch-link ) - --install ( TARGETS "roctx64" LIBRARY DESTINATION ${DEST_NAME}/lib ) -+install ( TARGETS "roctx64" LIBRARY DESTINATION lib ) - install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so ) - install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-major-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_MAJOR} ) - install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-patch-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} ) diff --git a/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch deleted file mode 100644 index e9c33885a01c..000000000000 --- a/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: roctracer-rocm-5.0.2/CMakeLists.txt -=================================================================== ---- roctracer-rocm-5.0.2.orig/CMakeLists.txt -+++ roctracer-rocm-5.0.2/CMakeLists.txt -@@ -173,9 +173,6 @@ set ( CPACK_PACKAGE_CONTACT "ROCm Profil - set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library" ) - set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" ) - --# Install license file --install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${CPACK_PACKAGE_NAME}) -- - ## Debian package specific variables - if ( DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE} ) - set ( CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE} ) diff --git a/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch deleted file mode 100644 index 93ddee3e5b43..000000000000 --- a/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch +++ /dev/null @@ -1,39 +0,0 @@ -Skip loading proprietary AQLProfile lib -Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp -=================================================================== ---- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp -+++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp -@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init - if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); - if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {0}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); - - // Get Loader API table - loader_api_ = {0}; -Index: roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp -=================================================================== ---- roctracer-rocm-5.1.3.orig/test/hsa/src/hsa_rsrc_factory.cpp -+++ roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp -@@ -125,14 +125,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init - if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); - if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {0}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); - - // Get Loader API table - loader_api_ = {0}; diff --git a/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch b/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch deleted file mode 100644 index b932bb5cb5d3..000000000000 --- a/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch +++ /dev/null @@ -1,15 +0,0 @@ -Should not use the aggressive -Werror flag. - -Index: roctracer-rocm-5.3.3/CMakeLists.txt -=================================================================== ---- roctracer-rocm-5.3.3.orig/CMakeLists.txt -+++ roctracer-rocm-5.3.3/CMakeLists.txt -@@ -37,7 +37,7 @@ endif() - - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) --add_compile_options(-Wall -Werror) -+add_compile_options(-Wall) - - set(THREADS_PREFER_PTHREAD_FLAG ON) - diff --git a/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch b/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch deleted file mode 100644 index ac3e53c1f405..000000000000 --- a/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch +++ /dev/null @@ -1,37 +0,0 @@ -Remove all install commands for test -=================================================================== ---- roctracer-rocm-5.3.3.orig/test/CMakeLists.txt -+++ roctracer-rocm-5.3.3/test/CMakeLists.txt -@@ -87,7 +87,6 @@ function(generate_hsaco TARGET_ID INPUT_ - DEPENDS ${INPUT_FILE} clang - COMMENT "Building ${OUTPUT_FILE}..." - VERBATIM) -- install(FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} DESTINATION test/${PROJECT_NAME} COMPONENT tests) - set(HSACO_TARGET_LIST ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} PARENT_SCOPE) - endfunction(generate_hsaco) - -@@ -150,24 +149,10 @@ add_dependencies(mytest dlopen) - ## Copy the golden traces and test scripts - configure_file(run.sh ${PROJECT_BINARY_DIR} COPYONLY) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink run.sh ${PROJECT_BINARY_DIR}/run_ci.sh) --install(PROGRAMS ${PROJECT_BINARY_DIR}/run.sh DESTINATION test/${PROJECT_NAME} COMPONENT tests) - - configure_file(${PROJECT_SOURCE_DIR}/script/check_trace.py ${PROJECT_BINARY_DIR}/test/check_trace.py COPYONLY) --install(PROGRAMS ${PROJECT_BINARY_DIR}/test/check_trace.py DESTINATION test/${PROJECT_NAME}/test COMPONENT tests) - - file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "golden_traces/tests_trace_cmp_levels.txt" "golden_traces/*_trace.txt") - foreach(file ${files}) - configure_file(${file} ${PROJECT_BINARY_DIR}/test/${file} COPYONLY) - endforeach() --install(DIRECTORY ${PROJECT_BINARY_DIR}/test/golden_traces DESTINATION test/${PROJECT_NAME}/test COMPONENT tests) -- --# install all executables --set(all_executables) --get_property(all_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY BUILDSYSTEM_TARGETS) --foreach(target IN LISTS all_targets) -- get_target_property(target_type ${target} TYPE) -- if (target_type STREQUAL "EXECUTABLE") -- list(APPEND all_executables ${target}) -- endif() --endforeach() --install(TARGETS ${all_executables} DESTINATION test/${PROJECT_NAME}/test COMPONENT tests) diff --git a/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch b/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch deleted file mode 100644 index 46c8d1a168b8..000000000000 --- a/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch +++ /dev/null @@ -1,34 +0,0 @@ -Install libs directly into /usr/lib64 -=================================================================== -Index: roctracer-rocm-5.3.3/src/CMakeLists.txt -=================================================================== ---- roctracer-rocm-5.3.3.orig/src/CMakeLists.txt -+++ roctracer-rocm-5.3.3/src/CMakeLists.txt -@@ -215,12 +215,12 @@ target_include_directories(roctracer_too - target_link_libraries(roctracer_tool util roctracer hsa-runtime64::hsa-runtime64 stdc++fs Threads::Threads atomic dl) - target_link_options(roctracer_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/tracer_tool/exportmap -Wl,--no-undefined) - --install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime) -+install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime) - - add_library(hip_stats SHARED hip_stats/hip_stats.cpp) - target_compile_definitions(hip_stats PRIVATE __HIP_PLATFORM_AMD__) - target_link_libraries(hip_stats roctracer stdc++fs) --install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime) -+install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime) - - endif() - -Index: roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt -=================================================================== ---- roctracer-rocm-5.3.3.orig/plugin/file/CMakeLists.txt -+++ roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt -@@ -38,5 +38,5 @@ target_link_options(file_plugin PRIVATE - target_link_libraries(file_plugin PRIVATE util roctracer hsa-runtime64::hsa-runtime64 stdc++fs) - - install(TARGETS file_plugin LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} -- COMPONENT runtime) -\ No newline at end of file -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ COMPONENT runtime) diff --git a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild deleted file mode 100644 index 923072f3fe67..000000000000 --- a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake prefix python-any-r1 - -DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git" -SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz - https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz" -S="${WORKDIR}/roctracer-rocm-${PV}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -RDEPEND="dev-libs/rocr-runtime:${SLOT} - dev-util/hip:${SLOT}" -DEPEND="${RDEPEND}" -BDEPEND=" - $(python_gen_any_dep ' - dev-python/cppheaderparser[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - # https://github.com/ROCm-Developer-Tools/roctracer/pull/63 - "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch - "${FILESDIR}"/${PN}-5.0.2-Werror.patch - "${FILESDIR}"/${PN}-5.0.2-headers.patch - "${FILESDIR}"/${PN}-5.0.2-strip-license.patch - "${FILESDIR}"/${PN}-5.1.3-no-aqlprofile.patch -) - -python_check_deps() { - python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" \ - "dev-python/ply[${PYTHON_USEDEP}]" -} - -src_prepare() { - cmake_src_prepare - - mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die - mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die - rm "${S}"/inc/util/hsa* || die - cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die - - # change destination for headers to include/roctracer; - - sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \ - -e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \ - -e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \ - -e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \ - -i CMakeLists.txt || die - - # do not download additional sources via git - sed -e "/execute_process ( COMMAND sh -xc \"if/d" \ - -e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \ - -e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \ - -i test/CMakeLists.txt || die - - hprefixify script/*.py -} - -src_configure() { - export HIP_PATH="$(hipconfig -p)" - - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa" - ) - - cmake_src_configure -} diff --git a/dev-util/roctracer/roctracer-5.3.3-r1.ebuild b/dev-util/roctracer/roctracer-5.3.3-r1.ebuild deleted file mode 100644 index f5ebd55cf86d..000000000000 --- a/dev-util/roctracer/roctracer-5.3.3-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -ROCM_VERSION=${PV} - -inherit cmake prefix python-any-r1 rocm - -DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git" -SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz" -S="${WORKDIR}/roctracer-rocm-${PV}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/rocr-runtime - dev-util/hip" -DEPEND="${RDEPEND}" -BDEPEND=" - $(python_gen_any_dep ' - dev-python/cppheaderparser[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - ') -" - -PATCHES=( "${FILESDIR}"/roctracer-5.3.3-flat-lib-layout.patch - "${FILESDIR}"/roctracer-5.3.3-do-not-install-test-files.patch - "${FILESDIR}"/roctracer-5.3.3-Werror.patch ) - -python_check_deps() { - python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" \ - "dev-python/ply[${PYTHON_USEDEP}]" -} - -src_prepare() { - cmake_src_prepare - - hprefixify script/*.py - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.3.3-rocm-path.patch) -} - -src_configure() { - export ROCM_PATH="$(hipconfig -p)" - local mycmakeargs=( - -DCMAKE_MODULE_PATH="${EPREFIX}/usr/lib64/cmake/hip" - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DHIP_CXX_COMPILER=hipcc - ) - - cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}" || die - # if LD_LIBRARY_PATH not set, dlopen cannot find correct lib - LD_LIBRARY_PATH="${EPREFIX}"/usr/lib64 bash run.sh || die -} diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest index 0bc6494fdd6e..99a0a12b33e3 100644 --- a/dev-util/rr/Manifest +++ b/dev-util/rr/Manifest @@ -1,5 +1,7 @@ AUX rr-5.7.0-no-force-lto.patch 720 BLAKE2B 78733ac4cf79e9f49ccd4f6c6dc98ef7ebc518392072eed660ee5fbf22c90f0b89ee5d708edae2bce61e06d91522e46b5cebc3ffb8983c8d97ecbc1b261a8f7a SHA512 2f53aad8c1c65689a967ddf94c5f9d60d8edd2ed5486a4c95d74e2fa6e50e752adb3ae699085834af57d4251b48616d414d452a73bd1e0e3d9a5b0ee9e75622b DIST mozilla-rr-5.8.0.tar.gz 1734617 BLAKE2B 75fcd99da89dc4acc033d033abc91ff61500ad1429702641888c628ad0e70f1dfb61309aa76092f34d3314086572a6af334970e5f4abb4d7c812800b23e64869 SHA512 98f0c970fad5c3a2c5d7c17f40c454db072d31053425ffc308a66a643e2f36ede04f33ab8b13f94c42c60a3b00e18a790783467f99a97e421551c498df313a6b +DIST mozilla-rr-5.9.0.tar.gz 1801696 BLAKE2B b87d0a33201a513a692e8deb20ada38f235ce7a3e41dd806d0dba9a1a73f2c3dbf71d7f95b7cb0b284c7e38a4a19ea58f9ddef31d2e9b92efc686b24a8e551e7 SHA512 796d9b0b64e3993dfc14cf488e5e598b1de4828da415b1f97435598d62c1c133fc268d7838601275a00f59f05bf53d0bb796380418f4cb6cdfdda2c50207f996 EBUILD rr-5.8.0.ebuild 1855 BLAKE2B 83b9c7daf9cc58b1b09bfa08c8dc29c0936086123bf2de82d3a3b30b94eb4e2a4f00e815b47eef190304e4c238b897c527d7d3d4302801e832df068cce5f9a45 SHA512 ae2cabb78ea9347e7e17c55cb8334d2c145f54d22311abcb1513d189be0c0665eb04469a86e321b3ea2a0612be78624f95e6731dda59628a87be7772506df0da -EBUILD rr-9999.ebuild 1855 BLAKE2B 83b9c7daf9cc58b1b09bfa08c8dc29c0936086123bf2de82d3a3b30b94eb4e2a4f00e815b47eef190304e4c238b897c527d7d3d4302801e832df068cce5f9a45 SHA512 ae2cabb78ea9347e7e17c55cb8334d2c145f54d22311abcb1513d189be0c0665eb04469a86e321b3ea2a0612be78624f95e6731dda59628a87be7772506df0da +EBUILD rr-5.9.0.ebuild 2071 BLAKE2B 330ff4836fa0c585befa4403b5f4244175d8bea4c59817b552e478eec49467d93510940ea9fee9ea784562dbd435b0c7ee336058aa020f90bca4e2693621b77c SHA512 a8832a854f521087ef6308e56da654eec26af8787ed6d0658edbc1ec88fb13c421f03bab1a9b756354a8a1237b824ef81b446a893b88fa4c9b43d2f130acdd16 +EBUILD rr-9999.ebuild 2071 BLAKE2B 330ff4836fa0c585befa4403b5f4244175d8bea4c59817b552e478eec49467d93510940ea9fee9ea784562dbd435b0c7ee336058aa020f90bca4e2693621b77c SHA512 a8832a854f521087ef6308e56da654eec26af8787ed6d0658edbc1ec88fb13c421f03bab1a9b756354a8a1237b824ef81b446a893b88fa4c9b43d2f130acdd16 MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b diff --git a/dev-util/rr/rr-5.9.0.ebuild b/dev-util/rr/rr-5.9.0.ebuild new file mode 100644 index 000000000000..5d5eed823cfa --- /dev/null +++ b/dev-util/rr/rr-5.9.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +CMAKE_BUILD_TYPE=Release + +inherit cmake linux-info python-single-r1 + +DESCRIPTION="Record and Replay Framework" +HOMEPAGE="https://rr-project.org/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/rr-debugger/rr" + inherit git-r3 +else + SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +# rr itself is MIT and BSD-2, but there's various bits under third-party too. +LICENSE="MIT BSD-2 GPL-2 ZLIB" +SLOT="0" +IUSE="multilib test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + app-arch/zstd:= + dev-libs/capnproto:= + sys-libs/zlib:= +" +RDEPEND=" + ${DEPEND} + dev-debug/gdb[xml] +" +# Add all the deps needed only at build/test time. +DEPEND+=" + test? ( + $(python_gen_cond_dep ' + dev-python/pexpect[${PYTHON_USEDEP}] + ') + dev-debug/gdb[xml] + )" + +QA_FLAGS_IGNORED=" + usr/lib.*/rr/librrpage.so + usr/lib.*/rr/librrpage_32.so +" + +RESTRICT="test" # toolchain and kernel version dependent + +PATCHES=( + "${FILESDIR}"/${PN}-5.7.0-no-force-lto.patch +) + +pkg_setup() { + if use kernel_linux; then + CONFIG_CHECK="SECCOMP" + linux-info_pkg_setup + fi + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i 's:-Werror::' CMakeLists.txt || die # bug #609192 +} + +src_test() { + if has usersandbox ${FEATURES} ; then + ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping." + return 0 + fi + + cmake_src_test +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -Ddisable32bit=$(usex !multilib) # bug #636786 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # Upstream's CMake avoids stripping librrpreload at least, and + # Fedora avoids stripping all libraries. Treat it like Valgrind + # and play it safe. + dostrip -x "/usr/$(get_libdir)/rr" + + python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py + python_newscript scripts/zen_workaround.py rr-zen_workaround.py +} diff --git a/dev-util/rr/rr-9999.ebuild b/dev-util/rr/rr-9999.ebuild index 9da8ebac1116..5d5eed823cfa 100644 --- a/dev-util/rr/rr-9999.ebuild +++ b/dev-util/rr/rr-9999.ebuild @@ -27,6 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" ${PYTHON_DEPS} + app-arch/zstd:= dev-libs/capnproto:= sys-libs/zlib:= " @@ -65,7 +66,7 @@ pkg_setup() { src_prepare() { cmake_src_prepare - sed -i 's:-Werror::' CMakeLists.txt || die #609192 + sed -i 's:-Werror::' CMakeLists.txt || die # bug #609192 } src_test() { @@ -80,7 +81,7 @@ src_test() { src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test) - -Ddisable32bit=$(usex !multilib) #636786 + -Ddisable32bit=$(usex !multilib) # bug #636786 ) cmake_src_configure @@ -89,6 +90,11 @@ src_configure() { src_install() { cmake_src_install + # Upstream's CMake avoids stripping librrpreload at least, and + # Fedora avoids stripping all libraries. Treat it like Valgrind + # and play it safe. + dostrip -x "/usr/$(get_libdir)/rr" + python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py python_newscript scripts/zen_workaround.py rr-zen_workaround.py } diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest index 2e09d6d07ef6..3251e13510de 100644 --- a/dev-util/rt-tests/Manifest +++ b/dev-util/rt-tests/Manifest @@ -1,7 +1,8 @@ AUX rt-tests-2.7-musl.patch 10247 BLAKE2B fe5fde87f14efa50c90e593d4c8c858912131e25c0af90b2e90ba1d08ec50ec82d5114a1ea17c0f07b1ba4135689ff1862209dd79d9b021a2a8d5e58eca9ab3c SHA512 3aeafa3e6d2882960638cd57183983c0880f46c8116493bf76764b04a6087d88777438c1ff78d20217f879f3386fc4fac9b29a5ebb68f7d0e695ae3b324cedd7 +AUX rt-tests-2.8-glibc.patch 1520 BLAKE2B f53e78fc619d3fc9d060f21fa1df0d7900ae2700f2c80e3bf51d258f14800fd7a847fbaba0b6a1588e128b911c7ae073d1bebe8df5ab8703c1dec22cf1dabe94 SHA512 5e2bf757af29f362ffdfa811cb13fe32efc3436d702e04bef54e65b9afc3dcec72321dd60684c3a25fbff2aa62929e2cfdea7a23841d037a88af429457ed7b6f AUX rt-tests-2.8-musl.patch 10249 BLAKE2B 1843d51dd4cc422b53f49f9d99418a719414f5298c2b26a552dea4a269400a5a63b0d439f306b6135b6a534c2c4833221c766721089e9946d59ef348b1250626 SHA512 d6eeae9975d833b7686abc54b4e77ad874a23aa7aceb6b9dc6eba2b9149fb6bf4f03b929e7dbf1d66d7010fd5e2208fad90d6e638d722c550634b8871b52d089 DIST rt-tests-2.7.tar.xz 106864 BLAKE2B 89af0a92465ca29eb19adb6bb521be377dedb4153fc98bdcce48e1bad71803ed4aad2088227cfc679ce2441d09932acae437911535daec266b7ac2247fbad8d8 SHA512 6f2e523a6ff683473a222dc3b38abd34a06610c78b488d9d103643e410089d03820c76a4f40afaa4694d29f36e1aef6ced584cae9bad72921e3d633e36a5cda3 DIST rt-tests-2.8.tar.xz 108480 BLAKE2B 852143d6d8017f08cecf847e5feb8d59390373828826d75f5d22259208fc0c3e3966615039cfc9a832648377044ffd10cced481796d68426c70bb824b558c1f4 SHA512 e3fa03258cd1fe22a65c6af9ac17398dba79fbb5a92f6aacbbb06bfb677982abc421d699d2889850505e83d78b0605cced7dbfb176e023cc34bdd25ec819a3a5 EBUILD rt-tests-2.7.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be -EBUILD rt-tests-2.8.ebuild 916 BLAKE2B bb7156a6af5a00eec881410acf6fa23d86c68947ca8e82450662771e623139171c3ca9440bf4ac1891131588c9ee7c5bc996af6d00c3995943d812187a810d58 SHA512 8f38767eb8a0d60fcc7392646010933b562682826cd549cafe56788585c2a85ec499a820296cc468aaeb9b045b36097c7bff110f339364ea737e9ba5b46ef7be +EBUILD rt-tests-2.8.ebuild 961 BLAKE2B 85eb4fe4b6298c9fe382638c3bc7593513adc83f2b3a354001884572034d3aa7dff2a9cc7b88d00163c3a11dff11a8e392702a76da0e0d6c09e636545be68eb1 SHA512 44329b243808513a900d06b51998c7516376f9b57ff44fa4d5ac066f8baf0b1f2b29fee7ea523d169dec987f1aed4f44a96d0c24266e8e12919b1dffaadd27ad MISC metadata.xml 837 BLAKE2B b0d50d18a087e0e3adde1eeeeec4f9e3cf69d921d893c5f26f9205979d53cb3fb67c66da49a19646f00463456337edfa6482a129ba6f53bdefcc083b6420a4c8 SHA512 943f07d2ac45ada4c0e961f43543c7f8f5a1e96ae6a69e8e4f99ca47f7e43a8ca2525a299f9451b0877349542955e6428e6029dfae8e30e67ca970b883eb04d7 diff --git a/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch b/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch new file mode 100644 index 000000000000..7cfbdaa0236b --- /dev/null +++ b/dev-util/rt-tests/files/rt-tests-2.8-glibc.patch @@ -0,0 +1,55 @@ +From 280e198c39d1b17d0491d7c4e7afda97ae6c8e6f Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 29 Jan 2025 16:46:11 -0500 +Subject: [PATCH] Fix rt-tests build with glibc-2.41 + +The sched_*attr APIs were added to glibc +https://sourceware.org/git/?p=glibc.git;a=commit;h=21571ca0d70302909cf72707b2a7736cf12190a0 + +This fixes the build conflict in rt-tests with glibc-2.4 + +Signed-off-by: Yaakov Selkowitz +Signed-off-by: John Kacur +--- + src/include/rt-sched.h | 2 ++ + src/lib/rt-sched.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h +index 80171c76e0ee..dfd7f45f51cc 100644 +--- a/src/include/rt-sched.h ++++ b/src/include/rt-sched.h +@@ -42,6 +42,7 @@ + #define __NR_sched_getattr 275 + #endif + ++#if ! __GLIBC_PREREQ(2, 41) + struct sched_attr { + uint32_t size; + uint32_t sched_policy; +@@ -67,5 +68,6 @@ int sched_getattr(pid_t pid, + struct sched_attr *attr, + unsigned int size, + unsigned int flags); ++#endif + + #endif /* __RT_SCHED_H__ */ +diff --git a/src/lib/rt-sched.c b/src/lib/rt-sched.c +index 8023bc70c473..2500abde26e4 100644 +--- a/src/lib/rt-sched.c ++++ b/src/lib/rt-sched.c +@@ -14,6 +14,7 @@ + + #include "rt-sched.h" + ++#if ! __GLIBC_PREREQ(2, 41) + int sched_setattr(pid_t pid, + const struct sched_attr *attr, + unsigned int flags) +@@ -28,3 +29,4 @@ int sched_getattr(pid_t pid, + { + return syscall(__NR_sched_getattr, pid, attr, size, flags); + } ++#endif +-- +2.47.1 diff --git a/dev-util/rt-tests/rt-tests-2.8.ebuild b/dev-util/rt-tests/rt-tests-2.8.ebuild index d11236401857..8749b0d1bb86 100644 --- a/dev-util/rt-tests/rt-tests-2.8.ebuild +++ b/dev-util/rt-tests/rt-tests-2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,10 @@ DEPEND="${PYTHON_DEPS} sys-process/numactl" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-glibc.patch" +) + src_prepare() { default use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch" -- cgit v1.2.3