Merge branch 'sycl' into peter/3channel

Author: ProGTX

clang/include/clang/Basic/CodeGenOptions.def

@@ -459,11 +459,6 @@ CODEGENOPT(SkipRaxSetup, 1, 0)
 ENUM_CODEGENOPT(ZeroCallUsedRegs, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind,
                 5, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::Skip)
 
-/// Whether to expect -main-file-name to be an absolute path to use it for
-/// checksum calculations or not.
-CODEGENOPT(SYCLUseMainFileName, 1, 0)
-
-
 /// Modify C++ ABI to returning `this` pointer from constructors and
 /// non-deleting destructors. (No effect on Microsoft ABI.)
 CODEGENOPT(CtorDtorReturnThis, 1, 0)

clang/include/clang/Basic/CodeGenOptions.h

@@ -258,9 +258,6 @@ class CodeGenOptions : public CodeGenOptionsBase {
   /// file, for example with -save-temps.
   std::string MainFileName;
 
-  /// The user provided name for the "main file", with its full path.
-  std::string FullMainFileName;
-
   /// The name for the split debug info file used for the DW_AT_[GNU_]dwo_name
   /// attribute in the skeleton CU.
   std::string SplitDwarfFile;

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -219,8 +219,6 @@ def warn_drv_mismatch_fpga_archive : Warning<
 def warn_drv_sycl_native_cpu_and_targets: Warning<
   "-fsycl-targets=native_cpu overrides SYCL targets option">,
   InGroup<SyclNativeCPUTargets>;
-def err_drv_unsupported_opt_sycl : Error<
-  "option '%0' not supported with SYCL compilation">;
 def err_drv_argument_only_allowed_with : Error<
   "invalid argument '%0' only allowed with '%1'">;
 def err_drv_opt_unsupported_input_type : Error<

clang/include/clang/Basic/LangOptions.def

@@ -302,6 +302,7 @@ LANGOPT(SYCLAllowFuncPtr  , 1, 0, "Allow function pointers in SYCL device code")
 LANGOPT(SYCLStdLayoutKernelParams, 1, 0, "Enable standard layout requirement for SYCL kernel parameters")
 LANGOPT(SYCLUnnamedLambda , 1, 0, "Allow unnamed lambda SYCL kernels")
 LANGOPT(SYCLForceInlineKernelLambda , 1, 0, "Force inline SYCL kernel lambdas in entry point")
+LANGOPT(SYCLAllowAllFeaturesInConstexpr, 1, 0, "Allow all C++ features in SYCL device code in manifestly constant-evaluated expressions")
 LANGOPT(SYCLESIMDForceStatelessMem, 1, 0, "Make accessors use USM memory in ESIMD kernels")
 LANGOPT(SYCLESIMDBuildHostCode, 1, 1, "Build the host implementation of ESIMD functions")
 ENUM_LANGOPT(SYCLVersion  , SYCLMajorVersion, 2, SYCL_None, "Version of the SYCL standard used")

clang/include/clang/Driver/Options.td

@@ -6779,7 +6779,7 @@ def fintelfpga : Flag<["-"], "fintelfpga">,
   MarshallingInfoFlag<LangOpts<"IntelFPGA">>,
   HelpText<"Perform ahead-of-time compilation for FPGA">;
 def fsycl_device_only : Flag<["-"], "fsycl-device-only">,
-  HelpText<"Compile SYCL kernels for device">;
+  Alias<offload_device_only>, HelpText<"Compile SYCL kernels for device">;
 def fsycl_embed_ir : Flag<["-"], "fsycl-embed-ir">,
   HelpText<"Embed LLVM IR for runtime kernel fusion">;
 defm sycl_esimd_force_stateless_mem : BoolFOption<"sycl-esimd-force-stateless-mem",
@@ -8173,10 +8173,6 @@ def main_file_name : Separate<["-"], "main-file-name">,
   HelpText<"Main file name to use for debug info and source if missing">,
   Visibility<[CC1Option, CC1AsOption]>,
   MarshallingInfoString<CodeGenOpts<"MainFileName">>;
-def full_main_file_name : Separate<["-"], "full-main-file-name">,
-  HelpText<"File name with full path to use for debug info during host and device compile">,
-  Visibility<[CC1Option, CC1AsOption]>,
-  MarshallingInfoString<CodeGenOpts<"FullMainFileName">>;
 def split_dwarf_output : Separate<["-"], "split-dwarf-output">,
   HelpText<"File name to use for split dwarf debug info output">,
   Visibility<[CC1Option, CC1AsOption]>,
@@ -8564,14 +8560,15 @@ def fenable_sycl_dae : Flag<["-"], "fenable-sycl-dae">,
 def fsycl_enable_int_header_diags: Flag<["-"], "fsycl-enable-int-header-diags">,
   HelpText<"Enable diagnostics that require the SYCL integration header.">,
   MarshallingInfoFlag<LangOpts<"SYCLEnableIntHeaderDiags">>;
-def fsycl_use_main_file_name : Flag<["-"], "fsycl-use-main-file-name">,
-  HelpText<"Tells compiler that -main-file-name contains an absolute path and "
-           "file specified there should be used for checksum calculation.">,
-  MarshallingInfoFlag<CodeGenOpts<"SYCLUseMainFileName">>;
 def fsycl_is_native_cpu : Flag<["-"], "fsycl-is-native-cpu">,
   HelpText<"Perform device compilation for Native CPU.">,
   Visibility<[CC1Option]>,
   MarshallingInfoFlag<LangOpts<"SYCLIsNativeCPU">>;
+defm sycl_allow_all_features_in_constexpr
+    : BoolFOption<
+          "sycl-allow-all-features-in-constexpr", LangOpts<"SYCLAllowAllFeaturesInConstexpr">,
+          DefaultFalse,
+          PosFlag<SetTrue, [], [CC1Option], "Allow all C++ features in SYCL device code in manifestly constant-evaluated expressions">, NegFlag<SetFalse>>;
 
 } // let Visibility = [CC1Option]
 

