From e2da5772ff34cd81537c1b6156cf100301a45c08 Mon Sep 17 00:00:00 2001 From: David Salinas Date: Wed, 22 Jan 2025 18:24:45 +0000 Subject: [PATCH] Deprecate roc-obj* tooling - make Perl packages RECOMENDS/SUGGESTS for hip-dev - update CHANGE log SWDEV-511528 - TECH Remove ROCM Perl dependency - hip-dev SWDEV-333176 - Shift functionality of 'roc-obj-*' perl scripts into llvm-objdump Change-Id: Iec3ba245848781f95c825f0d37aff4b4fb54f5e4 [ROCm/clr commit: c942833b34f2a64de09e96eefa1e3b2c6a030cf6] --- projects/clr/CHANGELOG.md | 4 ++++ projects/clr/hipamd/bin/roc-obj | 2 ++ projects/clr/hipamd/bin/roc-obj-extract | 3 +++ projects/clr/hipamd/bin/roc-obj-ls | 3 +++ projects/clr/hipamd/packaging/CMakeLists.txt | 9 ++++----- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/projects/clr/CHANGELOG.md b/projects/clr/CHANGELOG.md index 8c735b767d..3008d9a442 100644 --- a/projects/clr/CHANGELOG.md +++ b/projects/clr/CHANGELOG.md @@ -18,6 +18,10 @@ Full documentation for HIP is available at [rocm.docs.amd.com](https://rocm.docs * Out of memory error on Windows. When the user calls the API hipMalloc for device memory allocation specifying a size larger than the available device memory, the HIP runtime fixes the error in the API implementation, allocating the available device memory plus system memory (shared virtual memory). The fix is not available on Linux. +### Changed + - roc-obj* tools are being deprecated, and will be removed in an upcoming release. + - Perl package dependencies are now RECOMENDS or SUGGESTS. Users will need to install these themselves. + - Support for ROCm Object tooling has moved into llvm-objdump provided by package rocm-llvm. ## HIP 6.3.2 for ROCm 6.3.2 diff --git a/projects/clr/hipamd/bin/roc-obj b/projects/clr/hipamd/bin/roc-obj index cb5925d485..c5cf7509c6 100755 --- a/projects/clr/hipamd/bin/roc-obj +++ b/projects/clr/hipamd/bin/roc-obj @@ -207,6 +207,8 @@ run_command() { } main() { + printf "Warning: These roc-obj tools are being DEPRECATED. Similar functionality is being provided by llvm-objdump in the rocm-llvm package.\n" + [[ -n $OPT_OUTDIR ]] && mkdir -p "$OPT_OUTDIR" local inputs=() while (( $# )); do diff --git a/projects/clr/hipamd/bin/roc-obj-extract b/projects/clr/hipamd/bin/roc-obj-extract index b2cc2b5707..9d8722f0ba 100755 --- a/projects/clr/hipamd/bin/roc-obj-extract +++ b/projects/clr/hipamd/bin/roc-obj-extract @@ -73,6 +73,9 @@ sub usage { my %options=(); getopts('vho:', \%options); +# this tool is being deprecated +print("Warning: This tool is being DEPRECATED. Similar funcitonality is provided in the rocm-llvm package with llvm-objdump.\n"); + if (defined $options{h}) { usage(); } diff --git a/projects/clr/hipamd/bin/roc-obj-ls b/projects/clr/hipamd/bin/roc-obj-ls index 44a428269a..eae047c9da 100755 --- a/projects/clr/hipamd/bin/roc-obj-ls +++ b/projects/clr/hipamd/bin/roc-obj-ls @@ -59,6 +59,9 @@ if (defined $options{h}) { usage(); } +# this tool is being deprecated +print("Warning: This tool is being DEPRECATED. Similar funcitonality is provided in the rocm-llvm package with llvm-objdump.\n"); + my $verbose = $options{v}; my $debug = $options{d}; diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt index a10e9c90af..6de7afe620 100644 --- a/projects/clr/hipamd/packaging/CMakeLists.txt +++ b/projects/clr/hipamd/packaging/CMakeLists.txt @@ -244,16 +244,15 @@ configure_file(hip-devel.prerm ${CMAKE_CURRENT_BINARY_DIR}/dev/prerm @ONLY) set(CPACK_DEBIAN_DEV_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/dev/postinst;${CMAKE_CURRENT_BINARY_DIR}/dev/prerm") # Dev/devel package dependencies set(HIP_DEV_ROCM_PKG_DEPENDENCIES "hip-runtime-amd, rocm-llvm, rocm-core") -set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS - "perl (>= 5.0), libfile-copy-recursive-perl, libfile-listing-perl, - libfile-which-perl, liburi-perl, libc6, file, ${HIP_DEV_ROCM_PKG_DEPENDENCIES}, hsa-rocr-dev, hipcc") +set(CPACK_DEBIAN_DEV_PACKAGE_RECOMMENDS "perl (>= 5.0), libfile-copy-recursive-perl, libfile-listing-perl, libfile-which-perl, liburi-perl") +set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libc6, file, ${HIP_DEV_ROCM_PKG_DEPENDENCIES}, hsa-rocr-dev, hipcc") set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hip-base") set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hip-base") set(CPACK_RPM_DEV_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/dev/postinst") set(CPACK_RPM_DEV_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/dev/prerm") -set(CPACK_RPM_DEV_PACKAGE_REQUIRES - "perl >= 5.0, perl-File-Which, perl-File-Listing, perl-URI, file, ${HIP_DEV_ROCM_PKG_DEPENDENCIES}, hsa-rocr-devel, hipcc") +set(CPACK_RPM_DEV_PACKAGE_SUGGESTS "perl >= 5.0, perl-File-Which, perl-File-Listing, perl-URI") +set(CPACK_RPM_DEV_PACKAGE_REQUIRES "file, ${HIP_DEV_ROCM_PKG_DEPENDENCIES}, hsa-rocr-devel, hipcc") set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hip-base") set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hip-base")