Merge from 'sycl' to 'sycl-web'

Author: iclsrc

buildbot/configure.py

@@ -11,10 +11,11 @@ def do_configure(args):
     sycl_dir = os.path.join(args.src_dir, "sycl")
     spirv_dir = os.path.join(args.src_dir, "llvm-spirv")
     xpti_dir = os.path.join(args.src_dir, "xpti")
+    libdevice_dir = os.path.join(args.src_dir, "libdevice")
     ocl_header_dir = os.path.join(args.obj_dir, "OpenCL-Headers")
     icd_loader_lib = os.path.join(args.obj_dir, "OpenCL-ICD-Loader", "build")
     llvm_targets_to_build = 'X86'
-    llvm_enable_projects = 'clang;llvm-spirv;sycl;opencl-aot;xpti'
+    llvm_enable_projects = 'clang;llvm-spirv;sycl;opencl-aot;xpti;libdevice'
     libclc_targets_to_build = ''
     sycl_build_pi_cuda = 'OFF'
     llvm_enable_assertions = 'ON'
@@ -49,10 +50,11 @@ def do_configure(args):
         "-DCMAKE_BUILD_TYPE={}".format(args.build_type),
         "-DLLVM_ENABLE_ASSERTIONS={}".format(llvm_enable_assertions),
         "-DLLVM_TARGETS_TO_BUILD={}".format(llvm_targets_to_build),
-        "-DLLVM_EXTERNAL_PROJECTS=sycl;llvm-spirv;opencl-aot;xpti",
+        "-DLLVM_EXTERNAL_PROJECTS=sycl;llvm-spirv;opencl-aot;xpti;libdevice",
         "-DLLVM_EXTERNAL_SYCL_SOURCE_DIR={}".format(sycl_dir),
         "-DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR={}".format(spirv_dir),
         "-DLLVM_EXTERNAL_XPTI_SOURCE_DIR={}".format(xpti_dir),
+        "-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR={}".format(libdevice_dir),
         "-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects),
         "-DLIBCLC_TARGETS_TO_BUILD={}".format(libclc_targets_to_build),
         "-DSYCL_BUILD_PI_CUDA={}".format(sycl_build_pi_cuda),

clang/include/clang/Basic/AttrDocs.td

