Merge branch 'develop' into roc-6.4.x

* Update envsetup.sh HIP_ON_ROCclr_ROOT path to hip and remove

aqlprofiletest

* Update packages - remove broken packages

README.md

@@ -127,6 +127,7 @@ bash install-prerequisites.sh
 export GPU_ARCHS="gfx942"               # Example
 export GPU_ARCHS="gfx940;gfx941;gfx942" # Example
 
+cd ~/WORKSPACE/
 # Pick and run build commands in the docker container:
 # Build rocm-dev packages
 make -f ROCm/tools/rocm-build/ROCm.mk -j ${NPROC:-$(nproc)} rocm-dev

tools/rocm-build/ROCm.mk

@@ -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

tools/rocm-build/build_rocr.sh

@@ -255,8 +255,8 @@ print_output_directory() {
 # Common variables
 target="build"
 
-kfdtest_target="yes"
-rocrtst_target="yes"
+kfdtest_target="no"
+rocrtst_target="no"
 rocr_target="ON"
 
 package_root="$(getPackageRoot)"

tools/rocm-build/docker/ubuntu22/packages

@@ -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

tools/rocm-build/docker/ubuntu24/install-prerequisites.sh

@@ -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

tools/rocm-build/envsetup.sh

@@ -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