Addressing feedback

* Moved macro test to Preprocessor
* Fixed when the value of the SYCL Standard is set for different flags

Signed-off-by: Ruyman Reyes <[email protected]>

Author: Ruyk

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4727,7 +4727,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // Forward -cl options to -cc1
   RenderOpenCLOptions(Args, CmdArgs);
 
-  // Forward -sycl options to -cc1
+  // Forward -sycl-std option to -cc1
   Args.AddLastArg(CmdArgs, options::OPT_sycl_std_EQ);
 
   if (Arg *A = Args.getLastArg(options::OPT_fcf_protection_EQ)) {

clang/lib/Frontend/CompilerInvocation.cpp

@@ -2433,6 +2433,10 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
       Diags.Report(diag::err_drv_invalid_value) 
           << A->getAsString(Args) << A->getValue();
     }
+  } else if (Args.hasArg(options::OPT_fsycl_is_device) 
+                         || Args.hasArg(options::OPT_fsycl_is_host)
+                         || Args.hasArg(options::OPT_fsycl)) {
+    Opts.setSYCLVersion(LangOptions::SYCLVersionList::sycl_1_2_1);
   }
 
   Opts.IncludeDefaultHeader = Args.hasArg(OPT_finclude_default_header);

clang/test/CodeGenSYCL/macro_definitions.cpp

@@ -1,5 +1,8 @@
 // RUN: %clang_cc1 %s -E -dM | FileCheck %s
 // RUN: %clang_cc1 %s -fsycl-is-device -E -dM | FileCheck --check-prefix=CHECK-SYCL %s
-
+// RUN: %clang_cc1 %s -fsycl -E -dM | FileCheck --check-prefix=CHECK-ANY-SYCL %s
 // CHECK-NOT:#define __SYCL_DEVICE_ONLY__ 1
-// CHECK-SYCL:#define __SYCL_DEVICE_ONLY__ 1
+// CHECK-NOT:#define CL_SYCL_LANGUAGE_VERSION 121
+// CHECK-ANY-SYCL-NOT:#define __SYCL_DEVICE_ONLY__ 1
+// CHECK-ANY-SYCL:#define CL_SYCL_LANGUAGE_VERSION 121
+// CHECK-SYCL:#define CL_SYCL_LANGUAGE_VERSION 121

clang/test/Preprocessor/sycl-macro.cpp

@@ -169,7 +169,7 @@ mode in SYCL:
 * IsSYCLOffloadDevice: True if calling clang to set up a device compilation
 * IsSYCLHost: True if setting up a call to clang to do a host compilation
 
-The additional option `-sycl-std` allows specifiying which version of
+The option `-sycl-std` allows specifiying which version of
 the SYCL standard will be used for the compilation. 
 The default value for this option is `1.2.1`.