Merge branch 'sycl' of https://github.com/intel/llvm into reorg-folder

Author: Chen, Brox

.git-blame-ignore-revs

@@ -55,3 +55,6 @@ dd3c26a045c081620375a878159f536758baba6e
 f98ee40f4b5d7474fc67e82824bf6abbaedb7b1c
 2238dcc39358353cac21df75c3c3286ab20b8f53
 f9008e6366c2496b1ca1785b891d5578174ad63e
+
+# [libc++][NFC] Apply clang-format on large parts of the code base
+5aa03b648b827128d439f705cd7d57d59673741d

.github/workflows/linux_matrix_e2e_on_nightly.yml

@@ -28,17 +28,17 @@ jobs:
             reset_gpu: false
 
           - name: Intel
-            runner: '["Linux", "gen9"]'
+            runner: '["Linux", "gen12"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
-            extra_image_opts: -u 1001
+            extra_image_opts:
             extra_cmake_args:
             target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu
             reset_gpu: true
 
           - name: ESIMD Emu
             runner: '["Linux", "x86-cpu"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
-            extra_image_opts: -u 1001
+            extra_image_opts:
             extra_cmake_args:
             target_devices: ext_intel_esimd_emulator:gpu
             reset_gpu: false
@@ -47,7 +47,7 @@ jobs:
       name: ${{ matrix.name }}
       runner: ${{ matrix. runner }}
       image: ${{ matrix.image }}
-      image_options: --device=/dev/dri --privileged --cap-add SYS_ADMIN ${{ matrix.extra_image_opts }}
+      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN ${{ matrix.extra_image_opts }}
       extra_cmake_args: ${{ matrix.extra_cmake_args }}
       target_devices: ${{ matrix.target_devices }}
       ref: ${{ inputs.ref }}

.github/workflows/linux_single_e2e.yml

@@ -5,40 +5,59 @@ on:
     inputs:
       name:
         type: string
+        required: True
+
       runner:
         type: string
+        required: True
       image:
         type: string
+        required: True
       image_options:
         type: string
-      extra_cmake_args:
-        type: string
+        required: False
+
       target_devices:
         type: string
-      ref:
+        required: True
+      extra_cmake_args:
+        description: |
+          If empty, then HIP_PLATFORM and AMD_ARCH would be automatically added
+          if inputs.target_devices contains 'ext_oneapi_hip'
         type: string
-      reset_gpu:
+        required: False
+
+      ref:
         type: string
+        required: True
       merge_ref:
         description: |
           Commit-ish to merge post-checkout if non-empty. Must be reachable from
           the default_branch input paramter.
         type: string
         default: 'FETCH_HEAD'
+        required: False
 
       sycl_toolchain_artifact:
         type: string
         default: ''
+        required: False
       sycl_toolchain_archive:
         type: string
         default: ''
+        required: False
       sycl_toolchain_decompress_command:
         type: string
         default: ''
+        required: False
 
+      reset_gpu:
+        type: string
+        required: False
       env:
         type: string
         default: '{}'
+        required: False
 
 jobs:
   lin_e2e_only:
@@ -66,11 +85,7 @@ jobs:
         path: llvm
         ref: ${{ inputs.ref }}
         merge_ref: ${{ inputs.merge_ref }}
-        # We run build and HIP E2E tests under different users on the same
-        # runners, so need to use distinct cache paths.
-        cache_path: "/__w/repo_cache_e2e/"
-    - name: Hack to fix testing
-      run: rm -rf /__w/repo_cache_e2e/ || true
+        cache_path: "/__w/repo_cache/"
     - name: Install drivers
       if: env.compute_runtime_tag != ''
       run: |
@@ -111,11 +126,25 @@ jobs:
     - run: which clang++ sycl-ls
     - run: sycl-ls --verbose
     - run: SYCL_PI_TRACE=-1 sycl-ls
