GPU CMake: Use global hip_HIPIFY_PERL_EXECUTABLE variable

davidrohr · davidrohr · commit eb18b0ab440f · 2024-03-21T16:34:58.000+01:00
diff --git a/GPU/GPUTracking/Base/hip/CMakeLists.txt b/GPU/GPUTracking/Base/hip/CMakeLists.txt
@@ -18,7 +18,6 @@ if(NOT DEFINED GPUCA_HIP_HIPIFY_FROM_CUDA OR "${GPUCA_HIP_HIPIFY_FROM_CUDA}")
   file(MAKE_DIRECTORY ${GPUCA_HIP_SOURCE_DIR})
   set(GPUCA_HIP_FILE_LIST GPUReconstructionCUDA.cu GPUReconstructionCUDAExternalProvider.cu GPUReconstructionCUDA.h GPUReconstructionCUDAInternals.h GPUReconstructionCUDAkernel.template.cu CUDAThrustHelpers.h GPUReconstructionCUDADef.h GPUReconstructionCUDAGenRTC.cxx GPUReconstructionCUDAKernels.cu GPUReconstructionCUDArtc.cu)
   set(GPUCA_HIP_LOCAL_FILE_LIST GPUReconstructionHIPIncludes.h)
-  set(HIPIFY_EXECUTABLE "/opt/rocm/bin/hipify-perl")
   set(HIP_SOURCES "")
   foreach(file ${GPUCA_HIP_FILE_LIST})
     get_filename_component(ABS_CUDA_SORUCE ../cuda/${file} ABSOLUTE)
@@ -27,7 +26,7 @@ if(NOT DEFINED GPUCA_HIP_HIPIFY_FROM_CUDA OR "${GPUCA_HIP_HIPIFY_FROM_CUDA}")
     string(REPLACE "CUDA" "HIP" HIP_SOURCE ${HIP_SOURCE1})
     add_custom_command(
       OUTPUT ${GPUCA_HIP_SOURCE_DIR}/${HIP_SOURCE}
-      COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed -e 's/CUDA/HIP/g' -e 's/cuda/hip/g' > ${GPUCA_HIP_SOURCE_DIR}/${HIP_SOURCE}
+      COMMAND ${hip_HIPIFY_PERL_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed -e 's/CUDA/HIP/g' -e 's/cuda/hip/g' > ${GPUCA_HIP_SOURCE_DIR}/${HIP_SOURCE}
       DEPENDS ${ABS_CUDA_SORUCE}
       COMMENT "Hippifying ${HIP_SOURCE}"
     )
diff --git a/cmake/O2AddHipifiedExecutable.cmake b/cmake/O2AddHipifiedExecutable.cmake
@@ -24,7 +24,6 @@ function(o2_add_hipified_executable baseTargetName)
                         "SOURCES;PUBLIC_LINK_LIBRARIES;JOB_POOL")
 
   # Process each .cu file to generate a .hip file
-  set(HIPIFY_EXECUTABLE "/opt/rocm/bin/hipify-perl")
   set(HIP_SOURCES)
 
   foreach(file ${A_SOURCES})
@@ -38,7 +37,7 @@ function(o2_add_hipified_executable baseTargetName)
 
       add_custom_command(
         OUTPUT ${OUTPUT_HIP_FILE}
-        COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
+        COMMAND ${hip_HIPIFY_PERL_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
         DEPENDS ${file}
         COMMENT "Hippifying ${HIP_SOURCE}"
       )
diff --git a/cmake/O2AddHipifiedLibrary.cmake b/cmake/O2AddHipifiedLibrary.cmake
@@ -24,7 +24,6 @@ function(o2_add_hipified_library baseTargetName)
                         )
 
   # Process each .cu file to generate a .hip file
-  set(HIPIFY_EXECUTABLE "/opt/rocm/bin/hipify-perl")
   set(HIP_SOURCES)
 
   foreach(file ${A_SOURCES})
@@ -38,7 +37,7 @@ function(o2_add_hipified_library baseTargetName)
 
       add_custom_command(
         OUTPUT ${OUTPUT_HIP_FILE}
-        COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
+        COMMAND ${hip_HIPIFY_PERL_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
         DEPENDS ${file}
         COMMENT "Hippifying ${HIP_SOURCE}"
       )
diff --git a/dependencies/FindO2GPU.cmake b/dependencies/FindO2GPU.cmake
@@ -241,6 +241,9 @@ if(ENABLE_HIP)
     set_package_properties(hipcub PROPERTIES TYPE REQUIRED)
     set_package_properties(rocprim PROPERTIES TYPE REQUIRED)
     set_package_properties(rocthrust PROPERTIES TYPE REQUIRED)
+    if(NOT hip_HIPIFY_PERL_EXECUTABLE)
+      message(FATAL_ERROR "Could not find hipify-perl command")
+    endif()
   endif()
   if (CMAKE_HIP_COMPILER)
     enable_language(HIP)

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ function(o2_add_hipified_library baseTargetName)`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`# Process each .cu file to generate a .hip file`
`27`		`- set(HIPIFY_EXECUTABLE "/opt/rocm/bin/hipify-perl")`
`28`	`27`	`set(HIP_SOURCES)`
`29`	`28`
`30`	`29`	`foreach(file ${A_SOURCES})`
`@@ -38,7 +37,7 @@ function(o2_add_hipified_library baseTargetName)`
`38`	`37`
`39`	`38`	`add_custom_command(`
`40`	`39`	`OUTPUT ${OUTPUT_HIP_FILE}`
`41`		`- COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} \| sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}`
	`40`	`+ COMMAND ${hip_HIPIFY_PERL_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} \| sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}`
`42`	`41`	`DEPENDS ${file}`
`43`	`42`	`COMMENT "Hippifying ${HIP_SOURCE}"`
`44`	`43`	`)`