[SYCL] change sycl version definition to 202012

Author: dklochkov-emb

clang/lib/Basic/Version.cpp

@@ -128,7 +128,7 @@ std::string getClangFullCPPVersion() {
 llvm::SmallVector<std::pair<llvm::StringRef, llvm::StringRef>, 2>
 getSYCLVersionMacros(const LangOptions &LangOpts) {
   if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2020)
-    return {{"SYCL_LANGUAGE_VERSION", "202001"}};
+    return {{"SYCL_LANGUAGE_VERSION", "202012"}};
   llvm_unreachable("SYCL standard should be set");
 }
 } // end namespace clang

clang/test/CodeGenSYCL/integration_header_ppmacros.cpp

@@ -17,7 +17,7 @@ int main() {
   sycl::kernel_single_task<class first_kernel>([]() {});
 }
 // CHECK: #ifndef SYCL_LANGUAGE_VERSION
-// CHECK-NEXT: #define SYCL_LANGUAGE_VERSION 202001
+// CHECK-NEXT: #define SYCL_LANGUAGE_VERSION 202012L
 // CHECK-NEXT: #endif //SYCL_LANGUAGE_VERSION
 
 // CHECK-RANGE: #ifndef __SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__

clang/test/Preprocessor/sycl-macro.cpp

@@ -16,11 +16,11 @@
 // CHECK-NOT:#define SYCL_EXTERNAL
 // CHECK-NOT:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
 
-// CHECK-SYCL-STD:#define SYCL_LANGUAGE_VERSION 202001
+// CHECK-SYCL-STD:#define SYCL_LANGUAGE_VERSION 202012L
 
 // CHECK-SYCL-STD:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
 
-// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202001
+// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202012L
 // CHECK-SYCL-STD-2020:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
 
 // CHECK-SYCL-STD-DEVICE:#define __SYCL_DEVICE_ONLY__ 1

sycl/include/sycl/aliases.hpp

@@ -141,7 +141,7 @@ using cl_double = double;
 } // namespace opencl
 
 // Vector aliases are different between SYCL 1.2.1 and SYCL 2020
-#if SYCL_LANGUAGE_VERSION >= 202001
+#if SYCL_LANGUAGE_VERSION >= 202012L
 __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/include/sycl/detail/defines_elementary.hpp

@@ -57,7 +57,7 @@
 #endif // __SYCL_DEPRECATED
 
 #ifndef __SYCL2020_DEPRECATED
-#if SYCL_LANGUAGE_VERSION >= 202001 &&                                         \
+#if SYCL_LANGUAGE_VERSION >= 202012L &&                                         \
     !defined(SYCL2020_DISABLE_DEPRECATION_WARNINGS)
 #define __SYCL2020_DEPRECATED(message) __SYCL_DEPRECATED(message)
 #else

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 || SYCL_LANGUAGE_VERSION < 202012L
 #define __SYCL_NONCONST_FUNCTOR__
 #endif
 
@@ -1139,7 +1139,7 @@ class __SYCL_EXPORT handler {
     // Range rounding is supported only for newer SYCL standards.
 #if !defined(__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__) &&                  \
     !defined(DPCPP_HOST_DEVICE_OPENMP) &&                                      \
-    !defined(DPCPP_HOST_DEVICE_PERF_NATIVE) && SYCL_LANGUAGE_VERSION >= 202001
+    !defined(DPCPP_HOST_DEVICE_PERF_NATIVE) && SYCL_LANGUAGE_VERSION >= 202012L
     auto [RoundedRange, HasRoundedRange] = getRoundedRange(UserRange);
     if (HasRoundedRange) {
       using NameWT = typename detail::get_kernel_wrapper_name_t<NameT>::name;
@@ -1170,7 +1170,7 @@ class __SYCL_EXPORT handler {
     } else
 #endif // !__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ &&
        // !DPCPP_HOST_DEVICE_OPENMP && !DPCPP_HOST_DEVICE_PERF_NATIVE &&
-       // SYCL_LANGUAGE_VERSION >= 202001
+       // SYCL_LANGUAGE_VERSION >= 202012L
     {
       (void)UserRange;
       (void)Props;