[CI] Run windows E2E tests with composite action (#18124)

Author: ayylol

.github/workflows/sycl-windows-build.yml

@@ -25,6 +25,9 @@ on:
         description: 'Artifacts retention period'
         type: string
         default: 3
+      e2e_binaries_artifact:
+        type: string
+        required: false
       compiler:
         type: string
         required: false
@@ -78,7 +81,7 @@ permissions: read-all
 jobs:
   build:
     name: Build + LIT
-    runs-on: [Windows, build]
+    runs-on: [Windows, build-e2e]
     environment: WindowsCILock
     outputs:
       build_conclusion: ${{ steps.build.conclusion }}
@@ -226,6 +229,22 @@ jobs:
         name: sycl_windows_default
         path: ${{ inputs.artifact_archive_name }}
         retention-days: ${{ inputs.retention-days }}
+
+    - name: Setup SYCL toolchain
+      run: |
+        echo "PATH=$env:GITHUB_WORKSPACE\\install\\bin;$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "LIB=$env:GITHUB_WORKSPACE\\install\\lib;$env:LIB" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Build E2E tests
+      if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}
+      uses: ./devops/actions/run-tests/windows/e2e
+      with:
+        ref: ${{ inputs.ref || github.sha }}
+        testing_mode: build-only
+        target_devices: all
+        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
+        extra_lit_opts: --param sycl_build_targets="spir"
+
     - name:  Detect hung tests
       if: always()
       shell: powershell

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

@@ -49,25 +49,10 @@ jobs:
     uses: ./.github/workflows/sycl-windows-build.yml
     with:
       changes: ${{ needs.detect_changes.outputs.filters }}
-
-  build-e2e:
-    needs: build
-    # Continue if build was successful.
-    if: |
-      always()
-      && !cancelled()
-      && needs.build.outputs.build_conclusion == 'success'
-    uses: ./.github/workflows/sycl-windows-run-tests.yml
-    with:
-      name: Build Windows E2E tests
-      runner: '["Windows", "build-e2e"]'
-      sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
-      e2e_testing_mode: build-only
-      extra_lit_opts: --param sycl_build_targets="spir"
       e2e_binaries_artifact: sycl_windows_e2ebin
 
   run_prebuilt_e2e_tests:
-    needs: [build, build-e2e]
+    needs: build
     # Continue if build was successful.
     if: |
       always()
@@ -85,6 +70,7 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
+      target_devices: "level_zero:gpu"
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
       e2e_testing_mode: run-only
       e2e_binaries_artifact: sycl_windows_e2ebin

.github/workflows/sycl-windows-run-tests.yml

@@ -152,73 +152,18 @@ jobs:
     - run: |
         sycl-ls --verbose
 
-    - name: Download E2E Binaries
-      if: ${{ inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'run-only' }}
-      uses: actions/download-artifact@v4
-      with:
-        name: ${{ inputs.e2e_binaries_artifact }}
-    - name: Extract E2E Binaries
-      if: ${{ inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'run-only' }}
-      shell: bash
-      run: |
-        mkdir build-e2e
-        tar -xf e2e_bin.tar.gz -C build-e2e
-
-    - name: Configure E2E with Level Zero target
-      if: inputs.tests_selector == 'e2e'
-      shell: cmd
-      run: |
-        mkdir build-e2e
-        cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py"
-
-    - name: Keep track of files after configuring E2E step
-      if: ${{ always() && inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'build-only' }}
-      shell: bash
-      run: ls build-e2e > e2econf_files.txt
-
-    - name: Run End-to-End tests
+    - name: Run E2E Tests
       if: inputs.tests_selector == 'e2e'
-      shell: bash {0}
-      env:
-        LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.e2e_testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.e2e_testing_mode }} ${{ inputs.extra_lit_opts }}
-      run: |
-        # Run E2E tests.
-        if [[ ${{inputs.compiler}} == 'icx' ]]; then
-           export LIT_FILTER_OUT="compile_on_win_with_mdd"
-        fi
-        cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1
-
-        exit_code=$?
-        cat e2e.log
-        if [ $exit_code -ne 0 ]; then
-          # This is duplicated between lin/win, updates must change both.
-          awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Timed Out Tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
-        fi
-        exit $exit_code
-
-    # Github CI doesn't support containers on Windows, so we cannot guarantee
-    # that paths are the same between building and running systems. To avoid
-    # CMake issues related to absolute paths we reconfigure the build-e2e
-    # folder on the run system.
-    - name: Remove E2E configuration files
-      if: ${{ always() && inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'build-only' }}
-      shell: bash
-      run: |
-        for FILE in $(cat e2econf_files.txt); do rm -r build-e2e/$FILE; done
-        rm e2econf_files.txt
-
-    - name: Pack E2E test binaries
-      if: ${{ always() && !cancelled() && inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'build-only' }}
-      shell: bash
-      run: |
-        tar -czf e2e_bin.tar.gz -C build-e2e .
-    - name: Upload E2E test binaries
-      if: ${{ always() && !cancelled() && inputs.tests_selector == 'e2e' && inputs.e2e_testing_mode == 'build-only' }}
-      uses: actions/upload-artifact@v4
+      uses: ./devops/actions/run-tests/windows/e2e
+      timeout-minutes: 60
       with:
