Skip to content

Remove sycl 1.2.1 code #16118

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 3 commits into from
Nov 26, 2024
Merged

Remove sycl 1.2.1 code #16118

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
7d73555
[SYCL] remove 1.2.1 code
dklochkov-emb Nov 19, 2024
609a7bb
[SYCL] remove old code of 1.2.1 version
dklochkov-emb Nov 20, 2024
b64e150
[SYCL] remove unused macros from queue header
dklochkov-emb Nov 20, 2024
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
8 changes: 0 additions & 8 deletions sycl/include/sycl/aliases.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,11 @@ using cl_double = double;
} // namespace opencl

// Vector aliases are different between SYCL 1.2.1 and SYCL 2020
#if SYCL_LANGUAGE_VERSION >= 202001
__SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(2)
__SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(3)
__SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4)
__SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8)
__SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)
#else
__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(2)
__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(3)
__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4)
__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8)
__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)
#endif
} // namespace _V1
} // namespace sycl

Expand Down
11 changes: 0 additions & 11 deletions sycl/include/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,7 @@
// 41(!!!) includes of SYCL headers + 10 includes of standard headers.
// 3300+ lines of code

// SYCL_LANGUAGE_VERSION is 4 digit year followed by 2 digit revision
#if !SYCL_LANGUAGE_VERSION || SYCL_LANGUAGE_VERSION < 202001
Copy link
Contributor

@AlexeySachkov AlexeySachkov Nov 19, 2024

Choose a reason for hiding this comment

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

SYCL_LANGUAGE_VERSION is a compiler-provided macro, meaning that the only situation this #if can be taken is when SYCL headers are used with 3rd-party host compiler. I don't know why would we need a different API in that case - most likely this condition is some kind of legacy code and I would completely drop __SYCL_NONCONST_FUNCTOR__ and all its uses (meaning _KERNELFUNCPARAM_TYPE as well).

#define __SYCL_NONCONST_FUNCTOR__
#endif

// replace _KERNELFUNCPARAM(KernelFunc) with KernelType KernelFunc
// or const KernelType &KernelFunc
#ifdef __SYCL_NONCONST_FUNCTOR__
#define _KERNELFUNCPARAMTYPE KernelType
#else
#define _KERNELFUNCPARAMTYPE const KernelType &
#endif
#define _KERNELFUNCPARAM(a) _KERNELFUNCPARAMTYPE a

#if defined(__SYCL_UNNAMED_LAMBDA__)
Expand Down
5 changes: 1 addition & 4 deletions sycl/include/sycl/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,8 @@
// these macros are #undef immediately.
// replace _KERNELFUNCPARAM(KernelFunc) with KernelType KernelFunc
// or const KernelType &KernelFunc
#ifdef __SYCL_NONCONST_FUNCTOR__
#define _KERNELFUNCPARAM(a) KernelType a
#else

#define _KERNELFUNCPARAM(a) const KernelType &a
#endif

namespace sycl {
inline namespace _V1 {
Expand Down
Loading