[OpenCL] Update header to include new enums from cl_khr_command_buffer (#18820)

`cl_khr_command_buffer` symbols changed by
KhronosGroup/OpenCL-Headers#265

Uplift OpenCL-Headers to
KhronosGroup/OpenCL-Headers@60ba29d
and OpenCL-ICD-Loader to
KhronosGroup/OpenCL-ICD-Loader@ddf6c70

The latest header also requires to explicitly enable
`CL_ENABLE_BETA_EXTENSIONS` for beta extensions like
`cl_khr_command_buffer`.

Author: Nuullll

opencl/CMakeLists.txt

@@ -20,8 +20,8 @@ set(OCL_LOADER_REPO
 
 # Repo tags/hashes
 
-set(OCL_HEADERS_TAG 542d7a8f65ecfd88b38de35d8b10aa67b36b33b2)
-set(OCL_LOADER_TAG 804b6f040503c47148bee535230070da6b857ae4)
+set(OCL_HEADERS_TAG 60ba29d8117b5f81d6ab294fa62d9b6688d83f4e)
+set(OCL_LOADER_TAG ddf6c70230a79cdb8fcccfd3c775b09e6820f42e)
 
 # OpenCL Headers
 if(NOT OpenCL_HEADERS)

sycl/include/sycl/detail/cl.h

@@ -14,5 +14,10 @@
 #define CL_TARGET_OPENCL_VERSION 300
 #endif
 
+// Include symbols for beta extensions
+#ifndef CL_ENABLE_BETA_EXTENSIONS
+#define CL_ENABLE_BETA_EXTENSIONS
+#endif
+
 #include <CL/cl.h>
 #include <CL/cl_ext.h>

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

@@ -57,7 +57,7 @@ if(UR_OPENCL_INCLUDE_DIR)
 else()
     FetchContent_Declare(OpenCL-Headers
         GIT_REPOSITORY  "https://github.com/KhronosGroup/OpenCL-Headers.git"
-        GIT_TAG         542d7a8f65ecfd88b38de35d8b10aa67b36b33b2
+        GIT_TAG         60ba29d8117b5f81d6ab294fa62d9b6688d83f4e
     )
     FetchContent_MakeAvailable(OpenCL-Headers)
     FetchContent_GetProperties(OpenCL-Headers

unified-runtime/source/adapters/opencl/command_buffer.hpp

@@ -9,7 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "common.hpp"
-#include <CL/cl_ext.h>
 #include <ur/ur.hpp>
 
 /// Handle to a kernel command.

unified-runtime/source/adapters/opencl/common.hpp

@@ -7,6 +7,11 @@
 //===-----------------------------------------------------------------===//
 #pragma once
 
+// Include symbols for beta extensions
+#ifndef CL_ENABLE_BETA_EXTENSIONS
+#define CL_ENABLE_BETA_EXTENSIONS
+#endif
+
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
 #include <climits>

unified-runtime/test/conformance/exp_command_buffer/native-command/append_native_opencl.cpp

@@ -5,6 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include "common.h"
+
+// Include symbols for beta extensions
+#ifndef CL_ENABLE_BETA_EXTENSIONS
+#define CL_ENABLE_BETA_EXTENSIONS
+#endif
+
 #include <CL/cl_ext.h>
 
 // Test using using OpenCL cl_khr_command_buffer to add commands to a native