gentoo auto-resync : 31:01:2023 - 21:02:55

21 files changed, 622 insertions, 6 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4661ec7477c0..e09958540350 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 3742d7d6e848..c134bea433d3 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -5,9 +5,13 @@ AUX Tensile-5.0.2-gentoopath.patch 3410 BLAKE2B bbf2c406bbcf2c34efd04667788719f6
 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec
 AUX Tensile-5.0.2-use-ninja.patch 897 BLAKE2B f06a3831a43a4b6c00e7eb231cc13901f7b4a3a924a50d85ba81f9def535951c450a01504506476c1ee88317cbdf0c0c00a57cb5cd198ab44e8e0b94aefda25d SHA512 15404d3cd5dbc7b74e81092d86f9c49cd45fe4df645602849ff515baafa3890fd68ca808cbebd6ae37e951b382ff4446a31089306c950f8549431dfbe75c3b53
 AUX Tensile-5.1.3-gentoopath.patch 3350 BLAKE2B 890ab24fbd99aede187bde67c8d6f586f625c30cff34da39e12b199b022170de8df3087c3581f9e635d5d12f31db0aa944a2628733417322621ab51b0292b01b SHA512 d17a948146e7ef2447ae92b2822f53cd77b0992297fd2a43598434db4f7c2095d269138ce5c0eedda73a34e193fc56401f22471f9eca68ec6026577f07a7fca1
+AUX Tensile-5.4.2-gentoopath.patch 3147 BLAKE2B 4834c0f9b1241b79704fbda954cffcf70e19be9a7bee7564a309b3b52bf67d3ab6876e644e5599dbb820bbbf3c2d44aab15e74f589c1c3d2e11798e83b063c7c SHA512 e8f6ac86bb96b1ca2c34dd10691e99d4121e6c214f9371f622caa17a936326c2b33b39529df888e6feb8ba9796b33860d047653c945604813023451888048990
+AUX Tensile-5.4.2-use-ninja.patch 1164 BLAKE2B 41d6dbb68fa41b53d230afd06af95acb014163d14b7f0e61d5a2945ef02c7a3d376f327a3f82fa86085c8eb95820d95883bdc05024e87b69dad61caf39c3b124 SHA512 b73271b637b4b3c045813638b1cebf6c3b4ac50350a62a76351e6fdf3e74b20104bbb135085c96c9c0e99f20f971af316d9686c8347a894361ee90abb66175fa
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
+DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80
 EBUILD Tensile-5.0.2-r2.ebuild 2634 BLAKE2B f3828862d1d5986ee3b561f4a652856f8887c70ebccdf43eadc69a62c2434fa129eae16e6891345c1664de1c4f12d20f3f406f0741afd3a4fda520f0d58175fe SHA512 fc81aba4df641f76331750af7237e9f8b15bb5806984ed60c9b39f82e3293c22b676dfda864351b9d32c687522b4052b99ba8f1528436aae7997e5b35c799d4d
 EBUILD Tensile-5.1.3-r1.ebuild 2723 BLAKE2B 9d894b023b6d6aeef26422e770bf4195ce3b40f6086f6e121f635c2fb351fb9f4a22d5dcea58c5bcc51067b7c8c8a2d63bd8b68d2db2a00a72d2ded2332663ec SHA512 82c586818ceeba2eb55406d309e743ae90f7cddb0ed129773b51edb694c54ec016860aae82df2e1d8bb5111a896c3d7a33a0a2a3f3b7ebf2f49614b82651959c
+EBUILD Tensile-5.4.2.ebuild 2623 BLAKE2B 03c9cf9dfa7258b61ba77a757893dafb3a11e15ab25759fc0b0026b431d6239383bb89ec52e86815cc58aa3cc704a1bedced529511711f56a57087a6b29937da SHA512 b44c3b5f25a3acd2769a188b39ab8e29a5ce5e05a68b5a62eb5bd2c5f979c9da1eff7fd27a504c0bf07cd3389632042b0d2c65ab8204bd759cbd8bbdcfa6e900
 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
