[SYCL][UR] Improve support for preinstalled OpenCL deps

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>

Author: sarnex

opencl/CMakeLists.txt

@@ -11,8 +11,6 @@ if (MSVC)
   )
 endif()
 
-# Repo URLs
-
 set(OCL_HEADERS_REPO
   "https://github.com/KhronosGroup/OpenCL-Headers.git")
 set(OCL_LOADER_REPO
@@ -23,59 +21,70 @@ set(OCL_LOADER_REPO
 set(OCL_HEADERS_TAG 6eabe90aa7b6cff9c67800a2fe25a0cd88d8b749)
 set(OCL_LOADER_TAG ddf6c70230a79cdb8fcccfd3c775b09e6820f42e)
 
+
+find_package(OpenCL QUIET)
+
 # OpenCL Headers
-if(NOT OpenCL_HEADERS)
+if(NOT OpenCL_FOUND)
+  # Repo URLs
+
   message(STATUS "Will fetch OpenCL headers from ${OCL_HEADERS_REPO}")
 
   FetchContent_Declare(ocl-headers
     GIT_REPOSITORY    ${OCL_HEADERS_REPO}
     GIT_TAG           ${OCL_HEADERS_TAG}
-  )
+    )
+  
+  FetchContent_MakeAvailable(ocl-headers)
+  FetchContent_GetProperties(ocl-headers)
+  set(OpenCL_INCLUDE_DIR
+  ${ocl-headers_SOURCE_DIR} CACHE PATH "Path to OpenCL Headers")
+  target_compile_definitions(Headers INTERFACE -DCL_TARGET_OPENCL_VERSION=300)
+  add_library(OpenCL-Headers ALIAS Headers)
 else()
-  message(STATUS "OpenCL headers are added manually ${OpenCL_HEADERS}")
-
-  FetchContent_Declare(ocl-headers
-    URL               ${OpenCL_HEADERS}
+  set(OPENCL_TEST_PROGRAM "#define CL_TARGET_OPENCL_VERSION 300
+        #include <CL/cl_ext.h>
+        #ifndef cl_khr_spirv_queries
+        #error Unsupported header version
+        #endif
+        int main(int, char*[]) { cl_image_desc v; (void) v.mem_object; return 0; }"
+    )
+  file(WRITE "${CMAKE_BINARY_DIR}/test_opencl.c" "${OPENCL_TEST_PROGRAM}")
+  try_compile(
+   OPENCL_HEADERS_VERSION_SUPPORTED
+   ${CMAKE_BINARY_DIR}/cmake_try_compile
+   SOURCES "${CMAKE_BINARY_DIR}/test_opencl.c"
   )
+  if(NOT OPENCL_HEADERS_VERSION_SUPPORTED)
+    message(FATAL_ERROR "Preinstalled OpenCL headers are not supported, "
+            "use commit ${OCL_HEADERS_TAG}")
+  endif()
+  message(STATUS "Using OpenCL headers at ${OpenCL_INCLUDE_DIR}")
 endif()
 
-FetchContent_MakeAvailable(ocl-headers)
-FetchContent_GetProperties(ocl-headers)
-set(OpenCL_INCLUDE_DIR
-  ${ocl-headers_SOURCE_DIR} CACHE PATH "Path to OpenCL Headers")
-
-target_compile_definitions(Headers INTERFACE -DCL_TARGET_OPENCL_VERSION=300)
-add_library(OpenCL-Headers ALIAS Headers)
-
 # OpenCL Library (ICD Loader)
 
-# Set OPENCL_ICD_LOADER_HEADERS_DIR, as prerequisite for ICD build
-set(OPENCL_ICD_LOADER_HEADERS_DIR
-  ${OpenCL_INCLUDE_DIR} CACHE PATH "Path to OpenCL Headers")
-
 # LLVM build sets this OFF by default, but we need OpenCL to be built as shared
 # library.
 set(BUILD_SHARED_LIBS ON)
 
-if(NOT OpenCL_LIBRARY_SRC)
+if(NOT OpenCL_FOUND)
+  # Set OPENCL_ICD_LOADER_HEADERS_DIR, as prerequisite for ICD build
+  set(OPENCL_ICD_LOADER_HEADERS_DIR
+  ${OpenCL_INCLUDE_DIR} CACHE PATH "Path to OpenCL Headers")
   message(STATUS "Will fetch OpenCL ICD Loader from ${OCL_LOADER_REPO}")
 
   FetchContent_Declare(ocl-icd
     GIT_REPOSITORY    ${OCL_LOADER_REPO}
     GIT_TAG           ${OCL_LOADER_TAG}
-  )
+    )
+  
+  FetchContent_MakeAvailable(ocl-icd)
+  add_library(OpenCL-ICD ALIAS OpenCL)
 else()
-  # TODO: add possibility to use prebuilt OpenCL library rather than building
-  #       together with llvm.
   message(STATUS
-    "OpenCL ICD Loader sources added manually ${OpenCL_LIBRARY_SRC}")
-
-  FetchContent_Declare(ocl-icd
-    URL               ${OpenCL_LIBRARY_SRC}
-  )
+    "Using OpenCL ICD Loader at ${OpenCL_LIBRARY}")
 endif()
 
