[CI] Remove workarounds

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

@@ -40,11 +40,6 @@ on:
         required: True
         description: |
           Commit SHA or branch to checkout the intel/llvm repo.
-      devops_ref:
-        type: string
-        required: False
-        description: |
-          Commit SHA or branch to checkout the devops directory.
       tests_ref:
         type: string
         required: False
@@ -217,9 +212,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        ref: ${{ inputs.devops_ref || inputs.repo_ref }}
         sparse-checkout: |
           devops
+          sycl/cts_exclude_filter
     - name: Register cleanup after job is finished
       uses: ./devops/actions/cleanup
     - name: Reset Intel GPU
@@ -326,7 +321,6 @@ jobs:
       timeout-minutes: 35
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
-        cts_exclude_ref: ${{ inputs.repo_ref }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         cts_testing_mode: ${{ inputs.cts_testing_mode }}
         sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

.github/workflows/sycl-rel-nightly.yml

@@ -1,241 +1,13 @@
+# The actual version of this workflow can be found on the latest sycl-rel-*
+# branch. This file is still needed to launch the workflow on another branches.
+
 name: SYCL Release Branch Nightly
 
 on:
   workflow_dispatch:
-    inputs:
-      testing_branch:
-        description: |
-          Branch to test, e.g. sycl-rel-6_0_0.
-          If nothing is specified, the last release branch is used.
-
-  schedule:
-    - cron: '0 3 * * *'
-
-permissions: read-all
 
 jobs:
-  # To avoid unnecessary scheduled runs this job checks if there are new commits
-  # since the last run. More precisely, it checks if the last commit is older
-  # than 24h. That means the previous Nightly already tested this commit.
-  check_for_new_commits:
-    if: github.repository == 'intel/llvm'
+  dummy:
     runs-on: ubuntu-latest
-    name: Check for new commits
-    outputs:
-      is_new_commit: ${{ steps.is_new_commit.outputs.is_new_commit }}
     steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-    - run: git show --quiet | tee -a $GITHUB_STEP_SUMMARY
-
-    - id: is_new_commit
-      if: ${{ github.event_name == 'schedule' }}
-      run: |
-        if [ -z "$(git rev-list --after="24 hours" HEAD)" ]; then
-          echo "is_new_commit=false" >> $GITHUB_OUTPUT
-        fi
-
-  ubuntu2204_build:
-    needs: [check_for_new_commits]
-    if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
-    uses: ./.github/workflows/sycl-linux-build.yml
-    secrets: inherit
-    with:
-      build_cache_root: "/__w/"
-      build_artifact_suffix: default
-      build_configure_extra_args: '--disable-jit --no-assertions --add_security_flags=sanitize --hip --cuda'
-      build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
-      build_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      pack_release: 'true'
-
-      # We upload the build for people to download/use, override its name and
-      # prefer widespread gzip compression.
-      artifact_archive_name: sycl_linux.tar.gz
-
-  ubuntu2204_test:
-    needs: [ubuntu2204_build]
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: AMD/HIP
-            runner: '["Linux", "amdgpu"]'
-            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
-            target_devices: hip:gpu
-
-          - name: Intel L0 Gen12 GPU
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-            target_devices: level_zero:gpu
-            extra_lit_opts: --param gpu-intel-gen12=True
-
-          - name: Intel L0 Battlemage GPU
-            runner: '["Linux", "bmg"]'
-            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-            target_devices: level_zero:gpu
-
-          - name: Intel OCL Gen12 GPU
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-            target_devices: opencl:gpu
-            extra_lit_opts: --param gpu-intel-gen12=True
-
-          - name: Intel OCL CPU
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --privileged --cap-add SYS_ADMIN
-            target_devices: opencl:cpu
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: ${{ matrix.name }}
-      runner: ${{ matrix.runner }}
-      image_options: ${{ matrix.image_options }}
-      target_devices: ${{ matrix.target_devices }}
-      tests_selector: e2e
-      extra_lit_opts: ${{ matrix.extra_lit_opts }}
-      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      devops_ref: sycl
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-
-  build-win:
-    needs: [check_for_new_commits]
-    if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
-    uses: ./.github/workflows/sycl-windows-build.yml
-    with:
-      ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      build_configure_extra_args: '--disable-jit --no-assertions --add_security_flags=sanitize'
-      pack_release: 'true'
-
-      # We upload both Linux/Windows build via Github's "Releases"
-      # functionality, make sure Linux/Windows names follow the same pattern.
-      artifact_archive_name: sycl_windows.tar.gz
-
-  e2e-win:
-    needs: build-win
-    # Continue if build was successful.
-    if: |
-      always()
-      && !cancelled()
-      && needs.build-win.outputs.build_conclusion == 'success'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Intel GEN12 Graphics with Level Zero
-            runner: '["Windows","gen12"]'
-            # 6_1_0 doesn't support the auto-detection, keep it until 6_2_0.
-            extra_lit_opts: --param gpu-intel-gen12=True
-          - name: Intel Battlemage Graphics with Level Zero
-            runner: '["Windows","bmg"]'
-    uses: ./.github/workflows/sycl-windows-run-tests.yml
-    with:
-      name: ${{ matrix.name }}
-      runner: ${{ matrix.runner }}
-      target_devices: level_zero:gpu
-      sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
-      extra_lit_opts: ${{ matrix.extra_lit_opts }}
-      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      devops_ref: sycl
-
-  cuda-aws-start:
-    needs: [ubuntu2204_build]
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    uses: ./.github/workflows/sycl-aws.yml
-    secrets: inherit
-    with:
-      mode: start
-      ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-
-  cuda-run-tests:
-    needs: [ubuntu2204_build, cuda-aws-start]
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: CUDA E2E
-      runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
-      image: ghcr.io/intel/llvm/ubuntu2204_build:latest
-      image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
-      target_devices: cuda:gpu
-      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      devops_ref: sycl
-
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-
-  cuda-aws-stop:
-    needs: [cuda-aws-start, cuda-run-tests]
-    if: always() && ${{ needs.cuda-aws-start.result != 'skipped' }}
-    uses: ./.github/workflows/sycl-aws.yml
-    secrets: inherit
-    with:
-      mode: stop
-      ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-
-  build-sycl-cts:
-    needs: ubuntu2204_build
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: Build SYCL-CTS
-      runner: '["Linux", "build"]'
-      cts_testing_mode: 'build-only'
-      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-      tests_selector: cts
-      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      devops_ref: sycl
-      tests_ref: 87f8677c4b67cfe56ad6f09246036f10c306c977
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
-
-  run-sycl-cts:
-    needs: [ubuntu2204_build, build-sycl-cts]
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: SYCL-CTS on OCL CPU
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: opencl:cpu
-
-          - name: SYCL-CTS on L0 gen12
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: level_zero:gpu
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: ${{ matrix.name }}
-      runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
-      image_options: ${{ matrix.image_options }}
-      target_devices: ${{ matrix.target_devices }}
-      tests_selector: cts
-      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2'  }}
-      devops_ref: sycl
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
-
-  hardening-check:
-    needs: [ubuntu2204_build, build-win]
-    if: |
-      always()
-      && !cancelled()
-      && needs.ubuntu2204_build.outputs.build_conclusion == 'success'
-      && needs.build-win.outputs.build_conclusion == 'success'
-    uses: ./.github/workflows/sycl-hardening-check.yml
-    with:
-      sycl_linux_artifact: sycl_linux_release
-      sycl_linux_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_linux_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-
-      sycl_windows_artifact: sycl_windows_release
-      sycl_windows_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
+      - run: echo "Doing nothing"

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

@@ -133,7 +133,6 @@ jobs:
       benchmark_save_name: ${{ matrix.save_name }}
       benchmark_preset: ${{ inputs.preset }}
       repo_ref: ${{ matrix.ref }}
-      devops_ref: ${{ github.ref }}
       sycl_toolchain_artifact: sycl_linux_prod_noassert
       sycl_toolchain_archive: ${{ needs.build_sycl.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.build_sycl.outputs.artifact_decompress_command }}

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

@@ -34,11 +34,6 @@ on:
         required: False
         description: |
           Commit SHA or branch to checkout the intel/llvm repo.
-      devops_ref:
-        type: string
-        required: False
-        description: |
-          Commit SHA or branch to checkout the devops directory.
       tests_ref:
         type: string
         required: False
@@ -111,7 +106,7 @@ jobs:
       with:
         sparse-checkout: |
           devops/actions
-        ref: ${{ inputs.devops_ref|| inputs.repo_ref || github.sha }}
+          sycl/cts_exclude_filter
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
@@ -171,7 +166,6 @@ jobs:
       uses: ./devops/actions/run-tests/windows/cts
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
-        cts_exclude_ref: ${{ inputs.repo_ref }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         cts_testing_mode: ${{ inputs.cts_testing_mode }}
         sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

devops/actions/run-tests/cts/action.yml

@@ -4,9 +4,6 @@ inputs:
   ref:
     description: "Commit SHA or branch to checkout tests"
     required: true
-  cts_exclude_ref:
-    description: "Commit SHA or branch to checkout the cts_exclude_filter dir"
-    required: true
   extra_cmake_args:
     required: false
   cts_testing_mode:
@@ -21,18 +18,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-  - name: Checkout cts_exclude_filter folder
-    uses: actions/checkout@v4
-    with:
-      ref: ${{ inputs.cts_exclude_ref }}
-      path: cts_exclude
-      sparse-checkout: |
-        sycl/cts_exclude_filter
-  - name: Move sycl to root
-    shell: bash
-    run: |
-      mv cts_exclude/sycl .
-      rm -rf cts_exclude
   - name: Checkout SYCL CTS tests
     if: inputs.cts_testing_mode != 'run-only'
     uses: ./devops/actions/cached_checkout

devops/actions/run-tests/windows/cts/action.yml

@@ -4,9 +4,6 @@ inputs:
   ref:
     description: "Commit SHA or branch to checkout tests"
     required: true
-  cts_exclude_ref:
-    description: "Commit SHA or branch to checkout the cts_exclude_filter dir"
-    required: true
   extra_cmake_args:
     required: false
   cts_testing_mode:
@@ -21,18 +18,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-  - name: Checkout cts_exclude_filter folder
-    uses: actions/checkout@v4
-    with:
-      ref: ${{ inputs.cts_exclude_ref }}
-      path: cts_exclude
-      sparse-checkout: |
-        sycl/cts_exclude_filter
-  - name: Move sycl to root
-    shell: bash
-    run: |
-      mv cts_exclude/sycl .
-      rm -rf cts_exclude
   - name: Checkout SYCL CTS tests
     if: inputs.cts_testing_mode != 'run-only'
     uses: ./devops/actions/cached_checkout