Skip to content

[SYCL] Prepare some deprecated aliases for removal #22371

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

Draft
KornevNikita wants to merge 3 commits into
base: sycl
Choose a base branch
from
+52 −20
Draft

[SYCL] Prepare some deprecated aliases for removal #22371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bd8466
[SYCL] Prepare some deprecated aliases for removal
KornevNikita Jun 19, 2026
9ccc548
fix-e2e
KornevNikita Jun 23, 2026
0ac7949
fix vector_convert.hpp
KornevNikita Jun 25, 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
32 changes: 32 additions & 0 deletions sycl/include/sycl/aliases.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ class half;
#define __SYCL_MAKE_VECTOR_ALIAS(ALIAS, TYPE, N) \
using ALIAS##N = sycl::vec<TYPE, N>;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES

@KornevNikita KornevNikita Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlueck hi, could you please review the changes in this file?

I'd like to remove deprecated aliases that are not part of SYCL 2020:
I have no doubts regarding sycl::cl_* as these aliases have been replaced by sycl::opencl::cl_*.
But the rest (see PR desc) has been removed without any replacement. Although this change aligns our implementation with the spec, I'm not sure if it's desired.

#define __SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(ALIAS, TYPE, N, MESSAGE) \
using ALIAS##N __SYCL2020_DEPRECATED(MESSAGE) = sycl::vec<TYPE, N>;
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

#define __SYCL_MAKE_VECTOR_ALIASES_FOR_ARITHMETIC_TYPES(N) \
__SYCL_MAKE_VECTOR_ALIAS(char, char, N) \
Expand All @@ -36,6 +38,7 @@ class half;
__SYCL_MAKE_VECTOR_ALIAS(double, double, N) \
__SYCL_MAKE_VECTOR_ALIAS(half, half, N)

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// There are no 'cl_*' vec aliases in SYCL 2020
#define __SYCL_MAKE_VECTOR_ALIASES_FOR_OPENCL_TYPES(N) \
__SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(cl_char, sycl::cl_char, N, "") \
Expand All @@ -49,6 +52,7 @@ class half;
__SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(cl_float, sycl::cl_float, N, "") \
__SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(cl_double, sycl::cl_double, N, "") \
__SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(cl_half, sycl::cl_half, N, "")
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

#define __SYCL_MAKE_VECTOR_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES(N) \
__SYCL_MAKE_VECTOR_ALIAS(schar, signed char, N) \
Expand All @@ -59,17 +63,24 @@ class half;
__SYCL_MAKE_VECTOR_ALIAS(longlong, long long, N) \
__SYCL_MAKE_VECTOR_ALIAS(ulonglong, unsigned long long, N)

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
#define __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_ARITHMETIC_TYPES(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_OPENCL_TYPES(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES(N)
#else
#define __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_ARITHMETIC_TYPES(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES(N)
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

