GPU OpenCL: Make SPIR-V version settable in CMake

Author: davidrohr

GPU/GPUTracking/Base/opencl/CMakeLists.txt

@@ -39,6 +39,10 @@ set(OCL_DEFINECL "-D$<JOIN:$<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS
 set(SRCS GPUReconstructionOCL.cxx)
 set(HDRS GPUReconstructionOCL.h GPUReconstructionOCLInternals.h)
 
+if (NOT DEFINED GPUCA_OCL_SPIRV_VERSION)
+  set(GPUCA_OCL_SPIRV_VERSION 1.2)
+endif()
+
 if(OPENCL_ENABLED_SPIRV) # BUILD OpenCL intermediate code for SPIR-V target
   # executes clang to create llvm IL code
   # Add -fintegrated-objemitter once we switch to clang >= 17
@@ -47,7 +51,7 @@ if(OPENCL_ENABLED_SPIRV) # BUILD OpenCL intermediate code for SPIR-V target
       OUTPUT ${CL_BIN}.spirv
       COMMAND ${CMAKE_COMMAND} -E env "PATH=${TMP_LLVM_SPIRV_PATH}:\$$PATH" ${LLVM_CLANG}
               -O0
-              --target=spirv64
+              --target=spirv64v${GPUCA_OCL_SPIRV_VERSION}
               -fno-integrated-objemitter
               -ferror-limit=1000 -Wno-invalid-constexpr -Wno-unused-command-line-argument
               ${OCL_FLAGS}
@@ -106,4 +110,4 @@ endif()
 if(OPENCL_ENABLED_SPIRV)
   target_compile_definitions(${targetName} PRIVATE OPENCL_ENABLED_SPIRV)
 endif()
-target_compile_definitions(${targetName} PRIVATE GPUCA_OCL_BUILD_FLAGS=$<JOIN:${OCL_FLAGS},\ >)
+target_compile_definitions(${targetName} PRIVATE GPUCA_OCL_BUILD_FLAGS=$<JOIN:${OCL_FLAGS},\ > GPUCA_OCL_SPIRV_VERSION=${GPUCA_OCL_SPIRV_VERSION})

GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cxx

@@ -209,14 +209,14 @@ int32_t GPUReconstructionOCLBackend::InitDevice_Runtime()
             while ((pos = device_il_version.find("SPIR-V", pos)) != std::string::npos) {
               float spirvVersion;
               sscanf(device_il_version.c_str() + pos, "SPIR-V_%f", &spirvVersion);
-              if (spirvVersion >= 1.2) {
+              if (spirvVersion >= GPUCA_OCL_SPIRV_VERSION) {
                 break;
               }
               pos += strlen("SPIR-V_0.0");
             }
             if (pos == std::string::npos) {
               deviceOK = false;
-              deviceFailure += " - No SPIR-V 1.6 (" + device_il_version + ")";
+              deviceFailure += " - No SPIR-V " + std::to_string(GPUCA_OCL_SPIRV_VERSION) + " (" + device_il_version + ")";
             }
           }