From 19ab60011ef43193296e9552081c12b8e5aa0ae0 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 6 Sep 2024 09:24:34 -0700 Subject: [PATCH 1/4] Skip dev-igc run if the PR has ci-no-devigc label --- .github/workflows/sycl-linux-precommit.yml | 5 ++++- .github/workflows/sycl-linux-run-tests.yml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 424ade23f1b08..6941489174dd8 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -100,7 +100,7 @@ jobs: env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' - name: E2E tests with dev igc on Intel Arc A-Series Graphics runner: '["Linux", "arc"]' - image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }} + image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu reset_intel_gpu: true @@ -110,6 +110,8 @@ jobs: use_dev_igc: ${{ contains(needs.detect_changes.outputs.filters, 'devigccfg') }} extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' + # Run only if the PR do not have the 'ci-no-devigc' label. + run_condition: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'false' || 'true' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -123,6 +125,7 @@ jobs: use_dev_igc: ${{ matrix.use_dev_igc }} extra_lit_opts: ${{ matrix.extra_lit_opts }} env: ${{ matrix.env || '{}' }} + run_condition: ${{ matrix.run_condition || 'true' }} ref: ${{ github.sha }} merge_ref: '' diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 1f3cbd5f156b1..49e8c185fc7b5 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -76,6 +76,11 @@ on: default: '{}' required: False + run_condition: + type: string + default: 'true' + required: False + workflow_dispatch: inputs: runner: @@ -146,6 +151,7 @@ permissions: jobs: run: + if: inputs.run_condition == 'true' name: ${{ inputs.name }} runs-on: ${{ fromJSON(inputs.runner) }} container: From 61acb638f9ba598d7c9defadf70716fc3335776c Mon Sep 17 00:00:00 2001 From: Udit Agarwal Date: Fri, 6 Sep 2024 10:41:50 -0700 Subject: [PATCH 2/4] Fix typo Co-authored-by: Nick Sarnie --- .github/workflows/sycl-linux-precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 6941489174dd8..e69f6a2469845 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -110,7 +110,7 @@ jobs: use_dev_igc: ${{ contains(needs.detect_changes.outputs.filters, 'devigccfg') }} extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' - # Run only if the PR do not have the 'ci-no-devigc' label. + # Run only if the PR does not have the 'ci-no-devigc' label. run_condition: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'false' || 'true' }} uses: ./.github/workflows/sycl-linux-run-tests.yml From 01c5a4df09765afb0069410e2feec8fe257effc6 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 6 Sep 2024 11:22:50 -0700 Subject: [PATCH 3/4] Rename run_condition to skip_run --- .github/workflows/sycl-linux-precommit.yml | 4 ++-- .github/workflows/sycl-linux-run-tests.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 6941489174dd8..51be02cca38b0 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -111,7 +111,7 @@ jobs: extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' # Run only if the PR do not have the 'ci-no-devigc' label. - run_condition: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'false' || 'true' }} + skip_run: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'true' || 'false' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -125,7 +125,7 @@ jobs: use_dev_igc: ${{ matrix.use_dev_igc }} extra_lit_opts: ${{ matrix.extra_lit_opts }} env: ${{ matrix.env || '{}' }} - run_condition: ${{ matrix.run_condition || 'true' }} + skip_run: ${{ matrix.skip_run || 'false' }} ref: ${{ github.sha }} merge_ref: '' diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 49e8c185fc7b5..077f7f8aac726 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -76,9 +76,9 @@ on: default: '{}' required: False - run_condition: + skip_run: type: string - default: 'true' + default: 'false' required: False workflow_dispatch: @@ -151,7 +151,7 @@ permissions: jobs: run: - if: inputs.run_condition == 'true' + if: inputs.skip_run == 'false' name: ${{ inputs.name }} runs-on: ${{ fromJSON(inputs.runner) }} container: From b525ebf10065e3a6fbd6735745d78fb3dbfc12c0 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 6 Sep 2024 12:18:35 -0700 Subject: [PATCH 4/4] Simply check for ci-no-devigc --- .github/workflows/sycl-linux-precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index cb3e869593ca8..b4a38a2cef24e 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -111,7 +111,7 @@ jobs: extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }' # Run only if the PR does not have the 'ci-no-devigc' label. - skip_run: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'true' || 'false' }} + skip_run: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: