[CI] Add sycl toolchain to PATH when building E2E tests

Author: uditagarwal97

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

@@ -345,7 +345,7 @@ jobs:
         testing_mode: build-only
         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
@@ -360,7 +360,7 @@ jobs:
         testing_mode: build-only
         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
@@ -375,5 +375,5 @@ jobs:
         testing_mode: build-only
         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

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

@@ -94,7 +94,7 @@ jobs:
           ref: ${{ inputs.ref || github.sha }}
           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
 

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

@@ -19,7 +19,7 @@ inputs:
     required: false
   retention-days:
     required: false
-  sycl_compiler:
+  sycl_toolchain:
     required: false
 
 runs:
@@ -76,11 +76,28 @@ 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
+      which clang++
+      which sycl-ls
+      which sycl-post-link
+
   - name: Configure E2E tests
     if: inputs.testing_mode != 'run-only'
     shell: bash
     run: |
-      cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DCMAKE_CXX_COMPILER="${{ inputs.sycl_compiler || '$(which clang++)'}}" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ steps.cmake_opts.outputs.opts }}
+      cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DCMAKE_CXX_COMPILER="${{ '$(which clang++)' }}" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ steps.cmake_opts.outputs.opts }}
   - name: SYCL End-to-end tests
     id: run_e2e
     continue-on-error: true