// FIXME: OpenCL vector aliases are not defined by SYCL 2020 spec and should be
// removed from here. See intel/llvm#7888. They are deprecated for now.
// FIXME: schar, longlong and ulonglong aliases are not defined by SYCL 2020
// spec, but they are preserved in SYCL 2020 mode, because SYCL-CTS is
// still using them.
// See KhronosGroup/SYCL-CTS#446 and KhronosGroup/SYCL-Docs#335
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
#define __SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(N) \
__SYCL_MAKE_VECTOR_ALIASES_FOR_OPENCL_TYPES(N) \
__SYCL_2020_MAKE_DEPRECATED_VECTOR_ALIAS(schar, std::int8_t, N, "") \
Expand All @@ -86,19 +97,37 @@ class half;
__SYCL_MAKE_VECTOR_ALIAS(float, float, N) \
__SYCL_MAKE_VECTOR_ALIAS(double, double, N) \
__SYCL_MAKE_VECTOR_ALIAS(half, half, N)
#else
// TODO: remove the FIXME comments above.
#define __SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(N) \
__SYCL_MAKE_VECTOR_ALIAS(char, std::int8_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(uchar, std::uint8_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(short, std::int16_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(ushort, std::uint16_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(int, std::int32_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(uint, std::uint32_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(long, std::int64_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(ulong, std::uint64_t, N) \
__SYCL_MAKE_VECTOR_ALIAS(float, float, N) \
__SYCL_MAKE_VECTOR_ALIAS(double, double, N) \
__SYCL_MAKE_VECTOR_ALIAS(half, half, N)
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

namespace sycl {
inline namespace _V1 {
using byte __SYCL2020_DEPRECATED("use std::byte instead") = std::uint8_t;
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
using schar __SYCL2020_DEPRECATED("") = signed char;
using uchar __SYCL2020_DEPRECATED("") = unsigned char;
using ushort __SYCL2020_DEPRECATED("") = unsigned short;
using uint __SYCL2020_DEPRECATED("") = unsigned int;
using ulong __SYCL2020_DEPRECATED("") = unsigned long;
using longlong __SYCL2020_DEPRECATED("") = long long;
using ulonglong __SYCL2020_DEPRECATED("") = unsigned long long;
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
using half = sycl::detail::half_impl::half;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
using cl_bool __SYCL2020_DEPRECATED("use sycl::opencl::cl_bool instead") = bool;
using cl_char
__SYCL2020_DEPRECATED("use sycl::opencl::cl_char instead") = std::int8_t;
Expand All @@ -121,6 +150,7 @@ using cl_float
__SYCL2020_DEPRECATED("use sycl::opencl::cl_float instead") = float;
using cl_double
__SYCL2020_DEPRECATED("use sycl::opencl::cl_double instead") = double;
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

namespace opencl {
// Strictly speaking, cl_* aliases should not be defined in opencl namespace in
Expand Down Expand Up @@ -150,7 +180,9 @@ __SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)

#undef __SYCL_MAKE_VECTOR_ALIAS
#undef __SYCL_MAKE_VECTOR_ALIASES_FOR_ARITHMETIC_TYPES
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
#undef __SYCL_MAKE_VECTOR_ALIASES_FOR_OPENCL_TYPES
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
#undef __SYCL_MAKE_VECTOR_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES
#undef __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH
#undef __SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH
10 changes: 5 additions & 5 deletions sycl/include/sycl/atomic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,19 @@ class __SYCL2020_DEPRECATED(

#ifdef __SYCL_DEVICE_ONLY__
template <typename T2 = T>
std::enable_if_t<!std::is_same<cl_float, T2>::value, T>
std::enable_if_t<!std::is_same<opencl::cl_float, T2>::value, T>
load(memory_order Order = memory_order::relaxed) const {
return __spirv_AtomicLoad(Ptr, SpirvScope,
detail::getSPIRVMemorySemanticsMask(Order));
}
template <typename T2 = T>
std::enable_if_t<std::is_same<cl_float, T2>::value, T>
std::enable_if_t<std::is_same<opencl::cl_float, T2>::value, T>
load(memory_order Order = memory_order::relaxed) const {
auto *TmpPtr = reinterpret_cast<typename multi_ptr<
cl_int, addressSpace, access::decorated::yes>::pointer>(Ptr);
cl_int TmpVal = __spirv_AtomicLoad(
opencl::cl_int, addressSpace, access::decorated::yes>::pointer>(Ptr);
opencl::cl_int TmpVal = __spirv_AtomicLoad(
TmpPtr, SpirvScope, detail::getSPIRVMemorySemanticsMask(Order));
cl_float ResVal = sycl::bit_cast<cl_float>(TmpVal);
opencl::cl_float ResVal = sycl::bit_cast<opencl::cl_float>(TmpVal);
return ResVal;
}
#else
Expand Down
24 changes: 12 additions & 12 deletions sycl/include/sycl/detail/vector_convert.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,15 @@ using enable_if_to_int_vector_t =
__SYCL_VECTOR_INT_INT_CONVERT(Op, 8, DestType, SPVType) \
__SYCL_VECTOR_INT_INT_CONVERT(Op, 16, DestType, SPVType)

__SYCL_INT_INT_CONVERT(S, char, schar)
__SYCL_INT_INT_CONVERT(S, char, signed char)
__SYCL_INT_INT_CONVERT(S, short, short)
__SYCL_INT_INT_CONVERT(S, int, int)
__SYCL_INT_INT_CONVERT(S, long, long)

__SYCL_INT_INT_CONVERT(U, uchar, uchar)
__SYCL_INT_INT_CONVERT(U, ushort, ushort)
__SYCL_INT_INT_CONVERT(U, uint, uint)
__SYCL_INT_INT_CONVERT(U, ulong, ulong)
__SYCL_INT_INT_CONVERT(U, unsigned char, unsigned char)
__SYCL_INT_INT_CONVERT(U, unsigned short, unsigned short)
__SYCL_INT_INT_CONVERT(U, unsigned int, unsigned int)
__SYCL_INT_INT_CONVERT(U, unsigned long, unsigned long)

#undef __SYCL_SCALAR_INT_INT_CONVERT
#undef __SYCL_VECTOR_INT_INT_CONVERT
Expand Down Expand Up @@ -467,15 +467,15 @@ __SYCL_INT_INT_CONVERT(U, ulong, ulong)
__SYCL_FLOAT_INT_CONVERT(Op, DestType, SPVType, rtp, Rtp) \
__SYCL_FLOAT_INT_CONVERT(Op, DestType, SPVType, rtn, Rtn)

__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToS, char, schar)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToS, char, signed char)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToS, short, short)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToS, int, int)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToS, long, long)

__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, uchar, uchar)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, ushort, ushort)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, uint, uint)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, ulong, ulong)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, unsigned char, unsigned char)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, unsigned short, unsigned short)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, unsigned int, unsigned int)
__SYCL_FLOAT_INT_CONVERT_FOR_TYPE(FToU, unsigned long, unsigned long)

#undef __SYCL_SCALAR_FLOAT_INT_CONVERT
#undef __SYCL_VECTOR_FLOAT_INT_CONVERT
Expand Down Expand Up @@ -688,9 +688,9 @@ inline NativeBFT ConvertFToBF16Vec(NativeFloatT vec) {
EXPAND_BF16_ROUNDING_MODE(type, type_str, sycl::rounding_mode::rtn, rd) \
EXPAND_BF16_ROUNDING_MODE(type, type_str, sycl::rounding_mode::rtz, rz)

EXPAND_BF16_TYPE(uint, uint)
EXPAND_BF16_TYPE(unsigned int, unsigned int)
EXPAND_BF16_TYPE(int, int)
EXPAND_BF16_TYPE(ushort, ushort)
EXPAND_BF16_TYPE(unsigned short, unsigned short)
EXPAND_BF16_TYPE(short, short)
EXPAND_BF16_TYPE(long, ll)
EXPAND_BF16_TYPE(unsigned long long, ull)
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/builtins/integer_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ template <typename T> inline T __get_high_half(T a0b0, T a0b1, T a1b0, T a1b1) {
// A helper function for mul_hi built-in for long
template <typename T>
inline void __get_half_products(T a, T b, T &a0b0, T &a0b1, T &a1b0, T &a1b1) {
constexpr sycl::cl_int halfsize = (sizeof(T) * 8) / 2;
constexpr sycl::opencl::cl_int halfsize = (sizeof(T) * 8) / 2;
T a1 = a >> halfsize;
T a0 = (a << halfsize) >> halfsize;
T b1 = b >> halfsize;
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Adapters/level_zero/eager_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ void simple_vadd(sycl::queue &Queue, const std::array<T, N> &VA,

int main() {
const size_t array_size = 4;
std::array<sycl::cl_int, array_size> A = {{1, 2, 3, 4}}, B = {{1, 2, 3, 4}},
C;
std::array<sycl::opencl::cl_int, array_size> A = {{1, 2, 3, 4}},
B = {{1, 2, 3, 4}}, C;
sycl::queue Q;

// simple_vadd(Q, A, B, C);
Expand Down
Loading