diff options
| author |   Yiyang Wu <xgreenlandforwyy@gmail.com> | 2022-08-06 16:14:32 +0800 |
|---|---|---|
| committer |   Benda Xu <heroxbd@gentoo.org> | 2022-08-06 22:20:14 +0800 |
| commit | e1d053dbfe4fa017dff9bb79e6e0fc794fc105f0 (patch) | |
| tree | 404b6a28db167c38358abc68970f7f26f6ee881b | |
| parent | dev-util/rocprofiler: Fix patch for rpl_run script (diff) | |
| download | gentoo-e1d053dbfe4fa017dff9bb79e6e0fc794fc105f0.tar.gz gentoo-e1d053dbfe4fa017dff9bb79e6e0fc794fc105f0.tar.bz2 gentoo-e1d053dbfe4fa017dff9bb79e6e0fc794fc105f0.zip | |
dev-util/rocprofiler: Skip loading proprietary AQLProfile lib
This should be in d4034da0890695292c0c2d24aba60446bcf8a465 as the commit
message suggests, but missed there.
Closes: https://github.com/gentoo/gentoo/pull/26755
Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
| -rw-r--r-- | dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch | 35 | ||||
| -rw-r--r-- | dev-util/rocprofiler/rocprofiler-4.3.0.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/rocprofiler/rocprofiler-5.0.2.ebuild | 1 |
3 files changed, 37 insertions, 0 deletions
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/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() { |