GPU RTC: Simplify the way LB preprocessor definitions are imported as parameter object, and replace explicit invalid list with CMake-auto-generated one

Author: davidrohr

GPU/GPUTracking/Base/GPUReconstructionProcessing.cxx

@@ -12,12 +12,9 @@
 /// \file GPUReconstructionProcessing.cxx
 /// \author David Rohr
 
-#define GPUCA_DEF_PARAMETERS_LOAD_DEFAULTS
-#include "GPUDefParametersDefault.h"
-#include "GPUDefParametersLoad.inc"
-
 #include "GPUReconstructionProcessing.h"
 #include "GPUReconstructionThreading.h"
+#include "GPUDefParametersLoad.inc"
 
 using namespace o2::gpu;
 

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu

@@ -14,11 +14,6 @@
 
 #define GPUCA_GPUCODE_HOSTONLY
 
-#define GPUCA_DEF_PARAMETERS_LOAD_DEFAULTS
-#include "GPUReconstructionCUDADef.h"
-#include "GPUDefParametersDefault.h"
-#include "GPUDefParametersLoad.inc"
-
 #include "GPUReconstructionCUDAIncludesSystem.h"
 #include "GPUReconstructionCUDADef.h"
 #include <cuda_profiler_api.h>
@@ -28,6 +23,7 @@
 #include "GPUReconstructionIncludes.h"
 #include "GPUParamRTC.h"
 #include "GPUReconstructionCUDAHelpers.inc"
+#include "GPUDefParametersLoad.inc"
 
 #if defined(GPUCA_KERNEL_COMPILE_MODE) && GPUCA_KERNEL_COMPILE_MODE == 1
 #include "utils/qGetLdBinarySymbols.h"

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDAGenRTC.cxx

@@ -13,13 +13,10 @@
 /// \author David Rohr
 
 #define GPUCA_GPUCODE_HOSTONLY
-#define GPUCA_DEF_PARAMETERS_LOAD_DEFAULTS
-#include "GPUDefParametersDefault.h"
-#include "GPUDefParametersLoad.inc"
 
 #include "GPUReconstructionCUDA.h"
 #include "GPUParamRTC.h"
-#include "GPUDefMacros.h"
+#include "GPUDefParametersLoad.inc"
 #include <unistd.h>
 #include "Framework/SHA1.h"
 #include <sys/stat.h>

GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cxx

@@ -12,9 +12,7 @@
 /// \file GPUReconstructionOCL.cxx
 /// \author David Rohr
 
-#define GPUCA_DEF_PARAMETERS_LOAD_DEFAULTS
 #include "GPUReconstructionOCLIncludesHost.h"
-#include "GPUDefParametersDefault.h"
 #include "GPUDefParametersLoad.inc"
 
 #include <map>

GPU/GPUTracking/CMakeLists.txt

@@ -231,7 +231,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
 endif()
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly)
-file(GENERATE
+file(GENERATE # TODO: Do this as a list
      OUTPUT include_gpu_onthefly/GPUReconstructionKernelList.h
      INPUT Base/GPUReconstructionKernelList.template.h
 )
@@ -255,10 +255,19 @@ file(GENERATE
      OUTPUT include_gpu_onthefly/GPUDefParametersLoad.inc
      INPUT Definitions/GPUDefParametersLoad.template.inc
 )
-if(NOT ALIGPU_BUILD_TYPE STREQUAL "O2")
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly)
-endif()
-set(HDRS_INSTALL ${HDRS_INSTALL} ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUReconstructionKernelList.h ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParameters.h ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoad.inc)
+file(GENERATE
+     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase
+     CONTENT "$<JOIN:$<LIST:TRANSFORM,$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNEL_NAMES>,REPLACE,[^A-Za-z0-9]+,_>,\n>"
+)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h
+  COMMAND awk "{print(\"#ifndef GPUCA_LB_\" $0 \"\\n#define GPUCA_LB_\" $0 \" 0\\n#endif\")}" ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase > ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h
+  COMMENT "Generating GPUDefParametersLoadPrepare.h"
+  VERBATIM
+  COMMAND_EXPAND_LISTS
+)
+
+set(HDRS_INSTALL ${HDRS_INSTALL} ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUReconstructionKernelList.h ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParameters.h ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoad.inc ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h)
 include(kernels.cmake)
 
 # Optional sources depending on optional dependencies
@@ -396,6 +405,12 @@ set_source_files_properties(Base/GPUReconstructionLibrary.cxx
                             PROPERTIES
                             INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
 
+# Make sure header files generated with add_custom_command are built
+target_sources(${targetName}
+               PRIVATE FILE_SET "generatedHeaders"
+               TYPE HEADERS
+               FILES ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h # TODO: build file list for this
+               BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 
 # Add compile definitions and libraries depending on available optional dependencies
 if(GPUCA_QA)