diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index 923cf43da194f..0ee18b8029ff1 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -346,6 +346,7 @@ jobs: target_devices: all binaries_artifact: ${{ inputs.e2e_binaries_artifact }} sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + sycl_toolchain: $GITHUB_WORKSPACE/toolchain/ extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - name: Remove E2E tests before spirv-backend run @@ -361,6 +362,7 @@ jobs: target_devices: all binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }} sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + sycl_toolchain: $GITHUB_WORKSPACE/toolchain/ extra_lit_opts: --param spirv-backend=True - name: Remove E2E tests before preview-mode run @@ -376,4 +378,5 @@ jobs: target_devices: all binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }} sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + sycl_toolchain: $GITHUB_WORKSPACE/toolchain/ extra_lit_opts: --param test-preview-mode=True diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 12986e98617fc..0cb973675008d 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -95,6 +95,7 @@ jobs: testing_mode: full target_devices: native_cpu:cpu sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + sycl_toolchain: $GITHUB_WORKSPACE/toolchain/ extra_lit_opts: --param sycl_build_targets="native_cpu" extra_cmake_args: -DSYCL_TEST_E2E_TARGETS="native_cpu:cpu" -DSYCL_TEST_E2E_STANDALONE=ON diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml index 450ea7865b99a..e97fcd8e877fe 100644 --- a/devops/actions/run-tests/e2e/action.yml +++ b/devops/actions/run-tests/e2e/action.yml @@ -21,6 +21,8 @@ inputs: required: false sycl_compiler: required: false + sycl_toolchain: + required: false runs: using: "composite" @@ -76,6 +78,20 @@ runs: if [ -n "$CMAKE_EXTRA_ARGS" ]; then echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT fi + + # Installing SYCL toolchain so that E2E tests pick up latest + # binaries (like sycl-post-link) while building instead of using + # system installed ones. + - name: Install SYCL toolchain + if: | + (inputs.sycl_toolchain != '' && + inputs.testing_mode != 'run-only') + shell: bash + env: + SYCL_TOOLCHAIN: ${{ inputs.sycl_toolchain }} + run: | + echo "PATH=$SYCL_TOOLCHAIN/bin/:$PATH" >> $GITHUB_ENV + - name: Configure E2E tests if: inputs.testing_mode != 'run-only' shell: bash