Skip to content

[SYCL] Partially revert "Don't include OpenCL headers when compiling for device" #22588

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
uditagarwal97 merged 2 commits into from
Jul 10, 2026
Merged

[SYCL] Partially revert "Don't include OpenCL headers when compiling for device" #22588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f005ce6
[SYCL] Partially revert 'Don't include OpenCL headers when compiling …
uditagarwal97 Jul 9, 2026
fd27821
Chnage macro name to __SYCL_IGC_COMPILER__
uditagarwal97 Jul 9, 2026
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
10 changes: 7 additions & 3 deletions sycl/include/sycl/detail/cl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@
#define CL_ENABLE_BETA_EXTENSIONS
#endif

#ifndef __SYCL_DEVICE_ONLY__
// FIXME: Drop OpenCL headers from both host and device.
// Can not do that under preview breaking changes, because
// SYCL CTS use -fpreview-breaking-changes and rely on
// SYCL headers to include OpenCL headers. We need to fix
// such tests before we can drop OpenCL headers.
#ifndef __SYCL_IGC_COMPILER__
#include <CL/cl.h>
#include <CL/cl_ext.h>
#else
// On the SYCL device pass we don't need to include the OpenCL headers.
// Just forward declare the opaque handle types used by SYCL headers.
// Forward declare the opaque handle types used by SYCL headers.
// We should not do "using cl_command_queue = void*" because that
// can cause redifinition errors if the user application also
// includes OpenCL headers.
Expand Down
Loading