Merge branch 'intel:sycl' into CI-l0v2

Author: luszczewskakasia1

.github/workflows/sycl-check-ready-to-merge-prs.yml

@@ -27,27 +27,25 @@ jobs:
           days=3
           days_in_seconds=$((days*24*60*60))
 
-          gh repo set-default intel/llvm
-
           # Function to ping gatekeepers and print debug info
           ping_gatekeepers() {
             pr_number=$1
-            gh pr comment "$pr_number" --body "@intel/llvm-gatekeepers please consider merging"
+            gh pr comment "$pr_number" --repo intel/llvm --body "@intel/llvm-gatekeepers please consider merging"
             echo "Pinged @intel/llvm-gatekeepers for https://github.com/intel/llvm/pull/$pr_number"
           }
 
           # Get the list of suitable PRs
-          prs=$(gh pr list --search "is:open review:approved draft:no status:success" --json number --jq '.[].number')
+          prs=$(gh pr list --search "is:open review:approved draft:no status:success" --repo intel/llvm --json number --jq '.[].number')
           now=$(date -u +%s)
           for pr in $prs; do
             # Skip PRs that don't target the sycl branch
-            pr_base=$(gh pr view $pr --json baseRefName -q .baseRefName)
+            pr_base=$(gh pr view $pr --repo intel/llvm --json baseRefName -q .baseRefName)
             if [ "$pr_base" != "sycl" ]; then
               continue
             fi
 
             # Get the timestamp of the latest comment mentioning @intel/llvm-gatekeepers