+    - name: Deduce CMake options
+      id: cmake_opts
+      shell: bash
+      run: |
+        if [ -n "${{ inputs.extra_cmake_args }}" ]; then
+          echo 'opts=${{ inputs.extra_cmake_args }}' >> $GITHUB_OUTPUT
+        else
+          if [ "${{ contains(inputs.target_devices, 'ext_oneapi_hip')  }}" == "true" ]; then
+            echo 'opts=-DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"' >> $GITHUB_OUTPUT
+          else
+            echo 'opts=' >> $GITHUB_OUTPUT
+          fi
+        fi
+    - run: echo ${{ steps.cmake_opts.outputs.opts }}
     - name: Configure
       run: |
-        cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.target_devices }}" -DCMAKE_CXX_COMPILER="$(which clang++)" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ inputs.extra_cmake_args }}
+        cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.target_devices }}" -DCMAKE_CXX_COMPILER="$(which clang++)" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ steps.cmake_opts.outputs.opts }}
     - name: SYCL End-to-end tests
       env:
-        LIT_OPTS: -v --no-progress-bar --show-unsupported --max-time 3600 --time-tests
+        LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests
       run: |
         ninja -C build-e2e check-sycl-e2e

.github/workflows/sycl_detect_changes.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: [Linux, build]
     timeout-minutes: 3
     outputs:
-      filters: ${{ steps.changes.outputs.changes }}
+      filters: ${{ steps.result.outputs.result }}
     steps:
       - name: Check file changes
         uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
@@ -59,3 +59,18 @@ jobs:
               - *drivers_and_configs
               # Temporary, until plugins are enabled in nightly image.
               - sycl/**
+
+      - name: Set output
+        id: result
+        uses: actions/github-script@v6
+        with:
+          script: |
+            console.log("Number of files changed:");
+            console.log(context.payload.pull_request.changed_files);
+            if (context.payload.pull_request.changed_files < 500) {
+              return '${{ steps.changes.outputs.changes }}';
+            }
+            // Treat everything as changed for huge PRs.
+            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "drivers_and_configs", "test_build"];
+
+      - run: echo '${{ steps.result.outputs.result }}'

.github/workflows/sycl_linux_build_and_test.yml

@@ -234,7 +234,7 @@ jobs:
       target_devices: ${{ matrix.targets }}
       ref: ${{ inputs.build_ref || github.sha }}
       merge_ref: ${{ inputs.merge_ref }}
-      reset_gpu: ${{ contains(matrix.runs-on, 'gen9') && contains(matrix.runs-on, 'Linux') }}
+      reset_gpu: ${{ contains(matrix.runs-on, 'gen12') && contains(matrix.runs-on, 'Linux') }}
 
       sycl_toolchain_artifact: sycl_linux_${{ inputs.build_artifact_suffix }}
       sycl_toolchain_archive: ${{ inputs.artifact_archive_name }}
@@ -257,7 +257,7 @@ jobs:
       options: ${{ matrix.container_options }}
     steps:
     - name: Reset GPU
-      if: ${{ contains(matrix.config, 'gen9') }}
+      if: ${{ contains(matrix.config, 'gen12') }}
       run: |
         sudo mount -t debugfs none /sys/kernel/debug
         sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'

.github/workflows/sycl_linux_gen12_exp.yml

@@ -0,0 +1,23 @@
+name: Experiment with Linux GEN12 runners
+run-name: Linux GEN12 ${{ inputs.env }} on ${{ inputs.devices }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      env:
+        default: '{"LIT_FILTER":""}'
+      devices:
+        default: 'ext_oneapi_level_zero:gpu'
+
+jobs:
+  e2e:
+    uses: ./.github/workflows/linux_single_e2e.yml
+    with:
+      name: "Linux GEN12 E2E"
+      runner: '["Linux", "gen12"]'
+      image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
+      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+      target_devices: ${{ inputs.devices }}
+      ref: ${{ github.sha }}
+
+      env: ${{ inputs.env }}

.github/workflows/sycl_nightly.yml

@@ -12,8 +12,8 @@ jobs:
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       # Restore once plugins are enabled in the build.
-      # lts_config: "hip_amdgpu;ocl_gen9;ocl_x64;l0_gen9;esimd_emu;cuda_aws;win_l0_gen12"
-      lts_config: "ocl_gen9;ocl_x64;l0_gen9;win_l0_gen12"
+      # lts_config: "hip_amdgpu;ocl_gen12;ocl_x64;l0_gen12;esimd_emu;cuda_aws;win_l0_gen12"
+      lts_config: "ocl_gen12;ocl_x64;l0_gen12;win_l0_gen12"
 
   ubuntu2204_build_test:
     if: github.repository == 'intel/llvm'
@@ -52,7 +52,7 @@ jobs:
 
   ubuntu2204_docker_build_push:
     if: github.repository == 'intel/llvm'
-    runs-on: ubuntu-22.04
+    runs-on: [Linux, build]
     needs: ubuntu2204_build_test
     steps:
     - uses: actions/checkout@v3

.github/workflows/sycl_post_commit.yml

@@ -5,6 +5,7 @@ on:
     branches:
     - sycl
     - sycl-devops-pr/**
+    - llvmspirv_pulldown
 
 jobs:
   # This job generates matrix of tests for SYCL End-to-End tests
@@ -13,7 +14,7 @@ jobs:
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
-      lts_config: "l0_gen9;win_l0_gen12"
+      lts_config: "l0_gen12;win_l0_gen12"
   linux_self_prod:
     name: Linux (Self build + shared libraries + no-assertions)
     if: github.repository == 'intel/llvm'

.github/workflows/sycl_precommit.yml renamed to .github/workflows/sycl_precommit_linux.yml

@@ -1,10 +1,11 @@
-name: SYCL Pre Commit
+name: SYCL Pre Commit on Linux
 
 on:
   pull_request_target:
     branches:
     - sycl
     - sycl-devops-pr/**
+    - llvmspirv_pulldown
     # Do not run builds if changes are only in the following locations
     paths-ignore:
     - '.github/ISSUE_TEMPLATE/**'
@@ -28,6 +29,7 @@ jobs:
   lint:
     needs: [detect_changes]
     if: |
+      github.event.pull_request.head.repo.full_name == 'intel/llvm' ||
       !contains(needs.detect_changes.outputs.filters, 'ci')
     runs-on: [Linux, build]
     container:
@@ -61,12 +63,13 @@ jobs:
   test_matrix:
     needs: [detect_changes]
     if: |
+      github.event.pull_request.head.repo.full_name == 'intel/llvm' ||
       !contains(needs.detect_changes.outputs.filters, 'ci')
     name: Generate Test Matrix
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       ref: ${{ github.event.pull_request.head.sha }}
-      lts_config: "hip_amdgpu;lin_intel;esimd_emu;cuda_aws;win_l0_gen12"
+      lts_config: "hip_amdgpu;lin_intel;esimd_emu;cuda_aws"
 
   linux_default:
     name: Linux
@@ -76,41 +79,17 @@ jobs:
     if: |
       always()
       && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
-      && contains(needs.detect_changes.outputs.filters, 'test_build')
-      && !contains(needs.detect_changes.outputs.filters, 'ci')
+      && (github.event.pull_request.head.repo.full_name == 'intel/llvm'
+          || !contains(needs.detect_changes.outputs.filters, 'ci'))
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
     secrets: inherit
     with:
       build_ref: ${{ github.event.pull_request.head.sha }}
+      merge_ref: ${{ github.event.pull_request.base.sha }}
       build_cache_root: "/__w/"
       build_cache_size: "8G"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
       check_filters: ${{ needs.detect_changes.outputs.filters }}
-
-  linux_e2e_on_nightly:
-    name: Linux SYCL E2E on Nightly
-    needs: [detect_changes]
-    if: |
-      !contains(needs.detect_changes.outputs.filters, 'test_build')
-      && !contains(needs.detect_changes.outputs.filters, 'ci')
-    uses: ./.github/workflows/linux_matrix_e2e_on_nightly.yml
-    secrets: inherit
-    with:
-      ref: ${{ github.event.pull_request.head.sha }}
-
-  windows_default:
-    name: Windows
-    needs: [lint, test_matrix, detect_changes]
-    if: |
-      always()
-      && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
-      && github.repository == 'intel/llvm'
-      && !contains(needs.detect_changes.outputs.filters, 'ci')
-    uses: ./.github/workflows/sycl_windows_build_and_test.yml
-    with:
-      lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
-      build_ref: ${{ github.event.pull_request.head.sha }}
-      check_filters: ${{ needs.detect_changes.outputs.filters }}