new SYCL_LANGUAGE_VERSION macro and etc.

Signed-off-by: Chris Perkins <chris.perkins@intel.com>

Author: cperkinsintel

clang/lib/Frontend/InitPreprocessor.cpp

@@ -463,10 +463,12 @@ static void InitializeStandardPredefinedMacros(const TargetInfo &TI,
 
   if (LangOpts.SYCL) {
     // SYCL Version is set to a value when building SYCL applications
-    if (LangOpts.SYCLVersion == 2017)
+    if (LangOpts.SYCLVersion == 2017) {
       Builder.defineMacro("CL_SYCL_LANGUAGE_VERSION", "121");
-    else if (LangOpts.SYCLVersion == 2020)
-      Builder.defineMacro("CL_SYCL_LANGUAGE_VERSION", "202001");
+      Builder.defineMacro("SYCL_LANGUAGE_VERSION", "201707");
+    } else if (LangOpts.SYCLVersion == 2020) {
+      Builder.defineMacro("SYCL_LANGUAGE_VERSION", "202001");
+    }
 
     if (LangOpts.SYCLValueFitInMaxInt)
       Builder.defineMacro("__SYCL_ID_QUERIES_FIT_IN_INT__", "1");

clang/test/Preprocessor/sycl-macro.cpp

@@ -13,9 +13,10 @@
 // CHECK-NOT:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
 
 // CHECK-SYCL-STD:#define CL_SYCL_LANGUAGE_VERSION 121
+// CHECK-SYCL-STD:#define SYCL_LANGUAGE_VERSION 201707
 // CHECK-SYCL-STD:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
 
-// CHECK-SYCL-STD-2020:#define CL_SYCL_LANGUAGE_VERSION 202001
+// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202001
 
 // CHECK-SYCL-STD-DEVICE:#define __SYCL_DEVICE_ONLY__ 1
 // CHECK-SYCL-STD-DEVICE:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1

sycl/include/CL/sycl/handler.hpp

@@ -33,8 +33,8 @@
 #include <memory>
 #include <type_traits>
 
-// CL_SYCL_LANGUAGE_VERSION is 4 digit year followed by 2 digit revision
-#if !CL_SYCL_LANGUAGE_VERSION || CL_SYCL_LANGUAGE_VERSION < 202001
+// SYCL_LANGUAGE_VERSION is 4 digit year followed by 2 digit revision
+#if !SYCL_LANGUAGE_VERSION || SYCL_LANGUAGE_VERSION < 202001
 #define __SYCL_NONCONST_FUNCTOR__
 #endif
 
@@ -812,7 +812,7 @@ class __SYCL_EXPORT handler {
   template <typename T> struct ShouldEnableSetArg {
     static constexpr bool value =
         std::is_trivially_copyable<detail::remove_reference_t<T>>::value
-#if CL_SYCL_LANGUAGE_VERSION && CL_SYCL_LANGUAGE_VERSION <= 121
+#if SYCL_LANGUAGE_VERSION && SYCL_LANGUAGE_VERSION <= 201707
             && std::is_standard_layout<detail::remove_reference_t<T>>::value
 #endif
         || is_same_type<sampler, T>::value // Sampler

sycl/test/basic_tests/macros.cpp

@@ -11,8 +11,7 @@
 #include <iostream>
 
 int main() {
-  std::cout << "SYCL language version: " << CL_SYCL_LANGUAGE_VERSION
-            << std::endl;
+  std::cout << "SYCL language version: " << SYCL_LANGUAGE_VERSION << std::endl;
   std::cout << "SYCL compiler version: " << __SYCL_COMPILER_VERSION
             << std::endl;
   return 0;

sycl/test/basic_tests/set_arg_error.cpp

@@ -44,7 +44,7 @@ int main() {
         5, ntc);
     h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
         4, NonTriviallyCopyable{});
-#if CL_SYCL_LANGUAGE_VERSION && CL_SYCL_LANGUAGE_VERSION <= 121
+#if SYCL_LANGUAGE_VERSION && SYCL_LANGUAGE_VERSION <= 201707
     NonStdLayout nstd;
     h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
         6, nstd);