dev-util/roctracer: Skip loading proprietary AQLProfile lib

Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Benda Xu <heroxbd@gentoo.org>

5 files changed, 62 insertions, 0 deletions

diff --git a/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
new file mode 100644
index 000000000000..0548953f3089
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
@@ -0,0 +1,20 @@
+Skip loading proprietary AQLProfile lib
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+ 
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+ 
+   // Get Loader API table
+   loader_api_ = {0};
diff --git a/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch
new file mode 100644
index 000000000000..93ddee3e5b43
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch
@@ -0,0 +1,39 @@
+Skip loading proprietary AQLProfile lib
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+ 
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+ 
+   // Get Loader API table
+   loader_api_ = {0};
+Index: roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/test/hsa/src/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp
+@@ -125,14 +125,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+ 
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+ 
+   // Get Loader API table
+   loader_api_ = {0};
diff --git a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
index e5c7872fe3a1..c0573fc9cb13 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
 	"${FILESDIR}"/${PN}-4.3.0-ldflag.patch
 	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
+	"${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch
 )
 
 python_check_deps() {
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
index efabd899d252..a95a1732ef5e 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
 	"${FILESDIR}"/${PN}-5.0.2-headers.patch
 	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+	"${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch
 )
 
 python_check_deps() {
diff --git a/dev-util/roctracer/roctracer-5.1.3.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
index b378cfcc340d..1154d03f8c16 100644
--- a/dev-util/roctracer/roctracer-5.1.3.ebuild
+++ b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
 	"${FILESDIR}"/${PN}-5.0.2-headers.patch
 	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+	"${FILESDIR}"/${PN}-5.1.3-no-aqlprofile.patch
 )
 
 python_check_deps() {