@@ -2117,8 +2117,8 @@ def SYCLDeviceIndirectlyCallableDocs : Documentation {
 This attribute can only be applied to functions and indicates that the
 function must be treated as a device function and must be emitted even if it has
 no direct uses from other SYCL device functions. However, it cannot be applied
-to functions marked as 'static', functions declared within an anonymous
-namespace or class member functions.
+to functions marked as 'static' and functions declared within an anonymous
+namespace.
 
 It also means that function should be available externally and
 cannot be optimized out due to reachability analysis or by any other

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -340,6 +340,8 @@ def warn_drv_object_size_disabled_O0 : Warning<
   InGroup<InvalidCommandLineArgument>, DefaultWarnNoWerror;
 def err_invalid_branch_protection: Error <
   "invalid branch protection option '%0' in '%1'">;
+def warn_drv_deprecated_option : Warning<
+  "option '%0' is deprecated, use '%1' directly instead">, InGroup<Deprecated>;
 
 def note_drv_command_failed_diag_msg : Note<
   "diagnostic msg: %0">;

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10690,8 +10690,7 @@ def warn_boolean_attribute_argument_is_not_valid: Warning<
    InGroup<AdjustedAttributes>;
 def err_sycl_attibute_cannot_be_applied_here
     : Error<"%0 attribute cannot be applied to a "
-            "%select{static function or function in an anonymous namespace"
-            "|class member function}1">;
+            "static function or function in an anonymous namespace">;
 def warn_sycl_attibute_function_raw_ptr
     : Warning<"SYCL 1.2.1 specification does not allow %0 attribute applied "
               "to a function with a raw pointer "

clang/include/clang/Basic/LangOptions.def

@@ -238,6 +238,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(SYCLVersion       , 32, 0, "Version of the SYCL standard used")
+LANGOPT(DeclareSPIRVBuiltins, 1, 0, "Declare SPIR-V builtin functions")
 
 LANGOPT(HIPUseNewLaunchAPI, 1, 0, "Use new kernel launching API for HIP")
 

clang/include/clang/Driver/Action.h

@@ -76,6 +76,7 @@ class Action {
     SPIRVTranslatorJobClass,
     SPIRCheckJobClass,
     SYCLPostLinkJobClass,
+    PartialLinkJobClass,
     BackendCompileJobClass,
 
     JobClassFirst = PreprocessJobClass,
@@ -680,6 +681,18 @@ class SYCLPostLinkJobAction : public JobAction {
   }
 };
 
+class PartialLinkJobAction : public JobAction {
+  void anchor() override;
+
+public:
+  PartialLinkJobAction(Action *Input, types::ID OutputType);
+  PartialLinkJobAction(ActionList &Input, types::ID OutputType);
+
+  static bool classof(const Action *A) {
+    return A->getKind() == PartialLinkJobClass;
+  }
+};
+
 class BackendCompileJobAction : public JobAction {
   void anchor() override;
 

clang/include/clang/Driver/CC1Options.td

@@ -807,6 +807,8 @@ def finclude_default_header : Flag<["-"], "finclude-default-header">,
   HelpText<"Include default header file for OpenCL">;
 def fdeclare_opencl_builtins : Flag<["-"], "fdeclare-opencl-builtins">,
   HelpText<"Add OpenCL builtin function declarations (experimental)">;
+def fdeclare_spirv_builtins : Flag<["-"], "fdeclare-spirv-builtins">,
+  HelpText<"Add SPIR-V builtin function declarations (experimental)">;
 def fpreserve_vec3_type : Flag<["-"], "fpreserve-vec3-type">,
   HelpText<"Preserve 3-component vector type">;
 def fwchar_type_EQ : Joined<["-"], "fwchar-type=">,

clang/include/clang/Driver/Driver.h

@@ -621,6 +621,15 @@ class Driver {
           &CachedResults,
       Action::OffloadKind TargetDeviceOffloadKind) const;
 
+  /// Static offload library seen.
+  bool OffloadStaticLibSeen = false;
+
+  void setOffloadStaticLibSeen() { OffloadStaticLibSeen = true; }
+
+  /// Returns true if an offload static library is found.
+  bool checkForOffloadStaticLib(Compilation &C,
+                                llvm::opt::DerivedArgList &Args) const;
+
 public:
   /// GetReleaseVersion - Parse (([0-9]+)(.([0-9]+)(.([0-9]+)?))?)? and
   /// return the grouped values as integers. Numbers which are not
@@ -642,6 +651,8 @@ class Driver {
                                 MutableArrayRef<unsigned> Digits);
   /// Compute the default -fmodule-cache-path.
   static void getDefaultModuleCachePath(SmallVectorImpl<char> &Result);
+
+  bool getOffloadStaticLibSeen() const { return OffloadStaticLibSeen; };
 };
 
 /// \return True if the last defined optimization level is -Ofast.
@@ -651,6 +662,9 @@ bool isOptimizationLevelFast(const llvm::opt::ArgList &Args);
 /// \return True if the filename has a valid object file extension.
 bool isObjectFile(std::string FileName);
 
+/// \return True if the filename has a static archive/lib extension.
+bool isStaticArchiveFile(const StringRef &FileName);
+
 /// \return True if the argument combination will end up generating remarks.
 bool willEmitRemarks(const llvm::opt::ArgList &Args);
 

clang/include/clang/Driver/ToolChain.h

@@ -145,6 +145,7 @@ class ToolChain {
   mutable std::unique_ptr<Tool> SPIRVTranslator;
   mutable std::unique_ptr<Tool> SPIRCheck;
   mutable std::unique_ptr<Tool> SYCLPostLink;
+  mutable std::unique_ptr<Tool> PartialLink;
   mutable std::unique_ptr<Tool> BackendCompiler;
 
   Tool *getClang() const;
@@ -158,6 +159,7 @@ class ToolChain {
   Tool *getSPIRVTranslator() const;
   Tool *getSPIRCheck() const;
   Tool *getSYCLPostLink() const;
+  Tool *getPartialLink() const;
   Tool *getBackendCompiler() const;
 
   mutable std::unique_ptr<SanitizerArgs> SanitizerArguments;

clang/lib/AST/ASTContext.cpp

@@ -10191,6 +10191,10 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
   if (D->hasAttr<AliasAttr>() || D->hasAttr<UsedAttr>())
     return true;
 
+  if (LangOpts.SYCLIsDevice && !D->hasAttr<OpenCLKernelAttr>() &&
+      !D->hasAttr<SYCLDeviceAttr>())
+    return false;
+
   if (const auto *FD = dyn_cast<FunctionDecl>(D)) {
     // Forward declarations aren't required.
     if (!FD->doesThisDeclarationHaveABody())
@@ -10213,6 +10217,16 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
       }
     }
 
+    // Methods explcitly marked with 'sycl_device' attribute (via SYCL_EXTERNAL)
+    // or `indirectly_callable' attribute must be emitted regardless of number
+    // of actual uses
+    if (LangOpts.SYCLIsDevice && isa<CXXMethodDecl>(D)) {
+      if (auto *A = D->getAttr<SYCLDeviceIndirectlyCallableAttr>())
+        return !A->isImplicit();
+      if (auto *A = D->getAttr<SYCLDeviceAttr>())
+        return !A->isImplicit();
+    }
+
     GVALinkage Linkage = GetGVALinkageForFunction(FD);
 
     // static, static inline, always_inline, and extern inline functions can

clang/lib/CodeGen/CodeGenModule.cpp

@@ -2516,11 +2516,6 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
   if (Global->hasAttr<IFuncAttr>())
     return emitIFuncDefinition(GD);
 
-  if (LangOpts.SYCLIsDevice) {
-    if (!Global->hasAttr<SYCLDeviceAttr>())
-      return;
-  }
-
   // If this is a cpu_dispatch multiversion function, emit the resolver.
   if (Global->hasAttr<CPUDispatchAttr>())
     return emitCPUDispatchDefinition(GD);
@@ -2565,6 +2560,11 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
     }
   }
 
