Merge from 'sycl' to 'sycl-web'

Author: iclsrc

CONTRIBUTING.md

@@ -20,6 +20,11 @@ is strongly encouraged that you submit the patch to https://llvm.org/ directly.
 See [LLVM contribution guidelines](https://llvm.org/docs/Contributing.html)
 for more information.
 
+**Note (October, 2020)**: DPC++ runtime and compiler ABI is currently in frozen
+state. This means that no ABI-breaking changes will be accepted by default.
+Project maintainers may still approve breaking changes in some cases. Please,
+see [ABI Policy Guide](sycl/doc/ABIPolicyGuide.md) for more information.
+
 - Create a personal fork of the project on GitHub
   - For the DPC++ Compiler project, use **sycl** branch as baseline for your
     changes. See [Get Started Guide](sycl/doc/GetStartedGuide.md).

buildbot/dependency.conf

@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2020.11.10.0.05
 # https://github.com/intel/llvm/releases/download/2020-WW41/win-oclcpuexp-2020.11.10.0.05_rel.zip
 ocl_cpu_rt_ver_win=2020.11.10.0.05
 # Same GPU driver supports Level Zero and OpenCL:
-# https://github.com/intel/compute-runtime/releases/tag/20.41.18123
-ocl_gpu_rt_ver=20.41.18123
+# https://github.com/intel/compute-runtime/releases/tag/20.42.18209
+ocl_gpu_rt_ver=20.42.18209
 # 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
@@ -24,7 +24,7 @@ fpga_ver_win=20200913_000017
 [DRIVER VERSIONS]
 cpu_driver_lin=2020.11.10.0.05
 cpu_driver_win=2020.11.10.0.05
-gpu_driver_lin=20.41.18123
+gpu_driver_lin=20.42.18209
 gpu_driver_win=27.20.100.8778
 fpga_driver_lin=2020.11.10.0.05
 fpga_driver_win=2020.11.10.0.05

clang/include/clang/Driver/Options.td

@@ -3610,7 +3610,7 @@ defm underscoring : BooleanFFlag<"underscoring">, Group<gfortran_Group>;
 defm whole_file : BooleanFFlag<"whole-file">, Group<gfortran_Group>;
 
 // C++ SYCL options
-def reuse_exe_EQ : Joined<["-"], "reuse-exe=">,
+def reuse_exe_EQ : Joined<["-"], "reuse-exe=">, Flags<[CoreOption]>,
   HelpText<"Speed up FPGA aoc compile if the device code in <exe> is unchanged.">,
   MetaVarName<"<exe>">;
 def fsycl : Flag<["-"], "fsycl">, Group<sycl_Group>, Flags<[CC1Option, CoreOption]>,

clang/include/clang/Sema/Sema.h

@@ -388,26 +388,6 @@ class SYCLIntegrationHeader {
                                   : nullptr;
   }
 
-  /// Emits a forward declaration for given declaration.
-  void emitFwdDecl(raw_ostream &O, const Decl *D,
-                   SourceLocation KernelLocation);
-
-  /// Emits forward declarations of classes and template classes on which
-  /// declaration of given type depends. See example in the comments for the
-  /// implementation.
-  /// \param O
-  ///     stream to emit to
-  /// \param T
-  ///     type to emit forward declarations for
-  /// \param KernelLocation
-  ///     source location of the SYCL kernel function, used to emit nicer
-  ///     diagnostic messages if kernel name is missing
-  /// \param Emitted
-  ///     a set of declarations forward declrations has been emitted for already
-  void emitForwardClassDecls(raw_ostream &O, QualType T,
-                             SourceLocation KernelLocation,
-                             llvm::SmallPtrSetImpl<const void *> &Emitted);
-
 private:
   /// Keeps invocation descriptors for each kernel invocation started by
   /// SYCLIntegrationHeader::startKernel

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4058,6 +4058,17 @@ static void RenderDebugOptions(const ToolChain &TC, const Driver &D,
   RenderDebugInfoCompressionArgs(Args, CmdArgs, D, TC);
 }
 
+/// Check whether the given input tree contains any wrapper actions
+static bool ContainsWrapperAction(const Action *A) {
+  if (isa<OffloadWrapperJobAction>(A))
+    return true;
+  for (const auto &AI : A->inputs())
+    if (ContainsWrapperAction(AI))
+      return true;
+
+  return false;
+}
+
 void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                          const InputInfo &Output, const InputInfoList &Inputs,
                          const ArgList &Args, const char *LinkingOutput) const {
@@ -5227,13 +5238,17 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // preprocessed inputs and configure concludes that -fPIC is not supported.
   Args.ClaimAllArgs(options::OPT_D);
 
+  bool SkipO =
+      Args.hasArg(options::OPT_fsycl_link_EQ) && ContainsWrapperAction(&JA);
+  const Arg *OArg = Args.getLastArg(options::OPT_O_Group);
   // Manually translate -O4 to -O3; let clang reject others.
-  if (Arg *A = Args.getLastArg(options::OPT_O_Group)) {
-    if (A->getOption().matches(options::OPT_O4)) {
+  // When compiling a wrapped binary, do not optimize.
+  if (!SkipO && OArg) {
+    if (OArg->getOption().matches(options::OPT_O4)) {
       CmdArgs.push_back("-O3");
       D.Diag(diag::warn_O4_is_O3);
     } else {
-      A->render(Args, CmdArgs);
+      OArg->render(Args, CmdArgs);
     }
   }
 
@@ -6379,24 +6394,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     // Host-side SYCL compilation receives the integration header file as
     // Inputs[1].  Include the header with -include
     if (!IsSYCLOffloadDevice && SYCLDeviceInput) {
-      SmallString<128> RealPath;
-#if defined(_WIN32)
-      // Fixup the header path name in case there are discrepancies in the
-      // string used for the temporary directory environment variable and
-      // actual path expectations.
-      //
-      // While generating the driver commands, we're most often working
-      // with non-existing files. The Unix implementation of LLVM's real_path
-      // returns an empty path for a non-existing file if it's expected to be
-      // placed in the current directory. This becomes a problem when we're
-      // saving intermediate compilation results via -save-temps.
-      // Since the header file path fix-up is Windows-specific, the real_path
-      // call is not necessary for a Unix-based OS (case-sensitive filesystem).
-      llvm::sys::fs::real_path(SYCLDeviceInput->getFilename(), RealPath);
-#else  // _WIN32
-      RealPath.assign(StringRef(SYCLDeviceInput->getFilename()));
-#endif // _WIN32
-      const char *IntHeaderPath = Args.MakeArgString(RealPath);
+      const char *IntHeaderPath =
+          Args.MakeArgString(SYCLDeviceInput->getFilename());
       CmdArgs.push_back("-include");
       CmdArgs.push_back(IntHeaderPath);
       // When creating dependency information, filter out the generated

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -511,19 +511,6 @@ static void addImpliedArgs(const llvm::Triple &Triple,
       BeArgs.push_back("-g");
   if (Args.getLastArg(options::OPT_O0))
     BeArgs.push_back("-cl-opt-disable");
-  // Check if floating pointing optimizations are allowed.
-  bool isFastMath = isOptimizationLevelFast(Args);
-  Arg *A = Args.getLastArg(options::OPT_ffast_math, options::OPT_fno_fast_math,
-                           options::OPT_funsafe_math_optimizations,
-                           options::OPT_fno_unsafe_math_optimizations);
-  isFastMath =
-      isFastMath || (A && (A->getOption().getID() == options::OPT_ffast_math ||
-                           A->getOption().getID() ==
-                               options::OPT_funsafe_math_optimizations));
-  A = Args.getLastArg(options::OPT_ffp_model_EQ);
-  isFastMath = isFastMath || (A && StringRef(A->getValue()).equals("fast"));
-  if (isFastMath)
-    BeArgs.push_back("-cl-fast-relaxed-math");
   if (BeArgs.empty())
     return;
   if (Triple.getSubArch() == llvm::Triple::NoSubArch ||