From 7d73555ad6dcd56611878ebfa9857a572d1bf64c Mon Sep 17 00:00:00 2001 From: "Klochkov, Denis" Date: Tue, 19 Nov 2024 02:07:47 -0800 Subject: [PATCH 1/3] [SYCL] remove 1.2.1 code --- sycl/include/sycl/aliases.hpp | 8 -------- sycl/include/sycl/handler.hpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/sycl/include/sycl/aliases.hpp b/sycl/include/sycl/aliases.hpp index fc359b7659802..cc42d99565d9a 100644 --- a/sycl/include/sycl/aliases.hpp +++ b/sycl/include/sycl/aliases.hpp @@ -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 diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 4e8f62d53c36d..581d9772bf998 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -68,7 +68,7 @@ // 3300+ lines of code // SYCL_LANGUAGE_VERSION is 4 digit year followed by 2 digit revision -#if !SYCL_LANGUAGE_VERSION || SYCL_LANGUAGE_VERSION < 202001 +#if !SYCL_LANGUAGE_VERSION #define __SYCL_NONCONST_FUNCTOR__ #endif From 609a7bbee47236b40b48364153fa871841b025d3 Mon Sep 17 00:00:00 2001 From: "Klochkov, Denis" Date: Wed, 20 Nov 2024 02:15:22 -0800 Subject: [PATCH 2/3] [SYCL] remove old code of 1.2.1 version --- sycl/include/sycl/handler.hpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 581d9772bf998..da7167d94e661 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -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 -#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__) From b64e150dcac8a2119476d2be26c76b710a7c4d6a Mon Sep 17 00:00:00 2001 From: "Klochkov, Denis" Date: Wed, 20 Nov 2024 02:26:14 -0800 Subject: [PATCH 3/3] [SYCL] remove unused macros from queue header --- sycl/include/sycl/queue.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 9e530604ce84e..e4fce00ff0288 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -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 {