From 81775169ccd217e286a7b500aef3e5de4ce47b4a Mon Sep 17 00:00:00 2001 From: Ajay GunaShekar <86270081+agunashe@users.noreply.github.com> Date: Fri, 26 Sep 2025 15:35:20 -0700 Subject: [PATCH] SWDEV-1 - hipcc args: --rocm-path to --hip-path in tests (#998) --- .../hip-tests/catch/multiproc/CMakeLists.txt | 2 +- .../catch/unit/c_compilation/CMakeLists.txt | 2 +- .../catch/unit/callback/CMakeLists.txt | 2 +- .../catch/unit/compiler/CMakeLists.txt | 2 +- .../catch/unit/dynamicLoading/CMakeLists.txt | 4 +-- .../catch/unit/module/CMakeLists.txt | 30 +++++++++---------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/projects/hip-tests/catch/multiproc/CMakeLists.txt b/projects/hip-tests/catch/multiproc/CMakeLists.txt index 688e74a6ba..6a3b995e39 100644 --- a/projects/hip-tests/catch/multiproc/CMakeLists.txt +++ b/projects/hip-tests/catch/multiproc/CMakeLists.txt @@ -23,7 +23,7 @@ if(UNIX) --genco ${CMAKE_CURRENT_SOURCE_DIR}/dummy_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../multiproc/dummy_kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include - --rocm-path=${ROCM_PATH}) + --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/dummy_kernel.code) endif() diff --git a/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt b/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt index af28bf6a46..2b5d06a163 100644 --- a/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/c_compilation/CMakeLists.txt @@ -33,7 +33,7 @@ add_custom_target(devprop_c_custom -c ${CMAKE_CURRENT_SOURCE_DIR}/hipGetDeviceProp.c -I${HIP_PATH}/include -D${PLATFORM_DEFINE} - --rocm-path=${ROCM_PATH} + --hip-path=${HIP_PATH} -o hipGetDeviceProp.o BYPRODUCTS hipGetDeviceProp.o ) diff --git a/projects/hip-tests/catch/unit/callback/CMakeLists.txt b/projects/hip-tests/catch/unit/callback/CMakeLists.txt index 64aa871a18..da5404e6cf 100644 --- a/projects/hip-tests/catch/unit/callback/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/callback/CMakeLists.txt @@ -33,7 +33,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/SimpleKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/callback/SimpleKernel.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include - --rocm-path=${ROCM_PATH}) + --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/SimpleKernel.code) endif() diff --git a/projects/hip-tests/catch/unit/compiler/CMakeLists.txt b/projects/hip-tests/catch/unit/compiler/CMakeLists.txt index 6f1278d407..b191e10b15 100644 --- a/projects/hip-tests/catch/unit/compiler/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/compiler/CMakeLists.txt @@ -94,7 +94,7 @@ if(HIP_PLATFORM MATCHES "amd") -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/picojson - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} --offload-arch=amdgcnspirv + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} --offload-arch=amdgcnspirv -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/compiler/hipSpirvTest) add_dependencies(CompilerTest hipSpirvTest) endif() diff --git a/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt b/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt index 1820732fe3..71a014fd3e 100644 --- a/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/dynamicLoading/CMakeLists.txt @@ -32,12 +32,12 @@ hip_add_exe_to_target(NAME dynamicLoading TEST_TARGET_NAME build_tests) if(HIP_PLATFORM MATCHES "amd") -add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -fPIC -lpthread -shared ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR} --rocm-path=${ROCM_PATH} -o libLazyLoad.so) +add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -fPIC -lpthread -shared ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR} --hip-path=${HIP_PATH} -o libLazyLoad.so) elseif(HIP_PLATFORM MATCHES "nvidia") add_custom_target(libLazyLoad.so COMMAND ${CMAKE_CXX_COMPILER} -Xcompiler -fPIC -lpthread -shared ${CMAKE_CURRENT_SOURCE_DIR}/liblazyLoad.cc -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -I${HIP_PATH}/include/ -o libLazyLoad.so) endif() -add_custom_target(bit_extract_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/bit_extract_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/bit_extract_kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH} -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR}) +add_custom_target(bit_extract_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/bit_extract_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/bit_extract_kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH} -L${HIP_PATH}/${CMAKE_INSTALL_LIBDIR}) add_custom_target(vecadd.cc COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/vecadd.cc ${CMAKE_CURRENT_BINARY_DIR}/../dynamicLoading/) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS diff --git a/projects/hip-tests/catch/unit/module/CMakeLists.txt b/projects/hip-tests/catch/unit/module/CMakeLists.txt index a1fe3d2531..905cd1bf52 100644 --- a/projects/hip-tests/catch/unit/module/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/module/CMakeLists.txt @@ -68,7 +68,7 @@ add_custom_target(coopKernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/coopKernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/coopKernel.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS @@ -160,56 +160,56 @@ add_custom_target(copiousArgKernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel0.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=0 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel0.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel1.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=1 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel1.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel2.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=2 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel2.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel3.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=3 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel3.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel16.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=16 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel16.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) add_custom_target(copiousArgKernel17.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} -mllvm -amdgpu-kernarg-preload-count=17 ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel17.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/copiousArgKernel.code ${CMAKE_CURRENT_BINARY_DIR}/copiousArgKernel0.code