gentoo auto-resync : 06:08:2022 - 20:10:30

31 files changed, 711 insertions, 13 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dc3baa5ee051..257182a90320 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 26f0aac4a517..29f82f60a0c9 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -13,5 +13,5 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
 EBUILD Tensile-4.3.0-r1.ebuild 2764 BLAKE2B e24ddb516d8dfd9e5e691f567f5b97b279e518b38be49a2cc69e8eae100d4d2ce7dc1432247c0bd5c94656ff1a7faf88a8e8f2e8df3dbbbc491eb4323cc20706 SHA512 79859e7dd5647bc4c1eb766faa9b3116994ed74aeb900caaf1b524a1216dcadd8d0c608d097a0c4c1d51b3117b75ccf7a061b7624cad6390fd5ce37494d67987
-EBUILD Tensile-5.0.2-r1.ebuild 2640 BLAKE2B a09e82c0d91aebdc308c58a5e1b09a6cbc998a6cb67dde419949532a39c915396d46c4e87d824ed8c8bc735c31c6cad9b9bc7a3aee96063203f8364f50d1c686 SHA512 0218b8b1276ab0f9038a02d0d0f94c169dd8da9a2f694ac097bb894298b04bf7e5fc87b66d7761cacc0415980dbca4f5c3a3f38fb044db4433ee071e4a49c64d
+EBUILD Tensile-5.0.2-r2.ebuild 2634 BLAKE2B a54c9ec8c4876585f8b807da04ea4d92ae2905dae86dfd7f5202bbfa02d492158c5364e6136e1b1a9990a2c37ad0171096da429074734b3a101ff483e4e7794a SHA512 14ae5bfd4490453123bc271ddbbfc329cbb6b271ee719c696318befb97592d06b502a8105c1764a8e15bc99ad3da254b28997fa458a90b7c57afc064320fd31a
 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
diff --git a/dev-util/Tensile/Tensile-5.0.2-r1.ebuild b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
index 5bb9a3f21927..38854fd0c269 100644
--- a/dev-util/Tensile/Tensile-5.0.2-r1.ebuild
+++ b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-util/rocm-smi-4.3.0
 "
 DEPEND="${RDEPEND}
-	dev-util/hip:${SLOT}
+	dev-util/hip:=
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 1cbe026b76a3..e10dc8f75b58 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-SWDEV-316128-HIP-surface-API-support.patch 1156 BLAKE2B 52ff9a2389533ac213055ff8c1d4359cbd490f64699233a6c97dbb54ea8216d94039b016b9dcdde7a304662b9ca5c444ac889a6491e847b0a701e0b0cc0e4b59 SHA512 0c210ac60929a951ce1210b1f76e2e6966cc411834a350e6d01d1eb20cb862056cec881a00978cdbe5bfc61e53128c1cd09c6138cca9469213a6bbf425b8686d
 AUX hip-3.5.1-config-cmake-in.patch 1227 BLAKE2B 5b85ff489232590aa9ddbf8bbf1d5730c8152626e221ce735afcc8b92c3a62e1b2805ed9f3709b3e97b67f787886fd36d685101ea5d3bb76f023dd668b0ebd3d SHA512 0a190ab213ec5ee626843b584c684913ff5cfe0864e443616da7f8f1cf848bc29e46cd7c2d2df6929058acf696f25420267ded69f03862a20b443d107867af74
 AUX hip-3.5.1-detect_offload-arch_for_clang-roc.patch 782 BLAKE2B f851798324799d53271db8149ce7538709435a12a607a352989f5ea816d183573cb21ba2c54d507ec8aad242ccbdb06f79113b48ac8d26f51f402066a124ca6a SHA512 bc60f252e5c1df1c453717f2565a41e05014fc259195a7d25db83bc37a52c33eea261a3afbf37b0afaf80d7b1ffbbe02d8f97967556667238929ea6e6df0108d
 AUX hip-3.5.1-hip_vector_types.patch 247 BLAKE2B 05d17292a61b8ecd6c6cc8bb8075d909885896f6183ffe84882e98066ef9d44d33431a2b12fcbc36db3f0b94713313d5b85918fe041b1102256ac523ac7f8782 SHA512 d02610b59336f332e9025d860977ad27c6d82c35577ecae9b89b253fc911aafc14553ccaa4b667befe4ea7dbe8c55298643dea5e163941c702d35a4f8a594c9d
@@ -12,19 +13,29 @@ AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c
 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-clang-include-path.patch 564 BLAKE2B 8cdfbd9eba9c5e642a8e85aa269b0e369ef11a90c30771e0b1ef21d1ff1bfbb6d9f27cc03693b22b39347d939a11994ffbe4dd2f9edc5583811fff273c304307 SHA512 e6d8dda10155a6d269435f37bf8d4fa25b503861450d474cc01c21ea582857caa9ed26ca04e513b12708ae60348cd32296aaf39c805ee3f925e7d6590cae658c
+AUX hip-5.1.3-fix-hip_prof_gen.patch 1480 BLAKE2B caa3fa9840a8add5a25daaeb6f26eed9da3fe55686f6343e31b836a0b2e12999cd45d9220469cde036c7914f672b6cc46695fce1bfe4a8d6d35c836cdc14e413 SHA512 a588238cb12dc973acc6513bead68439b10b49214d5dceb81a0498510f79269b79897a02dd9e2ee1ef396a762d49310fd0a406d7f8b6c0e85faeba0f69b1de23
+AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226
 AUX hipvars-5.0.2.pm 590 BLAKE2B b67de8f86bc53d9fbcd50a9cfa9759feb0145f3b3e40360cc322676411e038ff21b8f81265ba27d099e51c3dc55230f87c477cbadfba2b48c08978216f2fbd81 SHA512 0becd625e6f34d687338e25ca4697e68a735a1df60a4c2c53f577e7999a34bc07041f513632f9534aa4b35da2cf50b02c96187f69fd183bff893343257aa85b9
+AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d
 AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6
 DIST 5.0.2-update-header.patch.gz 5136 BLAKE2B 290b9e250e3004a1147ad28606d7d205078affbd809c6a429744767ebabf35bd8df6395dc135984d345ae2f23fa457dcb2524bcbf31c5bf16903d3ee2007bf5d SHA512 41b1025c403e874026a712ec6f6571c873203b08ddadf68848f6d1f63924c21b206677b330f79edad2c4b85e2ba5053b1d33f70c7c09ff9c17bc5905b849da0c
+DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a
 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
+DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
 DIST rocm-hip-4.1.0.tar.gz 954215 BLAKE2B c4b75ab2158e6921be1c34820ab5d1a5e2eb36112834b0143c50023caa27de384e0497f4837947cc7fe05554c6c95201340b1979eb916b31ebb4ffec8c923735 SHA512 420ffd7b79e2b4506873cbfc56e96395f8ed9d9375ce28df51626601199d4d8dca6920528e255d39a48ad66ee11f4b653f3b9f659df489d32b21886fb86c64b5
 DIST rocm-hip-4.2.0.tar.gz 918281 BLAKE2B 45c28289c8ff9e600bfd9daff8af162c897fcfdf41ce65d91d1761d58253d87a6385fd4a15e818619ca39d3413479bf043ab2758fead349a243105e979b64f7c SHA512 e620507321c949ded2eab6159099eef0eab267eb686b6ee0ed86022fffaa51fb8714a7f344b79acf76c876c55919360905d1bb3a7c00a87f40174774d6682ce8
 DIST rocm-hip-4.3.0.tar.gz 967550 BLAKE2B 263e8bbaa86198d3cb6a29f5597b56a3fe1e9338a8c485935070e6253816ccdba9671f33d8142c260aa3c36f43a71de7f2c1b7a15e1227f97aaf03ed10ce10dd SHA512 bc2d9597200405397387cc8f626f0cc734ee450c462bd7c7a0c655e3dfe2d1e09780328cbfa1c0d1e0db836e561fc450c5d514a6ad1a5828cb913c4c3c535ef1
 DIST rocm-hip-5.0.2.tar.gz 958496 BLAKE2B 9c8bb1eacd982203e3bd6c24560672c4a9aaf5606608635d7da5a60f613d9be50998f990c1ea3e0e6f5581e0efcba09af736a77bbc9469b2898e0974d063e8d6 SHA512 4a99e86a4594c15509a1bbfec0678cd05469eb14dcf35ce650e1eb7c2415f57f59071b1b8add2f8566ccf06242bead77abd275987fe79fe6031dea90d5693805
+DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hipamd-5.0.2.tar.gz 319973 BLAKE2B ca19938eeca66f0d2614ff933e1d0e75b6b8dbc8d996fd4369e5649897b9948271ac88f2a66f0a40ef586d6185b30d01132decac95d1615c1ee419996050ed07 SHA512 056acab082b5073e81f9e5de00ae12c85021d1c297cdcfc45b85f191dcc68603f64fe5d0e75f9523120657947eb125beaa9c3ce26234968c43b200e638f9afa3
+DIST rocm-hipamd-5.1.3.tar.gz 331996 BLAKE2B 176121fe199d53c02a0fc407015681c2f08c8a72104738b457581fd81b37d16efb8170a46d687fb85a45242ba8564246cdd5746e78d9b73dd0bdc9b24eb8378c SHA512 daa6f4da97f71a5fd1f79d8c9e5fc43324743aec91362a05fa62e08966397a637d794abc7e14230eccf5f1271f9fac58d1336aaad1f2cded6cd10792845a494b
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
 DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780
+DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
+DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
 EBUILD hip-4.0.0-r1.ebuild 3817 BLAKE2B c01eb20493f27e9650d1cad3413b7fa14ef799d67e8b02de235d1e37a4f6633c8f0f6ea73fa8f075d0a10ffb2dbe0ccba4a65c4a505e665be7d657d5c773641a SHA512 2b5b58f13d832572f547f5ba4e67daf62b180523424e1e4605e96d1b7d834b700f8aebc95b047ab08ba36e16098aa07ddf7f9c91654672b00edc863bb5c25d68
 EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
 EBUILD hip-4.1.0-r1.ebuild 3366 BLAKE2B c8663bbba532bca211de1a8b8253e2df9544cc656ae47a0d8e651161f7e4186227b9cdc11e3b3b010bbb1d8a18ff36ece37d5a9ad4092ed496f3c9d1e7dc7791 SHA512 fc2145fad2fe1e5a28331a91959c591693cec497504344e6ae2587276d7b20e7895d94780273a0f83307efbb0e6099e0bdc1874bcefa2595590a736092502891
@@ -34,4 +45,5 @@ EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f6
 EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
 EBUILD hip-5.0.2-r2.ebuild 4885 BLAKE2B a5b5c0cd40d1ae31d15ba4d774bfc6ce744b06025b08114976b6aa24758f5880eadf0cdd0b483d80469f6afd953beca56bf5dd6e8c79af111bbbe490baa876bb SHA512 00708d55c02c65cba95b009e3e14006901f92ea1ba8a08a32c25996e04613f4d6237c3b9ba0b1e2c237ad8269282fad39e17ef67b2319fb64bbe6ae9654f5748
+EBUILD hip-5.1.3.ebuild 6042 BLAKE2B d57df2bb4a811b42a048f6f9e72ef54b2d567784eb2d6b80416408363c0246a67ae2f83ca0c9e5c76f1834a987b33b6408688a0c6037e34f6a7dc83b11abcc46 SHA512 761bd007526189d308a437781ffada9244c7ee58b29c4ac63cbf8b5b7f1f265b0e5de1e90aff9b799c1aa1bfc53deb368f181b8a1a27d201762379b7a6f3fa73
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/0001-SWDEV-316128-HIP-surface-API-support.patch b/dev-util/hip/files/0001-SWDEV-316128-HIP-surface-API-support.patch
new file mode 100644
index 000000000000..14af91f9055b
--- /dev/null
+++ b/dev-util/hip/files/0001-SWDEV-316128-HIP-surface-API-support.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..bf1f2dd32ce5
--- /dev/null
+++ b/dev-util/hip/files/hip-5.1.3-clang-include-path.patch
@@ -0,0 +1,12 @@
+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-fix-hip_prof_gen.patch b/dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch
new file mode 100644
index 000000000000..05b25e7178fa
--- /dev/null
+++ b/dev-util/hip/files/hip-5.1.3-fix-hip_prof_gen.patch
@@ -0,0 +1,38 @@
+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-rocm-path.patch b/dev-util/hip/files/hip-5.1.3-rocm-path.patch
new file mode 100644
index 000000000000..2ce68b733577
--- /dev/null
+++ b/dev-util/hip/files/hip-5.1.3-rocm-path.patch
@@ -0,0 +1,13 @@
+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/hipvars-5.1.3.pm b/dev-util/hip/files/hipvars-5.1.3.pm
new file mode 100644
index 000000000000..7de38b7f3c78
--- /dev/null
+++ b/dev-util/hip/files/hipvars-5.1.3.pm
@@ -0,0 +1,21 @@
+#!/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/hip-5.1.3.ebuild b/dev-util/hip/hip-5.1.3.ebuild
new file mode 100644
index 000000000000..a9e9844fdcc2
--- /dev/null
+++ b/dev-util/hip/hip-5.1.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake llvm prefix python-any-r1
+
+LLVM_MAX_SLOT=14
+
+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
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	dev-libs/rocm-comgr:${SLOT}
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	dev-perl/URI-Encode
+	sys-devel/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}/0001-SWDEV-316128-HIP-surface-API-support.patch"
+)
+
+python_check_deps() {
+	if use profile; then
+		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}
+
+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}\/cmake DESTINATION/s: .): $(get_libdir)):" -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\|samples\)/s,DESTINATION \.,DESTINATION share,g" \
+		-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"
+	# 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'}:'/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'/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:/usr/lib/amdgcn/bitcode:" \
+		-i "${S}/hip-config.cmake.in" || die
+
+	einfo "prefixing hipcc and its utils..."
+	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
+	hprefixify $(grep -rl --exclude-dir=build/ "/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
+}
+
+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_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/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
index 4baa8bee5352..9c0f6da8c531 100644
--- a/dev-util/rocm-clang-ocl/Manifest
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -1,5 +1,6 @@
+AUX rocm-clang-ocl-5.0.2-system-llvm.patch 715 BLAKE2B 7a23c5887e3251b68113f5466946a4a967808ec4268df2eac093b374497cce8d1ca4955c549cc8c2c5f676a51903be367fc457b01a8d1d2f3bfdf5aa85dad024 SHA512 a45561970797cf8f7406ae9ff0e3844cfd8641a5b9ee08a2958907a0154f2cafe3142c507e5249df3bfb3108f17032edeceeab850143eee358886e4ff6ade035
 DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c SHA512 059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c
 DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911 SHA512 582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167
 EBUILD rocm-clang-ocl-4.3.0.ebuild 912 BLAKE2B 0c5a8985f4eb050a2faa5b136523383ae03addf1d6b38508ff67c118436398c74e90488c20292832a87d1b0099a1ef9e0d8bfff65e21036a88e5f7f17e898779 SHA512 4b6410884e506cbf847ee57581cd820bd4fbb9158c4c74281ef3c4bd4cf07f34e50d20abe724e1dc2b39c8c0e88de673943207f8a741e4df0608c8ec5d8f0d58
