Merge remote-tracking branch 'intel/sycl' into steffen/deprecate_fallback_assert

Author: steffenlarsen

.github/CODEOWNERS

@@ -223,3 +223,7 @@ llvm/test/Instrumentation/ThreadSanitizer/ @intel/dpcpp-sanitizers-review
 sycl/test-e2e/AddressSanitizer/ @intel/dpcpp-sanitizers-review
 sycl/test-e2e/MemorySanitizer/ @intel/dpcpp-sanitizers-review
 sycl/test-e2e/ThreadSanitizer/ @intel/dpcpp-sanitizers-review
+
+# ABI compatibility
+devops/compat_ci_exclude.sycl-rel-** @gmlueck @xtian-github
+sycl/test/abi/*sycl-rel*.dump @AlexeySachkov @KornevNikita

.github/workflows/sycl-linux-precommit.yml

@@ -81,7 +81,7 @@ jobs:
 
   compat_read_exclude:
     name: Read compatibility testing exclude list
-    runs-on: [Linux, build]
+    runs-on: [Linux, aux-tasks]
     outputs:
       FILTER_6_2: ${{ steps.result.outputs.FILTER_6_2 }}
       FILTER_6_3: ${{ steps.result.outputs.FILTER_6_3 }}

.github/workflows/sycl-nightly.yml

@@ -8,6 +8,21 @@ on:
 permissions: read-all
 
 jobs:
+  check_abi_symbols:
+    name: Check ABI symbols tests match release branch
+    runs-on: [Linux, build]
+    if: github.repository == 'intel/llvm'
+    container: ghcr.io/intel/llvm/ubuntu2404_build
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+          sycl/test/abi
+    - run: |
+        git fetch --depth=1 origin sycl-rel-6_3
+        git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_linux.dump sycl/test/abi/sycl_symbols_linux-sycl-rel-6_3.dump
+        git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_windows.dump sycl/test/abi/sycl_symbols_windows-sycl-rel-6_3.dump
+
   ubuntu2204_build:
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl-linux-build.yml

.github/workflows/sycl-ur-perf-benchmarking.yml

@@ -28,8 +28,18 @@ on:
           deployment branch will be used.
         required: false
         default: ''
+      save_name:
+        type: string
+        description: |
+          Specify a custom name to use for the benchmark result: If uploading
+          results, this will be the name used to refer results from the current
+          run.
+        required: false
+        default: ''
       upload_results:
         type: string # true/false: workflow_dispatch does not support booleans
+        description: |
+          Upload results to https://intel.github.io/llvm/benchmarks/.
         required: true
       runner:
         type: string
@@ -67,8 +77,14 @@ on:
           Leave both pr_no and commit_hash empty to use latest commit.
         required: false
         default: ''
+      save_name:
+        type: string
+        description: |
+          Name to use for the benchmark result:
+        required: false
+        default: ''
       upload_results:
-        description: 'Save and upload results'
+        description: 'Save and upload results (to https://intel.github.io/llvm/benchmarks)'
         type: choice
         options:
           - false
@@ -90,16 +106,61 @@ on:
 permissions: read-all
 
 jobs:
+  sanitize_inputs:
+    name: Sanitize inputs
+    runs-on: ubuntu-latest
+    env:
+      COMMIT_HASH: ${{ inputs.commit_hash }}
+      PR_NO: ${{ inputs.pr_no }}
+      SAVE_NAME: ${{ inputs.save_name }}
+    outputs:
+      benchmark_save_name: ${{ steps.sanitize.outputs.benchmark_save_name }}
+      build_ref: ${{ steps.sanitize.outputs.build_ref }}
+    steps:
+      - id: sanitize
+        run: |
+          # Validate user inputs:
+          # usage: check_if_nonempty <var> <regex to check var against> <err message>
+          check_nonempty() {
+            [ -z "$1" ] && return
+            if [ -z "$(echo "$1" | grep -P "$2")" ]; then
+              echo "$3"
+              exit 1
+            fi
+          }
+          check_nonempty "$COMMIT_HASH" '^[0-9a-f]{7,}$' "Bad commit hash (or hash short)."
+          check_nonempty "$PR_NO" '^[0-9]+$' "Bad PR number."
+          check_nonempty "$SAVE_NAME" '^[A-Za-z][A-Za-z0-9_-]+$' "Bad save name."
+
+          BENCHMARK_SAVE_NAME=""
+          BUILD_REF="${{ github.ref }}"
+          if [ -n "$SAVE_NAME" ]; then
+            BENCHMARK_SAVE_NAME="$(echo "$SAVE_NAME" | tr -cd 'A-Za-z0-9_-')"
+          fi;
+          if [ -n "$COMMIT_HASH" ]; then
+            echo "Using commit hash $COMMIT_HASH for build..."
+            BUILD_REF="$COMMIT_HASH"
+            shortened_commit="$(echo "$COMMIT_HASH" | cut -c 1-7)"
+            [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="Commit_${shortened_commit}"
+          elif [ -n "$PR_NO" ]; then
+            echo "Using PR no. $PR_NO for build..."
+            BUILD_REF="refs/pull/$PR_NO/head"
+            [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="PR_${PR_NO}"
+          fi
+          [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="Baseline"
+
+          echo "benchmark_save_name=$BENCHMARK_SAVE_NAME" >> $GITHUB_OUTPUT
+          echo "build_ref=$BUILD_REF" >> $GITHUB_OUTPUT
+
+          echo "Final sanitized values:"
+          cat $GITHUB_OUTPUT
+
   build_sycl:
     name: Build SYCL
+    needs: [ sanitize_inputs ]
     uses: ./.github/workflows/sycl-linux-build.yml
     with:
-      build_ref: |
-        ${{
-          inputs.commit_hash != '' && inputs.commit_hash ||
-          inputs.pr_no != '' && format('refs/pull/{0}/head', inputs.pr_no) ||
-          github.ref
-        }}
+      build_ref: ${{ needs.sanitize_inputs.outputs.build_ref }}
       build_cache_root: "/__w/"
       build_cache_suffix: "prod_noassert"
       build_configure_extra_args: "--no-assertions"
@@ -112,14 +173,12 @@ jobs:
 
   run_benchmarks_build:
     name: Run Benchmarks on Build
-    needs: [ build_sycl ]
+    needs: [ build_sycl, sanitize_inputs ]
     strategy:
       matrix:
         include:
-          - ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || inputs.pr_no != '' && format('refs/pull/{0}/head', inputs.pr_no) || github.ref }}
-            save_name: ${{ inputs.commit_hash != '' && format('Commit{0}', inputs.commit_hash) || inputs.pr_no != '' && format('PR{0}', inputs.pr_no) || 'Baseline' }}
-            # Set default values if not specified:
-            runner: ${{ inputs.runner || '["PVC_PERF"]' }}
+          # Set default values if not specified:
+          - runner: ${{ inputs.runner || '["PVC_PERF"]' }}
             backend: ${{ inputs.backend || 'level_zero:gpu' }}
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     secrets: inherit
@@ -131,9 +190,9 @@ jobs:
       target_devices: ${{ matrix.backend }}
       tests_selector: benchmarks
       benchmark_upload_results: ${{ inputs.upload_results }}
-      benchmark_save_name: ${{ matrix.save_name }}
+      benchmark_save_name: ${{ needs.sanitize_inputs.outputs.benchmark_save_name }}
       benchmark_preset: ${{ inputs.preset }}
-      repo_ref: ${{ matrix.ref }}
+      repo_ref: ${{ needs.sanitize_inputs.outputs.build_ref }}
       toolchain_artifact: ${{ needs.build_sycl.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.build_sycl.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build_sycl.outputs.toolchain_decompress_command }}

README.md

@@ -79,10 +79,6 @@ for general guidelines around contributing to this project. You can then see
 [ContributeToDPCPP](./sycl/doc/developer/ContributeToDPCPP.md) for DPC++ specific 
 guidelines.
 
-## Late-outline OpenMP\* and OpenMP\* Offload
-
-See [openmp](/openmp) branch.
-
 # License
 
 See [LICENSE](./sycl/LICENSE.TXT) for details.

clang/include/clang/Basic/Attr.td

@@ -494,6 +494,7 @@ def TargetAnyX86 : TargetArch<["x86", "x86_64"]>;
 def TargetSPIRV : TargetArch<["spirv", "spirv32", "spirv64"]>;
 def TargetWebAssembly : TargetArch<["wasm32", "wasm64"]>;
 def TargetNVPTX : TargetArch<["nvptx", "nvptx64"]>;
+def TargetNativeCPU : TargetArch<["native_cpu"]>;
 def TargetWindows : TargetSpec {
   let OSes = ["Win32"];
 }
@@ -4530,6 +4531,11 @@ def RISCVVLSCC: DeclOrTypeAttr, TargetSpecificAttr<TargetRISCV> {
  let Documentation = [RISCVVLSCCDocs];
 }
 
+def NativeCPULibclcCall : DeclOrTypeAttr, TargetSpecificAttr<TargetNativeCPU> {
+  let Spellings = [Clang<"libclc_call", 0>];
+  let Documentation = [Undocumented];
+}
+
 def Target : InheritableAttr {
   let Spellings = [GCC<"target">];
   let Args = [StringArgument<"featuresStr">];

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -13038,6 +13038,8 @@ def err_free_function_first_occurrence_missing_attr: Error<
   "the first occurrence of SYCL kernel free function should be declared with 'sycl-nd-range-kernel' or 'sycl-single-task-kernel' compile time properties">;
 def err_free_function_class_method : Error<
   "%select{static |}0class method cannot be used to define a SYCL kernel free function kernel">;
+def err_sycl_kernel_virtual_arg : Error<
+  "argument type '%0' virtually inherited from base class `%1` is not supported as a SYCL kernel argument">;
 
 
 // SYCL kernel entry point diagnostics

clang/include/clang/Basic/TargetInfo.h

@@ -1711,6 +1711,11 @@ class TargetInfo : public TransferrableTargetInfo,
     return CC_C;
   }
 
+  /// Gets the calling convention for libclc built-ins for the given target.
+  virtual CallingConv getLibclcCallingConv() const {
+    return getDefaultCallingConv();
+  }
+
   /// Get the default atomic options.
   AtomicOptions getAtomicOpts() const { return AtomicOpts; }
 

clang/include/clang/Driver/Action.h

@@ -76,6 +76,7 @@ class Action {
     OffloadUnbundlingJobClass,
     OffloadWrapperJobClass,
     OffloadPackagerJobClass,
+    OffloadPackagerExtractJobClass,
     OffloadDepsJobClass,
     SPIRVTranslatorJobClass,
     SYCLPostLinkJobClass,
@@ -719,6 +720,17 @@ class OffloadPackagerJobAction : public JobAction {
   }
 };
 
+class OffloadPackagerExtractJobAction : public JobAction {
+  void anchor() override;
+
+public:
+  OffloadPackagerExtractJobAction(ActionList &Inputs, types::ID Type);
+
+  static bool classof(const Action *A) {
+    return A->getKind() == OffloadPackagerExtractJobClass;
+  }
+};
+
 class OffloadDepsJobAction final : public JobAction {
   void anchor() override;
 

clang/include/clang/Driver/Driver.h

@@ -990,6 +990,9 @@ 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 filename is an Offload Binary file.
+bool isOffloadBinaryFile(const StringRef &FileName);
+
 /// \return True if the argument combination will end up generating remarks.
 bool willEmitRemarks(const llvm::opt::ArgList &Args);