GPU CMake: Generate optimized parameter files for all available architectures, not only for hardcoded list

Author: davidrohr

GPU/GPUTracking/CMakeLists.txt

@@ -410,10 +410,9 @@ target_sources(${targetName}
                BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 
 make_directory(${CMAKE_CURRENT_BINARY_DIR}/genGPUArch)
-set(GPU_CONST_PARAM_ARCHITECTUES "AMPERE;TURING;VEGA;MI100")
 set(GPU_CONST_PARAM_FILES "")
 set(GPU_ARCH_PARAMS_HEADER ${CMAKE_CURRENT_BINARY_DIR}/genGPUArch/GPUDefParametersDefaults_OnTheFly.h)
-generate_gpu_param_header("${GPU_CONST_PARAM_ARCHITECTUES}" ${GPU_ARCH_PARAMS_HEADER})
+generate_gpu_param_header("ALL" ${GPU_ARCH_PARAMS_HEADER} "GPU_CONST_PARAM_ARCHITECTUES")
 foreach(GPU_ARCH ${GPU_CONST_PARAM_ARCHITECTUES})
   set(PARAMFILE ${CMAKE_CURRENT_BINARY_DIR}/genGPUArch/gpu_const_param_${GPU_ARCH}.par)
   add_custom_command(

GPU/GPUTracking/cmake/gpu_param_header_generator.cmake

@@ -12,10 +12,12 @@
 # file gpu_param_header_generator.cmake
 # author Gabriele Cimador
 
-function(generate_macros json_content output types arch_list)
+function(generate_macros json_content output types arch_list arch_list_output)
     foreach(arch IN LISTS arch_list)
-        set(${output}_${arch} "")
+        set(OUTPUT_TMP_${arch} "")
     endforeach()
+    set(arch_list_output_tmp)
+    list(FIND arch_list "ALL" do_all_architectures)
     foreach(TYPE IN LISTS types)
         string(JSON n_params LENGTH "${json_content}" "${TYPE}")
         math(EXPR last "${n_params} - 1")
@@ -28,7 +30,14 @@ function(generate_macros json_content output types arch_list)
                 if(arch STREQUAL "default_cpu" AND NOT TYPE STREQUAL "PAR")
                   message(FATAL_ERROR "Bogus entry ${param_name} for ${arch}")
                 endif()
-                list(FIND arch_list "${arch}" list_idx)
+                if(do_all_architectures GREATER -1)
+                    if(arch_list_output AND NOT arch MATCHES ^default)
+                        list(APPEND arch_list_output_tmp "${arch}")
+                    endif()
+                    set(list_idx 0)
+                else()
+                    list(FIND arch_list "${arch}" list_idx)
+                endif()
                 if(list_idx GREATER -1)
                     string(JSON param_values GET "${JSON_CONTENT}" "${TYPE}" "${param_name}" "${arch}")
                     if(TYPE STREQUAL "LB")
@@ -45,17 +54,22 @@ function(generate_macros json_content output types arch_list)
                     set(MACRO_DEFINITION "#define ${MACRO_NAME} ${vals}")
                     if(arch MATCHES ^default)
                         # fallback defaults are wrapped in #ifndef
-                        string(APPEND ${output}_${arch} "#ifndef ${MACRO_NAME}\n  ${MACRO_DEFINITION}\n#endif\n\n")
+                        string(APPEND OUTPUT_TMP_${arch} "#ifndef ${MACRO_NAME}\n  ${MACRO_DEFINITION}\n#endif\n\n")
                     else()
-                        string(APPEND ${output}_${arch} "${MACRO_DEFINITION}\n")
+                        string(APPEND OUTPUT_TMP_${arch} "${MACRO_DEFINITION}\n")
                     endif()
                 endif()
             endforeach()
         endforeach()
     endforeach()
     foreach(arch IN LISTS arch_list)
-        set(${output}_${arch} "${${output}_${arch}}" PARENT_SCOPE)
+        set(${output}_${arch} "${OUTPUT_TMP_${arch}}" PARENT_SCOPE)
     endforeach()
+    if(arch_list_output)
+        list(REMOVE_DUPLICATES arch_list_output_tmp)
+        list(SORT arch_list_output_tmp)
+        set(${arch_list_output} "${arch_list_output_tmp}" PARENT_SCOPE)
+    endif()
 endfunction()
 
 function(generate_gpu_param_header GPU_ARCH OUT_HEADER)
@@ -78,7 +92,14 @@ function(generate_gpu_param_header GPU_ARCH OUT_HEADER)
     set(TYPES CORE LB PAR)
     # Per architecture definitions
     set(_first TRUE)
-    generate_macros("${JSON_CONTENT}" TMP_OUTPUT "${TYPES}" "${ARCH_LIST};default;default_cpu")
+    generate_macros("${JSON_CONTENT}" TMP_OUTPUT "${TYPES}" "${ARCH_LIST};default;default_cpu" "JSON_ARCHITECTURES")
+    list(FIND ARCH_LIST "ALL" do_all_architectures)
+    if(ARGC GREATER 2)
+        set(${ARGV2} "${JSON_ARCHITECTURES}" PARENT_SCOPE)
+    endif()
+    if(do_all_architectures GREATER -1)
+        set(ARCH_LIST ${JSON_ARCHITECTURES})
+    endif()
     foreach(ARCH IN LISTS ARCH_LIST)
         if(_first)
             file(APPEND "${TMP_HEADER}" "#if defined(GPUCA_GPUTYPE_${ARCH})\n\n")
@@ -98,7 +119,7 @@ function(generate_gpu_param_header GPU_ARCH OUT_HEADER)
     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")
+    file(APPEND "${TMP_HEADER}" "#ifndef GPUCA_GPUCODE_GENRTC // Defaults for non-LB parameters also for CPU fallback\n\n")
     file(APPEND "${TMP_HEADER}" ${TMP_OUTPUT_default_cpu})
     file(APPEND "${TMP_HEADER}" "\n#endif // GPUCA_GPUCODE_GENRTC\n")