-EBUILD rocm-clang-ocl-5.0.2.ebuild 912 BLAKE2B 5f546699f86c7d5c5180ac1e72631bc75be828c61aa60546e7b4163f7100bef0d5747f887fec47dbadfa53cd97927fae378f3cc8dd2e76a22284569ca9182b6e SHA512 6ecd1861b6fe80d23b5d20ca4149da833ee795888d2adef13004ccf3f59b4570717b23266a1866aacbb9c963e751194c7e6f599b23d743b814eeb44d73e1e103
+EBUILD rocm-clang-ocl-5.0.2-r1.ebuild 850 BLAKE2B b3f6c078612c7849bc5a83ccc367d834d820c2a194e45ec2851c66a711e7b042becf0c67e41b31091f84b7ecc0930faac8d65ca49811127f66b3f98629654afa SHA512 4733c5a49318fc27dba5aa5c63283b1140d937201897c97017e0333a19383209ff5d60c498121ee3eedb75b2354291aa5b8619b2c5ef05d7eb14fa78a2291db1
 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
new file mode 100644
index 000000000000..5f052f4282e0
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
@@ -0,0 +1,17 @@
+Use system clang.
+
+Forwarded: not yet.
+
+Index: clang-ocl-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- clang-ocl-rocm-5.0.2.orig/CMakeLists.txt
++++ clang-ocl-rocm-5.0.2/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(hcc_FOUND)
+     set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "")
+     set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "")
+ else()
+-    find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS /opt/rocm/llvm/bin)
++    find_program(CLANG_EXE NAMES clang)
+     get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY)
+     find_package(AMDDeviceLibs PATHS /opt/rocm)
+     set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "")
diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
index 202836d1adbe..40be9d9dd7df 100644
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
+++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
@@ -20,12 +20,13 @@ DEPEND="
 
 S="${WORKDIR}/clang-ocl-rocm-${PV}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch )
