Merge branch 'main' into maxime/imm-cmd-list-support

Author: Bensuo

.github/workflows/coverity.yml

@@ -53,6 +53,7 @@ jobs:
           -DCUDA_CUDA_LIBRARY=/usr/local/cuda/lib64/stubs/libcuda.so
           -DUR_BUILD_ADAPTER_NATIVE_CPU=ON
           -DUR_BUILD_ADAPTER_HIP=ON
+          -DUR_BUILD_ADAPTER_OPENCL=ON
 
       - name: Run Coverity
         run: |

README.md

@@ -137,6 +137,10 @@ List of options provided by CMake:
 | UR_ENABLE_COMGR         | Enable comgr lib usage           | AMD/NVIDIA | AMD     |
 | UR_DPCXX | Path of the DPC++ compiler executable to build CTS device binaries | File path | `""` |
 | UR_SYCL_LIBRARY_DIR | Path of the SYCL runtime library directory to build CTS device binaries | Directory path | `""` |
+| UR_HIP_ROCM_DIR | Path of the default ROCm HIP installation | Directory path | `/opt/rocm` |
+| UR_HIP_INCLUDE_DIR | Path of the ROCm HIP include directory | Directory path | `${UR_HIP_ROCM_DIR}/include` |
+| UR_HIP_HSA_INCLUDE_DIRS | Path of the ROCm HSA include directory | Directory path | `${UR_HIP_ROCM_DIR}/hsa/include;${UR_HIP_ROCM_DIR}/include` |
+| UR_HIP_LIB_DIR | Path of the ROCm HIP library directory | Directory path | `${UR_HIP_ROCM_DIR}/lib` |
 
 ### Additional make targets
 

source/adapters/hip/CMakeLists.txt

@@ -10,14 +10,14 @@ set(UR_HIP_PLATFORM "AMD" CACHE STRING "UR HIP platform, AMD or NVIDIA")
 
 # Set default ROCm installation directory
 set(UR_HIP_ROCM_DIR "/opt/rocm" CACHE STRING "ROCm installation dir")
-
-set(UR_HIP_INCLUDE_DIR "${UR_HIP_ROCM_DIR}/include")
-
+# Allow custom location of HIP/HSA include and HIP library directories
+set(UR_HIP_INCLUDE_DIR "${UR_HIP_ROCM_DIR}/include" CACHE PATH
+  "Custom ROCm HIP include dir")
 set(UR_HIP_HSA_INCLUDE_DIRS
-    "${UR_HIP_ROCM_DIR}/hsa/include;${UR_HIP_ROCM_DIR}/include")
-
-# Set HIP lib dir
-set(UR_HIP_LIB_DIR "${UR_HIP_ROCM_DIR}/lib")
+  "${UR_HIP_ROCM_DIR}/hsa/include;${UR_HIP_ROCM_DIR}/include" CACHE FILEPATH
+  "Custom ROCm HSA include dir")
+set(UR_HIP_LIB_DIR "${UR_HIP_ROCM_DIR}/lib" CACHE PATH
+  "Custom ROCm HIP library dir")
 
 # Check if HIP library path exists (AMD platform only)
 if("${UR_HIP_PLATFORM}" STREQUAL "AMD")
@@ -31,7 +31,8 @@ if("${UR_HIP_PLATFORM}" STREQUAL "AMD")
                         " please check ROCm installation.")
     endif()
 
-    # Check if HSA include path exists
+    # Check if HSA include path exists. In rocm-6.0.0 the layout of HSA
+    # directory has changed, check for the new location as well.
     foreach(D IN LISTS UR_HIP_HSA_INCLUDE_DIRS)
         if(EXISTS "${D}")
             set(UR_HIP_HSA_INCLUDE_DIR "${D}")

source/adapters/opencl/CMakeLists.txt

@@ -67,16 +67,14 @@ if(UR_OPENCL_ICD_LOADER_LIBRARY)
     set(OpenCLICDLoaderLibrary ${UR_OPENCL_ICD_LOADER_LIBRARY})
 else()
     find_package(OpenCL 3.0)
-    if(OpenCL_FOUND)
-        set(OpenCLICDLoaderLibrary OpenCL::OpenCL)
-    else()
+    if(NOT OpenCL_FOUND)
         FetchContent_Declare(OpenCL-ICD-Loader
             GIT_REPOSITORY  "https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
             GIT_TAG         main
         )
         FetchContent_MakeAvailable(OpenCL-ICD-Loader)
-        set(OpenCLICDLoaderLibrary ${PROJECT_BINARY_DIR}/lib/libOpenCL.so)
     endif()
+    set(OpenCLICDLoaderLibrary OpenCL::OpenCL)
 endif()
 
 message(STATUS "OpenCL Include Directory: ${OpenCLIncludeDirectory}")