sync to latest sycl branch

Signed-off-by: jinge90 <[email protected]>

Author: jinge90

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -175,6 +175,8 @@ jit_compiler::compileDeviceCode(InMemoryFile SourceFile,
   DerivedArgList DAL{UserArgList};
   const auto &OptTable = getDriverOptTable();
   DAL.AddFlagArg(nullptr, OptTable.getOption(OPT_fsycl_device_only));
+  DAL.AddFlagArg(nullptr,
+                 OptTable.getOption(OPT_fno_sycl_dead_args_optimization));
   DAL.AddJoinedArg(
       nullptr, OptTable.getOption(OPT_resource_dir_EQ),
       (DPCPPRoot + "/lib/clang/" + Twine(CLANG_VERSION_MAJOR)).str());
@@ -518,5 +520,11 @@ jit_compiler::parseUserArgs(View<const char *> UserArgs) {
         "Runtime compilation of ESIMD kernels is not yet supported");
   }
 
+  if (AL.hasFlag(OPT_fsycl_dead_args_optimization,
+                 OPT_fno_sycl_dead_args_optimization, false)) {
+    return createStringError(
+        "Dead argument optimization must be disabled for runtime compilation");
+  }
+
   return std::move(AL);
 }

sycl/include/sycl/aliases.hpp

@@ -140,19 +140,11 @@ using cl_double = double;
 } // namespace opencl
 
 // Vector aliases are different between SYCL 1.2.1 and SYCL 2020
-#if SYCL_LANGUAGE_VERSION >= 202001
 __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_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8)
 __SYCL_2020_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)
-#else
-__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(2)
-__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(3)
-__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4)
-__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8)
-__SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)
-#endif
 } // namespace _V1
 } // namespace sycl
 

sycl/include/sycl/handler.hpp

@@ -67,18 +67,7 @@
 // 41(!!!) includes of SYCL headers + 10 includes of standard headers.
 // 3300+ lines of code
 
-// 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
-
-// replace _KERNELFUNCPARAM(KernelFunc) with   KernelType KernelFunc
-//                                     or     const KernelType &KernelFunc
-#ifdef __SYCL_NONCONST_FUNCTOR__
-#define _KERNELFUNCPARAMTYPE KernelType
-#else
 #define _KERNELFUNCPARAMTYPE const KernelType &
-#endif
 #define _KERNELFUNCPARAM(a) _KERNELFUNCPARAMTYPE a
 
 #if defined(__SYCL_UNNAMED_LAMBDA__)

sycl/include/sycl/queue.hpp

@@ -56,11 +56,8 @@
 // these macros are #undef immediately.
 // replace _KERNELFUNCPARAM(KernelFunc) with   KernelType KernelFunc
 //                                     or     const KernelType &KernelFunc
-#ifdef __SYCL_NONCONST_FUNCTOR__
-#define _KERNELFUNCPARAM(a) KernelType a
-#else
+
 #define _KERNELFUNCPARAM(a) const KernelType &a
-#endif
 
 namespace sycl {
 inline namespace _V1 {