+
 src_prepare() {
-	sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
-		-e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
+	cmake_src_prepare
+
+	sed \
 		-e "/AMDDeviceLibs PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
 		-e "s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
 		-i CMakeLists.txt || die
-
-	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 362d70575632..05e774a2d06a 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -8,6 +8,7 @@ DIST rocm-cmake-4.2.0.tar.gz 22147 BLAKE2B 14d90d187a845fd148b77cd73a628653405be
 DIST rocm-cmake-4.3.0.tar.gz 22912 BLAKE2B 588ba127aa401826021e40d2c0dc05fb40e6000bf26ad2f32a40d52b4882a5e0705f9d303784ca830f2dc88dbda4fc7ffe89e0080d862dd8867a021f7c008331 SHA512 1277336c9535fa934bd7f255299d31d817ae3c659468ade4d7689325df175aa3029f5b1ebde072a4f1d5edf31281582371a44902fa46171634ad238fc8b3bde0
 DIST rocm-cmake-4.5.2.tar.gz 26353 BLAKE2B a4865501c0bdf83f968b040dc61edf9ded248c0d9f07e8efcfa90e212382f8637dc06c2116d21f08b063e9f038ad7d4d2ea7aafb57c9cd562156783084e772d9 SHA512 8c4ec3f1b10f5e2d3057e8a670bc75c347a70508b8610569fe71b67a3f91f901272b3bec11734fc2835efc19c666572d9c63e8edbd035c28adb00c6e349cc5c7
 DIST rocm-cmake-5.0.2.tar.gz 34496 BLAKE2B 94a19c51e318bade4034ab219bd4ef7f4adbb412d0306ab38a0d3e5a6fb178d42a793997e097b45b9d07e4a0b38fb32db137a7ec3d8540ab76035774f00a34d5 SHA512 c9378b13c4d9fddc82d12e3889851368b959dfe490227f4e8494c07d5e397e369cc80b4aadaf977ed382150b972dddd54b9bcf291bd640bab5ab35cd5b002b6f
+DIST rocm-cmake-5.1.3.tar.gz 39781 BLAKE2B 9ffe9ce6390889b651ffbb8019dc8f0274f8aa3ac7cf14da05f828ab952c575ff34e120f0cef3b3fd46bff208f47a3d293feff2c77a1104e942c5d9f4303f61c SHA512 31dfbfd822a9b6f817ef459df171e4a2ba16556d00ad8b3b5be3ebebffe03cbbd815d394cc6452509e47424a3cac50e523e31923b2b9c48d586163ead2338c74
 EBUILD rocm-cmake-3.10.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.8.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.9.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
@@ -17,5 +18,6 @@ EBUILD rocm-cmake-4.2.0.ebuild 731 BLAKE2B 756a54919e71e54702a32910f35e7e348aa44
 EBUILD rocm-cmake-4.3.0.ebuild 746 BLAKE2B 4c573d26974310d9e0a58022cb20e07f4282815b60337c9851b01faac91ed0cc11c95fb0aad253a63bb4702cac98e644bb3c255edf70c9511a3ca8180007811d SHA512 01b9c5239ca43bc08a8a42ceac0bc540c0015811f63cc17239f2356661edd2c470b0b92197e7e418c9e31b5aee79dfe22ef2eab337681e880f66c5b782c4a12e
 EBUILD rocm-cmake-4.5.2.ebuild 746 BLAKE2B a9ea8cabfaaaeb24e5cf5af8c5ecbef16a6e368b7bd27e4a2ef8c945a28a3ef53f298aeb48c085113e635411d44a04c35d4bed30a675de933c3b470d6ab58e8a SHA512 82cc4b6d02b29d7632ba31d0122369a4da28d27df01cf6ae00450a966e4de185ca1820c4f3e0fae5c5ed9851702691656e9d780d1b4350f34c742f8db4164300
 EBUILD rocm-cmake-5.0.2-r1.ebuild 775 BLAKE2B 2e5d016a04ac4837e1740f2961870943617bc447f8dca2fd024cfd3f25dbdbef8ad26a981b681a2feb840900824da832a75db73cfa3c53246b3b1cf31813c193 SHA512 a5c69b0d930960f560eb2fca33a39bd627c99528f052d85a94f3c5e951d47bb7e927d1a5e29e0f8804eb96900e339136cbbb500a2f4b5f794698742ce44c5673
+EBUILD rocm-cmake-5.1.3.ebuild 775 BLAKE2B 2e5d016a04ac4837e1740f2961870943617bc447f8dca2fd024cfd3f25dbdbef8ad26a981b681a2feb840900824da832a75db73cfa3c53246b3b1cf31813c193 SHA512 a5c69b0d930960f560eb2fca33a39bd627c99528f052d85a94f3c5e951d47bb7e927d1a5e29e0f8804eb96900e339136cbbb500a2f4b5f794698742ce44c5673
 EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 MISC metadata.xml 372 BLAKE2B d476bc60c5fdfc14c214db2fa6cdb09e97a99ee4a6320e51db7332afea9ded612e54e44680474e662810fdcf70d01457f582bb9495ef20fd98fd1b008f636e4c SHA512 2ae528e0cb9221b053295cd2eca87988905b08429e81b911f21163770164d27444f5227d2bb26174d46cde2c054a1bc8c3a120c8e0f404cfa92f98c64253a481
diff --git a/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild b/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild
new file mode 100644
index 000000000000..ac9cb2351f34
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-license.patch
+)
+
+src_prepare() {
+	sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
+		-i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 01b244895966..102dd8ac2452 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,11 +1,14 @@
 AUX rocm-smi-5.0.2-gcc12-memcpy.patch 605 BLAKE2B 8dcf4c74b9f1ccf832d71cc8b54d50aa1c7c2978bd70c359875548b753bcf52b54bfefe30b34aecc211499c9b46a9b0e62661ef8725c1c1ef3cde81da669b581 SHA512 7a39dcae0fd99fc82b92fca0a9080d42f9378065f120712132a42841ed67c056ff469e3b13760181f5d96861c1169fe8c6f0426e5351e5b67d6439605a11c41f
+AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f718f1f37869e5432993ca016ff7278cc14d7744d61efc813ee100e462bb9bb1bd61975fb620e82eaab37abe94bf415a9e40815919f59a SHA512 cd22af4b79ef366d10a36d663faf89c60a618aa9394fcac96d3521a9b9d1d270d20e216d918f18222930d883a8e2c72588ef97ab5a60086eed950a0ccfc7cddb
 DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
 DIST rocm-smi-4.3.0.tar.gz 1672482 BLAKE2B 21b35daa565ce368ac10110ba73f723c5d2125e401f5c8fa2d8e3300f450f39dd0c1de74681249868a842b568af0f2cf0d1f7bf0d40d338a7d1ee7c9e25b67dd SHA512 2bf5d3f1be50636c7c848cfa982fcdb6fbf25d648bcbe2a195e1153c7f4c8b11b2b3650aaa110eec780a218a1503afe84637c7d6e7e868e7065f8c51d8d3b8dd
 DIST rocm-smi-4.5.2.tar.gz 1674835 BLAKE2B 7cf69170a4a8dedfdc467e3b8dc64bd829136062487814e169cca0deabcd05d8adaf4fc440173e10cd8117ae63119f10a09c3042b0915b865e0620322c940e91 SHA512 640645d07dbc93a85d4e498bcc88fa0caab36b5af0f9feabf8a2383786ccb2b588be625f46e90d1b71803c011891a62a3642098fd0eb83530d5d8e0a49d204dc
 DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05
+DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e
 EBUILD rocm-smi-4.0.0.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
 EBUILD rocm-smi-4.3.0.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
 EBUILD rocm-smi-4.5.2.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
 EBUILD rocm-smi-5.0.2.ebuild 1792 BLAKE2B 219a84df1c3507b7b6ff70023c6a9b7c20e70bb74bdb00b3b66dd815bc787e97bcda15679a51acb2d6750d4c3d15dbe2b8fbc0e22c8e8bf1e588eead40be2fc3 SHA512 54cfc8b4c28daf189e6ded59fdda18f06525f294a0d097fff01943ace2718d668f98cf17565c9f5429b4816e20376d4a37bb41e8d8d1b3c50b4efd40b86a092b
+EBUILD rocm-smi-5.1.3.ebuild 1847 BLAKE2B f62dc60f89d0e7b3820466e118daac95bbd1d636dde571b946e810b74c2963b60ff5257b5100427d4930159e3c152795f8d7fda9f29ee9f67a7363baa64cb7c7 SHA512 bbdd706f03334093da02b5a870e00bc49af430faf4ccb835ceb7a52e15d456aef71ecdf8cb7369e639d3392853f90f1b8cece8f598dde9bd7ec2718e93c920d8
 EBUILD rocm-smi-9999.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
 MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..3f322aef3582
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch
@@ -0,0 +1,26 @@
+Detect amdgpu module for amdgpu-builtin kernel
+From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001
+From: YiyangWu <xgreenlandforwyy@gmail.com>
+Date: Sat, 2 Apr 2022 16:40:11 +0800
+Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
+
+Closes: #102
+
+Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
+---
+ python_smi_tools/rocm_smi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python_smi_tools/rocm_smi.py b/python_smi_tools/rocm_smi.py
+index 57606ee..35be495 100755
+--- a/python_smi_tools/rocm_smi.py
++++ b/python_smi_tools/rocm_smi.py
+@@ -66,7 +66,7 @@ def driverInitialized():
+     """
+     driverInitialized = ''
+     try:
+-        driverInitialized = str(subprocess.check_output("cat /proc/modules|grep amdgpu", shell=True))
++        driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True))
+     except subprocess.CalledProcessError:
+         pass
+     if len(driverInitialized) > 0:
diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild
new file mode 100644
index 000000000000..7947568516a5
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="MIT NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
+	"${FILESDIR}"/${PN}-5.1.3-detect-builtin-amdgpu.patch
+)
+
+src_prepare() {
+	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
+		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
+	sed -e "/link DESTINATION/,+1d" \
+		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
+		-e "/bindings_link/,+3d" \
+		-e "/rsmiBindings.py/,+1d" \
+		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
+	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die
+	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm_bandwidth_test/Manifest b/dev-util/rocm_bandwidth_test/Manifest
index e774d96bf0ff..e82a88279f81 100644
--- a/dev-util/rocm_bandwidth_test/Manifest
+++ b/dev-util/rocm_bandwidth_test/Manifest
@@ -2,5 +2,5 @@ AUX 4.3.0-use-proper-delete-operator.patch 1201 BLAKE2B d1ca41918c625a0927ff4a68
 DIST rocm_bandwidth_test-4.3.0.tar.gz 37965 BLAKE2B e4689c4a11257aecf98a0a047dcb56bc23deb8e781d819488c9c934ee2ea6914f0de49a48f09c3895383f715659ff750c0fb2bbf3ec136350d935bd159d2237b SHA512 8c646cbb736ab50bf25302566436cda9acb496a639453ae35235de34ec5ace1cc1a5a1544eb3482114386c9f8b850d4572e2eef6884c7cab50e9a4b6b37f67c0
 DIST rocm_bandwidth_test-5.0.2.tar.gz 38091 BLAKE2B bf9767d55a3400fa1bc95a638a9fd6debcd3b0cd8f5d698eb5d39568c5dc7321c5a63c6678b4bc91f7bd5ff9cee13da7800b3a7523a24a0ceae607be8b18b0b4 SHA512 b235838442dd12e0283b36168eed4853094f423b8b61e3f623be78133af9f89406fb83254972d5a622f90998450660165205deb95082cb49907f112f4de80942
 EBUILD rocm_bandwidth_test-4.3.0.ebuild 555 BLAKE2B b3b4b13e7115b7adf3b64e4559ef5be3961197c5824ee4f8518614e56c0789017e149b0ea3402b1c46f54459a8e2587e6fca69413d0eb392470b550668fed55c SHA512 7d934e3a9a50ac55c75d6e5443197b427ec7807595dcc7b29fe7bdb6479d8f3a83ebe30081ae8e4d175bcbb9b37bb4900752d5eea96a95743c295385a02896f2
-EBUILD rocm_bandwidth_test-5.0.2.ebuild 579 BLAKE2B ae0e1842fbde4eb70c38e5787b5f370d5e0176c986a8a725c2b14062b41c9a5060ee7f674b055addd46dd263d5caaf1eb6d1ab25e2a69dded2c37c062ad59d63 SHA512 c1d92789d07e80c1cfe1bc54f329c183223cb165baf8efec4384738cfb8d99e95e579c101ce756e6b62b6db4a6a52a6ade4bcaac1e7f5bc5ee3642a608c9d317
+EBUILD rocm_bandwidth_test-5.0.2-r1.ebuild 573 BLAKE2B d8d76c19f1abe33baa48533c9fbd32fa3981a49b3530b7ea54770230349df7513f09a4d8cbdfbec9d4339861c769414778ea674e7faa4031609f9b0018eb8062 SHA512 e1726587640d81630af6aa4f701203c78bb5a2ba3cb72d75037d63aa2cba53b9835173a97340b2a56ff56fbab9d9cf0327684605a514d88039a506831be08d69
 MISC metadata.xml 338 BLAKE2B 5cb4452f4f4b4d4af05fdf3a487d18d970b300fd36466bac36fcdea5b77a7c71efafcf6edfdc5e041bb484f0eb7bac694689db1663ece9260cb8c10d799949ef SHA512 dab4e8519c431bfa40fb174851106f51d79ded92e9fd40a9478689fce70c9c8bab75ea595e099faf3d1ec990071c50e2a0793c1697850b745c14d0b5b59d03bf
diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.0.2.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.0.2-r1.ebuild
index 6353571d9ac8..094ed9071adb 100644
--- a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.0.2.ebuild
+++ b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.0.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="NCSA-AMD"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 
-DEPEND="dev-libs/rocr-runtime:${SLOT}"
+DEPEND="dev-libs/rocr-runtime:="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 5ab865139858..cc02af025d4b 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,4 +1,5 @@
 AUX rocminfo-4.3.0-detect-builtin-amdgpu.patch 936 BLAKE2B f4011201ae5cd4ecd495caa72b3b8e1eda5011265394388eea558479f7aceacf22193a0774f5a9919380b770429d1f40d056c1efde535f5db73bbb6e0d705d33 SHA512 78d075a8640a5223f914390e957fda4ec0297266fbda5837d339560732bd8aac5c46365b1b00cbe4650007d3ca94c711fc838849d74ce0dc4b9fcebc18a7fadb
+AUX rocminfo-5.1.3-detect-builtin-amdgpu.patch 1720 BLAKE2B 990b0bfd101fbe41e7dfda85f88d18763371f7c9cdc46ac10a5c695c45d8e29c08f1444b44524ba0917489b89d4906498c81e9e8d805f5ab9b98e2160a394799 SHA512 c193cc7f72df6cc8d5118f1f55ae184f8d80083aee255efb64762b4f0cc00f2c8973515617630dd8267dc1053cac4d1773683870563c29000eb4fd32a7f54e78
 DIST rocminfo-3.10.0.tar.gz 15106 BLAKE2B 7cc90a1c0b9c5f8664dc6c9bebe83f590526565df8ccb3b3d137ca1db42a7ae9640c43a2de01ae13319d8ea3267709ff8b0a70d2b4473d84d5350f7568a897fa SHA512 79eae3c294c1f3077515b807f9b0070a32122542ac6330704b9e0130366717361e046a9ccd5f43a02770746d2123292020d94de6878d053aec58519f1bd36521
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
@@ -8,6 +9,7 @@ DIST rocminfo-4.1.0.tar.gz 15379 BLAKE2B dcf7a663792538dbe5c02fbc9e5874d1e716f29
 DIST rocminfo-4.2.0.tar.gz 15379 BLAKE2B a76dd3f0d550d5b8a8c39454ef44d5f0a76ad24e4a3b75a9fd2a1b0d4d983a02a877c0eb4d2e4158f9c8c97602b52a2de9a1f535fad609a52e8cad48c4c8a833 SHA512 801c29ae88878b9448ad2f2c9faaa7ffba3a46c77887bebf2fa8d3db7e9258fb4678cf2b898ddfc88a34fcc0fdcc91c9aa2f4a1509eeb05db6a7b085ae28f3dc
 DIST rocminfo-4.3.0.tar.gz 15379 BLAKE2B 86683d8e88d26a8730cf84b3a1d4f69231ff7158186ca6b867b5a029ae485978cf0d67db2b07c05c046bb300b55b6e80e280b9429cef903e3077dc1da0945b8d SHA512 88b7f1ad86e76ede270d12fc3065eba192fcf3938d749b8345dac3b71be0985071dc5139a801ff46015369cd09b3eefcd8ff9ea71ab297476dda195f57792849
 DIST rocminfo-5.0.2.tar.gz 15767 BLAKE2B 4617e4df51cc0b02d1743e655491600510e4f9fc22ef47612aa69bc311e7dc3979b0063c650d9a4fee0124be404b92c110dc9db056a554ee25ba3d4bfd12f618 SHA512 dd02837e621a414b54ef50b52ca816509ffa8b613e7de5f8b09449c5fc543dee054860a2245462008f687683af48203b6d2080fe71bf6e3654981d6bfd56e254
+DIST rocminfo-5.1.3.tar.gz 16772 BLAKE2B 1b35661f9e6cd8cd5180ef3e4fd3dd8e7d6b282947d25c81b0b8bd347a5bee11cf87d950bbd8adcbd7a8a3053c41622b8e99fc0b56f4a14bdf4acf20992becc7 SHA512 998d499b0ae9a22bde30b2c26e31587a78b5ed63a19649d5b203eb47a044f17d1d4d3e951ec094d5be1ca3ba37efa4b19f5b53047727158170fa90c13a8c7563
 EBUILD rocminfo-3.10.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
@@ -17,5 +19,6 @@ EBUILD rocminfo-4.1.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0f
 EBUILD rocminfo-4.2.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0fe62f5cfc5ff10d12d68e116b3320276eb25c29180e45969594d16215d90921a4c21caa9d2d68f8f87ed9bf1f0 SHA512 0bcf6920d17952e31f090b2a0830a70cfbe737a31987024a7901d9728795b9166cac2894f6ec995e17a71f7cf33001655e8b5a4c1956413a38d0751b7c1669ac
 EBUILD rocminfo-4.3.0.ebuild 679 BLAKE2B f3efa2bbccc24bcc06179594a432ce9d53b3dfe89e545bfbc6d712fb928db7a89db764a03e988ab60f0ceaf5d52ac58680b8130a96365c6b6401b2d9df7de066 SHA512 cfd93c79aa88dedcd1e80223494e6e27b62cc949bede65c471bba4dc25da12f9fe687af0c8ff42a31f84d3132e74d64ab9a4774c212e2d5242a2daff438a2e1e
 EBUILD rocminfo-5.0.2.ebuild 788 BLAKE2B adf51ef812b52a6a5e81086b9561e76f0b04b36e304bfbbbc3dbbb7cfae1515b298e58f3644c371511115cfface8f70416aa32b2605de56e0549c3851e194263 SHA512 e3a5a2babe283f645d2c614381ea6e724dda8ace49449a1777ac8dafa98bc3f59947d8c8b65f2cf31d35be393a44f03947957d2c8a6f23e4fdab76beabfbbf28
+EBUILD rocminfo-5.1.3.ebuild 916 BLAKE2B acf34ad534cdafdf9409ee3f357ab47b01238e39b23bb10da0be48421a40bb7800a485643787ae446916833ac625ef59a8f1b10f714ed1bd68464ffd65a2d58c SHA512 cb8b43112fd94df38c4b4c47b1aa2a8cdb9b319e605ec64a7d615ebabf53bee850643f8d47b2445cb54531285cf3cdcc18b734898f1e9da65203960f7a6ae251
 EBUILD rocminfo-9999.ebuild 606 BLAKE2B 74046413f39f646c076f8cbc9d0a5d1373c3be8e303bd50767d6019d3b1a58a06d05ef0dbdacdcd079aeb519c28fc163c38246608024b9fc4225c99051d3b6df SHA512 20dcaa312421446d3ee1882f85babfdfd51a51dd598eae824b36d7fc8969da717f05685d436c59b61d2d1744479672a4de544667379a7fb9163c5e9637fab70c
 MISC metadata.xml 370 BLAKE2B 25693db5400c16b160c544c9afbf0a093c18cc94164e38fcde05e50cf6cbeef1f4875f59cf83830f8e700a60508b913430208b96518cc9a14c14f036d8152748 SHA512 763bc8e1c7f89ae046514b721ece281146d0b80768f49699ba8f347ff5f8c6a8facb8e6554c0ac0abfb195797acfb51f30f322fe90f6d342320a1d9cb44e1740
diff --git a/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..5d0b2ed284bd
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch
@@ -0,0 +1,50 @@
+/sys/module/amdgpu instead of lsmod for builtin amdgpu kernel module
+
+https://github.com/RadeonOpenCompute/rocminfo/pull/43
+https://github.com/RadeonOpenCompute/rocminfo/issues/42
+From ea4f017ed035928b1970e2589b02ec9b348c863e Mon Sep 17 00:00:00 2001
+From: YiyangWu <xgreenlandforwyy@gmail.com>
+Date: Wed, 18 Aug 2021 21:05:20 +0800
+Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
+
+Closes: #42
+
+Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
+---
+ rocminfo.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/rocminfo.cc b/rocminfo.cc
+index 871f406..58c847d 100755
+--- a/rocminfo.cc
++++ b/rocminfo.cc
+@@ -995,6 +995,8 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
+   err = AcquireAgentInfo(agent, &agent_i);
+   RET_IF_HSA_ERR(err);
+ 
++  std::string ind(kIndentSize, ' ');
++
+   printLabel("*******", true);
+   std::string agent_ind("Agent ");
+   agent_ind += std::to_string(*agent_number).c_str();
+@@ -1031,16 +1033,16 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
+ 
+ int CheckInitialState(void) {
+   // Check kernel module for ROCk is loaded
+-  FILE *fd = popen("lsmod | grep amdgpu", "r");
+-  char buf[16];
+-  if (fread (buf, 1, sizeof (buf), fd) == 0) {
++  int module_dir;
++  module_dir = open("/sys/module/amdgpu", O_DIRECTORY);
++  if (module_dir < 0) {
+     printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
+                                                           COL_RED, COL_RESET);
+     return -1;
+   } else {
+     printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
++	close(module_dir);
+   }
+-  pclose(fd);
+ 
+   // Check if user belongs to the group for /dev/kfd (e.g. "video" or
+   // "render")
diff --git a/dev-util/rocminfo/rocminfo-5.1.3.ebuild b/dev-util/rocminfo/rocminfo-5.1.3.ebuild
new file mode 100644
index 000000000000..c090c863e060
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-5.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="UoI-NCSA"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/${PN}-5.1.3-detect-builtin-amdgpu.patch")
+
+src_prepare() {
+	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	cmake_src_prepare
+}
diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest
index a254fb800f50..55e7e960d1bc 100644
--- a/dev-util/rocprofiler/Manifest
+++ b/dev-util/rocprofiler/Manifest
@@ -1,10 +1,13 @@
 AUX rocprofiler-4.3.0-fix-gcc11.patch 410 BLAKE2B 04516f2da7ed09de30243bb05241489deb9ee23e94ef5014dede9c9d54869d24a8467699cdc7e7fa5840c98102b386555c40ab77c4fe1d9679d2bdf17fb7855f SHA512 170963d5a52b5b42924f39d0dc9b2c6c8e4ae468b97cf453a28d6a1be8f2b5bf49f73de80a40cd98b837038f53bbd4002f9ed83864129c36682f317b376da83c
 AUX rocprofiler-4.3.0-gentoo-location.patch 2651 BLAKE2B 296c84acb0887ef0792698636ca521d749fb81e283e0e42a9799f2af002a7f5397eb9051ee2711b3d78a34b9061db3be420e7de07fc1c0ee478c2b6402cecfa5 SHA512 a55c83584fb40a0a342125ae88689eea7857e6663759e5d5664a9c618afeea74662d551e9cab78ec03859d4503d67ea0f6b26143a8bea05d213f6426112ffb18
 AUX rocprofiler-4.3.0-ldflag.patch 627 BLAKE2B 116e02e22f1ad0b3168dbc2aa76792a8797b1e6fe4c77f876af6c6e964936d2c2687972dd68c2057623197d8ddc1e9b318767f5e3818b7e35a03ce433b821080 SHA512 393e6334d2f13a6f8a0708c45233b1211b074969873ff1faaf5e58b667be57602b7a885f737f9309699fee9ab859d6ce28f5760e2b42556d9d8320957f68dca0
+AUX rocprofiler-4.3.0-no-aqlprofile.patch 1708 BLAKE2B ab7054d368332f39fd4ddcb377610001011a279764fb921a2440245ed13ea123024e8c35b26398d3e007089687fc5ec734c6fce1fae58dd03963ad6fc0a02c84 SHA512 cd8c5f1d78e73b75c109d99f2d35fb9815d2360092669337941595698a3326c53266ea6a530faa599d954afaed19d8b41a73e4513ec832899eb17835134de5df
 AUX rocprofiler-4.3.0-nostrip.patch 540 BLAKE2B 20592fe6ee33effc9feaca9ffcd6d48bef0a46bb7353c4e0b624cfb60b29a168ace763c86775c020ce162dca59886a68068485da19a2a14b35582a3ae33dfbe4 SHA512 a1d2a5d1606e4d2d249e51063f76b96dc460fb6ebe358029182bf9e4de88dd6879332cdff0ee7458b808a4dcc35fcbba3b43f0fc8c5dc2a0cffbbf2ddb05634c
-AUX rocprofiler-5.0.2-gentoo-location.patch 2218 BLAKE2B 1f7a2279ee98be6ca5f225e4a034c661f992a61010d43096e63174a38b9bdb02726d7dfd32d8cbf2b9f328c25edd030f9db8d6cc1043ecf28f908aba94173f97 SHA512 83de59a2650349d9ce3ca761a67d0cb5e3c8f5b1c64eef75637ddd7fbba2cc869c5ce6665966bd033df9f5dbbf99677de6b433ef4398814acdcefaf6687c79df
+AUX rocprofiler-5.0.2-gentoo-location.patch 2219 BLAKE2B 10237145d132be7b31b311b9f2ed69cb7494da312f980ffcf92eb89ed8a946d15e9312e77bd3997a578e6c33f3ef1efb896e73c597705bf461daf1f73cc77bfa SHA512 dfe21a0e43ecc94e15899e4f2a7ee28ae36d5b666ad6df66892b9d9befc9444111c817861b136aa8973cc426e0f30964909753360bf7fd7da31ffa05029457ba
 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
 DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
-EBUILD rocprofiler-4.3.0.ebuild 1618 BLAKE2B ca44d2232838b018f8ee27faa0d04d9a25709c6649e73fd90b64381075295e0b38a0a19ce8cedaaae5eff3224d5b79a8854927078db54cff5a7b785b15370ba9 SHA512 10ff1ee45e0b60a8c7476b9d5ee7cc5a0393ed2a6c044dea9676903841d106e5c199aeca4e2581f38cebe62735f719fc5f4b91982692dac6b5c0f5efe412d4ce
-EBUILD rocprofiler-5.0.2.ebuild 1581 BLAKE2B 0cae17e1bc9e5156cc61e51f2dcd0852798126546597d46f45497f56f8c0f20419bbf8a06ee5d422a7201ea04fd0d7739427d83a0423e47bac0f37486fcf3a90 SHA512 cb3186151bfbf782bf60e6b59d9806c77557966f9a8d41e569b6b5985c56468218dc0417d801889ab853f13de368e3156567a12f39945c77aca7ed6bbec2b7ff
+DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
+EBUILD rocprofiler-4.3.0.ebuild 1666 BLAKE2B abaaa17b92498d7db90a8361163ab16ad34ee4809af3c167b0c1c0ff08be4cd48eddd76c1045c9ca1fb94105f8f23b72c07309afc19a2db10a9240d854268876 SHA512 a02efb1ad47cdb4559fcc86380174e24c48239e2e1cedc454770a199b1bc4be9ba9808ae73f55c264089901e2171216df6087a690774a4b782704be8c3cb0cb0
+EBUILD rocprofiler-5.0.2.ebuild 1629 BLAKE2B 0c9738996f10c94cdb9bd295cde87e9361c6cf212d4d06aaedd89b6df07ebe0be414ed815780960f240d77408dcaba3bf3571bff40e50fd5856b0830708c718c SHA512 bf700e4967b2568dbee630f6dc8765b1022268c843b27eb944bc759f11d45b0e89433f8f17eab1346956309b76932966e30f803c6991666d4ab71a2a1bb22b3d
+EBUILD rocprofiler-5.1.3.ebuild 1588 BLAKE2B bbd8e7a21ce4bf5883d72cfafaf7df0353b4a2551fd2cbd6883895bac5e8631ddcb6433f0500af844e04db2df581519b0a25b71acc6dac6a70db9361a5c0c98a SHA512 5ee3608db53523a3397125416f50de8dfb95a93cc4a0e0250a1e6066012b88ab23e28b4b4c2265dd08c09270cbc7cf1521084ed169a33f07180b6ebb3dcdfbba
 MISC metadata.xml 493 BLAKE2B 79000a74b13a0d35e0bcdb8254471fde9027c498ca75e761a3f694690315149e711ae8f7b73ae9bc5aa462358784fac055b975149109829e00cb2acac73ef138 SHA512 3f49c336aee801fb73d26b9d43a52816ca15c75061bed885c1b1406929ae1a3b9b01ce6f3c71b17ca9e121dcbc73f525d5a843c526ea8d4b433642eeff89ccd5
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch
new file mode 100644
index 000000000000..12480d0baa0a
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch
@@ -0,0 +1,35 @@
+Skip loading proprietary AQLProfile lib
+--- a/src/util/hsa_rsrc_factory.cpp 2021-06-28 23:09:44.000000000 +0800
++++ b/src/util/hsa_rsrc_factory.cpp 2022-05-11 10:48:23.431989766 +0800
+@@ -138,14 +138,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+
+   // Get Loader API table
+   loader_api_ = {0};
+--- a/test/util/hsa_rsrc_factory.cpp        2021-06-28 23:09:44.000000000 +0800
++++ b/test/util/hsa_rsrc_factory.cpp        2022-05-11 10:50:44.571990702 +0800
+@@ -135,14 +135,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+
+   // Get Loader API table
+   loader_api_ = {0};
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch
index 0605675e41c6..56cc79211ff0 100644
--- a/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch
+++ b/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch
@@ -9,7 +9,7 @@ Index: rocprofiler-rocm-5.0.2/bin/rpl_run.sh
 -ROOT_DIR=$(dirname $PKG_DIR)
 -TT_DIR=$ROOT_DIR/roctracer
 +ROOT_DIR=$PKG_DIR
-+TT_DIR=ROOT_DIR
++TT_DIR=$ROOT_DIR
  RUN_DIR=`pwd`
  TMP_DIR="/tmp"
  DATA_DIR="rpl_data_${time_stamp}_$$"
diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
index 630f4754fc8f..33982694c17f 100644
--- a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 
 PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch"
 		"${FILESDIR}/${PN}-4.3.0-nostrip.patch"
+		"${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
 		"${FILESDIR}/${PN}-4.3.0-ldflag.patch"
 		"${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" )
 
diff --git a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
index 7e8f0346636d..23d1b9cc746c 100644
--- a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 
 PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
 		"${FILESDIR}/${PN}-4.3.0-ldflag.patch"
+		"${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
 		"${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
 
 python_check_deps() {
diff --git a/dev-util/rocprofiler/rocprofiler-5.1.3.ebuild b/dev-util/rocprofiler/rocprofiler-5.1.3.ebuild
new file mode 100644
index 000000000000..e58a6e4b99d3
--- /dev/null
+++ b/dev-util/rocprofiler/rocprofiler-5.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/roctracer:${SLOT}
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
+		"${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
+		"${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
+
+python_check_deps() {
+	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	sed -e "s,\${DEST_NAME}/lib,$(get_libdir),g" \
+		-e "s,\${DEST_NAME}/include,include/\${DEST_NAME},g" \
+		-e "s,\${DEST_NAME}/bin,bin,g" \
+		-e "/ctrl DESTINATION/s,\${DEST_NAME}/tool,bin,g" \
+		-e "/CPACK_RESOURCE_FILE_LICENSE/d" \
+		-e "/libtool.so DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
+		-DUSE_PROF_API=1
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 3168d9281035..1bdb1a0448d6 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -10,11 +10,14 @@ DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a3
 DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
 DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
 DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
+DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
 DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994ea919d572c5091ecec73d614bebb7ec14a14d81a0cabbe514b8439ddd7225f1a3a3fa7a0b653c33f938568bbe0c593 SHA512 35d3e9648bc5ee60bbddc15c9675efba7de3b4b3b725b9623e71a83007b8f23a323cc1da82e67f0ff425e5f827d6c632435bf465be8cba8c775405ead3f0f3be
 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
 DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
+DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0-r1.ebuild 1809 BLAKE2B 11126fdae37659f3d58b0ca3d3f6d5bdc7664577d02c07966c8af50eae42779a02e944b994957123a85131227c904b3a86fc15a2471acb954eb326fac1c1f808 SHA512 bb934a99d460828da3569ebe848294a46170995faca74b3d97443f8ef193605dae5554d68cbc6749a15f0e686833897ebe9c376e415555ae0118d112c206aa5f
 EBUILD roctracer-4.3.0-r2.ebuild 2453 BLAKE2B 6fa00df1af44e136531c4e14e11af95a37a59e60a5137da5bf5d58cb6070d9ebfefae0e7527154ef88875110e430509d2d7f4bd9423735c850dabd0620988bff SHA512 48fa4afdecb640a3fc508a2fd87a90867278e991864061fa98ae7a5657db3c1f8db5a26cf20ebfb891975a26ba24cbb8e2dac7dee64e7e976f9539310e362faf
 EBUILD roctracer-5.0.2.ebuild 2457 BLAKE2B 430f8942ebaf5e85d9bb654e2eaf905f44a3b664d78cd559db8bf6d70ce02e0a3213deea265d408a8e2f7088cb1af841ab6e05647d41173e53cfa709ef7eaabb SHA512 cae7d1a201af227be6f8103f18de6fef8e58a9d0dd7902ef3378eca866ed89844bd600eb4f64062d62bdc88cf166eccbaee441fc119d563a244299fd9bf42528
+EBUILD roctracer-5.1.3.ebuild 2372 BLAKE2B b97a66c807c403d2075d8975d910762e88b5cd047fcbe714a30169d25c8cb2feeb8f2cc5b25133394e33213e4c8a4b621abe2171a695ff7570681b519182d803 SHA512 304e2d50eb4386e454aabb441410986c5a21641f15b6cafda5f91f52f1c67f7cb6626f833ce41029c596d10b4841d0c852be63bd0a53d8c8b8d6ef64daadef1e
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/roctracer-5.1.3.ebuild b/dev-util/roctracer/roctracer-5.1.3.ebuild
new file mode 100644
index 000000000000..b378cfcc340d
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.1.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake prefix python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
+	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
+	"${FILESDIR}"/${PN}-5.0.2-headers.patch
+	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
+
+	# change destination for headers to include/roctracer;
+
+	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
+		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
+		-i CMakeLists.txt || die
+
+	# do not download additional sources via git
+	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
+		-i test/CMakeLists.txt || die
+
+	hprefixify script/*.py
+}
+
+src_configure() {
+	export HIP_PATH="$(hipconfig -p)"
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+	)
+
+	cmake_src_configure
+}