-        name: ${{ inputs.e2e_binaries_artifact }}
-        path: e2e_bin.tar.gz
-        retention-days: 3
+        ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
+        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
+        testing_mode: ${{ inputs.e2e_testing_mode }}
+        extra_cmake_args: ${{ inputs.extra_cmake_args }}
+        target_devices: ${{ inputs.target_devices }}
+        extra_lit_opts: ${{ inputs.extra_lit_opts }}
+        retention-days: ${{ inputs.artifact_retention_days }}
 
     - name: Run SYCL CTS Tests
       if: inputs.tests_selector == 'cts'

devops/actions/run-tests/windows/e2e/action.yml

@@ -0,0 +1,112 @@
+name: 'Run SYCL E2E tests on Windows'
+
+inputs:
+  ref:
+    required: false
+  binaries_artifact:
+    required: false
+  testing_mode:
+    required: true
+  extra_cmake_args:
+    required: false
+  target_devices:
+    required: true
+  extra_lit_opts:
+    required: false
+  retention-days:
+    required: false
+  cxx_compiler:
+    required: false
+
+
+runs:
+  using: "composite"
+  steps:
+  - name: Checkout E2E tests
+    uses: actions/checkout@v4
+    with:
+      path: llvm
+      ref: ${{ inputs.ref || github.sha }}
+      sparse-checkout: |
+        llvm/utils/lit
+        sycl/test-e2e
+  - name: Download E2E Binaries
+    if: inputs.testing_mode == 'run-only'
+    uses: actions/download-artifact@v4
+    with:
+      name: ${{ inputs.binaries_artifact }}
+  - name: Extract E2E Binaries
+    if: inputs.testing_mode == 'run-only'
+    shell: bash
+    run: |
+      mkdir build-e2e
+      tar -xf e2e_bin.tar.gz -C build-e2e
+
+  - name: Deduce E2E CMake options
+    id: cmake_opts
+    shell: bash
+    env:
+      CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
+    run: |
+      if [ -n "$CMAKE_EXTRA_ARGS" ]; then
+        echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT
+      fi
+
+  - name: Make E2E folder
+    if: inputs.testing_mode != 'run-only'
+    shell: bash
+    run: |
+      mkdir build-e2e
+
+  - name: Configure E2E tests
+    shell: bash
+    run: |
+      cmake -GNinja -B build-e2e -S./llvm/sycl/test-e2e -DCMAKE_CXX_COMPILER="${{ inputs.cxx_compiler || '$(which clang++).exe' }}" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py" ${{ steps.cmake_opts.outputs.opts }}
+
+  - name: Keep track of files after configuring E2E step
+    if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
+    shell: bash
+    run: ls build-e2e > e2econf_files.txt
+
+  - name: Run End-to-End tests
+    shell: bash {0}
+    env:
+      LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.e2e_testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
+    run: |
+      # Run E2E tests.
+      if [[ ${{ inputs.cxx_compiler || '$(which clang++).exe' }} == 'icx' ]]; then
+         export LIT_FILTER_OUT="compile_on_win_with_mdd"
+      fi
+      cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1
+
+      exit_code=$?
+      cat e2e.log
+      if [ $exit_code -ne 0 ]; then
+        # This is duplicated between lin/win, updates must change both.
+        awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Timed Out Tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
+      fi
+      exit $exit_code
+
+  # Github CI doesn't support containers on Windows, so we cannot guarantee
+  # that paths are the same between building and running systems. To avoid
+  # CMake issues related to absolute paths we reconfigure the build-e2e
+  # folder on the run system.
+  - name: Remove E2E configuration files
+    if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
+    shell: bash
+    run: |
+      for FILE in $(cat e2econf_files.txt); do rm -r build-e2e/$FILE; done
+      rm e2econf_files.txt
+
+  - name: Pack E2E test binaries
+    if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
+    shell: bash
+    run: |
+      tar -czf e2e_bin.tar.gz -C build-e2e .
+  - name: Upload E2E test binaries
+    if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
+    uses: actions/upload-artifact@v4
+    with:
+      name: ${{ inputs.binaries_artifact }}
+      path: e2e_bin.tar.gz
+      retention-days: ${{ inputs.retention-days }}