github/ROCm
1
1
Fork 0
mirror of https://github.com/ROCm/ROCm.git synced 2026-01-08 22:28:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Promoting 6.4.x to Develop (#4877)

Browse Source
This commit is contained in:
ammallya
2025-06-03 19:13:52 -07:00
committed by GitHub
parent 3f3d592e2b
commit 9cff634d8c
11 changed files with 12 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/rocm-build/ROCm.mk
View File

@@ -87,7 +87,6 @@ endef
$(call adddep,amd_smi_lib,${ASAN_DEP})
$(call adddep,aqlprofile,${ASAN_DEP} rocr)
$(call adddep,aqlprofiletest,lightning rocminfo aqlprofile opencl_on_rocclr hip_on_rocclr)
$(call adddep,comgr,lightning devicelibs)
$(call adddep,dbgapi,rocr comgr)
$(call adddep,devicelibs,lightning)
@@ -115,7 +114,7 @@ $(call adddep,roctracer,${ASAN_DEP} rocr hip_on_rocclr)
# rocm-dev points to all possible last finish components of Stage1 build.
rocm-dev-components :=amd_smi_lib aqlprofile aqlprofiletest comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
rocm-dev-components :=amd_smi_lib aqlprofile comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
lightning rocprofiler-compute opencl_on_rocclr openmp_extras rocm_bandwidth_test rocm_smi_lib \
rocm-cmake rocm-core rocm-gdb rocminfo rocprofiler-register rocprofiler-sdk rocprofiler-systems \
rocprofiler rocr rocr_debug_agent rocrsamples roctracer

53
tools/rocm-build/build_rocm_bandwidth_test.sh
View File

@@ -12,8 +12,6 @@ printUsage() {
echo " -p, --package <type> Specify packaging format"
echo " -r, --release Make a release build instead of a debug build"
echo " -a, --address_sanitizer Enable address sanitizer"
echo " -w, --wheel Creates python wheel package of bandwidth test.
It needs to be used along with -r option"
echo " -o, --outdir <pkg_type> Print path of output directory containing packages of
type referred to by pkg_type"
echo " -h, --help Prints this help"
@@ -26,35 +24,22 @@ printUsage() {
return 0
}
#
# Build environment variables. The value of test
# root is imported from the envsetu.sh
#
PROJ_NAME="rocm_bandwidth_test"
TEST_BIN_DIR="$(getBinPath)"
TEST_NAME="rocm-bandwidth-test"
TEST_UTILS_DIR="$(getUtilsPath)"
TEST_SRC_DIR="$PROJ_NAME"
TEST_SRC_DIR="rocm_bandwidth_test"
TEST_BLD_DIR="$(getBuildPath $TEST_SRC_DIR)"
#
# Env variables for packaging rocm_bandwidth_test
#
ROCM_PKG_PREFIX="$ROCM_INSTALL_PATH"
TEST_PKG_ROOT="$(getPackageRoot)"
TEST_PKG_DEB="$(getPackageRoot)/deb/$TEST_SRC_DIR"
TEST_PKG_RPM="$(getPackageRoot)/rpm/$TEST_SRC_DIR"
#
# Build the name of run script
#
ROCR_LIB_DIR="$(getPackageRoot)/lib"
ROCR_INC_DIR="$(getPackageRoot)/hsa/include"
RUN_SCRIPT=$(echo $(basename "${BASH_SOURCE}") | sed "s/build_/run_/")
#
# Specify the default build type as debug
# DASH_JAY - Bind number of threads to use value set
# by user in their shell config file (.bashrc)
#
TARGET="build"
MAKETARGET="all"
BUILD_TYPE="Debug"
@@ -64,16 +49,11 @@ CLEAN_OR_OUT=0;
PKGTYPE="deb"
#parse the arguments
VALID_STR=`getopt -o hcraswo:p: --long help,clean,release,static,wheel,address_sanitizer,outdir:,package: -- "$@"`
VALID_STR=`getopt -o hcraso:p: --long help,clean,release,static,address_sanitizer,outdir:,package: -- "$@"`
eval set -- "$VALID_STR"
#
# Override default bindings if user specifies an option
#
while true ;
do
#echo "parocessing $1"
case "$1" in
(-h | --help)
printUsage ; exit 0;;
@@ -86,8 +66,6 @@ do
set_address_sanitizer_on ; shift ;;
(-s | --static)
ack_and_skip_static ;;
(-w | --wheel)
WHEEL_PACKAGE=true ; shift ;;
(-o | --outdir)
TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
(-p | --package)
@@ -106,9 +84,6 @@ if [ $RET_CONFLICT -ge 30 ]; then
exit $RET_CONFLICT
fi
#
# Clean the test build from system
#
clean_rocm_bandwidth_test() {
echo "Cleaning $TEST_NAME"
@@ -119,16 +94,10 @@ clean_rocm_bandwidth_test() {
rm -f $TEST_UTILS_DIR/$RUN_SCRIPT
}
#
# Build the test by runninh cmake
#
build_rocm_bandwidth_test() {
echo "Building $TEST_NAME"
#
# If build directory does not exist create it
#
if [ ! -d "$TEST_BLD_DIR" ]; then
mkdir -p "$TEST_BLD_DIR"
pushd "$TEST_BLD_DIR"
@@ -146,32 +115,22 @@ build_rocm_bandwidth_test() {
-DADDRESS_SANITIZER="$ADDRESS_SANITIZER" \
"$ROCM_BANDWIDTH_TEST_ROOT"
# Go back to the directory you came from
popd
fi
# Run the make cmd to build test
echo "Building $TEST_NAME"
cmake --build "$TEST_BLD_DIR" -- $MAKEARG -C $TEST_BLD_DIR
# Run the make cmd to install test
echo "Installing $TEST_NAME"
cmake --build "$TEST_BLD_DIR" -- $MAKEARG -C $TEST_BLD_DIR install
# Run the make cmd to package test
echo "Packaging $TEST_NAME"
cmake --build "$TEST_BLD_DIR" -- $MAKEARG -C $TEST_BLD_DIR package
# Run the copy cmd to place test in bin folder
mkdir -p "$TEST_BIN_DIR"
echo "Copying $TEST_NAME to $TEST_BIN_DIR"
progressCopy "$TEST_BLD_DIR/$TEST_NAME" "$TEST_BIN_DIR"
# Run the copy cmd to place run script in utils folder
mkdir -p "$TEST_UTILS_DIR"
echo "Copying $RUN_SCRIPT to $TEST_UTILS_DIR"
progressCopy "$SCRIPT_ROOT/$RUN_SCRIPT" "$TEST_UTILS_DIR"
copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "$TEST_PKG_DEB" $TEST_BLD_DIR/*.deb
copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$TEST_PKG_RPM" $TEST_BLD_DIR/*.rpm
@@ -192,7 +151,7 @@ verifyEnvSetup
case $TARGET in
(clean) clean_rocm_bandwidth_test ;;
(build) build_rocm_bandwidth_test; build_wheel "$TEST_BLD_DIR" "$PROJ_NAME" ;;
(build) build_rocm_bandwidth_test ;;
(outdir) print_output_directory ;;
(*) die "Invalid target $TARGET" ;;
esac

7
tools/rocm-build/build_rocr.sh
View File

@@ -137,9 +137,6 @@ build_rocrtst() {
mkdir -p "$package_root_rpm"
progressCopy "${RPM_FILE[@]}" "$package_root_rpm"
fi
mkdir -p "$package_utils"
progressCopy "$SCRIPT_ROOT/run_rocrtst.sh" "$package_utils"
popd
}
@@ -182,10 +179,6 @@ build_kfdtest() {
mkdir -p "$kfdtest_bin"
progressCopy "$kfdtest_build_dir" "$kfdtest_bin"
progressCopy "$kfdtest_build_dir/kfdtest.exclude" "$kfdtest_bin"
progressCopy "$kfdtest_build_dir/run_kfdtest.sh" "$kfdtest_bin"
mkdir -p "$package_utils"
progressCopy "$SCRIPT_ROOT/run_kfdtest.sh" "$package_utils"
if file_exists $kfdtest_build_dir/kfdtest*.deb ; then
mkdir -p "$package_root_deb"

3
tools/rocm-build/build_rocr_debug_agent.sh
View File

@@ -138,9 +138,6 @@ build() {
copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DEB}" "$BUILD_DIR/${API_NAME}"*.deb
copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_RPM}" "$BUILD_DIR/${API_NAME}"*.rpm
mkdir -p "$PACKAGE_UTILS"
progressCopy "$SCRIPT_ROOT/run_rocr_debug_agent_test.sh" "$PACKAGE_UTILS"
## Copy run test py script
echo "copying run-test.py to $PACKAGE_BIN"
progressCopy "$ROCR_DEBUG_AGENT_ROOT/test/run-test.py" "$PACKAGE_BIN"

3
tools/rocm-build/build_rocrsamples.sh
View File

@@ -108,9 +108,6 @@ build_rocrsamples() {
echo "Copying HSA Sample binaries to $ROCRTST_SAMPLES_PACKAGE"
progressCopy "$ROCRTST_SAMPLES_BUILD_DIR" "$ROCRTST_SAMPLES_PACKAGE"
mkdir -p "$PACKAGE_UTILS"
progressCopy "$SCRIPT_ROOT/run_rocrsamples.sh" "$PACKAGE_UTILS"
popd
}

0
tools/rocm-build/docker/ubuntu22/install-prerequisities.sh → tools/rocm-build/docker/ubuntu22/install-prerequisites.sh
View File

6
tools/rocm-build/docker/ubuntu22/packages
View File

@@ -60,7 +60,6 @@ libfile-find-rule-perl
libgflags-dev
libglew-dev
libgmp-dev
libgoogle-glog-dev
libgtk2.0-dev
libhdf5-serial-dev
libjpeg-dev
@@ -90,7 +89,6 @@ libsuitesparse-dev
libsystemd-dev
libtinfo-dev
libtool
libunwind-dev
liburi-encode-perl
libva-dev
libvirt-clients
@@ -98,7 +96,6 @@ libvirt-daemon-system
libyaml-cpp-dev
libzstd-dev
llvm
llvm-6.0-dev
llvm-dev
llvm-runtime
mesa-common-dev
@@ -112,8 +109,7 @@ pigz
pkg-config
protobuf-compiler
python-is-python3
python-pip-whl
python-yaml
python3-pip-whl
python3-dev
python3-pip
python3-venv

2
tools/rocm-build/docker/ubuntu24/install-prerequisites.sh
View File

@@ -17,7 +17,7 @@ git --version
# venv for python to be able to run pip3 without --break-system-packages
python3 -m venv /opt/venv
source /opt/venv/bin/activate
pip3 install CppHeaderParser argparse lxml recommonmark jinja2==3.0.0 \
websockets matplotlib numpy scipy minimal msgpack pytest sphinx joblib PyYAML rocm-docs-core cmake==3.25.2 pandas \
myst-parser setuptools lit

2
tools/rocm-build/envsetup.sh
View File

@@ -217,7 +217,7 @@ export RCCL_ROOT=$WORK_ROOT/rccl
export ROCM_DBGAPI_ROOT=$WORK_ROOT/ROCdbgapi
export ROCM_GDB_ROOT=$WORK_ROOT/ROCgdb
# export ROCclr_ROOT=$WORK_ROOT/vdi
export HIP_ON_ROCclr_ROOT=$WORK_ROOT/HIP
export HIP_ON_ROCclr_ROOT=$WORK_ROOT/hip
export HIPAMD_ROOT=$WORK_ROOT/hipamd
export HIP_CATCH_TESTS_ROOT=$WORK_ROOT/hip-tests
# export OPENCL_ON_ROCclr_ROOT=$WORK_ROOT/opencl-on-vdi

2
tools/rocm-build/rocm-6.4.0.xml
View File

@@ -23,7 +23,7 @@
<project name="rocprofiler-systems" />
<project name="roctracer" />
<!--HIP Projects-->
<project name="HIP" />
<project name="hip" />
<project name="hip-tests" />
<project name="HIPIFY" />
<project name="clr" />

2
tools/rocm-build/rocm-6.4.1.xml
View File

@@ -23,7 +23,7 @@
<project name="rocprofiler-systems" />
<project name="roctracer" />
<!--HIP Projects-->
<project name="HIP" />
<project name="hip" />
<project name="hip-tests" />
<project name="HIPIFY" />
<project name="clr" />