From 3827dd514b6ffd7d79aaef65339a15cd005abf90 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 13 Nov 2020 19:16:37 +0300 Subject: [PATCH 1/2] [SYCL][NFCI] Undef leaked macro definitions --- sycl/include/CL/sycl/detail/builtins.hpp | 1 + sycl/include/CL/sycl/swizzles.def | 1 + sycl/include/CL/sycl/types.hpp | 1 + 3 files changed, 3 insertions(+) diff --git a/sycl/include/CL/sycl/detail/builtins.hpp b/sycl/include/CL/sycl/detail/builtins.hpp index 290aaf6e65a41..a1e10c32f205d 100644 --- a/sycl/include/CL/sycl/detail/builtins.hpp +++ b/sycl/include/CL/sycl/detail/builtins.hpp @@ -286,6 +286,7 @@ __SYCL_MAKE_CALL_ARG3(select, __FUNC_PREFIX_OCL) // select #undef __SYCL_MAKE_CALL_ARG1 #undef __SYCL_MAKE_CALL_ARG2 #undef __SYCL_MAKE_CALL_ARG2_SAME +#undef __SYCL_MAKE_CALL_ARG2_SAME_RESULT #undef __SYCL_MAKE_CALL_ARG3 #undef __SYCL_PPCAT_NX #undef __SYCL_PPCAT diff --git a/sycl/include/CL/sycl/swizzles.def b/sycl/include/CL/sycl/swizzles.def index 845b6e5653751..d63d9363e2aa3 100644 --- a/sycl/include/CL/sycl/swizzles.def +++ b/sycl/include/CL/sycl/swizzles.def @@ -820,3 +820,4 @@ __SYCL_ACCESS(N == 16, even, 0, 2, 4, 6, 8, 10, 12, 14) #undef __SYCL_EXPAND #undef __SYCL_INDEXER #undef __SYCL_ACCESS +#undef __SYCL_SCALAR_ACCESS \ No newline at end of file diff --git a/sycl/include/CL/sycl/types.hpp b/sycl/include/CL/sycl/types.hpp index 3dfbb27f56445..2e21aa19e7427 100644 --- a/sycl/include/CL/sycl/types.hpp +++ b/sycl/include/CL/sycl/types.hpp @@ -2270,6 +2270,7 @@ __SYCL_DECLARE_FLOAT_VECTOR_CONVERTERS(double) #undef __SYCL_DECLARE_BOOL_VECTOR_CONVERTERS #undef __SYCL_DECLARE_BOOL_CONVERTER #undef __SYCL_DECLARE_SCALAR_BOOL_CONVERTER +#undef __SYCL_USE_EXT_VECTOR_TYPE__ } // namespace sycl } // __SYCL_INLINE_NAMESPACE(cl) From 589f2f19e66e0470deb03766fa9b22340453f53e Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 13 Nov 2020 19:23:33 +0300 Subject: [PATCH 2/2] Update swizzles.def --- sycl/include/CL/sycl/swizzles.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/include/CL/sycl/swizzles.def b/sycl/include/CL/sycl/swizzles.def index d63d9363e2aa3..fd503e445d7fe 100644 --- a/sycl/include/CL/sycl/swizzles.def +++ b/sycl/include/CL/sycl/swizzles.def @@ -820,4 +820,4 @@ __SYCL_ACCESS(N == 16, even, 0, 2, 4, 6, 8, 10, 12, 14) #undef __SYCL_EXPAND #undef __SYCL_INDEXER #undef __SYCL_ACCESS -#undef __SYCL_SCALAR_ACCESS \ No newline at end of file +#undef __SYCL_SCALAR_ACCESS