Merge from 'sycl' to 'sycl-web' (#2)

  CONFLICT (content): Merge conflict in clang/include/clang/Driver/Options.td

Author: linkren

buildbot/dependency.conf

@@ -7,8 +7,8 @@ ocl_cpu_rt_ver_win=2020.11.11.0.04
 # https://github.com/intel/compute-runtime/releases/tag/20.44.18297
 ocl_gpu_rt_ver=20.44.18297
 # Same GPU driver supports Level Zero and OpenCL:
-# https://downloadmirror.intel.com/29879/a08/igfx_win10_100.8778.zip
-ocl_gpu_rt_ver_win=27.20.100.8778
+# https://downloadmirror.intel.com/29988/a08/igfx_win10_100.8935.zip
+ocl_gpu_rt_ver_win=27.20.100.8935
 intel_sycl_ver=build
 # https://github.com/oneapi-src/oneTBB/releases/download/v2021.1-beta10/oneapi-tbb-2021.1-beta10-lin.tgz
 tbb_ver=2021.1.053
@@ -25,7 +25,7 @@ fpga_ver_win=20201022_000005
 cpu_driver_lin=2020.11.11.0.04
 cpu_driver_win=2020.11.11.0.04
 gpu_driver_lin=20.44.18297
-gpu_driver_win=27.20.100.8778
+gpu_driver_win=27.20.100.8935
 fpga_driver_lin=2020.11.11.0.04
 fpga_driver_win=2020.11.11.0.04
 # NVidia CUDA driver

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11092,7 +11092,7 @@ def note_invalid_type_in_sycl_kernel : Note<
   "%select{%1 should be globally-visible"
   "|unscoped enum %1 requires fixed underlying type"
   "|type %1 cannot be in the \"std\" namespace"
-  "|kernel name is missing"
+  "|unnamed type used in a SYCL kernel name"
   "}0">;
 
 def err_sycl_kernel_not_function_object

clang/include/clang/Driver/Options.td

@@ -1957,7 +1957,9 @@ def fsycl_link : Flag<["-"], "fsycl-link">, Alias<fsycl_link_EQ>,
 def fsycl_unnamed_lambda : Flag<["-"], "fsycl-unnamed-lambda">,
   Flags<[CC1Option, CoreOption]>, HelpText<"Allow unnamed SYCL lambda kernels">;
 def fsycl_help_EQ : Joined<["-"], "fsycl-help=">,
-  Flags<[NoXarchOption, CoreOption]>, HelpText<"Emit help information from the related offline compilation tool">, Values<"all,fpga,gen,x86_64">;
+  Flags<[NoXarchOption, CoreOption]>, HelpText<"Emit help information from the "
+  "related offline compilation tool. Valid values: all, fpga, gen, x86_64.">,
+  Values<"all,fpga,gen,x86_64">;
 def fsycl_help : Flag<["-"], "fsycl-help">, Alias<fsycl_help_EQ>,
   Flags<[NoXarchOption, CoreOption]>, AliasArgs<["all"]>, HelpText<"Emit help information "
   "from all of the offline compilation tools">;

clang/lib/Sema/SemaSYCL.cpp

@@ -2921,7 +2921,7 @@ class SYCLKernelNameTypeVisitor
               << KernelNameType;
           S.Diag(KernelInvocationFuncLoc,
                  diag::note_invalid_type_in_sycl_kernel)
-              << /* kernel name is missing */ 3;
+              << /* unnamed type used in a SYCL kernel name */ 3;
           IsInvalid = true;
           return;
         }

clang/test/SemaSYCL/unnamed-kernel.cpp

@@ -118,7 +118,7 @@ int main() {
   cl::sycl::queue q;
 #ifndef __SYCL_UNNAMED_LAMBDA__
   // expected-error-re@Inputs/sycl.hpp:220 {{'(lambda at {{.*}}unnamed-kernel.cpp{{.*}}' is an invalid kernel name type}}
-  // expected-note@Inputs/sycl.hpp:220 {{kernel name is missing}}
+  // expected-note@Inputs/sycl.hpp:220 {{unnamed type used in a SYCL kernel name}}
   // expected-note@+2{{in instantiation of function template specialization}}
 #endif
   q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); });