gentoo auto-resync : 14:02:2025 - 00:13:14

author: V3n3RiX <venerix@koprulu.sector> 2025-02-14 00:13:14 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2025-02-14 00:13:14 +0000
commit: 4fda045f90a4e301329bddb766e2e12a0b4401de (patch)
tree: 1d486767bfd9de15d6c11d341408385eb7f7debe /dev-util/hip
parent: 965058196f44550f3bc491dd85064071e085b776 (diff)
37 files changed, 4 insertions, 1958 deletions
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 <new>
-     #include <array>
-     #include <iosfwd>
-     #include <type_traits>
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 <Hao.Yuan@amd.com>
-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 <xgreenlandforwyy@gmail.com>
----
- 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 <aravindan.cheruvally@amd.com>
-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 <xgreenlandforwyy@gmail.com>
----
- 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 <xgreenlandforwyy@gmail.com>
----
- 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 <xgreenlandforwyy@gmail.com>
----
- 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 <xgreenlandforwyy@gmail.com>
----
- 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} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-     else()
-         set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-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 "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include;${HIP_CLANG_INCLUDE_PATH}>"
--  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include;${HIP_CLANG_INCLUDE_PATH}>"
-+  INTERFACE_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include>"
-+  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_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 "$<$<LINK_LANGUAGE:HIP>:--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 "$<$<LINK_LANGUAGE:HIP>:${CLANGRT_BUILTINS}>"
-+    INTERFACE_LINK_OPTIONS $<$<LINK_LANGUAGE:HIP>:--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 <xgreenlandforwyy@gmail.com>
----
- 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 <xgreenlandforwyy@gmail.com>
-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 <maneesh.gupta@amd.com>
-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 <mutex>
- #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 <atomic>
- #include <iostream>
-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 <algorithm>
- 
-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 <string>
- #include <vector>
-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 <hsa.h>
-+#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 <fstream>
- #include <limits>
-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 <Jeremy.Newton@amd.com>
-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 <Jeremy.Newton@amd.com>
----
- 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 <assert.h>
- #include <cstdarg>
-+#include <cstdint>
- #include <cstdio>
- #include <cstring>
- #include <string>
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
+	<dev-libs/rocr-runtime-6
 	x11-base/xorg-proto
 	virtual/opengl
 "
author	V3n3RiX <venerix@koprulu.sector>	2025-02-14 00:13:14 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2025-02-14 00:13:14 +0000
commit	4fda045f90a4e301329bddb766e2e12a0b4401de (patch)
tree	1d486767bfd9de15d6c11d341408385eb7f7debe /dev-util/hip
parent	965058196f44550f3bc491dd85064071e085b776 (diff)