Merge remote-tracking branch 'upstream/sycl' into urlog

Author: mateuszpn

clang/include/clang/AST/RecordLayout.h

@@ -75,8 +75,9 @@ class ASTRecordLayout {
   // performance or backwards compatibility preserving (e.g. AIX-ABI).
   CharUnits PreferredAlignment;
 
-  // UnadjustedAlignment - Maximum of the alignments of the record members in
-  // characters.
+  // UnadjustedAlignment - Alignment of record in characters before alignment
+  // adjustments. Maximum of the alignments of the record members and base
+  // classes in characters.
   CharUnits UnadjustedAlignment;
 
   /// RequiredAlignment - The required alignment of the object.  In the MS-ABI
@@ -186,7 +187,7 @@ class ASTRecordLayout {
   CharUnits getPreferredAlignment() const { return PreferredAlignment; }
 
   /// getUnadjustedAlignment - Get the record alignment in characters, before
-  /// alignment adjustement.
+  /// alignment adjustment.
   CharUnits getUnadjustedAlignment() const { return UnadjustedAlignment; }
 
   /// getSize - Get the record size in characters.

clang/include/clang/Driver/Options.td

@@ -7145,10 +7145,13 @@ defm sycl_force_inline_kernel_lambda
           NegFlag<SetFalse, [], [ClangOption, CLOption], "Disallow">,
           BothFlags<[], [ClangOption, CLOption, CC1Option], " force inline "
                     "SYCL kernels lambda in entry point">>;
-def fsycl_help_EQ : Joined<["-"], "fsycl-help=">, Flags<[NoXarchOption]>,
-  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_EQ
+    : Joined<["-"], "fsycl-help=">,
+      Flags<[NoXarchOption]>,
+      HelpText<
+          "Emit help information from the related offline compilation tool. "
+          "Valid values: all, gen, x86_64.">,
+      Values<"all,gen,x86_64">;
 def fsycl_help : Flag<["-"], "fsycl-help">, Alias<fsycl_help_EQ>,
   Flags<[NoXarchOption]>, AliasArgs<["all"]>,
   HelpText<"Emit help information from all of the offline compilation tools">;

clang/include/clang/Driver/Types.def

@@ -125,7 +125,6 @@ TYPE("tempfiletable",            Tempfiletable,INVALID,         "table",  phases
 TYPE("tempAOCOfilelist",         TempAOCOfilelist, INVALID,     "txt",    phases::Compile, phases::Backend, phases::Assemble, phases::Link)
 TYPE("archive",                  Archive,      INVALID,         "a",      phases::Compile, phases::Backend, phases::Assemble, phases::Link)
 TYPE("wholearchive",             WholeArchive, INVALID,         "a",      phases::Compile, phases::Backend, phases::Assemble, phases::Link)
-TYPE("fpga_dep",                 FPGA_Dependencies, INVALID,    "d",      phases::Compile, phases::Backend, phases::Assemble, phases::Link)
 TYPE("host_dep_image",           Host_Dependencies_Image, INVALID, "out", phases::Compile, phases::Backend, phases::Assemble, phases::Link)
 TYPE("api-information",          API_INFO,     INVALID,         "json",   phases::Precompile)
 TYPE("dx-container",             DX_CONTAINER, INVALID,         "dxo",    phases::Compile, phases::Backend)

clang/lib/AST/RecordLayoutBuilder.cpp

@@ -1302,6 +1302,7 @@ ItaniumRecordLayoutBuilder::LayoutBase(const BaseSubobjectInfo *Base) {
     setSize(std::max(getSize(), Offset + Layout.getSize()));
 
   // Remember max struct/class alignment.
+  UnadjustedAlignment = std::max(UnadjustedAlignment, BaseAlign);
   UpdateAlignment(BaseAlign, UnpackedAlignTo, PreferredBaseAlign);
 
   return Offset;

clang/lib/Driver/Driver.cpp

@@ -154,8 +154,8 @@ bool OffloadTargetInfo::hasHostKind() const {
 
 bool OffloadTargetInfo::isOffloadKindValid() const {
   return OffloadKind == "host" || OffloadKind == "openmp" ||
-         OffloadKind == "sycl" || OffloadKind == "fpga" ||
-         OffloadKind == "hip" || OffloadKind == "hipv4";
+         OffloadKind == "sycl" || OffloadKind == "hip" ||
+         OffloadKind == "hipv4";
 }
 
 bool OffloadTargetInfo::isOffloadKindCompatible(

clang/lib/Driver/OffloadBundler.cpp

@@ -308,42 +308,6 @@ static bool getStatic(const ArgList &Args) {
       !Args.hasArg(options::OPT_static_pie);
 }
 
-// Create an archive with llvm-ar.  This is used to create an archive that
-// contains host objects and the wrapped FPGA device binary
-void tools::gnutools::Linker::constructLLVMARCommand(
-    Compilation &C, const JobAction &JA, const InputInfo &Output,
-    const InputInfoList &Input, const ArgList &Args) const {
-  ArgStringList CmdArgs;
-  // Use 'cqL' to create the archive.  This allows for any fat archives that
-  // are passed on the command line to be added via contents instead of the
-  // full archive.  Any usage of the generated archive will then have full
-  // access to resolve any dependencies.
-  CmdArgs.push_back("cqL");
-  const char *OutputFilename = Output.getFilename();
-  if (llvm::sys::fs::exists(OutputFilename)) {
-    C.getDriver().Diag(clang::diag::warn_drv_existing_archive_append)
-        << OutputFilename;
-  }
-  CmdArgs.push_back(OutputFilename);
-  for (const auto &II : Input) {
-    if (II.getType() == types::TY_Tempfilelist) {
-      // Take the list file and pass it in with '@'.
-      std::string FileName(II.getFilename());
-      const char *ArgFile = Args.MakeArgString("@" + FileName);
-      CmdArgs.push_back(ArgFile);
-      continue;
-    }
-    if (II.isFilename())
-      CmdArgs.push_back(II.getFilename());
-  }
-
-  SmallString<128> LLVMARPath(C.getDriver().Dir);
-  llvm::sys::path::append(LLVMARPath, "llvm-ar");
-  const char *Exec = C.getArgs().MakeArgString(LLVMARPath);
-  C.addCommand(std::make_unique<Command>(
-      JA, *this, ResponseFileSupport::None(), Exec, CmdArgs, std::nullopt));
-}
-
 void tools::gnutools::StaticLibTool::ConstructJob(
     Compilation &C, const JobAction &JA, const InputInfo &Output,
     const InputInfoList &Inputs, const ArgList &Args,
@@ -413,12 +377,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
       ToolChain.getTriple().hasEnvironment() ||
       (ToolChain.getTriple().getVendor() != llvm::Triple::MipsTechnologies);
 
-  // Use of -fsycl-link creates an archive.
-  if (Args.hasArg(options::OPT_fsycl_link_EQ) &&
-      JA.getType() == types::TY_Archive) {
-    constructLLVMARCommand(C, JA, Output, Inputs, Args);
-    return;
-  }
   ArgStringList CmdArgs;
 
   // Silence warning for "clang -g foo.o -o foo"
@@ -739,10 +697,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         else
           CmdArgs.push_back("-lsycl");
         CmdArgs.push_back("-lsycl-devicelib-host");
-        // Use of -fintelfpga implies -lOpenCL.
-        // FIXME: Adjust to use plugin interface when available.
-        if (Args.hasArg(options::OPT_fintelfpga))
-          CmdArgs.push_back("-lOpenCL");
       }
 
       // LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so

clang/lib/Driver/ToolChains/Clang.cpp

@@ -63,12 +63,6 @@ class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
                     const char *LinkingOutput) const override;
-
-private:
-  void constructLLVMARCommand(Compilation &C, const JobAction &JA,
-                              const InputInfo &Output,
-                              const InputInfoList &InputFiles,
-                              const llvm::opt::ArgList &Args) const;
 };
 
 class LLVM_LIBRARY_VISIBILITY StaticLibTool : public Tool {

clang/lib/Driver/ToolChains/Gnu.cpp

@@ -65,55 +65,13 @@ static std::string FindVisualStudioExecutable(const ToolChain &TC,
   return std::string(canExecute(TC.getVFS(), FilePath) ? FilePath.str() : Exe);
 }
 
-// Add a call to lib.exe to create an archive.  This is used to embed host
-// objects into the bundled fat FPGA device binary.
-void visualstudio::Linker::constructMSVCLibCommand(Compilation &C,
-                                                   const JobAction &JA,
-                                                   const InputInfo &Output,
-                                                   const InputInfoList &Input,
-                                                   const ArgList &Args) const {
-  ArgStringList CmdArgs;
-  for (const auto &II : Input) {
-    if (II.getType() == types::TY_Tempfilelist) {
-      // Take the list file and pass it in with '@'.
-      std::string FileName(II.getFilename());
-      const char *ArgFile = Args.MakeArgString("@" + FileName);
-      CmdArgs.push_back(ArgFile);
-      continue;
-    }
-    CmdArgs.push_back(II.getFilename());
-  }
-  if (Args.hasArg(options::OPT_fsycl_link_EQ) &&
-      Args.hasArg(options::OPT_fintelfpga))
-    CmdArgs.push_back("/IGNORE:4221");
-
-  // Suppress multiple section warning LNK4078
-  if (Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false))
-    CmdArgs.push_back("/IGNORE:4078");
-
-  CmdArgs.push_back(
-      C.getArgs().MakeArgString(Twine("-OUT:") + Output.getFilename()));
-
-  SmallString<128> ExecPath(getToolChain().GetProgramPath("lib.exe"));
-  const char *Exec = C.getArgs().MakeArgString(ExecPath);
-  C.addCommand(std::make_unique<Command>(
-      JA, *this, ResponseFileSupport::AtFileUTF16(), Exec, CmdArgs, std::nullopt));
-}
-
 void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
                                         const InputInfo &Output,
                                         const InputInfoList &Inputs,
                                         const ArgList &Args,
                                         const char *LinkingOutput) const {
   ArgStringList CmdArgs;
 
-  // Create a library with -fsycl-link
-  if (Args.hasArg(options::OPT_fsycl_link_EQ) &&
-      JA.getType() == types::TY_Archive) {
-    constructMSVCLibCommand(C, JA, Output, Inputs, Args);
-    return;
-  }
-
   auto &TC = static_cast<const toolchains::MSVCToolChain &>(getToolChain());
 
   assert((Output.isFilename() || Output.isNothing()) && "invalid output");