From 58bcf95d0ab4f49a16ce66090fa88897dd141606 Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" Date: Wed, 7 Aug 2024 08:11:08 -0700 Subject: [PATCH] [CI][NFC] Rename reset_gpu variable Signed-off-by: Sarnie, Nick --- .../workflows/sycl-linux-matrix-e2e-on-nightly.yml | 6 +++--- .github/workflows/sycl-linux-precommit.yml | 14 +++++++------- .github/workflows/sycl-linux-run-tests.yml | 6 +++--- .github/workflows/sycl-nightly.yml | 6 +++--- .github/workflows/sycl-post-commit.yml | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml b/.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml index 3213ffe6dbedb..e021db2e950df 100644 --- a/.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml +++ b/.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml @@ -30,14 +30,14 @@ jobs: image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu - reset_gpu: true + reset_intel_gpu: true - name: Intel OCL GPU 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: opencl:gpu - reset_gpu: true + reset_intel_gpu: true - name: OCL CPU runner: '["Linux", "x86-cpu"]' @@ -57,7 +57,7 @@ jobs: image: ${{ matrix.image }} image_options: ${{ matrix.image_options }} target_devices: ${{ matrix.target_devices }} - reset_gpu: ${{ matrix.reset_gpu }} + reset_intel_gpu: ${{ matrix.reset_intel_gpu }} env: ${{ inputs.env }} ref: ${{ github.sha }} merge_ref: '' diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index c8e7dd7d992db..424ade23f1b08 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -86,7 +86,7 @@ jobs: image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu;opencl:cpu - reset_gpu: true + reset_intel_gpu: true install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }} extra_lit_opts: --param gpu-intel-gen12=True - name: E2E tests on Intel Arc A-Series Graphics @@ -94,7 +94,7 @@ jobs: image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu - reset_gpu: true + reset_intel_gpu: true install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }} extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' @@ -103,7 +103,7 @@ jobs: image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }} image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu - reset_gpu: true + reset_intel_gpu: true install_drivers: >- ${{ contains(needs.detect_changes.outputs.filters, 'drivers') || contains(needs.detect_changes.outputs.filters, 'devigccfg') }} @@ -118,7 +118,7 @@ jobs: image: ${{ matrix.image }} image_options: ${{ matrix.image_options }} target_devices: ${{ matrix.target_devices }} - reset_gpu: ${{ matrix.reset_gpu }} + reset_intel_gpu: ${{ matrix.reset_intel_gpu }} install_drivers: ${{ matrix.install_drivers }} use_dev_igc: ${{ matrix.use_dev_igc }} extra_lit_opts: ${{ matrix.extra_lit_opts }} @@ -147,12 +147,12 @@ jobs: runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_extra_opts: --device=/dev/dri - reset_gpu: true + reset_intel_gpu: true - name: Intel Arc A-Series Graphics system runner: '["Linux", "arc"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_extra_opts: --device=/dev/dri - reset_gpu: true + reset_intel_gpu: true - name: AMD system runner: '["Linux", "amdgpu"]' image: ghcr.io/intel/llvm/ubuntu2204_build:latest @@ -169,7 +169,7 @@ jobs: image: ${{ matrix.image }} image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }} target_devices: all - reset_gpu: ${{ matrix.reset_gpu }} + reset_intel_gpu: ${{ matrix.reset_intel_gpu }} env: '{"LIT_FILTER":"PerformanceTests/"}' extra_lit_opts: -a -j 1 --param enable-perf-tests=True diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 91c09c8655103..1f3cbd5f156b1 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -62,7 +62,7 @@ on: default: '' required: False - reset_gpu: + reset_intel_gpu: type: string required: False install_drivers: @@ -153,8 +153,8 @@ jobs: options: ${{ inputs.image_options }} env: ${{ fromJSON(inputs.env) }} steps: - - name: Reset GPU - if: inputs.reset_gpu == 'true' + - name: Reset Intel GPU + if: inputs.reset_intel_gpu == 'true' run: | sudo mount -t debugfs none /sys/kernel/debug sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged' diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 59c8f4cb3d602..1b921e21adc64 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -42,7 +42,7 @@ jobs: image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu - reset_gpu: true + reset_intel_gpu: true tests_selector: e2e extra_lit_opts: --param gpu-intel-gen12=True @@ -51,7 +51,7 @@ jobs: image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: opencl:gpu - reset_gpu: true + reset_intel_gpu: true tests_selector: e2e extra_lit_opts: --param gpu-intel-gen12=True @@ -98,7 +98,7 @@ jobs: target_devices: ${{ matrix.target_devices }} tests_selector: ${{ matrix.tests_selector }} extra_lit_opts: ${{ matrix.extra_lit_opts }} - reset_gpu: ${{ matrix.reset_gpu }} + reset_intel_gpu: ${{ matrix.reset_intel_gpu }} ref: ${{ github.sha }} merge_ref: '' sycl_toolchain_artifact: sycl_linux_default diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index 324e630a4378a..d1989b33c2484 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -68,17 +68,17 @@ jobs: runner: '["Linux", "gen12"]' extra_lit_opts: --param gpu-intel-gen12=True target_devices: level_zero:gpu;opencl:fpga - reset_gpu: true + reset_intel_gpu: true - name: Intel Arc A-Series Graphics with Level Zero runner: '["Linux", "arc"]' extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True - reset_gpu: true + reset_intel_gpu: true - name: AMD/HIP runner: '["Linux", "amdgpu"]' image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab image_options: -u 1001 --device=/dev/dri --device=/dev/kfd target_devices: ext_oneapi_hip:gpu - reset_gpu: false + reset_intel_gpu: false # Use static build because of shared lld packaging issue sycl_toolchain_artifact: sycl_linux_sprod_static sycl_toolchain_archive: ${{ needs.build-lin-static.outputs.artifact_archive_name }} @@ -94,13 +94,13 @@ jobs: env: '{"LIT_FILTER":"PerformanceTests/"}' extra_lit_opts: -a -j 1 --param enable-perf-tests=True --param gpu-intel-gen12=True target_devices: all - reset_gpu: true + reset_intel_gpu: true - name: Perf tests on Intel Arc A-Series Graphics system runner: '["Linux", "arc"]' env: '{"LIT_FILTER":"PerformanceTests/"}' extra_lit_opts: -a -j 1 --param enable-perf-tests=True target_devices: all - reset_gpu: true + reset_intel_gpu: true uses: ./.github/workflows/sycl-linux-run-tests.yml with: name: ${{ matrix.name }} @@ -108,7 +108,7 @@ jobs: image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }} image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }} target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }} - reset_gpu: ${{ matrix.reset_gpu }} + reset_intel_gpu: ${{ matrix.reset_intel_gpu }} extra_lit_opts: ${{ matrix.extra_lit_opts }} env: ${{ matrix.env || '{}' }}