Skip to content

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

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
merged 1 commit into from
Jun 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions sycl/include/sycl/detail/cl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion unified-runtime/source/adapters/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion unified-runtime/source/adapters/opencl/command_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
//===----------------------------------------------------------------------===//

#include "common.hpp"
#include <CL/cl_ext.h>
#include <ur/ur.hpp>

/// Handle to a kernel command.
Expand Down
5 changes: 5 additions & 0 deletions unified-runtime/source/adapters/opencl/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions unified-runtime/test/conformance/exp_command_buffer/native-command/append_native_opencl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down