-FetchContent_MakeAvailable(ocl-icd)
-add_library(OpenCL-ICD ALIAS OpenCL)
 
 add_subdirectory(opencl-aot)

opencl/opencl-aot/CMakeLists.txt

@@ -22,7 +22,13 @@ if(NOT MSVC)
   target_compile_options(${OPENCL_AOT_PROJECT_NAME} PRIVATE "-Wno-unused-parameter")
 endif()
 
+if(OpenCL_FOUND)
 target_link_libraries(${OPENCL_AOT_PROJECT_NAME}
+  PRIVATE
+    OpenCL::OpenCL)
+else()
+  target_link_libraries(${OPENCL_AOT_PROJECT_NAME}
   PRIVATE
     OpenCL-Headers
     OpenCL-ICD)
+endif()

sycl/CMakeLists.txt

@@ -150,6 +150,7 @@ if(OPENCL_FOUND EQUAL -1)
   message(FATAL_ERROR "opencl external project required but not found.")
 endif()
 
+if(TARGET OpenCL-Headers)
 # Copy OpenCL Headers into sycl headers build directory
 # Compiler does automatic lookup bin/../include based on clang binary location,
 # e.g. when run LIT tests
@@ -159,7 +160,8 @@ file(COPY ${OpenCL_INCLUDE_DIR}/CL DESTINATION ${SYCL_INCLUDE_BUILD_DIR})
 install(DIRECTORY ${OpenCL_INCLUDE_DIR}/CL
         DESTINATION ${SYCL_INCLUDE_DIR}
         COMPONENT OpenCL-Headers)
-
+endif()
+    
 # Option for enabling building the SYCL major release preview library.
 option(SYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB "Enable build of the SYCL major release preview library" ON)
 

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -56,8 +56,10 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
 endif()
 if("opencl" IN_LIST SYCL_ENABLE_BACKENDS)
   set(UR_BUILD_ADAPTER_OPENCL ON)
-  set(UR_OPENCL_ICD_LOADER_LIBRARY OpenCL-ICD CACHE FILEPATH
-    "Path of the OpenCL ICD Loader library" FORCE)
+  if(TARGET OpenCL-ICD)
+    set(UR_OPENCL_ICD_LOADER_LIBRARY OpenCL-ICD CACHE FILEPATH
+      "Path of the OpenCL ICD Loader library" FORCE)
+  endif()
 endif()
 if("native_cpu" IN_LIST SYCL_ENABLE_BACKENDS)
   set(UR_BUILD_ADAPTER_NATIVE_CPU ON)

unified-runtime/source/adapters/opencl/CMakeLists.txt

@@ -8,6 +8,14 @@ set(OPENCL_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE PATH "OpenCL adapter director
 set(UR_OPENCL_INCLUDE_DIR "" CACHE PATH "Directory containing the OpenCL Headers")
 set(UR_OPENCL_ICD_LOADER_LIBRARY "" CACHE FILEPATH "Path of the OpenCL ICD Loader library")
 
+if(NOT UR_OPENCL_INCLUDE_DIR AND NOT UR_OPENCL_ICD_LOADER_LIBRARY)
+  find_package(OpenCL QUIET)
+  if(OpenCL_FOUND)
+    set(UR_OPENCL_INCLUDE_DIR "${OpenCL_INCLUDE_DIR}")
+    set(UR_OPENCL_ICD_LOADER_LIBRARY "${OpenCL_LIBRARY_DIR}")
+  endif()
+endif()
+
 find_package(Threads REQUIRED)
 
 set(TARGET_NAME ur_adapter_opencl)
@@ -97,6 +105,11 @@ target_compile_definitions(ur_adapter_opencl PRIVATE
     CL_USE_DEPRECATED_OPENCL_1_2_APIS
 )
 
+# https://github.com/intel/llvm/issues/19648
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND LLVM_ENABLE_PEDANTIC)
+    target_compile_options(ur_adapter_opencl PRIVATE -std=gnu++17)
+endif()
+
 target_include_directories(${TARGET_NAME} PRIVATE
     ${OpenCLIncludeDirectory}
     "${CMAKE_CURRENT_SOURCE_DIR}/../../"