GPU Framework: Add OpenCL support to GPU param header generation + update CFCheckPadBaseline parameters

Author: cima22

GPU/GPUTracking/Definitions/Parameters/GPUParameters.json

@@ -338,10 +338,10 @@
       "TURING":   [512, 1]
     },
     "GPUTPCCFCheckPadBaseline": {
-      "default":  64,
-      "MI100":    [64, 10],
-      "VEGA":     [64, 2],
-      "AMPERE":   [64, 8]
+      "default":  576,
+      "MI100":    [576, 2],
+      "VEGA":     [576, 2],
+      "AMPERE":   [576, 2]
     },
     "GPUTPCCFChargeMapFiller_fillIndexMap": {
       "default":  512,

GPU/GPUTracking/cmake/gpu_param_header_generator.cmake

@@ -58,8 +58,6 @@ function(generate_gpu_param_header GPU_ARCH OUT_HEADER)
     endif()
     file(READ "${GPU_PARAM_JSON}" JSON_CONTENT)
     set(TMP_HEADER "${OUT_HEADER}.tmp")
-    message(STATUS "OUT_HEADER = '${OUT_HEADER}'")
-    message(STATUS "TMP_HEADER = '${TMP_HEADER}'")
     file(WRITE "${TMP_HEADER}" "#ifndef GPUDEFPARAMETERSDEFAULTS_H\n#define GPUDEFPARAMETERSDEFAULTS_H\n\n")
     file(APPEND "${TMP_HEADER}" "// This file is auto-generated from gpu_params.json. Do not edit directly.\n")
     string(REPLACE "," ";" ARCH_LIST "${TARGET_ARCH}")
@@ -69,19 +67,27 @@ function(generate_gpu_param_header GPU_ARCH OUT_HEADER)
     # Types
     set(TYPES CORE LB PAR)
     # Per architecture definitions
+    set(_first TRUE)
     foreach(ARCH IN LISTS ARCH_LIST)
-    file(APPEND "${TMP_HEADER}" "#if defined(GPUCA_GPUTYPE_${ARCH})\n\n")
-    generate_macros("${JSON_CONTENT}" "${TMP_HEADER}" "${TYPES}" "${ARCH}" "")
-    file(APPEND "${TMP_HEADER}" "\n#endif // GPUCA_GPUTYPE_${ARCH}\n\n")
+        if(_first)
+            file(APPEND "${TMP_HEADER}" "#if defined(GPUCA_GPUTYPE_${ARCH})\n\n")
+            set(_first FALSE)
+        else()
+            file(APPEND "${TMP_HEADER}" "#elif defined(GPUCA_GPUTYPE_${ARCH})\n\n")
+        endif()
+        generate_macros("${JSON_CONTENT}" "${TMP_HEADER}" "${TYPES}" "${ARCH}" "")
     endforeach()
+    if(NOT _first)
+        file(APPEND "${TMP_HEADER}" "#else\n#error GPU TYPE NOT SET\n#endif\n")
+    endif()
 
     # Default parameters
     file(APPEND "${TMP_HEADER}" "\n// Default parameters if not defined for the target architecture\n\n")
     generate_macros("${JSON_CONTENT}" "${TMP_HEADER}" "${TYPES}" "default" "use_ifndef_guard")
     file(APPEND "${TMP_HEADER}" "#endif // defined(GPUCA_GPUCODE) && !defined(GPUCA_GPUCODE_GENRTC) && !defined(GPUCA_GPUCODE_NO_LAUNCH_BOUNDS)\n\n")
 
     # CPU fallback
-    file(APPEND "${TMP_HEADER}" "#ifndef GPUCA_GPUCODE_GENRTC //Defaults for non-LB parameters also for CPU fallback\n\n")    # Get all keys of this TYPE as a semicolon-separated list
+    file(APPEND "${TMP_HEADER}" "#ifndef GPUCA_GPUCODE_GENRTC //Defaults for non-LB parameters also for CPU fallback\n\n")
     generate_macros("${JSON_CONTENT}" "${TMP_HEADER}" "PAR" "default_cpu" "use_ifndef_guard")
     file(APPEND "${TMP_HEADER}" "\n#endif // GPUCA_GPUCODE_GENRTC\n")
 

dependencies/FindO2GPU.cmake

@@ -73,21 +73,28 @@ function(detect_gpu_arch backend) # Detect GPU architecture, optionally filterri
 
   if(backend STREQUAL "CUDA") # CUDA filter
     set(TARGET_ARCH "${CUDA_TARGET}" PARENT_SCOPE)
-    return()
   elseif(backend STREQUAL "HIP") # HIP filter
     set(TARGET_ARCH "${HIP_TARGET}" PARENT_SCOPE)
-    return()
-  elseif(backend STREQUAL "ALL") # Return both
-    set(TARGET_ARCH "${CUDA_TARGET},${HIP_TARGET}" PARENT_SCOPE)
-    return()
+  elseif(backend STREQUAL "ALL") # Return enabled backends
+    set(_archs "")
+    if(CUDA_ENABLED)
+      list(APPEND _archs "${CUDA_TARGET}")
+    endif()
+    if(HIP_ENABLED)
+      list(APPEND _archs "${HIP_TARGET}")
+    endif()
+    if(OPENCL_ENABLED)
+      list(APPEND _archs "OPENCL")
+    endif()
+    list(JOIN _archs "," TARGET_ARCH)
+    set(TARGET_ARCH "${TARGET_ARCH}" PARENT_SCOPE)
   else()
     message(FATAL_ERROR "Unknown backend provided: ${backend}")
   endif()
 endfunction()
 
 function(set_target_gpu_arch backend target)
   detect_gpu_arch("${backend}")
-  message(STATUS "Compiling for ${TARGET_ARCH}")
   target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_${TARGET_ARCH})
 endfunction()