clang/include/clang/Sema/Sema.h

@@ -1133,6 +1133,11 @@ class Sema final : public SemaBase {
   /// must be codegen'ed.  Because handling these correctly adds overhead to
   /// compilation, this is currently only enabled for CUDA compilations.
   SemaDiagnosticBuilder::DeferredDiagnosticsType DeviceDeferredDiags;
+  /// Used to track deferred diagnostic that happened in an initializer of a
+  /// constexpr variable. When it is known that a variable doesn't have
+  /// constexpr initializer content of this container is pushed to
+  /// DeviceDeferredDiags.
+  SemaDiagnosticBuilder::DeferredDiagnosticsType MaybeDeviceDeferredDiags;
 
   /// CurContext - This is the current declaration context of parsing.
   DeclContext *CurContext;
@@ -2168,6 +2173,8 @@ class Sema final : public SemaBase {
   /// ExpressionEvaluationContextRecord object.
   bool isConstantEvaluatedOverride = false;
 
+  bool InConstexprVarInit = false;
+
   bool isConstantEvaluatedContext() const {
     return currentEvaluationContext().isConstantEvaluated() ||
            isConstantEvaluatedOverride;

clang/lib/Analysis/CallGraph.cpp

@@ -150,6 +150,27 @@ class CGBuilder : public StmtVisitor<CGBuilder> {
     StmtVisitor::VisitIfStmt(If);
   }
 
+  void VisitConstantExpr(ConstantExpr *CE) {
+    if (G->shouldSkipConstantExpressions())
+      return;
+    StmtVisitor::VisitConstantExpr(CE);
+  }
+
+  void VisitDeclStmt(DeclStmt *DS) {
+    if (G->shouldSkipConstantExpressions()) {
+      auto IsConstexprVarDecl = [this](Decl *D) {
+        if (const auto *VD = dyn_cast<VarDecl>(D))
+          return VD->isUsableInConstantExpressions(G->getASTContext());
+        return false;
+      };
+      if (llvm::any_of(DS->decls(), IsConstexprVarDecl)) {
+        return;
+      }
+    }
+
+    StmtVisitor::VisitDeclStmt(DS);
+  }
+
   void VisitChildren(Stmt *S) {
     for (Stmt *SubStmt : S->children())
       if (SubStmt)

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -397,40 +397,18 @@ std::optional<StringRef> CGDebugInfo::getSource(const SourceManager &SM,
   return Source;
 }
 
-// Compute valid FID for FileName.
-FileID ComputeValidFileID(SourceManager &SM, StringRef FileName) {
-  FileID MainFileID = SM.getMainFileID();
-  // Find the filename FileName and load it.
-  llvm::Expected<FileEntryRef> ExpectedFileRef =
-      SM.getFileManager().getFileRef(FileName);
-  if (ExpectedFileRef) {
-    MainFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                      SrcMgr::CharacteristicKind::C_User);
-  }
-  return MainFileID;
-}
-
 llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
   SourceManager &SM = CGM.getContext().getSourceManager();
   StringRef FileName;
   FileID FID;
   std::optional<llvm::DIFile::ChecksumInfo<StringRef>> CSInfo;
 
   if (Loc.isInvalid()) {
-    if (CGM.getCodeGenOpts().SYCLUseMainFileName &&
-        CGM.getLangOpts().MacroPrefixMap.size() > 0) {
-      // When fmacro-prefix-map is used, the original source file
-      // file name is indicated by FullMainFileName instead of the CU.
-      auto &CGO = CGM.getCodeGenOpts();
-      FileName = CGO.FullMainFileName;
-      FID = ComputeValidFileID(SM, CGO.FullMainFileName);
-    } else {
-      // The DIFile used by the CU is distinct from the main source file. Call
-      // createFile() below for canonicalization if the source file was specified
-      // with an absolute path.
-      FileName = TheCU->getFile()->getFilename();
-      CSInfo = TheCU->getFile()->getChecksum();
-    }
+    // The DIFile used by the CU is distinct from the main source file. Call
+    // createFile() below for canonicalization if the source file was specified
+    // with an absolute path.
+    FileName = TheCU->getFile()->getFilename();
+    CSInfo = TheCU->getFile()->getChecksum();
   } else {
     PresumedLoc PLoc = SM.getPresumedLoc(Loc);
     FileName = PLoc.getFilename();
@@ -449,13 +427,6 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
       return cast<llvm::DIFile>(V);
   }
 
-  if (SM.getFileEntryForID(SM.getMainFileID()) &&
-      CGM.getCodeGenOpts().SYCLUseMainFileName && FID.isInvalid())
-    // When an integration footer is involved, the main file is a temporary
-    // file generated by the compiler. FileName is pointing to original user
-    // source file. We use it here to properly calculate its checksum.
-    FID = ComputeValidFileID(SM, FileName);
-
   // Put Checksum at a scope where it will persist past the createFile call.
   SmallString<64> Checksum;
   if (!CSInfo) {
@@ -565,25 +536,18 @@ void CGDebugInfo::CreateCompileUnit() {
   auto &CGO = CGM.getCodeGenOpts();
   const LangOptions &LO = CGM.getLangOpts();
   std::string MainFileName = CGO.MainFileName;
-  std::string FullMainFileName = CGO.FullMainFileName;
   if (MainFileName.empty())
     MainFileName = "<stdin>";
 
   // The main file name provided via the "-main-file-name" option contains just
   // the file name itself with no path information. This file name may have had
   // a relative path, so we look into the actual file entry for the main
   // file to determine the real absolute path for the file.
-  // An exception here is workflow when integration footer is involved: in that
-  // case driver passes an absolute path to the original user-provided source
-  // file, whilst main file corresponds to a temporary file generated by the
-  // compiler.
   std::string MainFileDir;
   if (OptionalFileEntryRef MainFile =
           SM.getFileEntryRefForID(SM.getMainFileID())) {
     MainFileDir = std::string(MainFile->getDir().getName());
-    FileID MainFileID = SM.getMainFileID();
-    if (!llvm::sys::path::is_absolute(MainFileName) &&
-        !CGM.getCodeGenOpts().SYCLUseMainFileName) {
+    if (!llvm::sys::path::is_absolute(MainFileName)) {
       llvm::SmallString<1024> MainFileDirSS(MainFileDir);
       llvm::sys::path::Style Style =
           LO.UseTargetPathSeparator
@@ -594,14 +558,6 @@ void CGDebugInfo::CreateCompileUnit() {
       llvm::sys::path::append(MainFileDirSS, Style, MainFileName);
       MainFileName = std::string(
           llvm::sys::path::remove_leading_dotslash(MainFileDirSS, Style));
-    } else if (CGM.getCodeGenOpts().SYCLUseMainFileName) {
-      // When an integration footer is involved, the main file is a temporary
-      // file generated by the compiler. FullMainFileName is pointing to
-      // original user source file. We use it here to properly calculate its
-      // checksum.
-      MainFileID = ComputeValidFileID(SM, FullMainFileName);
-      // Make sure the filename points to the original user source filename.
-      MainFileName = FullMainFileName;
     }
     // If the main file name provided is identical to the input file name, and
     // if the input file is a preprocessed source, use the module name for
@@ -614,7 +570,7 @@ void CGDebugInfo::CreateCompileUnit() {
             .isPreprocessed()) {
       MainFileName = CGM.getModule().getName().str();
     } else {
-      CSKind = computeChecksum(MainFileID, Checksum);
+      CSKind = computeChecksum(SM.getMainFileID(), Checksum);
     }
   }
 

clang/lib/Driver/Driver.cpp

@@ -393,8 +393,7 @@ phases::ID Driver::getFinalPhase(const DerivedArgList &DAL,
     FinalPhase = phases::Compile;
 
   // -S only runs up to the backend.
-  } else if ((PhaseArg = DAL.getLastArg(options::OPT_S)) ||
-             (PhaseArg = DAL.getLastArg(options::OPT_fsycl_device_only))) {
+  } else if ((PhaseArg = DAL.getLastArg(options::OPT_S))) {
     FinalPhase = phases::Backend;
 
   // -c compilation only runs up to the assembler.
@@ -855,6 +854,19 @@ static bool addSYCLDefaultTriple(Compilation &C,
   return true;
 }
 
+// Special function that checks if -fsycl-device-only was passed on the
+// command line.  -fsycl-device-only is an alias of --offload-device-only.
+static bool hasSYCLDeviceOnly(const ArgList &Args) {
+  if (const Arg *SYCLDeviceOnlyArg =
+          Args.getLastArg(options::OPT_offload_device_only)) {
+    while (SYCLDeviceOnlyArg->getAlias())
+      SYCLDeviceOnlyArg = SYCLDeviceOnlyArg->getAlias();
+    if (SYCLDeviceOnlyArg->getSpelling().contains("sycl-device-only"))
+      return true;
+  }
+  return false;
+}
+
 void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
                                               InputList &Inputs) {
 
@@ -1074,7 +1086,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   bool HasValidSYCLRuntime =
       C.getInputArgs().hasFlag(options::OPT_fsycl, options::OPT_fno_sycl,
                                false) ||
-      C.getInputArgs().hasArg(options::OPT_fsycl_device_only);
+      hasSYCLDeviceOnly(C.getInputArgs());
 
   Arg *SYCLfpga = C.getInputArgs().getLastArg(options::OPT_fintelfpga);
 
@@ -1118,8 +1130,8 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
     if (!HasValidSYCLRuntime)
       return;
     if (Arg *IncompatArg = C.getInputArgs().getLastArg(OptId))
-      Diag(clang::diag::err_drv_unsupported_opt_sycl)
-          << IncompatArg->getSpelling();
+      Diag(clang::diag::err_drv_argument_not_allowed_with)
+          << IncompatArg->getSpelling() << "-fsycl";
   };
   // -static-libstdc++ is not compatible with -fsycl.
   argSYCLIncompatible(options::OPT_static_libstdcxx);
@@ -1743,13 +1755,12 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   if (Args.getLastArg(options::OPT_fsycl_dump_device_code_EQ))
     DumpDeviceCode = true;
 
-  if (const Arg *A = Args.getLastArg(
-          options::OPT_offload_host_only, options::OPT_offload_device_only,
-          options::OPT_offload_host_device, options::OPT_fsycl_device_only)) {
+  if (const Arg *A = Args.getLastArg(options::OPT_offload_host_only,
+                                     options::OPT_offload_device_only,
+                                     options::OPT_offload_host_device)) {
     if (A->getOption().matches(options::OPT_offload_host_only))
       Offload = OffloadHost;
-    else if (A->getOption().matches(options::OPT_offload_device_only) ||
-             A->getOption().matches(options::OPT_fsycl_device_only))
+    else if (A->getOption().matches(options::OPT_offload_device_only))
       Offload = OffloadDevice;
     else
       Offload = OffloadHostDevice;
@@ -3124,7 +3135,7 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
   Arg *InputTypeArg = nullptr;
   bool IsSYCL =
       Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false) ||
-      Args.hasArg(options::OPT_fsycl_device_only);
+      hasSYCLDeviceOnly(Args);
 
   // The last /TC or /TP option sets the input type to C or C++ globally.
   if (Arg *TCTP = Args.getLastArgNoClaim(options::OPT__SLASH_TC,
@@ -5855,10 +5866,9 @@ class OffloadingActionBuilder final {
             ++NumOfDeviceLibLinked;
             Arg *InputArg = MakeInputArg(Args, C.getDriver().getOpts(),
                                          Args.MakeArgString(LibName));
-            if (TC->getTriple().isNVPTX() ||
-                (TC->getTriple().isSPIR() &&
-                 TC->getTriple().getSubArch() ==
-                     llvm::Triple::SPIRSubArch_fpga)) {
+            if (TC->getTriple().isSPIR() &&
+                TC->getTriple().getSubArch() ==
+                    llvm::Triple::SPIRSubArch_fpga) {
               auto *SYCLDeviceLibsInputAction =
                   C.MakeAction<InputAction>(*InputArg, types::TY_Object);
               auto *SYCLDeviceLibsUnbundleAction =
@@ -6851,6 +6861,10 @@ class OffloadingActionBuilder final {
   /// Offload deps output is then forwarded to active device action builders so
   /// they can add it to the device linker inputs.
   void addDeviceLinkDependenciesFromHost(ActionList &LinkerInputs) {
+    if (isSYCLNativeCPU(C.getArgs())) {
+      // SYCL Native CPU doesn't need deps from clang-offload-deps.
+      return;
+    }
     // Link image for reading dependencies from it.
     auto *LA = C.MakeAction<LinkJobAction>(LinkerInputs,
                                            types::TY_Host_Dependencies_Image);