From 1c366ee95080864453064f808af492c7e7b81c2d Mon Sep 17 00:00:00 2001 From: "Deshpande, Chinmay Diwakar" Date: Tue, 24 Jun 2025 21:42:11 -0700 Subject: [PATCH] SWDEV-532676 - Fix hipcc flags for catch tests (#191) Co-authored-by: Chinmay Deshpande --- catch/unit/compiler/CMakeLists.txt | 4 +-- catch/unit/complex/CMakeLists.txt | 1 - catch/unit/deviceLib/CMakeLists.txt | 8 ++--- catch/unit/graph/CMakeLists.txt | 4 +-- catch/unit/module/CMakeLists.txt | 44 +++++++++++------------ catch/unit/occupancy/CMakeLists.txt | 2 +- catch/unit/synchronization/CMakeLists.txt | 2 +- catch/unit/texture/CMakeLists.txt | 2 +- 8 files changed, 33 insertions(+), 34 deletions(-) diff --git a/catch/unit/compiler/CMakeLists.txt b/catch/unit/compiler/CMakeLists.txt index ab630f7adf..e5ca7eb3a2 100644 --- a/catch/unit/compiler/CMakeLists.txt +++ b/catch/unit/compiler/CMakeLists.txt @@ -41,7 +41,7 @@ if(HIP_PLATFORM MATCHES "amd") ${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_features.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/main.cc -o ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_EXE} - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/picojson ${LIBFS}) @@ -52,7 +52,7 @@ if(HIP_PLATFORM MATCHES "amd") ${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_features.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/main.cc -o ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_COMPRESSED_EXE} - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} -I${CMAKE_CURRENT_SOURCE_DIR}/../../include -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2 -I${CMAKE_CURRENT_SOURCE_DIR}/../../external/picojson ${LIBFS}) diff --git a/catch/unit/complex/CMakeLists.txt b/catch/unit/complex/CMakeLists.txt index d5ca4629ea..b10c83d811 100644 --- a/catch/unit/complex/CMakeLists.txt +++ b/catch/unit/complex/CMakeLists.txt @@ -29,7 +29,6 @@ if(HIP_PLATFORM MATCHES "nvidia") elseif(HIP_PLATFORM MATCHES "amd") set(LINKER_LIBS hiprtc) endif() -add_definitions(-DHIP_PATH="${HIP_PATH}") hip_add_exe_to_target(NAME ComplexTest TEST_SRC ${TEST_SRC} diff --git a/catch/unit/deviceLib/CMakeLists.txt b/catch/unit/deviceLib/CMakeLists.txt index 89ff3ca0d5..1ad4dba46b 100644 --- a/catch/unit/deviceLib/CMakeLists.txt +++ b/catch/unit/deviceLib/CMakeLists.txt @@ -123,25 +123,25 @@ add_custom_target(kerDevAllocMultCO.code ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocMultCO.code -I${HIP_PATH}/include/ - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) add_custom_target(kerDevWriteMultCO.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevWriteMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevWriteMultCO.code -I${HIP_PATH}/include/ - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) add_custom_target(kerDevFreeMultCO.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevFreeMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevFreeMultCO.code -I${HIP_PATH}/include/ - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) add_custom_target(kerDevAllocSingleKer.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocSingleKer.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocSingleKer.code -I${HIP_PATH}/include/ - -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/kerDevAllocSingleKer.code) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/kerDevFreeMultCO.code) diff --git a/catch/unit/graph/CMakeLists.txt b/catch/unit/graph/CMakeLists.txt index 659c867470..d2ddfc93f1 100644 --- a/catch/unit/graph/CMakeLists.txt +++ b/catch/unit/graph/CMakeLists.txt @@ -181,7 +181,7 @@ if(HIP_PLATFORM MATCHES "amd") set(TEST_SRC ${TEST_SRC} ${AMD_SRC}) endif() -add_custom_target(add_Kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/add_Kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../graph/add_Kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) +add_custom_target(add_Kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/add_Kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../graph/add_Kernel.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/add_Kernel.code) @@ -190,7 +190,7 @@ hip_add_exe_to_target(NAME GraphsTest2 TEST_TARGET_NAME build_tests) if(HIP_PLATFORM MATCHES "amd") - add_custom_target(hipMatMul COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/hipMatMul.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/graph/hipMatMul.code -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) + add_custom_target(hipMatMul COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/hipMatMul.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/graph/hipMatMul.code -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) add_dependencies(build_tests hipMatMul) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/hipMatMul.code) diff --git a/catch/unit/module/CMakeLists.txt b/catch/unit/module/CMakeLists.txt index 67884f2b49..3f891d9743 100644 --- a/catch/unit/module/CMakeLists.txt +++ b/catch/unit/module/CMakeLists.txt @@ -39,28 +39,28 @@ set(TEST_SRC add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_function_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_function_module.cc -o get_function_module.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_function_module.cc) add_custom_target(get_function_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_function_module.code) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/launch_kernel_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/launch_kernel_module.cc -o launch_kernel_module.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/launch_kernel_module.cc) add_custom_target(launch_kernel_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/launch_kernel_module.code) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_global_test_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_global_test_module.cc -o get_global_test_module.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_global_test_module.cc) add_custom_target(get_global_test_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_global_test_module.code) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_tex_ref_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_tex_ref_module.cc -o get_tex_ref_module.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_tex_ref_module.cc) add_custom_target(get_tex_ref_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_tex_ref_module.code) @@ -92,50 +92,50 @@ add_custom_target(empty_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/empty_module.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/empty_module.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(copyKernel.code COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernel.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(copyKernel.s COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 -S ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernel.s - -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(addKernel.code COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/addKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/addKernel.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(copyKernelCompressed.code COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 --offload-compress --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernelCompressed.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(OFFLOAD_ARCH_GENERIC_STR "--offload-arch=gfx9-generic --offload-arch=gfx9-4-generic:sramecc+:xnack- --offload-arch=gfx9-4-generic:sramecc-:xnack- --offload-arch=gfx9-4-generic:xnack+ --offload-arch=gfx10-1-generic --offload-arch=gfx10-3-generic --offload-arch=gfx11-generic --offload-arch=gfx12-generic") add_custom_target(copyKernelGenericTarget.code COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=6 --genco ${OFFLOAD_ARCH_GENERIC_STR} ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernelGenericTarget.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(copyKernelGenericTargetCompressed.code COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=6 --offload-compress --genco ${OFFLOAD_ARCH_GENERIC_STR} ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernelGenericTargetCompressed.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}/empty_module.code ${CMAKE_CURRENT_BINARY_DIR}/copyKernel.code @@ -276,28 +276,28 @@ hip_add_exe_to_target(NAME module TEST_SRC ${TEST_SRC} TEST_TARGET_NAME build_tests) -add_custom_target(managed_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/managed_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/managed_kernel.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) +add_custom_target(managed_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/managed_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/managed_kernel.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) hip_add_exe_to_target(NAME managedKernel TEST_SRC ${LINUX_TEST_SRC} TEST_TARGET_NAME build_tests LINKER_LIBS ${CMAKE_DL_LIBS}) -add_custom_target(vcpy_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/vcpy_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/vcpy_kernel.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) +add_custom_target(vcpy_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/vcpy_kernel.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/vcpy_kernel.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) hip_add_exe_to_target(NAME VcpyKernel TEST_SRC ${LINUX_TEST_SRC} TEST_TARGET_NAME build_tests LINKER_LIBS ${CMAKE_DL_LIBS}) -add_custom_target(matmul.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/matmul.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/matmul.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) +add_custom_target(matmul.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/matmul.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/matmul.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) hip_add_exe_to_target(NAME matmul TEST_SRC ${LINUX_TEST_SRC} TEST_TARGET_NAME build_tests LINKER_LIBS ${CMAKE_DL_LIBS}) -add_custom_target(kernel_composite_test.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kernel_composite_test.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/kernel_composite_test.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH}) +add_custom_target(kernel_composite_test.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kernel_composite_test.cpp -o ${CMAKE_CURRENT_BINARY_DIR}/../module/kernel_composite_test.code -I${HIP_PATH}/include -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/kernel_composite_test.code ${CMAKE_CURRENT_BINARY_DIR}/matmul.code diff --git a/catch/unit/occupancy/CMakeLists.txt b/catch/unit/occupancy/CMakeLists.txt index 28c3862855..e7cdd4d6da 100644 --- a/catch/unit/occupancy/CMakeLists.txt +++ b/catch/unit/occupancy/CMakeLists.txt @@ -16,7 +16,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/simple_kernel.code COMMAND ${CMAKE_CXX_COMPILER} --genco --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/simple_kernel.cc -I${HIP_PATH}/include/ - -o simple_kernel.code --rocm-path=${ROCM_PATH} + -o simple_kernel.code --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/simple_kernel.cc) add_custom_target(simple_kernel ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/simple_kernel.code) diff --git a/catch/unit/synchronization/CMakeLists.txt b/catch/unit/synchronization/CMakeLists.txt index 61d2dcd22f..09d374611b 100644 --- a/catch/unit/synchronization/CMakeLists.txt +++ b/catch/unit/synchronization/CMakeLists.txt @@ -7,7 +7,7 @@ add_custom_target(memcpyInt.hsaco COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOA ${CMAKE_CURRENT_BINARY_DIR}/../synchronization/memcpyInt.hsaco -I ${HIP_PATH}/include -I ${CMAKE_CURRENT_SOURCE_DIR}/../../include -L - ${HIP_PATH}/${CMAKE_INSTALL_LIBDIR}/../../include --rocm-path=${ROCM_PATH}) + ${HIP_PATH}/${CMAKE_INSTALL_LIBDIR}/../../include --hip-path=${HIP_PATH}) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/memcpyInt.hsaco) # only for AMD if(HIP_PLATFORM MATCHES "amd") diff --git a/catch/unit/texture/CMakeLists.txt b/catch/unit/texture/CMakeLists.txt index 0e363d9743..69a5785427 100644 --- a/catch/unit/texture/CMakeLists.txt +++ b/catch/unit/texture/CMakeLists.txt @@ -99,7 +99,7 @@ endfunction() # CheckAcceptedArchs add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tex_ref_get_module.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/tex_ref_get_module.cc -o tex_ref_get_module.code - -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH} + -I${HIP_PATH}/include/ --hip-path=${HIP_PATH} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tex_ref_get_module.cc) add_custom_target(tex_ref_get_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tex_ref_get_module.code) set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/tex_ref_get_module.code)