Merge remote-tracking branch 'intel/sycl' into update_group_interface

Author: dyniols

.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-check-ready-to-merge-prs.yml

@@ -0,0 +1,54 @@
+# This workflow checks for ready-to-merge PRs - if a PR is open, not a draft,
+# passed all checks, and has been approved, it will ping @intel/llvm-gatekeepers
+# if this group has not already been mentioned or if the last mention was more
+# than $days days ago.
+
+name: Check ready-to-merge PRs
+
+on:
+  schedule:
+    - cron: '0 * * * *' # every hour
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  notify-ready-prs:
+    permissions:
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Number of days before repeating the gatekeepers ping
+          days=3
+          days_in_seconds=$((days*24*60*60))
+
+          # Function to ping gatekeepers and print debug info
+          ping_gatekeepers() {
+            pr_number=$1
+            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" --repo intel/llvm --json number --jq '.[].number')
+          now=$(date -u +%s)
+          for pr in $prs; do
+            # Get the timestamp of the latest comment mentioning @intel/llvm-gatekeepers
+            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
+              ping_gatekeepers "$pr"
+            # If the latest mention is older than $days, ping the gatekeepers again
+            else
+              comment_time=$(date -u -d "$latest_ts" +%s)
+              age=$((now - comment_time))
+              if (( age >= days_in_seconds )); then
+                ping_gatekeepers "$pr"
+              fi
+            fi
+          done

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

@@ -296,6 +296,9 @@ jobs:
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
         cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
+        # This is required to perform the DeviceConfigFile consistency test, see
+        # sycl/test-e2e/Basic/device_config_file_consistency.cpp.
+        cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
     - name: Additional Install for "--shared-libs" build
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
       run: |

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

@@ -81,9 +81,10 @@ jobs:
 
   compat_read_exclude:
     name: Read compatibility testing exclude list
-    runs-on: [Linux, build]
+    runs-on: [Linux, aux-tasks]
     outputs:
-      FILTER: ${{ steps.result.outputs.FILTER }}
+      FILTER_6_2: ${{ steps.result.outputs.FILTER_6_2 }}
+      FILTER_6_3: ${{ steps.result.outputs.FILTER_6_3 }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -96,7 +97,8 @@ jobs:
       run: |
         # Transform to format expected by `llvm-lit --filter-out "pattern1|pattern2|..."`.
         # First, remove comments/empty lines, then join lines with "|" as separator.
-        echo FILTER="$(grep -v '^#\|^\W*$' devops/compat_ci_exclude.sycl-rel-6_2 | paste -sd '|')" >> $GITHUB_OUTPUT
+        echo FILTER_6_2="$(grep -v '^#\|^\W*$' devops/compat_ci_exclude.sycl-rel-6_2 | paste -sd '|')" >> $GITHUB_OUTPUT
+        echo FILTER_6_3="$(grep -v '^#\|^\W*$' devops/compat_ci_exclude.sycl-rel-6_3 | paste -sd '|')" >> $GITHUB_OUTPUT
 
   run_prebuilt_e2e_tests:
     needs: [build, detect_changes, compat_read_exclude]
@@ -147,7 +149,13 @@ jobs:
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2
             target_devices: level_zero:gpu
-            extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER }}"'
+            extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_2 }}"'
+            e2e_binaries_artifact: 'in-container'
+          - name: ABI compatibility against sycl-rel-6_3
+            runner: '["Linux", "pvc"]'
+            image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3
+            target_devices: level_zero:gpu
+            extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_3 }}"'
             e2e_binaries_artifact: 'in-container'
 
     uses: ./.github/workflows/sycl-linux-run-tests.yml

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

@@ -159,6 +159,7 @@ on:
         options:
           - 'ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest'
           - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2'
+          - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3'
           - 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'
       image_options:
         description: |
@@ -357,6 +358,7 @@ jobs:
         save_name: ${{ inputs.benchmark_save_name }}
         preset: ${{ inputs.benchmark_preset }}
         dry_run: ${{ inputs.benchmark_dry_run }}
+        build_ref: ${{ inputs.repo_ref }}
       env:
         RUNNER_TAG: ${{ inputs.runner }}
         GITHUB_TOKEN: ${{ secrets.LLVM_SYCL_BENCHMARK_TOKEN }}

.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.

buildbot/configure.py

@@ -66,7 +66,6 @@ def do_configure(args, passthrough_args):
     xpti_enable_werror = "OFF"
     llvm_enable_zstd = "OFF"
     spirv_enable_dis = "OFF"
-    sycl_install_device_config_file = "OFF"
 
     if sys.platform != "darwin":
         # For more info on the enablement of level_zero_v2 refer to this document:
@@ -83,6 +82,11 @@ def do_configure(args, passthrough_args):
     if libclc_enabled:
         llvm_enable_projects += ";libclc"
 
+    # DeviceRTL uses -fuse-ld=lld, so enable lld.
+    if args.offload:
+        llvm_enable_projects += ";lld"
+        sycl_enabled_backends.append("offload")
+
     if args.cuda:
         llvm_targets_to_build += ";NVPTX"
         libclc_targets_to_build = libclc_nvidia_target_names
@@ -162,7 +166,6 @@ def do_configure(args, passthrough_args):
                 libclc_targets_to_build += libclc_nvidia_target_names
             libclc_gen_remangled_variants = "ON"
             spirv_enable_dis = "ON"
-            sycl_install_device_config_file = "ON"
 
     if args.enable_backends:
         sycl_enabled_backends += args.enable_backends
@@ -211,8 +214,13 @@ def do_configure(args, passthrough_args):
         "-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
         "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
-        "-DSYCL_INSTALL_DEVICE_CONFIG_FILE={}".format(sycl_install_device_config_file),
     ]
+    if args.offload:
+        cmake_cmd.extend(
+            [
+                "-DUR_BUILD_ADAPTER_OFFLOAD=ON",
+            ]
+        )
 
     if libclc_enabled:
         cmake_cmd.extend(
@@ -343,6 +351,11 @@ def main():
         default="AMD",
         help="choose hardware platform for HIP backend",
     )
+    parser.add_argument(
+        "--offload",
+        action="store_true",
+        help="Enable UR liboffload adapter (experimental)",
+    )
     parser.add_argument(
         "--level_zero_adapter_version",
         type=str,

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">];