attempt fix

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

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

@@ -109,9 +109,6 @@ jobs:
   build:
     name: Build + LIT
     runs-on: [Linux, build]
-    defaults:
-      run:
-         shell: bash
     container:
       image: ${{ inputs.build_image }}
       options: -u 1001:1001
@@ -162,15 +159,14 @@ jobs:
       env:
         CC: ${{ inputs.cc }}
         CXX: ${{ inputs.cxx }}
-        ARGS: ${{ inputs.build_configure_extra_args }}
         CUDA_LIB_PATH: "/usr/local/cuda/lib64/stubs"
       run: |
         mkdir -p $CCACHE_DIR
         mkdir -p $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
           -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
-          --ci-defaults $ARGS \
+          --ci-defaults ${{ inputs.build_configure_extra_args }} \
           --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
@@ -182,9 +178,6 @@ jobs:
     - name: check-llvm
       if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
-        if [[ ${{ inputs.cc }} == 'icx' ]] || [[ ${{ inputs.cxx }} == 'icpx' ]]; then
-          export LIT_FILTER="SYCL"
-        fi
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm
     - name: check-clang
       if: always() && !cancelled() && contains(inputs.changes, 'clang')
@@ -197,9 +190,6 @@ jobs:
       run: |
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
-        if [[ ${{ inputs.cc }} == 'icx' ]] || [[ ${{ inputs.cxx }} == 'icpx' ]]; then
-           export LIT_XFAIL="regression/host_tanpi_double_accuracy.cpp"
-        fi
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl
     - name: check-sycl-unittests
       if: always() && !cancelled() && contains(inputs.changes, 'sycl')

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

@@ -86,7 +86,7 @@ on:
       reset_intel_gpu:
         type: string
         required: False
-      is_icx:
+      use_oneapi:
         type: string
         default: 'false'
       install_igc_driver:
@@ -246,12 +246,8 @@ jobs:
             # If libllvm14 is already installed (dev igc docker), still return true.
             sudo apt-get install -yqq libllvm14 || true;
         fi
-        sudo -E bash devops/scripts/install_drivers.sh llvm/devops/dependencies.json ${{ inputs.install_dev_igc_driver == 'true' && 'llvm/devops/dependencies-igc-dev.json --use-dev-igc' || '' }} --all
-    - name: Setup oneAPI env
-      if: ${{ inputs.is_icx == 'true' }}
-      uses: ./devops/actions/setup_linux_oneapi_env
+        sudo -E bash devops/scripts/install_drivers.sh llvm/devops/dependencies.json ${{ inputs.install_dev_igc_driver == 'true' && 'llvm/devops/dependencies-igc-dev.json --use-dev-igc' || '' }} --all  
     - name: Source OneAPI TBB vars.sh
-      if: ${{ inputs.is_icx == 'false' }}
       shell: bash
       run: |
         # https://github.com/actions/runner/issues/1964 prevents us from using
@@ -353,20 +349,12 @@ jobs:
       env:
         LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param test-mode=${{ inputs.e2e_testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
       run: |
-        # When building with oneAPI, the oneAPI libsycl is found before the newly compiled one and the search order
-        # can't be changed by environment variables, so just rename it temporarily.
-        if [ ${{ inputs.is_icx }} == 'true' ]; then
-          sudo mv /opt/intel/oneapi/compiler/2025.0/lib/libsycl.so /opt/intel/oneapi/compiler/2025.0/lib/libsycl.so.bak
-        fi
         ninja -C build-e2e check-sycl-e2e > e2e.log 2>&1
         exit_code=$?
         cat e2e.log
         if [ $exit_code -ne 0 ]; then
           awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
         fi
-        if [ ${{ inputs.is_icx }} == 'true' ]; then
-          sudo mv /opt/intel/oneapi/compiler/2025.0/lib/libsycl.so.bak /opt/intel/oneapi/compiler/2025.0/lib/libsycl.so
-        fi
         exit $exit_code
     - name: Build SYCL CTS tests
       if: inputs.tests_selector == 'cts' && inputs.sycl_cts_artifact == ''

.github/workflows/sycl-nightly.yml

@@ -45,7 +45,7 @@ jobs:
       build_cache_root: "/__w/"
       build_cache_suffix: oneapi
       build_artifact_suffix: oneapi
-      build_configure_extra_args: '--hip --cuda --native_cpu --cmake-opt=-DCOMPILER_RT_BUILD_SANITIZERS=Off --cmake-opt=-DCOMPILER_RT_BUILD_MEMPROF=Off'
+      build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" --cmake-opt=-DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise" --cmake-opt=-DCOMPILER_RT_BUILD_SANITIZERS=Off --cmake-opt=-DCOMPILER_RT_BUILD_MEMPROF=Off
       cc: icx
       cxx: icpx
 
@@ -124,7 +124,7 @@ jobs:
     with:
       name: Intel PVC L0 oneAPI
       runner: '["Linux", "pvc"]'
-      is_icx: true
+      use_oneapi: true
       target_devices: level_zero:gpu
       extra_lit_opts: -j 50
       image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest

devops/actions/setup_linux_oneapi_env/action.yml

@@ -19,4 +19,4 @@ runs:
         changed_envvars=$(comm -13 <(echo "$env_before") <(echo "$env_after"))
         while IFS= read -r line; do
           echo "$line" >> $GITHUB_ENV
-        done <<< "$changed_envvars"
+        done <<< "$changed_envvars"