[SYCL-MLIR] Fix merge

Signed-off-by: Tsang, Whitney <whitney.tsang@intel.com>

Author: whitneywhtsang

.github/workflows/sycl_linux_build.yml

@@ -38,7 +38,7 @@ on:
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
-        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+        default: '[mlir_sycl, polygeist, cgeist, clang]'
         required: false
       merge_ref:
         description: |
@@ -150,6 +150,7 @@ jobs:
         ref: ${{ inputs.build_ref || github.sha }}
         merge_ref: ${{ inputs.merge_ref }}
         cache_path: "/__w/repo_cache/"
+        default_branch: sycl-mlir
     - name: Configure
       env:
         CC: ${{ inputs.cc }}
@@ -170,38 +171,43 @@ jobs:
     - name: Compile
       id: build
       run: cmake --build $GITHUB_WORKSPACE/build
-    - name: check-llvm
-      if: always() && !cancelled() && contains(inputs.changes, 'llvm')
+    - name: mlir-sycl-doc
+      if: always() && !cancelled() && contains(inputs.changes, 'mlir_sycl')
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-llvm
-    - name: check-clang
-      if: always() && !cancelled() && contains(inputs.changes, 'clang')
+        cmake --build $GITHUB_WORKSPACE/build --target mlir-sycl-doc
+    - name: polygeist-doc
+      if: always() && !cancelled() && contains(inputs.changes, 'polygeist')
       run: |
-        # Can we move this to Dockerfile? Hopefully, noop on Windows.
-        export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
-        cmake --build $GITHUB_WORKSPACE/build --target check-clang
-    - name: check-sycl
-      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+        cmake --build $GITHUB_WORKSPACE/build --target polygeist-doc
+    # TODO allow to optionally disable in-tree checks
+    - name: check-mlir-sycl
+      shell: bash
+      if: always() && !cancelled() && contains(inputs.changes, 'mlir_sycl')
       run: |
-        # TODO consider moving this to Dockerfile.
-        export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
-        cmake --build $GITHUB_WORKSPACE/build --target check-sycl
-    - name: check-llvm-spirv
-      if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
+        cmake --build $GITHUB_WORKSPACE/build --target check-mlir-sycl
+    - name: check-polygeist
+      shell: bash
+      if: always() && !cancelled() && contains(inputs.changes, 'polygeist')
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
-    - name: check-xptifw
-      if: always() && !cancelled() && contains(inputs.changes, 'xptifw')
+        cmake --build $GITHUB_WORKSPACE/build --target check-polygeist
+    - name: check-polygeist-unit
+      shell: bash
+      if: always() && !cancelled() && contains(inputs.changes, 'polygeist')
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
-    - name: check-libclc
-      if: always() && !cancelled() && contains(inputs.changes, 'libclc')
+        cmake --build $GITHUB_WORKSPACE/build --target check-polygeist-unit
+    - name: check-cgeist
+      shell: bash
+      if: always() && !cancelled() && contains(inputs.changes, 'cgeist')
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-libclc
-    - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
+        if [ -e /runtimes/oneapi-tbb/env/vars.sh ]; then
+          source /runtimes/oneapi-tbb/env/vars.sh;
+        fi
+        cmake --build $GITHUB_WORKSPACE/build --target check-cgeist
+    - name: check-clang-driver
+      shell: bash
+      if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
+        cmake --build $GITHUB_WORKSPACE/build --target check-clang-driver
     - name: Install
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       # TODO replace utility installation with a single CMake target

.github/workflows/sycl_precommit_aws.yml

@@ -13,6 +13,8 @@ on:
     workflows: [SYCL Pre Commit on Linux]
     types:
       - completed
+    branches-ignore:
+      - sycl-mlir
 
 jobs:
   create-check:

sycl/test-e2e/xfail_tests.txt

@@ -450,6 +450,7 @@ NonUniformGroups/tangle_group.cpp
 NonUniformGroups/tangle_group_algorithms.cpp
 OptionalKernelFeatures/is_compatible.cpp
 OptionalKernelFeatures/is_compatible/is_compatible_with_aspects.cpp
+OptionalKernelFeatures/no-fp64-optimization-declared-aspects.cpp
 OptionalKernelFeatures/throw-exception-for-unsupported-aspect.cpp
 Plugin/interop-level-zero-buffer-multi-dim.cpp
 Plugin/interop-level-zero-image-get-native-mem.cpp