Merge from 'sycl' to 'sycl-web' (1 commits)

Author: iclsrc

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

@@ -188,19 +188,19 @@ jobs:
             runner: '["Linux", "gen12"]'
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             extra_lit_opts: --param test-preview-mode=True
-            e2e_binaries_artifact: e2e_bin_preview
+            binaries_artifact: e2e_bin_preview
           - name: ABI compatibility / sycl-rel-6_2
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2
             target_devices: level_zero:gpu
             extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_2 }}"'
-            e2e_binaries_artifact: 'in-container'
+            binaries_artifact: 'in-container'
           - name: ABI compatibility / sycl-rel-6_3
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3
             target_devices: level_zero:gpu
             extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_3 }}"'
-            e2e_binaries_artifact: 'in-container'
+            binaries_artifact: 'in-container'
 
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
@@ -214,8 +214,8 @@ jobs:
       toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}
-      e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact || 'e2e_bin' }}
-      e2e_testing_mode: 'run-only'
+      binaries_artifact: ${{ matrix.binaries_artifact || 'e2e_bin' }}
+      testing_mode: 'run-only'
 
       # Do not install drivers on AMD and CUDA runners.
       install_igc_driver: >-

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

@@ -58,7 +58,7 @@ on:
         default: ''
         required: False
 
-      e2e_binaries_artifact:
+      binaries_artifact:
         description: |
           When set in modes other than `run-only` results in artifact upload.
           For `run-only` mode, if specified, means downloading pre-built
@@ -68,9 +68,9 @@ on:
         type: string
         default: ''
         required: False
-      e2e_testing_mode:
+      testing_mode:
         description: |
-          Testing mode to run E2E tests in, can be either `full`, `build-only`
+          Testing mode to run E2E/CTS tests in, can be either `full`, `build-only`
           or `run-only`.
         type: string
         default: 'full'
@@ -95,19 +95,6 @@ on:
         default: 'false'
         required: False
 
-      cts_testing_mode:
-        description: |
-          Testing mode to run SYCL-CTS in, can be either `full`, `build-only`
-          or `run-only`. In `build-only` mode an artifact of the CTS binaries
-          will be uploaded.
-        type: string
-        default: 'full'
-
-      sycl_cts_artifact:
-        type: string
-        default: ''
-        required: False
-
       benchmark_upload_results:
         description: |
           Set to true to upload results to git repository storing benchmarking
@@ -211,7 +198,7 @@ on:
           Extra options to be added to LIT_OPTS.
         default: ''
 
-      e2e_testing_mode:
+      testing_mode:
         type: choice
         options:
           - "full"
@@ -251,7 +238,7 @@ jobs:
     - name: Reset Intel GPU
       uses: ./devops/actions/reset_gpu
     - name: Install drivers
