Skip to content

GPU: Some improvements for device / platform selection and sanity checks #14000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 3 commits into from
Feb 25, 2025
Merged

GPU: Some improvements for device / platform selection and sanity checks #14000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22fcaa0
GPU: Do not try use OpenCL platforms where device query fails or whic…
davidrohr Feb 24, 2025
887e180
GPU OpenCL: Improve device detection and do not consider platforms/de…
davidrohr Feb 24, 2025
24a8ec4
GPU OpenCL: Make SPIR-V version settable in CMake
davidrohr Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions GPU/GPUTracking/Base/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -106,4 +110,4 @@ endif()
if(OPENCL_ENABLED_SPIRV)
target_compile_definitions(${targetName} PRIVATE OPENCL_ENABLED_SPIRV)
endif()
target_compile_definitions(${targetName} PRIVATE OCL_FLAGS=$<JOIN:${OCL_FLAGS},\ >)
target_compile_definitions(${targetName} PRIVATE GPUCA_OCL_BUILD_FLAGS=$<JOIN:${OCL_FLAGS},\ > GPUCA_OCL_SPIRV_VERSION=${GPUCA_OCL_SPIRV_VERSION})
Loading