diff --git a/dev-util/Tensile/Tensile-5.4.2.ebuild b/dev-util/Tensile/Tensile-5.4.2.ebuild
new file mode 100644
index 000000000000..09bccd0ab2dd
--- /dev/null
+++ b/dev-util/Tensile/Tensile-5.4.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 llvm prefix
+
+LLVM_MAX_SLOT=15
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+# Not compatible with recent versions of pytest
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	>=dev-util/rocm-smi-4.3.0
+"
+DEPEND="${RDEPEND}
+	dev-util/hip
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+		  "${FILESDIR}"/${PN}-5.3.3-gfx1031.patch
+		  "${FILESDIR}"/${PN}-5.3.3-fix-arch-parse.patch
+		  "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
+	  )
+
+CMAKE_USE_DIR="${WORKDIR}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \
+		"${FILESDIR}"/${PN}-5.4.2-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+	sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on
+
+	# ${Tensile_ROOT}/bin does not exists; call command directly
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \
+		-i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_newexe Utilities/merge.py ${PN}-merge
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+}
diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch
new file mode 100644
index 000000000000..2aed8082de05
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch
@@ -0,0 +1,67 @@
+Fix incorrect path in scripts and CMakeLists, in order to build tensile_client 
+===================================================================
+Index: Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.4.2.orig/Tensile/Source/lib/CMakeLists.txt
++++ Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt
+@@ -51,7 +51,7 @@ set(tensile_sources  ${tensile_sources}
+     )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)
+Index: Tensile-rocm-5.4.2/Tensile/Common.py
+===================================================================
+--- Tensile-rocm-5.4.2.orig/Tensile/Common.py
++++ Tensile-rocm-5.4.2/Tensile/Common.py
+@@ -1950,7 +1950,7 @@ def assignGlobalParameters( config ):
+     else:
+       print2(" %24s: %8s (unspecified)" % (key, defaultValue))
+ 
+-  globalParameters["ROCmPath"] = "/opt/rocm"
++  globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
+   if "ROCM_PATH" in os.environ:
+     globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
+   if "TENSILE_ROCM_PATH" in os.environ:
+Index: Tensile-rocm-5.4.2/Tensile/ClientWriter.py
+===================================================================
+--- Tensile-rocm-5.4.2.orig/Tensile/ClientWriter.py
++++ Tensile-rocm-5.4.2/Tensile/ClientWriter.py
+@@ -180,7 +180,7 @@ def runClient(libraryLogicPath, forBench
+ def getBuildClientLibraryScript(buildPath, libraryLogicPath):
+   callCreateLibraryCmd = ["python"] if os.name == "nt" else []
+ 
+-  callCreateLibraryCmd += [os.path.join(globalParameters["ScriptPath"] , "bin", "TensileCreateLibrary")]
++  callCreateLibraryCmd += "TensileCreateLibrary"
+ 
+   if globalParameters["MergeFiles"]:
+     callCreateLibraryCmd += ["--merge-files"]
+Index: Tensile-rocm-5.4.2/Tensile/GenerateSummations.py
+===================================================================
+--- Tensile-rocm-5.4.2.orig/Tensile/GenerateSummations.py
++++ Tensile-rocm-5.4.2/Tensile/GenerateSummations.py
+@@ -59,7 +59,7 @@ def createLibraryForBenchmark(logicPath,
+     Selection.
+     """
+ 
+-    pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary")
++    pythonExePath = "TensileCreateLibrary"
+     args = [pythonExePath, \
+         "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
+         "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \
+Index: Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.4.2.orig/HostLibraryTests/CMakeLists.txt
++++ Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt
+@@ -139,7 +139,7 @@ set(test_sources ${test_sources}
+ )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)
diff --git a/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch b/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch
new file mode 100644
index 000000000000..f88bf00665cb
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch
@@ -0,0 +1,21 @@
+Index: Tensile-rocm-5.4.2/Tensile/ClientExecutable.py
+===================================================================
+--- Tensile-rocm-5.4.2.orig/Tensile/ClientExecutable.py
++++ Tensile-rocm-5.4.2/Tensile/ClientExecutable.py
+@@ -44,6 +44,7 @@ class CMakeEnvironment:
+         args = ['cmake']
+         args += ['-G', 'Ninja'] if (os.name == 'nt') else []
+         args += itertools.chain.from_iterable([ ['-D{}={}'.format(key, value)] for key,value in self.options.items()])
++        args += itertools.chain.from_iterable([ ['-G', 'Ninja'], [ '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=ON' ] ])
+         args += [self.sourceDir]
+         args = [cmake_path(arg) for arg in args]
+ 
+@@ -53,7 +54,7 @@ class CMakeEnvironment:
+             subprocess.check_output(args, stderr=subprocess.STDOUT, cwd=Common.ensurePath(self.buildDir))
+ 
+     def build(self):
+-        args = [('ninja' if (os.name == "nt") else 'make'), f'-j{CPUThreadCount()}']
++        args = [('ninja'), f'-j{CPUThreadCount()}']
+         Common.print2(' '.join(args))
+         with Common.ClientExecutionLock():
+             # change to use  check_output to force windows cmd block util command finish
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 5535c89a08cd..35830e154176 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -5,6 +5,8 @@ AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.12260.1.tar.gz 8887984 BLAKE2B 626b5f2bd189ba9b2933b9d65227ca1552484f73f7398b2a763744d21a4ea189987e4eb08e9e7f09898fb49568b59a2c45298363495c1759fec9927a95cf4478 SHA512 4223e9c8213c7e6cf3539d955394a0a4a39cb8d2114ce18ccaeeb0b36a91ca6fc6a314fa9d9db24929fa7cd6b86ff8b82f369f35dd80e5df49b23ac9cd3a519b
 DIST intel-graphics-compiler-1.0.12504.5.tar.gz 8941924 BLAKE2B 6441cc50c2449524c800c73736f8963bc0011c6b87eefa03575cf09d00a8e812c9961bd50fb9801b77452da2d993e76196beb0a2093a249a87d7182e1c1e8707 SHA512 32a94b213a591f9ceb8ca08674c9fb8994b50818c51a6bfd412c4cd30bb9433b938eb7b49ba0afac9f2900a3dcbc7dd79e3e66fb444c7fd5723b6b50c5d1ab89
+DIST intel-graphics-compiler-1.0.12812.26.tar.gz 8796229 BLAKE2B 8880f0efa47ea90de403c32a9a66fe0f2d1cd6b71b2c57ea38d01f2836892dc36e4e859b19def015f22eb0415be2ff8999a49256830059499b0ae654482cd21f SHA512 13a9f57cf744c38145e2b3d45099a6d54b6d792780dc3a2ab352484975c899f1a5c4f6072c96e786ce3bdf4690bdcf04cecebcf56f9bef4409e3cc3f27ec8458
 EBUILD intel-graphics-compiler-1.0.12260.1-r1.ebuild 2502 BLAKE2B d71fff183834eb157c9f655858f8694cc8dab919330c973cd2e680e62b7a4e12f9d7034df5f4f49c24db751e74dca31abb39e1b3b9cb058d665889cf4a372ca0 SHA512 3b7a2e670fbd325c28be1f201b6b04289d53ccd9d7f430e32726909e0c2b32f6a6ed39cf7498fe5c7130930ea90f43f7003d341f1fc376818ffc74fd55073ec9
 EBUILD intel-graphics-compiler-1.0.12504.5-r1.ebuild 2537 BLAKE2B af1afa53f0eceb17a3671cafa4d38ffa323d1527f00147cc64d6b6d2183e2477d9b52bb971659385af6cd9e48ab651913979bb1a516632046603478c3c902f7e SHA512 dd0b14e2f63639f834234e2175af33facf870786cd4cc79bbd651e2d9f7ee1e86e47617bf1756e92917cd3f3706b9e8c94f6c08cfbeb3348c4f04709a27744bb
+EBUILD intel-graphics-compiler-1.0.12812.26.ebuild 2537 BLAKE2B af1afa53f0eceb17a3671cafa4d38ffa323d1527f00147cc64d6b6d2183e2477d9b52bb971659385af6cd9e48ab651913979bb1a516632046603478c3c902f7e SHA512 dd0b14e2f63639f834234e2175af33facf870786cd4cc79bbd651e2d9f7ee1e86e47617bf1756e92917cd3f3706b9e8c94f6c08cfbeb3348c4f04709a27744bb
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26.ebuild
new file mode 100644
index 000000000000..9d5ee1f86dd2
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		dev-libs/intel-vc-intrinsics
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+	"${FILESDIR}/${PN}-1.0.12504.5-vectorcompiler.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index e83be29ec09d..9dee029cd259 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,5 +1,5 @@
-DIST intel-graphics-system-controller-0.8.4.tar.gz 173733 BLAKE2B c51f21bd2093d44c12ce10b4e5990a4428294093c6a8ccd90b01be30d918ac0898ea57b68ad004f4f477a7049e5060521c7fb1547d09f6e30cae8eab41090a69 SHA512 948c2043765c7a5b5dd9c350474725871601a76d292fd34c57c81b492945107ba2519b6a3f113cefed158adb7ac61164e85284be4683d1f48870650fdba969ad
 DIST intel-graphics-system-controller-0.8.6.tar.gz 179906 BLAKE2B cadbcb559418f5e6164002cdff1dea2b8a0cec946fd0128c4f374f9b58d5086e9aba3cc97a05641be0255d848e8acf3429df16ca7d70debfff3a282445a7ca3f SHA512 40b89f54754fba3a5cf43c4cc822ec5ea0506cd854b0a85bb29e03370cbb25638ab67b8a568fe6f4d7dd2e41e7f302c550e6d4955b6e6fbf4df0d512a3afe64b
-EBUILD intel-graphics-system-controller-0.8.4.ebuild 1082 BLAKE2B cfdc214379c9382625e5fb1d99184289ee97619d5f5feff1e19743d6b4677e31641318f6abffb9aae80881da8e43fe37f428dfad4efe8b649e8434de028614bf SHA512 d209cb49e46a5a0abc65cf8ed222bed624476e1dd7c846300f2843167357cee989e3bcdc8746944b22d7eb665c1a98930ba30eb3bc54e7ac45439e6059be23d5
+DIST intel-graphics-system-controller-0.8.7.tar.gz 181536 BLAKE2B 663ec335acdf96edd0c084d2c703687925233caa602e30ac1b189342d1e2a2d370975933fc34171703d3161b4c0f1637bb735fdc89bcd7ed6e5a41b49f946271 SHA512 cc0eabb67fed0c40ab1b0f9501bba87b56c1e97e66242df360036256a18d26912525e78e339c6d09c8d9cf557d00aac60cfb354961304ca41e746f4964705900
 EBUILD intel-graphics-system-controller-0.8.6.ebuild 1082 BLAKE2B cfdc214379c9382625e5fb1d99184289ee97619d5f5feff1e19743d6b4677e31641318f6abffb9aae80881da8e43fe37f428dfad4efe8b649e8434de028614bf SHA512 d209cb49e46a5a0abc65cf8ed222bed624476e1dd7c846300f2843167357cee989e3bcdc8746944b22d7eb665c1a98930ba30eb3bc54e7ac45439e6059be23d5
+EBUILD intel-graphics-system-controller-0.8.7.ebuild 1083 BLAKE2B a7fec09efc27daee969214f998a6ff9701a8b08c6d7e2756b51a2f4ab9cb4788912f4b6b4aaee513363224af3c00f0fbb2ef09559a6b032c538760d11cdf942f SHA512 204132372e7a63ab7c9590c11aacd2082585e117ebd3de8efa26cf69948c41aab50b1a9acda1622a95b93e5b1e41ecb62340691ba0cdaaaae7e58875fa405976
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.4.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild
index 689dbdd96db5..49ca2234ca1b 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.4.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+cli doc"
 
 RDEPEND="dev-libs/metee:="
diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest
index 257ff2dafe59..39569b398aae 100644
--- a/dev-util/rocprofiler/Manifest
+++ b/dev-util/rocprofiler/Manifest
@@ -2,8 +2,13 @@ AUX rocprofiler-4.3.0-ldflag.patch 627 BLAKE2B 116e02e22f1ad0b3168dbc2aa76792a87
 AUX rocprofiler-4.3.0-no-aqlprofile.patch 1708 BLAKE2B ab7054d368332f39fd4ddcb377610001011a279764fb921a2440245ed13ea123024e8c35b26398d3e007089687fc5ec734c6fce1fae58dd03963ad6fc0a02c84 SHA512 cd8c5f1d78e73b75c109d99f2d35fb9815d2360092669337941595698a3326c53266ea6a530faa599d954afaed19d8b41a73e4513ec832899eb17835134de5df
 AUX rocprofiler-4.3.0-nostrip.patch 540 BLAKE2B 20592fe6ee33effc9feaca9ffcd6d48bef0a46bb7353c4e0b624cfb60b29a168ace763c86775c020ce162dca59886a68068485da19a2a14b35582a3ae33dfbe4 SHA512 a1d2a5d1606e4d2d249e51063f76b96dc460fb6ebe358029182bf9e4de88dd6879332cdff0ee7458b808a4dcc35fcbba3b43f0fc8c5dc2a0cffbbf2ddb05634c
 AUX rocprofiler-5.0.2-gentoo-location.patch 2219 BLAKE2B 10237145d132be7b31b311b9f2ed69cb7494da312f980ffcf92eb89ed8a946d15e9312e77bd3997a578e6c33f3ef1efb896e73c597705bf461daf1f73cc77bfa SHA512 dfe21a0e43ecc94e15899e4f2a7ee28ae36d5b666ad6df66892b9d9befc9444111c817861b136aa8973cc426e0f30964909753360bf7fd7da31ffa05029457ba
+AUX rocprofiler-5.1.3-remove-Werror.patch 665 BLAKE2B d5a906d446e7f348c97ddd1359757c0dbf68bd501e4f60d6536702a154b489ce48c77da28621301cf410cff3d521c29cb0b0be9dc9e0ed7c232d9d3b9d2b1877 SHA512 914a9ab2a9efc539a13afd02b36812bbdd4452f78c7b890925c3a6a3d8ae5a1052506f7f4d2a344a085d2002296136f8f63459166551cee636e0eaf5d97cc38b
+AUX rocprofiler-5.3.3-gentoo-location.patch 4439 BLAKE2B aa97006a55cb088ddf4f09efa1ef6b866d1840207d6f7d8c36fe08b35885c8e3a979ba5a823abcd47069498a8b5dac7f2b9030c91da8733ce5815fe323d2bd50 SHA512 1f2e10597565cf2011f3319ff5abfeb6374cea9a1bbc672e7ad318f9b434750f3b69dc8ff1132fd44001fa51d54631abf6dc09678361bd97a2279762aa191d20
+AUX rocprofiler-5.3.3-remove-aql-in-cmake.patch 644 BLAKE2B 76b2c28d9ea542700f2a327e083b2499559b098117ee44c8d092e00e264573fdc64731cf0839ca459e2650773937019a65765077931befe04d47e8e83ffd8d83 SHA512 6713ff66427592f554e221047b94e5af82aafbf92f3466fe42e1bbd8bff706f4228e02be158d178f577ea37045ff28c946cced9c65083db42ba3b128a39a2623
 DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
+DIST rocprofiler-5.3.3.tar.gz 1412740 BLAKE2B 29a63fc9df589787d18a28664002d35ec1b61e6b36f61cc1f2dc2dc14270d0aee4da594f735fceba71a7e29225bd0739b923a05bd36ec2a09a36e1ba95d8d971 SHA512 92b22272229c2c9a91983ded640a1b20f80538800f8e996dbf4e33e9f1f64a286a933f73b975e61c5b321883a11574c71ce91fd6ed7ddac32cd32da3bbea577c
 EBUILD rocprofiler-5.0.2-r1.ebuild 1647 BLAKE2B 88a2eceedda30da6e82ad7063bdeb63f796b3b535f00e7c5e50036827fd51bd097c253d604b8756ce0ca4e170d5bda1878530d478d2e5e2288de7f208e720601 SHA512 b35f7af9b8782721de6f76b6d0ace3220faf6dfceebacd6dc4bec4e8f41ca2b6afe52352d802ee3641cdb2edf433e8026a0c5d419a94680b9d9061b713b087ad
-EBUILD rocprofiler-5.1.3-r1.ebuild 1606 BLAKE2B b42af07ba8ef17828298ffef677b76396dbcaec605b3a9d41aa048a280acdfb91115baaface50a79877f367e2c968e8f557bba8420028c8deada1c2e6a954dc3 SHA512 1b7b069d287f215e9bb8820352361a6ac962e642439be9c3b0847a0548a26ae2453c8421d7113694835ffb5e326cb52ee9a124382b9ed92f97884c5a8c514f41
+EBUILD rocprofiler-5.1.3-r1.ebuild 1654 BLAKE2B f5a12c1ee6b51e51af1328bfc4519b35f3c16fa237f16ae6d8612ef9a52e1876bd80409f9baabce0f8aebc239dbf81449cba6aee677877f4049febcb8385bb8f SHA512 1a82ff8ec38048f1b573880481f8e47c5fbf3612c6bd5790660770d4c1a7b501f272d7c3237bb274107e87b7a572f62d67d9c632fb1d9e0f45883132e3e7fa65
+EBUILD rocprofiler-5.3.3.ebuild 1438 BLAKE2B 482e77aeec369fde9f9f7dca7d236a1553f85ed4a5c7e1bb2768947fa3ed4e9969af3a996aeffc225f89e21911e0f54c2cfce6e74b4d8e31cb205d5ffc043219 SHA512 387b53eac4e82dd348cf9a9c70a9b6cd51ca70ca961df96079b731ef431aac98a025e5b4b719bc686af2697dddd36d61734c3357992f0278933981affaa10f32
 MISC metadata.xml 493 BLAKE2B 79000a74b13a0d35e0bcdb8254471fde9027c498ca75e761a3f694690315149e711ae8f7b73ae9bc5aa462358784fac055b975149109829e00cb2acac73ef138 SHA512 3f49c336aee801fb73d26b9d43a52816ca15c75061bed885c1b1406929ae1a3b9b01ce6f3c71b17ca9e121dcbc73f525d5a843c526ea8d4b433642eeff89ccd5
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch b/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch
new file mode 100644
index 000000000000..a30d6d6d00a7
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch
@@ -0,0 +1,12 @@
+Index: rocprofiler-rocm-5.1.3/cmake_modules/env.cmake
+===================================================================
+--- rocprofiler-rocm-5.1.3.orig/cmake_modules/env.cmake
++++ rocprofiler-rocm-5.1.3/cmake_modules/env.cmake
+@@ -38,7 +38,6 @@ add_definitions ( -DHSA_DEPRECATED= )
+ ## Linux Compiler options
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden" )
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch
new file mode 100644
index 000000000000..48e6f6973ac8
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch
@@ -0,0 +1,102 @@
+Index: rocprofiler-rocm-5.3.3/bin/rpl_run.sh
+===================================================================
+--- rocprofiler-rocm-5.3.3.orig/bin/rpl_run.sh
++++ rocprofiler-rocm-5.3.3/bin/rpl_run.sh
+@@ -29,11 +29,12 @@ RUN_DIR=`pwd`
+ TMP_DIR="/tmp"
+ DATA_DIR="rpl_data_${time_stamp}_$$"
+ 
+-RPL_PATH=$ROOT_DIR/lib
+-TLIB_PATH=$RPL_PATH/rocprofiler
+-TTLIB_PATH=$ROOT_DIR/lib/roctracer
+-ROCM_LIB_PATH=$ROOT_DIR/lib
+-PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler
++RPL_PATH=$ROOT_DIR/@LIB_DIR@
++TLIB_PATH=$RPL_PATH
++TTLIB_PATH=$ROOT_DIR/@LIB_DIR@
++ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@
++PROF_BIN_DIR=$ROOT_DIR/bin
++PROF_LIBEXEC_DIR=$ROOT_DIR/libexec/rocprofiler
+ 
+ if [ -z "$ROCP_PYTHON_VERSION" ] ; then
+   ROCP_PYTHON_VERSION=python3
+@@ -69,7 +70,7 @@ export ROCP_HSA_INTERCEPT=1
+ # Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
+ unset ROCP_PROXY_QUEUE
+ # ROC Profiler metrics definition
+-export ROCP_METRICS=$TLIB_PATH/metrics.xml
++export ROCP_METRICS=$ROOT_DIR/share/rocprofiler/metrics.xml
+ # Disable AQL-profile read API
+ export AQLPROFILE_READ_API=0
+ # ROC Profiler package path
+@@ -103,7 +104,7 @@ usage() {
+   bin_name=`basename $0`
+   echo "ROCm Profiling Library (RPL) run script, a part of ROCprofiler library package."
+   echo "Full path: $BIN_DIR/$bin_name"
+-  echo "Metrics definition: $TLIB_PATH/metrics.xml"
++  echo "Metrics definition: $ROOT_DIR/share/rocprofiler/metrics.xml"
+   echo ""
+   echo "Usage:"
+   echo "  $bin_name [-h] [--list-basic] [--list-derived] [-i <input .txt/.xml file>] [-o <output CSV file>] <app command line>"
+@@ -211,7 +212,7 @@ fi
+ # setting ROCM_LIB_PATH
+ set_rocm_lib_path() {
+ 
+-  for ROCM_LIB_PATH in "$ROOT_DIR/lib" "$ROOT_DIR/lib64" ; do
++  for ROCM_LIB_PATH in $TLIB_PATH ; do
+      if [ -d "$ROCM_LIB_PATH" ]; then
+         return 0
+      fi
+@@ -385,11 +386,11 @@ while [ 1 ] ; do
+     export ROCP_METRICS="$2"
+   elif [ "$1" = "--list-basic" ] ; then
+     export ROCP_INFO=b
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$TLIB_PATH/rocprof-ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PROF_BIN_DIR/rocprof-ctrl"
+     exit 1
+   elif [ "$1" = "--list-derived" ] ; then
+     export ROCP_INFO=d
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$TLIB_PATH/rocprof-ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PROF_BIN_DIR/rocprof-ctrl"
+     exit 1
+   elif [ "$1" = "--basenames" ] ; then
+     if [ "$2" = "on" ] ; then
+@@ -550,7 +551,7 @@ elif [ "$input_type" = "txt" -o "$input_
+   mkdir -p $RES_DIR
+   echo "RPL: output dir '$RES_DIR'"
+   if [ "$input_type" = "txt" ] ; then
+-    $PROF_BIN_DIR/txt2xml.sh $INPUT_FILE $RES_DIR
++    $PROF_LIBEXEC_DIR/txt2xml.sh $INPUT_FILE $RES_DIR
+   else
+     echo "<metric></metric>" > $RES_DIR/input.xml
+   fi
+@@ -582,9 +583,9 @@ if [ -n "$csv_output" ] ; then
+   merge_output $OUTPUT_LIST
+   if [ "$GEN_STATS" = "1" ] ; then
+     db_output=$(echo $csv_output | sed "s/\.csv/.db/")
+-    $ROCP_PYTHON_VERSION $PROF_BIN_DIR/tblextr.py $db_output $OUTPUT_LIST
++    $ROCP_PYTHON_VERSION $PROF_LIBEXEC_DIR/tblextr.py $db_output $OUTPUT_LIST
+   else
+-    $ROCP_PYTHON_VERSION $PROF_BIN_DIR/tblextr.py $csv_output $OUTPUT_LIST
++    $ROCP_PYTHON_VERSION $PROF_LIBEXEC_DIR/tblextr.py $csv_output $OUTPUT_LIST
+   fi
+   if [ "$?" -ne 0 ] ; then
+     echo "Profiling data corrupted: '$OUTPUT_LIST'" | tee "$ROCPROFILER_SESS/error"
+Index: rocprofiler-rocm-5.3.3/CMakeLists.txt
+===================================================================
+--- rocprofiler-rocm-5.3.3.orig/CMakeLists.txt
++++ rocprofiler-rocm-5.3.3/CMakeLists.txt
+@@ -159,10 +159,10 @@ install ( FILES
+ install ( FILES
+           ${CMAKE_CURRENT_SOURCE_DIR}/test/tool/metrics.xml
+           ${CMAKE_CURRENT_SOURCE_DIR}/test/tool/gfx_metrics.xml
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME} )
++		  DESTINATION ${CMAKE_INSTALL_DATADIR}/${DEST_NAME} )
+ # librocprof-tool.so
+-install ( FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME} )
+-install ( FILES ${PROJECT_BINARY_DIR}/test/rocprof-ctrl DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME}
++install ( FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install ( FILES ${PROJECT_BINARY_DIR}/test/rocprof-ctrl DESTINATION ${CMAKE_INSTALL_BINDIR}
+           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
+ 
+ # File reorg Backward compatibility
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch
new file mode 100644
index 000000000000..19619f9606f5
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch
@@ -0,0 +1,13 @@
+Index: rocprofiler-rocm-5.3.3/cmake_modules/env.cmake
+===================================================================
+--- rocprofiler-rocm-5.3.3.orig/cmake_modules/env.cmake
++++ rocprofiler-rocm-5.3.3/cmake_modules/env.cmake
+@@ -119,8 +119,3 @@ message ( "---------GPU_TARGETS: ${GPU_T
+ if ( "${ROCM_ROOT_DIR}" STREQUAL "" )
+   message ( FATAL_ERROR "ROCM_ROOT_DIR is not found." )
+ endif ()
+-
+-find_library ( FIND_AQL_PROFILE_LIB "libhsa-amd-aqlprofile64.so" HINTS ${CMAKE_INSTALL_PREFIX} PATHS ${ROCM_ROOT_DIR})
+-if (  NOT FIND_AQL_PROFILE_LIB )
+-  message ( FATAL_ERROR "AQL_PROFILE not installed. Please install AQL_PROFILE" )
+-endif()
diff --git a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild b/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
index ded4edd1ce8e..e63978351e11 100644
--- a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
@@ -28,7 +28,8 @@ BDEPEND="
 
 PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
 		"${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
-		"${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
+		"${FILESDIR}/${PN}-5.0.2-gentoo-location.patch"
+		"${FILESDIR}/${PN}-5.1.3-remove-Werror.patch" )
 
 python_check_deps() {
 	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
diff --git a/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild b/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild
new file mode 100644
index 000000000000..2c18d7475a6f
--- /dev/null
+++ b/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/rocprofiler.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.1.3-remove-Werror.patch"
+		"${FILESDIR}/${PN}-5.3.3-gentoo-location.patch"
+		"${FILESDIR}/${PN}-5.3.3-remove-aql-in-cmake.patch" )
+
+python_check_deps() {
+	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DUSE_PROF_API=1
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 5b2110e14ddb..b4c4b05c142b 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -6,11 +6,16 @@ AUX roctracer-5.0.2-Werror.patch 922 BLAKE2B 5644e5450de7372ee1ad6d8158a50e006f1
 AUX roctracer-5.0.2-headers.patch 2452 BLAKE2B b5e34ddef1e61277d01b771b59e345c3ace07ff90f7e53c0bc50d0ebb6a13e07480173ac72b216a3fb54c3af2df5c1277fdc62db7f3e028213f71a889fa725c5 SHA512 073b45703bf37c5df1ed44843b17e08d8ada0373dce5f29a21cdea1d6d7fb73563501461a2b0c33f65c70e2c99d036523d012c7787b399a785f0ded89ad60f66
 AUX roctracer-5.0.2-strip-license.patch 681 BLAKE2B b7c78ca54fb208e1d943d9f217a8d40911a98823ff1b4c58441c87fdf60297200b4d02e5fbe685fea331c3d8f87c395291c19ac2621aa90c9fb1308071e176ba SHA512 56aae25b4c24d0f9a361c10007d0e3d90960191b08e254a0f6ffef9a36fb8d17270f8bed36c36ea866da137297ab96de4e211e8c06ace7ed7444e821f0589322
 AUX roctracer-5.1.3-no-aqlprofile.patch 1902 BLAKE2B 7ac98d5ad052e29313bd038b963763d4dba63c44bc261bd3119a911dfe6fbef99d73f58bf04f9c74a769d37299707c5e04a280db9343a3dbb5d0ab086a0106de SHA512 908f888e6384f3ee734b10553fc8cafb0e302031e21ed3763754e69fe146dbfb0204977c50db698f6f43a50c1a07685e8b86b5e7339ef65ff0634476b8177ee5
+AUX roctracer-5.3.3-do-not-install-test-files.patch 1948 BLAKE2B 1eeb7443b4cb4c6947a61ee1b4f9f42bef996cd9623e6864d273de438af8f0d21bd2465e5ad1b62e266d9b0a86b5afdf5a267d79018cbfbc356ed8e2205a2136 SHA512 aa1e556ddd5f070bdc0ca8b47b243dbdbd965de8f98d02964a13897d3cb273fdef08373f12113c9f1645c3333be212092505fd7087f5ab292aedc1365372a021
+AUX roctracer-5.3.3-flat-lib-layout.patch 1842 BLAKE2B dc7f2832e2bd4e04bad75ccd22e8e2e32353cec745521e8baf4d98772d0994efa08289e5563eb3191d78a2fa4deb1681551e582d08e9608b98fe72f599146a2f SHA512 967eab41a909a7369791bd0946ef4304473e2f763d2e4f497f5b7ddba3b81b9eb18ea72a815b2211bcb82ec87eebe817daf1788f7d44f8c4494a06c77be9d902
+AUX roctracer-5.3.3-rocm-path.patch 788 BLAKE2B ef0c9025bfb126e437f73149962c04661a5a5c33ee0c36e18854fa93bac591905cdc23e17fc2faf07659c5828de9361139e618752de3818b3b134e3536cd0c4b SHA512 f639b040871a43e23e7bf57a2214bf255032e3a5f9a20e08eae160bb0d371fb26fa147aefce20577935e40274779dbb150d445e044a22c7aeedc4e10b9865350
 DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
 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 rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
 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-5.0.2-r1.ebuild 2499 BLAKE2B 7fa663089248e00ec52dcc6ad569d0b204f9ef42f3259d36f32afc69b19a8b5adb5fda7893298abd7ebaba6bd96a69aeac25d394438edcbe97ebbeba5551f363 SHA512 47c829294b09b942329b1c4c4aa57da495aa5d649d57865109555c0685c5cb71d83b27c9105eafc9cf533633a70c456f4330699afcf1eeea87857a1617729ce6
 EBUILD roctracer-5.1.3-r1.ebuild 2414 BLAKE2B ba248280604a8403f8f37bb1795fe71b446badbb14ca5deb110de39103c014ee14965ed378718b881e0b4fddafe021da3a46de83720eb5ed09d816f92a309fcc SHA512 65d672add20f247160d94ea366f676d774ce3b9cae3d05c73a71f47768b308137da5e74fe846d2d4510421b9a5b06b378458d2d5359b01a65b3e5882c9375977
-MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
+EBUILD roctracer-5.3.3.ebuild 1604 BLAKE2B c04d6690b406193e0f4dd46619c349f053679c5b8c66e06b0a208eecb0c43a4f0bfabd9b12b5a653729af401b34b023d7ab77364809fde661f78ab6b33c40a06 SHA512 8b281ed89f8bcd01cb876cd68fcb18f4e5b43f841f6715c7d13c739cf5a58a9aaaaf454325af2a131479ec6995c6a3b70d35cb08e4611a4c27bdfb488c6f451b
+MISC metadata.xml 735 BLAKE2B 8ea832bbaee7b5e3494866e22c9b20a30545e8025938ad8c2357649a29a310b3abbc2f9e05259bffb9e412def64c37422b1c2eb15660fe2e3c2522f1399025e2 SHA512 edcf3165086c99763702c10dc3b04a2522f66ebf2c2f66578075fea4a14c89295e1a36a9d84ad43bc5407e8d0285b3826f0ee99e717a6e2c8baa7b1acb7ac6ae
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch b/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch
new file mode 100644
index 000000000000..ac3e53c1f405
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch
@@ -0,0 +1,37 @@
+Remove all install commands for test
+===================================================================
+--- roctracer-rocm-5.3.3.orig/test/CMakeLists.txt
++++ roctracer-rocm-5.3.3/test/CMakeLists.txt
+@@ -87,7 +87,6 @@ function(generate_hsaco TARGET_ID INPUT_
+     DEPENDS ${INPUT_FILE} clang
+     COMMENT "Building ${OUTPUT_FILE}..."
+     VERBATIM)
+-  install(FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} DESTINATION test/${PROJECT_NAME} COMPONENT tests)
+   set(HSACO_TARGET_LIST ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} PARENT_SCOPE)
+ endfunction(generate_hsaco)
+ 
+@@ -150,24 +149,10 @@ add_dependencies(mytest dlopen)
+ ## Copy the golden traces and test scripts
+ configure_file(run.sh ${PROJECT_BINARY_DIR} COPYONLY)
+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink run.sh ${PROJECT_BINARY_DIR}/run_ci.sh)
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/run.sh DESTINATION test/${PROJECT_NAME} COMPONENT tests)
+ 
+ configure_file(${PROJECT_SOURCE_DIR}/script/check_trace.py ${PROJECT_BINARY_DIR}/test/check_trace.py COPYONLY)
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/test/check_trace.py DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
+ 
+ file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "golden_traces/tests_trace_cmp_levels.txt" "golden_traces/*_trace.txt")
+ foreach(file ${files})
+   configure_file(${file} ${PROJECT_BINARY_DIR}/test/${file} COPYONLY)
+ endforeach()
+-install(DIRECTORY ${PROJECT_BINARY_DIR}/test/golden_traces DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
+-
+-# install all executables
+-set(all_executables)
+-get_property(all_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY BUILDSYSTEM_TARGETS)
+-foreach(target IN LISTS all_targets)
+-  get_target_property(target_type ${target} TYPE)
+-  if (target_type STREQUAL "EXECUTABLE")
+-    list(APPEND all_executables ${target})
+-  endif()
+-endforeach()
+-install(TARGETS ${all_executables} DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch b/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch
new file mode 100644
index 000000000000..46c8d1a168b8
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch
@@ -0,0 +1,34 @@
+Install libs directly into /usr/lib64
+===================================================================
+Index: roctracer-rocm-5.3.3/src/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.3.3.orig/src/CMakeLists.txt
++++ roctracer-rocm-5.3.3/src/CMakeLists.txt
+@@ -215,12 +215,12 @@ target_include_directories(roctracer_too
+ target_link_libraries(roctracer_tool util roctracer hsa-runtime64::hsa-runtime64 stdc++fs Threads::Threads atomic dl)
+ target_link_options(roctracer_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/tracer_tool/exportmap -Wl,--no-undefined)
+ 
+-install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime)
++install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime)
+ 
+ add_library(hip_stats SHARED hip_stats/hip_stats.cpp)
+ target_compile_definitions(hip_stats PRIVATE __HIP_PLATFORM_AMD__)
+ target_link_libraries(hip_stats roctracer stdc++fs)
+-install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime)
++install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime)
+ 
+ endif()
+ 
+Index: roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.3.3.orig/plugin/file/CMakeLists.txt
++++ roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt
+@@ -38,5 +38,5 @@ target_link_options(file_plugin PRIVATE
+ target_link_libraries(file_plugin PRIVATE util roctracer hsa-runtime64::hsa-runtime64 stdc++fs)
+ 
+ install(TARGETS file_plugin LIBRARY
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+-        COMPONENT runtime)
+\ No newline at end of file
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        COMPONENT runtime)
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch b/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch
new file mode 100644
index 000000000000..d8cc792b4dbb
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch
@@ -0,0 +1,12 @@
+Append flags for clang to recognize device lib path
+===================================================================
+--- roctracer-rocm-5.3.3.orig/test/CMakeLists.txt
++++ roctracer-rocm-5.3.3/test/CMakeLists.txt
+@@ -80,6 +80,7 @@ add_dependencies(mytest codeobj_test)
+ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
+   separate_arguments(CLANG_ARG_LIST UNIX_COMMAND
+     "-O2 -x cl -Xclang -finclude-default-header -cl-denorms-are-zero -cl-std=CL2.0 -Wl,--build-id=sha1
++    --rocm-path=@GENTOO_PORTAGE_EPREFIX@/usr --rocm-device-lib-path=@GENTOO_PORTAGE_EPREFIX@/usr/lib/amdgcn/bitcode
+     -target amdgcn-amd-amdhsa -mcpu=${TARGET_ID} -o ${OUTPUT_FILE} ${INPUT_FILE}")
+   add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
+     COMMAND clang ${CLANG_ARG_LIST}
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index 899809591942..1d728a2f4ec4 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -10,6 +10,10 @@
     <name>Craig Andrews</name>
   </maintainer>
   <maintainer type="person" proxied="yes">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-util/roctracer/roctracer-5.3.3.ebuild b/dev-util/roctracer/roctracer-5.3.3.ebuild
new file mode 100644
index 000000000000..a053427379df
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/roctracer-5.3.3-flat-lib-layout.patch
+	"${FILESDIR}"/roctracer-5.3.3-do-not-install-test-files.patch )
+
+python_check_deps() {
+	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
+		"dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	hprefixify script/*.py
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.3.3-rocm-path.patch)
+}
+
+src_configure() {
+	export ROCM_PATH="$(hipconfig -p)"
+	local mycmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/lib64/cmake/hip"
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	# if LD_LIBRARY_PATH not set, dlopen cannot find correct lib
+	LD_LIBRARY_PATH="${EPREFIX}"/usr/lib64 bash run.sh || die
+}