Skip to content

GPU HIP Cmake: Get rid of hipcc, use Clang --cuda-device-only instead #14033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
Mar 10, 2025
Merged

GPU HIP Cmake: Get rid of hipcc, use Clang --cuda-device-only instead #14033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef __HIPCC__ // CUDA
#define PER_KERNEL_OBJECT_EXT _fatbin
#else // HIP
#define PER_KERNEL_OBJECT_EXT _hip_cxx_o
#define PER_KERNEL_OBJECT_EXT _hip_o
#endif
#define GPUCA_KRNL(x_class, ...) QGET_LD_BINARY_SYMBOLS(GPUCA_M_CAT3(cuda_kernel_module_fatbin_krnl_, GPUCA_M_KRNL_NAME(x_class), PER_KERNEL_OBJECT_EXT))
#include "GPUReconstructionKernelList.h"
Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Base/hip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ add_custom_target(${MODULE}_HIP_SRC_CHK ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/

add_custom_command(
OUTPUT ${GPU_RTC_BIN}.command
COMMAND echo -n "${hip_HIPCC_EXECUTABLE} ${GPU_RTC_FLAGS_SEPARATED} ${GPU_RTC_DEFINES} --genco" > ${GPU_RTC_BIN}.command
COMMAND echo -n "${CMAKE_HIP_COMPILER} ${GPU_RTC_FLAGS_SEPARATED} ${GPU_RTC_DEFINES} -x hip --cuda-device-only" > ${GPU_RTC_BIN}.command
COMMAND_EXPAND_LISTS
VERBATIM
COMMENT "Preparing HIP RTC command file ${GPU_RTC_BIN}.command"
Expand Down Expand Up @@ -159,7 +159,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
install(FILES ${HDRS} DESTINATION include/GPU)

# o2_add_test(GPUsortHIP NAME test_GPUsortHIP
# SOURCES test/testGPUsortHIP.hip.cxx
# SOURCES test/testGPUsortHIP.hip
# PUBLIC_LINK_LIBRARIES O2::GPUCommon hip::host hip::device hip::hipcub roc::rocthrust
# COMPONENT_NAME GPU
# LABELS gpu)
Expand Down
6 changes: 2 additions & 4 deletions GPU/GPUTracking/Base/hip/per_kernel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

add_library(GPUTrackingHIPKernels OBJECT $<JOIN:$<LIST:TRANSFORM,$<LIST:TRANSFORM,$<LIST:TRANSFORM,$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNEL_NAMES>,REPLACE,[^A-Za-z0-9]+,_>,PREPEND,${O2_GPU_KERNEL_WRAPPER_FOLDER}/krnl_>,APPEND,.hip.cxx>, >)
set(CMAKE_CXX_COMPILER ${hip_HIPCC_EXECUTABLE})
set(CMAKE_CXX_FLAGS "${GPU_RTC_FLAGS} ${GPU_RTC_FLAGS_ARCH} --genco")
unset(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER})
add_library(GPUTrackingHIPKernels OBJECT $<JOIN:$<LIST:TRANSFORM,$<LIST:TRANSFORM,$<LIST:TRANSFORM,$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNEL_NAMES>,REPLACE,[^A-Za-z0-9]+,_>,PREPEND,${O2_GPU_KERNEL_WRAPPER_FOLDER}/krnl_>,APPEND,.hip>, >)
set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} --cuda-device-only")
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/hip/test/testGPUsortHIP.hip.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file testGPUsortHIP.hip.cxx
/// \file testGPUsortHIP.hip
/// \author Michael Lettrich

#define GPUCA_GPUTYPE_VEGA
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/cmake/kernel_helpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function(o2_gpu_add_kernel kernel_name kernel_files kernel_bounds kernel_type)
endif()

if(HIP_ENABLED)
set(TMP_FILENAMEA "${O2_GPU_KERNEL_WRAPPER_FOLDER}/krnl_${TMP_FILENAME}.hip.cxx")
set(TMP_FILENAMEA "${O2_GPU_KERNEL_WRAPPER_FOLDER}/krnl_${TMP_FILENAME}.hip")
set(O2_GPU_KERNEL_TEMPLATE_REPLACE "${TMP_KERNEL}")
configure_file(${O2_GPU_BASE_DIR}/Base/hip/GPUReconstructionHIPkernel.template.hip ${TMP_FILENAMEA})
endif()
Expand Down