+  if (LangOpts.SYCLIsDevice && MustBeEmitted(Global)) {
+    addDeferredDeclToEmit(GD);
+    return;
+  }
+
   // Ignore declarations, they will be emitted on their first use.
   if (const auto *FD = dyn_cast<FunctionDecl>(Global)) {
     // Forward declarations are emitted lazily on first use.

clang/lib/Driver/Action.cpp

@@ -49,6 +49,8 @@ const char *Action::getClassName(ActionClass AC) {
     return "llvm-no-spir-kernel";
   case SYCLPostLinkJobClass:
     return "sycl-post-link";
+  case PartialLinkJobClass:
+    return "partial-link";
   case BackendCompileJobClass:
     return "backend-compiler";
   }
@@ -454,6 +456,14 @@ void SYCLPostLinkJobAction::anchor() {}
 SYCLPostLinkJobAction::SYCLPostLinkJobAction(Action *Input, types::ID Type)
     : JobAction(SYCLPostLinkJobClass, Input, Type) {}
 
+void PartialLinkJobAction::anchor() {}
+
+PartialLinkJobAction::PartialLinkJobAction(Action *Input, types::ID Type)
+    : JobAction(PartialLinkJobClass, Input, Type) {}
+
+PartialLinkJobAction::PartialLinkJobAction(ActionList &Inputs, types::ID Type)
+    : JobAction(PartialLinkJobClass, Inputs, Type) {}
+
 void BackendCompileJobAction::anchor() {}
 
 BackendCompileJobAction::BackendCompileJobAction(ActionList &Inputs,