-            latest_ts=$(gh pr view $pr --json comments \
+            latest_ts=$(gh pr view $pr --repo intel/llvm --json comments \
               --jq '[.comments[] | select(.body | test("@intel/llvm-gatekeepers")) | .createdAt] | last')
             # If there is no previous mention, ping the gatekeepers
             if [[ -z "$latest_ts" ]]; then

.github/workflows/sycl-linux-run-tests.yml

@@ -380,5 +380,4 @@ jobs:
         dry_run: ${{ inputs.benchmark_dry_run }}
         exit_on_failure: ${{ inputs.benchmark_exit_on_failure }}
         build_ref: ${{ inputs.repo_ref }}
-      env:
-        RUNNER_TAG: ${{ inputs.runner }}
+        runner: ${{ inputs.runner }}

clang/include/clang/Sema/SemaSYCL.h

@@ -65,7 +65,8 @@ class SYCLIntegrationHeader {
     kind_work_group_memory,
     kind_dynamic_work_group_memory,
     kind_dynamic_accessor,
-    kind_last = kind_dynamic_accessor
+    kind_struct_with_special_type, // structs that contain special types
+    kind_last = kind_struct_with_special_type
   };
 
 public:
@@ -118,6 +119,9 @@ class SYCLIntegrationHeader {
   /// integration header is required.
   void addHostPipeRegistration() { NeedToEmitHostPipeRegistration = true; }
 
+  /// Set the ParentStruct field
+  void setParentStruct(ParmVarDecl *parent);
+
 private:
   // Kernel actual parameter descriptor.
   struct KernelParamDesc {
@@ -205,6 +209,20 @@ class SYCLIntegrationHeader {
   /// Keeps track of whether declaration of __sycl_host_pipe_registration
   /// type and __sycl_host_pipe_registrar variable are required to emit.
   bool NeedToEmitHostPipeRegistration = false;
+
+  // For free function kernels, keeps track of the parameter that is currently
+  // being analyzed if it is a struct that contains special types.
+  ParmVarDecl *ParentStruct = nullptr;
+
+  // For every struct that contains a special type which is given by
+  // the ParentStruct field above, record the offset and size of its fields
+  // at any nesting level. Store the information in the variable below.
+  llvm::DenseMap<ParmVarDecl *, llvm::SmallVector<std::pair<size_t, size_t>>>
+      OffsetSizeInfo;
+  // Likewise for the kind of a field i.e accessor, std_layout etc...
+  llvm::DenseMap<ParmVarDecl *,
+                 llvm::SmallVector<SYCLIntegrationHeader::kernel_param_kind_t>>
+      KindInfo;
 };
 
 class SYCLIntegrationFooter {
@@ -267,6 +285,10 @@ class SemaSYCL : public SemaBase {
 
   llvm::DenseSet<const FunctionDecl *> FreeFunctionDeclarations;
 
+  // A map that keeps track of all structs encountered with
+  // special types inside. Relevant for free function kernels only.
+  llvm::DenseSet<const RecordDecl *> StructsWithSpecialTypes;
+
 public:
   SemaSYCL(Sema &S);
 
@@ -317,6 +339,13 @@ class SemaSYCL : public SemaBase {
     SYCLKernelFunctions.insert(FD);
   }
 
+  /// Add ParentStruct to StructsWithSpecialTypes.
+  void addStructWithSpecialType(const RecordDecl *ParentStruct) {
+    StructsWithSpecialTypes.insert(ParentStruct);
+  }
+
+  auto &getStructsWithSpecialType() const { return StructsWithSpecialTypes; }
+
   /// Lazily creates and returns SYCL integration header instance.
   SYCLIntegrationHeader &getSyclIntegrationHeader() {
     if (SyclIntHeader == nullptr)

clang/lib/AST/DeclPrinter.cpp

@@ -1927,7 +1927,8 @@ void DeclPrinter::VisitNonTypeTemplateParmDecl(
 void DeclPrinter::VisitTemplateTemplateParmDecl(
     const TemplateTemplateParmDecl *TTPD) {
   VisitTemplateDecl(TTPD);
-  if (TTPD->hasDefaultArgument() && !TTPD->defaultArgumentWasInherited()) {
+  if (TTPD->hasDefaultArgument() && !Policy.SuppressDefaultTemplateArguments &&
+      !TTPD->defaultArgumentWasInherited()) {
     Out << " = ";
     TTPD->getDefaultArgument().getArgument().print(Policy, Out,
                                                    /*IncludeType=*/false);

clang/lib/Driver/Driver.cpp

@@ -5061,14 +5061,19 @@ class OffloadingActionBuilder final {
                llvm::zip(SYCLDeviceActions, SYCLTargetInfoList)) {
             Action *&A = std::get<0>(TargetActionInfo);
             auto &TargetInfo = std::get<1>(TargetActionInfo);
-            A = C.getDriver().ConstructPhaseAction(C, Args, CurPhase, A,
-                                                   AssociatedOffloadKind);
-            if (SYCLDeviceOnly)
+            Action *PreprocAction = C.getDriver().ConstructPhaseAction(
+                C, Args, CurPhase, A, AssociatedOffloadKind);
+            if (SYCLDeviceOnly) {
+              A = PreprocAction;
               continue;
+            }
             // Add an additional compile action to generate the integration
-            // header.
+            // header. This action compiles the source file instead of the
+            // generated preprocessed file to allow for control of the
+            // diagnostics that could come from the system headers.
             Action *CompileAction =
                 C.MakeAction<CompileJobAction>(A, types::TY_Nothing);
+            A = PreprocAction;
             DA.add(*CompileAction, *TargetInfo.TC, TargetInfo.BoundArch,
                    Action::OFK_SYCL);
           }
@@ -8001,8 +8006,15 @@ Action *Driver::BuildOffloadingActions(Compilation &C,
               if (isa<PreprocessJobAction>(A)) {
                 PackagerActions.push_back(OA);
                 A->setCannotBeCollapsedWithNextDependentAction();
-                Action *CompileAction =
-                    C.MakeAction<CompileJobAction>(A, types::TY_Nothing);
+                // The input to the compilation job is the preprocessed job.
+                // Take that input action (it should be one input) which is
+                // the source file and compile that file to generate the
+                // integration header/footer.
+                ActionList PreprocInputs = A->getInputs();
+                assert(PreprocInputs.size() == 1 &&
+                       "Single input size to preprocess action expected.");
+                Action *CompileAction = C.MakeAction<CompileJobAction>(
+                    PreprocInputs.front(), types::TY_Nothing);
                 DDeps.add(*CompileAction, *TC, BoundArch, Action::OFK_SYCL);
               }
             });