Skip to content

Commit 32e2213

Browse files
authored
[CI] Move arc test determination to precommit yaml (#12825)
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent e83a1f1 commit 32e2213

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

.github/workflows/sycl-detect-changes.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
filters:
77
description: Matched filters
88
value: ${{ jobs.need_check.outputs.filters }}
9-
arc_tests:
10-
description: Tests to run on Arc
11-
value: ${{ jobs.need_check.outputs.arc_tests }}
129

1310
jobs:
1411
need_check:
@@ -19,7 +16,6 @@ jobs:
1916
timeout-minutes: 3
2017
outputs:
2118
filters: ${{ steps.result.outputs.result }}
22-
arc_tests: ${{ steps.arc_tests.outputs.arc_tests }}
2319
steps:
2420
- name: Check file changes
2521
uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
@@ -89,12 +85,4 @@ jobs:
8985
return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "esimd"];
9086
9187
- run: echo '${{ steps.result.outputs.result }}'
92-
93-
- name: Set Arc tests
94-
id: arc_tests
95-
run: |
96-
if [ "${{ contains(steps.result.outputs.result, 'esimd') }}" == "true" ]; then
97-
echo 'arc_tests="(ESIMD|InvokeSimd|Matrix)/"' >> "$GITHUB_OUTPUT"
98-
else
99-
echo 'arc_tests="Matrix/"' >> "$GITHUB_OUTPUT"
100-
fi
88+

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,28 @@ jobs:
4747
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:7ed894ab0acc8ff09262113fdb08940d22654a30"
4848
changes: ${{ needs.detect_changes.outputs.filters }}
4949

50-
test:
50+
determine_arc_tests:
51+
name: Decide which Arc tests to run
5152
needs: [build, detect_changes]
5253
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
54+
# Github's ubuntu-* runners are slow to allocate. Use our CUDA runner since
55+
# we don't use it for anything right now.
56+
runs-on: [Linux, build]
57+
timeout-minutes: 3
58+
outputs:
59+
arc_tests: ${{ steps.arc_tests.outputs.arc_tests }}
60+
steps:
61+
- name: Determine Arc tests
62+
id: arc_tests
63+
run: |
64+
if [ "${{ contains(needs.detect_changes.outputs.filters, 'esimd') }}" == "true" ]; then
65+
echo 'arc_tests="(ESIMD|InvokeSimd|Matrix)/"' >> "$GITHUB_OUTPUT"
66+
else
67+
echo 'arc_tests="Matrix/"' >> "$GITHUB_OUTPUT"
68+
fi
69+
test:
70+
needs: [build, detect_changes, determine_arc_tests]
71+
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
5372
strategy:
5473
fail-fast: false
5574
matrix:
@@ -76,7 +95,7 @@ jobs:
7695
reset_gpu: true
7796
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
7897
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
79-
env: '{"LIT_FILTER":${{ needs.detect_changes.outputs.arc_tests }} }'
98+
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
8099
uses: ./.github/workflows/sycl-linux-run-tests.yml
81100
with:
82101
name: ${{ matrix.name }}

0 commit comments

Comments
 (0)