Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/sycl-detect-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- *llvm_spirv
- *clang
- 'libclc/**'
sycl: &sycl
sycl:
- *clang
- *sycl-jit
- *llvm_spirv
Expand All @@ -67,6 +67,8 @@ jobs:
- devops/dependencies-igc-dev.json
benchmarks:
- 'devops/scripts/benchmarks/**'
nonbench:
- '!devops/scripts/benchmarks/**'
perf-tests:
- sycl/test-e2e/PerformanceTests/**
esimd:
Expand Down Expand Up @@ -101,7 +103,6 @@ jobs:
return '${{ steps.changes.outputs.changes }}';
}
// Treat everything as changed for huge PRs.
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur", "ur_cuda_adapter", "ur_offload_adapter"];
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "drivers", "devigccfg", "benchmarks", "nonbench", "perf-tests", "esimd", "ur", "ur_cuda_adapter", "ur_offload_adapter"];

- run: echo '${{ steps.result.outputs.result }}'

14 changes: 10 additions & 4 deletions .github/workflows/sycl-linux-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,16 @@ jobs:
changes: ${{ needs.detect_changes.outputs.filters }}

toolchain_artifact: sycl_linux_default
e2e_binaries_artifact: e2e_bin
e2e_binaries_preview_artifact: e2e_bin_preview
e2e_binaries_artifact: ${{ contains(needs.detect_changes.outputs.filters, 'nonbench') && 'e2e_bin' || '' }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't really like the detect_changes here, i would prefer benchmarking_only was a boolean param that we could check here, and if this workflow was called with the benchmarking_only var we always skip tests regardless of the file. we could need a seperate workflow call for benchmarking (which we probably already have?)

fyi @intel/dpcpp-devops-reviewers

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change made to be as short as possible, to ease your review of its correctness and have CI working faster right now. @lukaszstolarczuk is refactoring benchmarking CI in #20439 There is a separate workflow there so this change (if we go with this patch before #20439) will be reverted.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If your team will commit to addressing my/Andrei's feedback in that PR I'm fine to merge this given it seems important to your team.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We are definitely going to implement this in #20439 way reverting my temporary changes.
If you can merge this PR and then do the review of #20439 it would be great.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would want to see if @aelovikov-intel is okay with this as well before merging

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I'm also OK with closing this PR without merging if we are able to review @lukaszstolarczuk change soon. @aelovikov-intel, please decide.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't touch detect_files workflow frequently enough to be confident that '!devops/scripts/benchmarks/**' does the right thing, so let's focus on the #20439 instead.

e2e_binaries_preview_artifact: ${{ contains(needs.detect_changes.outputs.filters, 'nonbench') && 'e2e_bin_preview' || '' }}

# Build and run native cpu e2e tests separately as cannot currently
# build all the e2e tests
build_run_native_cpu_e2e_tests:
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
if: |
always() && !cancelled()
&& needs.build.outputs.build_conclusion == 'success'
&& contains(needs.detect_changes.outputs.filters, 'nonbench')
runs-on: [Linux, build]
needs: [build]
container:
Expand Down Expand Up @@ -138,7 +141,10 @@ jobs:

E2E:
needs: [build, detect_changes, compat_read_exclude]
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
if: |
always() && !cancelled()
&& needs.build.outputs.build_conclusion == 'success'
&& contains(needs.detect_changes.outputs.filters, 'nonbench')
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sycl-windows-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
- 'devops/containers/**'
- 'devops/actions/build_container/**'
- 'devops/compat_ci_exclude.sycl-rel-6_2'
- 'devops/scripts/benchmarks/**'
- 'unified-runtime/examples/**'
- 'unified-runtime/scripts/**'
- 'unified-runtime/test/**'
Expand Down
Loading