[SYCL] Fix version of OpenCL headers and ICD loader (#3247)

Author: vladimirlaz

buildbot/dependency.py

@@ -50,29 +50,34 @@ def do_dependency(args):
     ocl_header_dir = os.path.join(args.obj_dir, "OpenCL-Headers")
     if not os.path.isdir(ocl_header_dir):
         clone_cmd = ["git", "clone", "https://github.com/KhronosGroup/OpenCL-Headers",
-                     "OpenCL-Headers", "-b", "v2020.06.16"]
+                     "OpenCL-Headers", "-b", "master"]
         subprocess.check_call(clone_cmd, cwd=args.obj_dir)
     else:
         fetch_cmd = ["git", "pull", "--ff", "--ff-only", "origin"]
         subprocess.check_call(fetch_cmd, cwd=ocl_header_dir)
 
-    # Workaround to unblock CI until KhronosGroup/OpenCL-ICD-Loader/pull/124
-    # is submitted
-    checkout_cmd = ["git", "checkout", "d1b936b72b9610626ecab8a991cec18348fba047"]
+    # Checkout fixed version to avoid unexpected issues coming from upstream
+    # Specific version can be uplifted as soon as such need arise
+    checkout_cmd = ["git", "checkout", "23710f1b99186065c1768fc3098ba681adc0f253"]
     subprocess.check_call(checkout_cmd, cwd=ocl_header_dir)
 
     # fetch and build OpenCL ICD loader
     icd_loader_dir = os.path.join(args.obj_dir, "OpenCL-ICD-Loader")
     if not os.path.isdir(icd_loader_dir):
         clone_cmd = ["git", "clone",
                      "https://github.com/KhronosGroup/OpenCL-ICD-Loader",
-                     "OpenCL-ICD-Loader", "-b", "v2020.06.16"]
+                     "OpenCL-ICD-Loader", "-b", "master"]
 
         subprocess.check_call(clone_cmd, cwd=args.obj_dir)
     else:
         fetch_cmd = ["git", "pull", "--ff", "--ff-only", "origin"]
         subprocess.check_call(fetch_cmd, cwd=icd_loader_dir)
 
+    # Checkout fixed version to avoid unexpected issues coming from upstream
+    # Specific version can be uplifted as soon as such need arise
+    checkout_cmd = ["git", "checkout", "5f8249691ec8c25775789498951f8e9eb62c201d"]
+    subprocess.check_call(checkout_cmd, cwd=icd_loader_dir)
+
     icd_build_dir = os.path.join(icd_loader_dir, "build")
     if os.path.isdir(icd_build_dir):
         shutil.rmtree(icd_build_dir)
@@ -119,4 +124,3 @@ def main():
     ret = main()
     exit_code = 0 if ret else 1
     sys.exit(exit_code)
-

opencl-aot/CMakeLists.txt

@@ -17,7 +17,7 @@ if (NOT OpenCL_INCLUDE_DIRS)
     set(OpenCL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc")
     ExternalProject_Add(opencl-headers
             GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-Headers.git
-            GIT_TAG d1b936b72b9610626ecab8a991cec18348fba047
+            GIT_TAG 23710f1b99186065c1768fc3098ba681adc0f253
             SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc"
             CONFIGURE_COMMAND ""
             BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCL_INCLUDE_DIRS}/CL ${CMAKE_CURRENT_BINARY_DIR}/inc/CL
@@ -48,7 +48,7 @@ if (NOT OpenCL_LIBRARIES)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/icd_build)
     ExternalProject_Add(opencl-icd
             GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
-            GIT_TAG v2020.06.16
+            GIT_TAG 5f8249691ec8c25775789498951f8e9eb62c201d
             SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd"
             BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icd_build"
             CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

sycl/CMakeLists.txt

@@ -100,7 +100,7 @@ if( NOT OpenCL_INCLUDE_DIRS )
   endif()
   ExternalProject_Add(ocl-headers
     GIT_REPOSITORY    https://github.com/KhronosGroup/OpenCL-Headers.git
-    GIT_TAG           d1b936b72b9610626ecab8a991cec18348fba047
+    GIT_TAG           23710f1b99186065c1768fc3098ba681adc0f253
     UPDATE_DISCONNECTED ${SYCL_EP_OCL_HEADERS_SKIP_AUTO_UPDATE}
     SOURCE_DIR        ${OpenCL_INCLUDE_DIRS}
     CONFIGURE_COMMAND ""
@@ -144,7 +144,7 @@ if( NOT OpenCL_LIBRARIES )
   endif()
   ExternalProject_Add(ocl-icd
     GIT_REPOSITORY    https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
-    GIT_TAG           v2020.06.16
+    GIT_TAG           5f8249691ec8c25775789498951f8e9eb62c201d
     UPDATE_DISCONNECTED ${SYCL_EP_OCL_ICD_SKIP_AUTO_UPDATE}
     SOURCE_DIR        ${OpenCL_ICD_LOADER_SOURCE_DIR}
     BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/icd_build"