-      if: inputs.e2e_binaries_artifact != 'in-container' && (inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true')
+      if: inputs.binaries_artifact != 'in-container' && (inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true')
       env:
         GITHUB_TOKEN: ${{ github.token }}
       run: |
@@ -345,8 +332,8 @@ jobs:
       timeout-minutes: 60
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
-        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
-        testing_mode: ${{ inputs.e2e_testing_mode }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
+        testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
         extra_lit_opts: ${{ inputs.extra_lit_opts }}
@@ -361,8 +348,8 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
-        cts_testing_mode: ${{ inputs.cts_testing_mode }}
-        sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
+        testing_mode: ${{ inputs.testing_mode }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.retention-days }}
 

.github/workflows/sycl-nightly.yml

@@ -271,14 +271,14 @@ jobs:
     with:
       name: Build SYCL-CTS for Linux
       runner: '["Linux", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
+      binaries_artifact: sycl_cts_bin_linux
 
   run-sycl-cts-linux:
     needs: [ubuntu2204_build, build-sycl-cts-linux]
@@ -303,15 +303,15 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
+      binaries_artifact: sycl_cts_bin_linux
 
   build-sycl-cts-win:
     needs: build-win
@@ -320,11 +320,11 @@ jobs:
     with:
       name: Build SYCL-CTS for Windows
       runner: '["Windows", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
-      sycl_cts_artifact: sycl_cts_bin_win
+      binaries_artifact: sycl_cts_bin_win
 
   run-sycl-cts-win:
     needs: [build-win, build-sycl-cts-win]
@@ -340,12 +340,12 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
-      sycl_cts_artifact: sycl_cts_bin_win
+      binaries_artifact: sycl_cts_bin_win
 
   # Verification example:
   # cosign-windows-amd64.exe verify-blob sycl_linux.tar.gz \

.github/workflows/sycl-post-commit.yml

@@ -81,8 +81,8 @@ jobs:
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             extra_lit_opts: --param spirv-backend=True
-            e2e_binaries_artifact: e2e_bin_spirv_backend
-            e2e_testing_mode: 'run-only'
+            binaries_artifact: e2e_bin_spirv_backend
+            testing_mode: 'run-only'
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
@@ -99,8 +99,8 @@ jobs:
       toolchain_artifact_filename: ${{ needs.build-lin.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build-lin.outputs.toolchain_decompress_command }}
 
-      e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact }}
-      e2e_testing_mode: ${{ matrix.e2e_testing_mode || 'full' }}
+      binaries_artifact: ${{ matrix.binaries_artifact }}
+      testing_mode: ${{ matrix.testing_mode || 'full' }}
 
       # Do not install drivers on AMD and CUDA runners.
       install_igc_driver: >-

.github/workflows/sycl-weekly.yml

@@ -30,15 +30,15 @@ jobs:
     with:
       name: Build SYCL-CTS
       runner: '["Linux", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
       extra_cmake_args: -DDPCPP_FLAGS=-fsycl-use-spirv-backend-for-spirv-gen
-      sycl_cts_artifact: sycl_cts_bin
+      binaries_artifact: sycl_cts_bin
 
   run-sycl-cts:
     needs: [ubuntu2204_build, build-sycl-cts]
@@ -63,12 +63,12 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin
+      binaries_artifact: sycl_cts_bin

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

@@ -79,5 +79,5 @@ jobs:
       runner: ${{ matrix.runner }}
       target_devices: "level_zero:gpu"
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
-      e2e_testing_mode: run-only
-      e2e_binaries_artifact: sycl_windows_e2ebin
+      testing_mode: run-only
+      binaries_artifact: sycl_windows_e2ebin

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

@@ -58,27 +58,20 @@ on:
         required: false
         default: "cl"
 
-      e2e_testing_mode:
-        type: string
-        default: "full"
-
-      e2e_binaries_artifact:
-        type: string
-        default: ''
-        required: False
-
-      cts_testing_mode:
+      testing_mode:
         description: |
-          Testing mode to run SYCL-CTS in, can be either `full`, `build-only`
-          or `run-only`. In `build-only` mode an artifact of the CTS binaries
+          Testing mode to run E2E/SYCL-CTS in, can be either `full`, `build-only`
+          or `run-only`. In `build-only` mode an artifact of the tests binaries
           will be uploaded.
         type: string
         default: 'full'
 
-      sycl_cts_artifact:
+
+      binaries_artifact:
         type: string
         default: ''
         required: False
+
       artifact_retention_days:
         description: 'E2E/SYCL-CTS binaries artifact retention period.'
         type: string
@@ -153,8 +146,8 @@ jobs:
       timeout-minutes: 60
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
-        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
-        testing_mode: ${{ inputs.e2e_testing_mode }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
+        testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
         extra_lit_opts: ${{ inputs.extra_lit_opts }}
@@ -167,8 +160,8 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
-        cts_testing_mode: ${{ inputs.cts_testing_mode }}
-        sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
+        testing_mode: ${{ inputs.testing_mode }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.artifact_retention_days }}