simplified by using non_benchmarks

Author: lslusarczyk

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

@@ -6,9 +6,6 @@ on:
       filters:
         description: Matched filters
         value: ${{ jobs.need_check.outputs.filters }}
-      benchmarks_only:
-        description: Whether only benchmarks were changed
-        value: ${{ jobs.need_check.outputs.benchmarks_only }}
 
 permissions: read-all
 
@@ -19,7 +16,6 @@ jobs:
     timeout-minutes: 3
     outputs:
       filters: ${{ steps.result.outputs.result }}
-      benchmarks_only: ${{ steps.benchmarks_only.outputs.result }}
     steps:
       - name: Set changed_files
         id: changed_files
@@ -50,7 +46,7 @@ jobs:
               - *llvm_spirv
               - *clang
               - 'libclc/**'
-            sycl: &sycl
+            sycl:
               - *clang
               - *sycl-jit
               - *llvm_spirv
@@ -69,8 +65,11 @@ jobs:
               - devops/scripts/install_drivers.sh
             devigccfg:
               - devops/dependencies-igc-dev.json
-            benchmarks:
+            benchmarks: &benchmarks
               - 'devops/scripts/benchmarks/**'
+            non_benchmarks:
+              - '!*benchmarks'
+              - '**'
             perf-tests:
               - sycl/test-e2e/PerformanceTests/**
             esimd:
@@ -105,19 +104,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", "non_benchmarks", "perf-tests", "esimd", "ur", "ur_cuda_adapter", "ur_offload_adapter"];
 
-      - name: Set benchmarks_only output
-        id: benchmarks_only
-        env:
-          CHANGES: ${{ steps.changes.outputs.changes }}
-        run: |
-          has_benchmarks_only=true
-          for change in $(echo "$CHANGES" | tr -d '[]" ' | tr ',' '\n'); do
-            if [[ "$change" != "benchmarks" ]]; then
-              has_benchmarks_only=false
-            fi
-          done
-          echo "result=$has_benchmarks_only" >> $GITHUB_OUTPUT
-
-      - run: echo '${{ steps.result.outputs.result }} ${{ steps.benchmarks_only.outputs.result }}'
+      - run: echo '${{ steps.result.outputs.result }}'

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

@@ -59,16 +59,16 @@ jobs:
       changes: ${{ needs.detect_changes.outputs.filters }}
 
       toolchain_artifact: sycl_linux_default
-      e2e_binaries_artifact: ${{ needs.detect_changes.outputs.benchmarks_only != 'true' && 'e2e_bin' || '' }}
-      e2e_binaries_preview_artifact: ${{ needs.detect_changes.outputs.benchmarks_only != 'true' && 'e2e_bin_preview' || '' }}
+      e2e_binaries_artifact: ${{ contains(needs.detect_changes.outputs.filters, 'non_benchmarks') && 'e2e_bin' || '' }}
+      e2e_binaries_preview_artifact: ${{ contains(needs.detect_changes.outputs.filters, 'non_benchmarks') && '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'
-      && needs.detect_changes.outputs.benchmarks_only == 'false'
+      && contains(needs.detect_changes.outputs.filters, 'non_benchmarks')
     runs-on: [Linux, build]
     needs: [build]
     container:
@@ -144,7 +144,7 @@ jobs:
     if: |
       always() && !cancelled()
       && needs.build.outputs.build_conclusion == 'success'
-      && needs.detect_changes.outputs.benchmarks_only == 'false'
+      && contains(needs.detect_changes.outputs.filters, 'non_benchmarks')
     strategy:
       fail-fast: false
       matrix: