From cc518c7b684dc1e6dca436f032c81ccd4987cc30 Mon Sep 17 00:00:00 2001
From: "Zhang, Yixing" <yixing.zhang@intel.com>
Date: Mon, 15 Sep 2025 13:44:07 -0700
Subject: [PATCH 1/6] Enable tests that are marked as unsupported but are
 passing with SPIR-V backend

---
 sycl/test-e2e/Basic/device_event.cpp                        | 3 ---
 sycl/test-e2e/Basic/image/image.cpp                         | 3 +++
 sycl/test-e2e/Basic/image/image_array.cpp                   | 3 +++
 sycl/test-e2e/Basic/image/lit.local.cfg                     | 2 +-
 sycl/test-e2e/InvokeSimd/lit.local.cfg                      | 5 +----
 sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp         | 5 -----
 sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp      | 4 ----
 sycl/test-e2e/Reduction/reduction_span.cpp                  | 4 ----
 sycl/test-e2e/Reduction/reduction_span_pack.cpp             | 4 ----
 sycl/test-e2e/Regression/group_load_fortified.cpp           | 4 ----
 sycl/test-e2e/Sampler/lit.local.cfg                         | 2 +-
 sycl/test-e2e/ThreadSanitizer/aot/gpu.cpp                   | 3 +++
 sycl/test-e2e/ThreadSanitizer/check_buffer.cpp              | 3 +++
 sycl/test-e2e/ThreadSanitizer/check_device_global.cpp       | 4 ++++
 sycl/test-e2e/ThreadSanitizer/check_device_usm.cpp          | 4 ++++
 sycl/test-e2e/ThreadSanitizer/check_host_usm.cpp            | 4 ++++
 sycl/test-e2e/ThreadSanitizer/check_shared_usm.cpp          | 4 ++++
 sycl/test-e2e/ThreadSanitizer/check_sub_buffer.cpp          | 3 +++
 sycl/test-e2e/ThreadSanitizer/group_local_memory.cpp        | 4 ++++
 sycl/test-e2e/ThreadSanitizer/lit.local.cfg                 | 3 ---
 sycl/test-e2e/ThreadSanitizer/local_accessor.cpp            | 4 ++++
 sycl/test-e2e/USM/copy.cpp                                  | 3 ---
 sycl/test-e2e/USM/memops2d/lit.local.cfg                    | 6 ------
 .../bindless_images/array/read_write_unsampled_array.cpp    | 3 +++
 sycl/test-e2e/bindless_images/lit.local.cfg                 | 4 ----
 sycl/test-e2e/bindless_images/read_write_unsampled.cpp      | 3 +++
 26 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/sycl/test-e2e/Basic/device_event.cpp b/sycl/test-e2e/Basic/device_event.cpp
index a9eabcead3166..c306fa69c4538 100644
--- a/sycl/test-e2e/Basic/device_event.cpp
+++ b/sycl/test-e2e/Basic/device_event.cpp
@@ -1,9 +1,6 @@
 // RUN: %{build} -o %t.run
 // RUN: %{run} %t.run
 
-// UNSUPPORTED: spirv-backend
-// UNSUPPORTED-TRACKER: CMPLRLLVM-64705
-
 //==--------device_event.cpp - SYCL class device_event test ----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/sycl/test-e2e/Basic/image/image.cpp b/sycl/test-e2e/Basic/image/image.cpp
index f1734918153d1..a14cf9b63be33 100644
--- a/sycl/test-e2e/Basic/image/image.cpp
+++ b/sycl/test-e2e/Basic/image/image.cpp
@@ -2,6 +2,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160589
+
 //==------------------- image.cpp - SYCL image basic test -----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/sycl/test-e2e/Basic/image/image_array.cpp b/sycl/test-e2e/Basic/image/image_array.cpp
index 2bf1f57540906..2327b9f63421f 100644
--- a/sycl/test-e2e/Basic/image/image_array.cpp
+++ b/sycl/test-e2e/Basic/image/image_array.cpp
@@ -3,6 +3,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160589
+
 //==------------------- image.cpp - SYCL image basic test -----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/sycl/test-e2e/Basic/image/lit.local.cfg b/sycl/test-e2e/Basic/image/lit.local.cfg
index 8ce73f3911718..6998c0659f302 100644
--- a/sycl/test-e2e/Basic/image/lit.local.cfg
+++ b/sycl/test-e2e/Basic/image/lit.local.cfg
@@ -5,7 +5,7 @@
 #
 # Legacy images aren't supported on AMD and also don't compile, so mark them
 # unsupported here. Bindless images should be used instead.
-config.unsupported_features += ['spirv-backend', 'target-amd']
+config.unsupported_features += ['target-amd']
 
 # Legacy images aren't supported on Native CPU. Bindless images should be used
 # instead when they are working.
diff --git a/sycl/test-e2e/InvokeSimd/lit.local.cfg b/sycl/test-e2e/InvokeSimd/lit.local.cfg
index 4b680ed078baf..b985b9561944b 100644
--- a/sycl/test-e2e/InvokeSimd/lit.local.cfg
+++ b/sycl/test-e2e/InvokeSimd/lit.local.cfg
@@ -6,9 +6,6 @@ config.required_features += ['gpu']
 # TODO: enable on Windows once driver is ready.
 if platform.system() != "Linux":
    config.unsupported = True
-
-# At the moment SPIR-V Backend has no plans to support this feature.
-config.unsupported_features += ['spirv-backend']
-
+   
 # https://github.com/intel/llvm/issues/20142.
 config.unsupported_features += ['target-native_cpu']
diff --git a/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp b/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
index 2bc1c39e47d15..be5cb469c639c 100644
--- a/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
+++ b/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
@@ -11,13 +11,8 @@
 // UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: fixed_size_group aspect not available on amd
 
-// UNSUPPORTED: spirv-backend
-// UNSUPPORTED-TRACKER: CMPLRLLVM-64702
-// The test is disabled for spirv-backend while we investigate the root cause.
-
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142
-
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/chunk.hpp>
 #include <sycl/group_algorithm.hpp>
diff --git a/sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp b/sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp
index 4c7093127c02a..563bb98ce7b1e 100644
--- a/sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp
+++ b/sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp
@@ -13,10 +13,6 @@
 // UNSUPPORTED: cuda
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/12995
 
-// UNSUPPORTED: spirv-backend
-// UNSUPPORTED-TRACKER: CMPLRLLVM-64702
-// The test is disabled for spirv-backend while we investigate the root cause.
-
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/fragment.hpp>
 #include <sycl/group_algorithm.hpp>
diff --git a/sycl/test-e2e/Reduction/reduction_span.cpp b/sycl/test-e2e/Reduction/reduction_span.cpp
index b96107a4c5674..04a0f34175dbc 100644
--- a/sycl/test-e2e/Reduction/reduction_span.cpp
+++ b/sycl/test-e2e/Reduction/reduction_span.cpp
@@ -3,10 +3,6 @@
 
 // This test performs basic checks of reductions initialized with a sycl::span
 
-// Depends on SPIR-V Backend & run-time drivers version.
-// XFAIL: spirv-backend && cpu
-// XFAIL-TRACKER: CMPLRLLVM-64705
-
 #include <sycl/detail/core.hpp>
 
 #include <sycl/reduction.hpp>
diff --git a/sycl/test-e2e/Reduction/reduction_span_pack.cpp b/sycl/test-e2e/Reduction/reduction_span_pack.cpp
index e101dfab842e5..daa29f68d01a9 100644
--- a/sycl/test-e2e/Reduction/reduction_span_pack.cpp
+++ b/sycl/test-e2e/Reduction/reduction_span_pack.cpp
@@ -4,10 +4,6 @@
 // This test performs basic checks of reductions initialized with a pack
 // containing at least one sycl::span
 
-// Depends on SPIR-V Backend & run-time drivers version.
-// XFAIL: spirv-backend && cpu
-// XFAIL-TRACKER: CMPLRLLVM-64705
-
 #include <sycl/detail/core.hpp>
 
 #include <sycl/reduction.hpp>
diff --git a/sycl/test-e2e/Regression/group_load_fortified.cpp b/sycl/test-e2e/Regression/group_load_fortified.cpp
index c7b1287548a38..ffa067221752f 100644
--- a/sycl/test-e2e/Regression/group_load_fortified.cpp
+++ b/sycl/test-e2e/Regression/group_load_fortified.cpp
@@ -2,10 +2,6 @@
 // RUN: %{build} -D_FORTIFY_SOURCE=2 -o %t.out
 // RUN: %{run} %t.out
 
-// Depends on SPIR-V Backend & run-time drivers version.
-// XFAIL: spirv-backend && cpu
-// XFAIL-TRACKER: CMPLRLLVM-64705
-
 // Checks that group_load runs even when the source code is fortified. This
 // failed at one point due to the use of std::memcpy in the implementation,
 // which would hold an assert in device code when fortified, which would fail
diff --git a/sycl/test-e2e/Sampler/lit.local.cfg b/sycl/test-e2e/Sampler/lit.local.cfg
index d5363329efec4..a2540de045655 100644
--- a/sycl/test-e2e/Sampler/lit.local.cfg
+++ b/sycl/test-e2e/Sampler/lit.local.cfg
@@ -8,7 +8,7 @@
 #
 # Legacy images aren't supported on AMD and also don't compile, so mark them
 # unsupported here. Bindless images should be used instead.
-config.unsupported_features += ['spirv-backend', 'target-amd']
+config.unsupported_features += ['target-amd']
 
 # Legacy images aren't supported on Native CPU. Use bindless_images when working.
 # https://github.com/intel/llvm/issues/20142
diff --git a/sycl/test-e2e/ThreadSanitizer/aot/gpu.cpp b/sycl/test-e2e/ThreadSanitizer/aot/gpu.cpp
index 3c0935cad742b..9bc97469f5eda 100644
--- a/sycl/test-e2e/ThreadSanitizer/aot/gpu.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/aot/gpu.cpp
@@ -13,3 +13,6 @@
 
 // RUN: %{run-aux} %{build} %device_tsan_aot_flags -O3 -g %S/Inputs/usm_data_race.cpp -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %S/Inputs/usm_data_race.cpp
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
diff --git a/sycl/test-e2e/ThreadSanitizer/check_buffer.cpp b/sycl/test-e2e/ThreadSanitizer/check_buffer.cpp
index 177335dbf0048..22f61faffdaaa 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_buffer.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_buffer.cpp
@@ -5,6 +5,9 @@
 // RUN: %{build} %device_tsan_flags -O2 -g -o %t2.out
 // RUN: %{run} %t2.out 2>&1 | FileCheck %s
 
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include <sycl/detail/core.hpp>
 
 static const int N = 128;
diff --git a/sycl/test-e2e/ThreadSanitizer/check_device_global.cpp b/sycl/test-e2e/ThreadSanitizer/check_device_global.cpp
index 67c302c06a01f..b97de1a634a34 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_device_global.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_device_global.cpp
@@ -4,6 +4,10 @@
 // RUN: %{run} %t1.out 2>&1 | FileCheck %s
 // RUN: %{build} %device_tsan_flags -O2 -g -o %t2.out
 // RUN: %{run} %t2.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/device_global/device_global.hpp>
 
diff --git a/sycl/test-e2e/ThreadSanitizer/check_device_usm.cpp b/sycl/test-e2e/ThreadSanitizer/check_device_usm.cpp
index 907252f7a01ed..4c53ee4505d43 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_device_usm.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_device_usm.cpp
@@ -2,6 +2,10 @@
 // ALLOW_RETRIES: 10
 // RUN: %{build} %device_tsan_flags -O0 -g -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include "sycl/detail/core.hpp"
 #include "sycl/usm.hpp"
 
diff --git a/sycl/test-e2e/ThreadSanitizer/check_host_usm.cpp b/sycl/test-e2e/ThreadSanitizer/check_host_usm.cpp
index 33f12be23121b..f4d48847bbbd5 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_host_usm.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_host_usm.cpp
@@ -2,6 +2,10 @@
 // ALLOW_RETRIES: 10
 // RUN: %{build} %device_tsan_flags -O0 -g -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include "sycl/detail/core.hpp"
 #include "sycl/usm.hpp"
 
diff --git a/sycl/test-e2e/ThreadSanitizer/check_shared_usm.cpp b/sycl/test-e2e/ThreadSanitizer/check_shared_usm.cpp
index e471e71538d80..7c977be56d9e6 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_shared_usm.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_shared_usm.cpp
@@ -2,6 +2,10 @@
 // ALLOW_RETRIES: 10
 // RUN: %{build} %device_tsan_flags -O0 -g -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include "sycl/detail/core.hpp"
 #include "sycl/usm.hpp"
 
diff --git a/sycl/test-e2e/ThreadSanitizer/check_sub_buffer.cpp b/sycl/test-e2e/ThreadSanitizer/check_sub_buffer.cpp
index 82e63a1376680..1819798b192bc 100644
--- a/sycl/test-e2e/ThreadSanitizer/check_sub_buffer.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/check_sub_buffer.cpp
@@ -5,6 +5,9 @@
 // RUN: %{build} %device_tsan_flags -O2 -g -o %t2.out
 // RUN: %{run} %t2.out 2>&1 | FileCheck %s
 
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include <sycl/detail/core.hpp>
 
 int main() {
diff --git a/sycl/test-e2e/ThreadSanitizer/group_local_memory.cpp b/sycl/test-e2e/ThreadSanitizer/group_local_memory.cpp
index c843ce694c71c..16433ecbfa101 100644
--- a/sycl/test-e2e/ThreadSanitizer/group_local_memory.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/group_local_memory.cpp
@@ -2,6 +2,10 @@
 // ALLOW_RETRIES: 10
 // RUN: %{build} %device_tsan_flags -O0 -g -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include "sycl/ext/oneapi/group_local_memory.hpp"
 #include "sycl/detail/core.hpp"
 #include "sycl/usm.hpp"
diff --git a/sycl/test-e2e/ThreadSanitizer/lit.local.cfg b/sycl/test-e2e/ThreadSanitizer/lit.local.cfg
index f87387034bc0c..63a387034a132 100644
--- a/sycl/test-e2e/ThreadSanitizer/lit.local.cfg
+++ b/sycl/test-e2e/ThreadSanitizer/lit.local.cfg
@@ -11,9 +11,6 @@ config.unsupported_features  += ['target-nvidia', 'target-amd']
 # TRACKER: https://github.com/intel/llvm/issues/16184
 config.unsupported_features += ['gpu-intel-gen12', 'gpu-intel-dg2']
 
-# CMPLRLLVM-64052
-config.unsupported_features += ['spirv-backend']
-
 # https://github.com/intel/llvm/issues/16920
 config.unsupported_features += ['arch-intel_gpu_bmg_g21']
 
diff --git a/sycl/test-e2e/ThreadSanitizer/local_accessor.cpp b/sycl/test-e2e/ThreadSanitizer/local_accessor.cpp
index 9a8292c1160fa..fa3e152d4dd6a 100644
--- a/sycl/test-e2e/ThreadSanitizer/local_accessor.cpp
+++ b/sycl/test-e2e/ThreadSanitizer/local_accessor.cpp
@@ -2,6 +2,10 @@
 // ALLOW_RETRIES: 10
 // RUN: %{build} %device_tsan_flags -O0 -g -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
+
+// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160602
+
 #include "sycl/detail/core.hpp"
 #include "sycl/usm.hpp"
 
diff --git a/sycl/test-e2e/USM/copy.cpp b/sycl/test-e2e/USM/copy.cpp
index c386e31227a89..7d85f3951fa06 100644
--- a/sycl/test-e2e/USM/copy.cpp
+++ b/sycl/test-e2e/USM/copy.cpp
@@ -9,9 +9,6 @@
 // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t1.out
 // RUN: %{run} %t1.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_bmg_g21
-// UNSUPPORTED-TRACKER: CMPLRLLVM-64705
-
 #include <sycl/detail/core.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/USM/memops2d/lit.local.cfg b/sycl/test-e2e/USM/memops2d/lit.local.cfg
index ecbf6de863832..48e1b6763cf31 100644
--- a/sycl/test-e2e/USM/memops2d/lit.local.cfg
+++ b/sycl/test-e2e/USM/memops2d/lit.local.cfg
@@ -1,8 +1,2 @@
-# This feature refers to an unsupported capability in the SPIR-V Backend,
-# pending triaging and identifying required features/extensions.
-# Temporarily disabled until the failure is addressed:
-# https://github.com/llvm/llvm-project/issues/127791
-config.unsupported_features += ['spirv-backend']
-
 # https://github.com/intel/llvm/issues/8126
 config.unsupported_features += ['windows']
diff --git a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
index 51080c3f7d57f..0bd7357711dd8 100644
--- a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
@@ -4,6 +4,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/pull/127737
+
 #include "../helpers/common.hpp"
 #include <iostream>
 #include <random>
diff --git a/sycl/test-e2e/bindless_images/lit.local.cfg b/sycl/test-e2e/bindless_images/lit.local.cfg
index a03e60ba97420..6b2103442fb66 100644
--- a/sycl/test-e2e/bindless_images/lit.local.cfg
+++ b/sycl/test-e2e/bindless_images/lit.local.cfg
@@ -1,7 +1,3 @@
-# Support of this feature is waiting for the upstream PR
-# https://github.com/llvm/llvm-project/pull/127737 to be merged with intel/llvm.
-config.unsupported_features += ['spirv-backend']
-
 # https://github.com/intel/llvm/issues/20142
 config.unsupported_features += ['target-native_cpu']
 
diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
index 8e05df4333cea..e9789ac404a85 100644
--- a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
@@ -6,6 +6,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/pull/127737
+
 #include "helpers/common.hpp"
 #include <iostream>
 #include <sycl/detail/core.hpp>

From da200b5a4951a833570cf7510d2a9503f4f196ff Mon Sep 17 00:00:00 2001
From: Yixing Zhang <yixing.zhang@intel.com>
Date: Thu, 25 Sep 2025 07:41:47 -0700
Subject: [PATCH 2/6] code clean up

---
 sycl/test-e2e/InvokeSimd/lit.local.cfg              | 5 ++++-
 sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sycl/test-e2e/InvokeSimd/lit.local.cfg b/sycl/test-e2e/InvokeSimd/lit.local.cfg
index b985b9561944b..4b680ed078baf 100644
--- a/sycl/test-e2e/InvokeSimd/lit.local.cfg
+++ b/sycl/test-e2e/InvokeSimd/lit.local.cfg
@@ -6,6 +6,9 @@ config.required_features += ['gpu']
 # TODO: enable on Windows once driver is ready.
 if platform.system() != "Linux":
    config.unsupported = True
-   
+
+# At the moment SPIR-V Backend has no plans to support this feature.
+config.unsupported_features += ['spirv-backend']
+
 # https://github.com/intel/llvm/issues/20142.
 config.unsupported_features += ['target-native_cpu']
diff --git a/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp b/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
index be5cb469c639c..3285ed8691f4f 100644
--- a/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
+++ b/sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
@@ -13,6 +13,7 @@
 
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142
+
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/chunk.hpp>
 #include <sycl/group_algorithm.hpp>

From a42ab7890e8d7b34a8895ec2904156fa8704e77e Mon Sep 17 00:00:00 2001
From: "Zhang, Yixing" <yixing.zhang@intel.com>
Date: Thu, 25 Sep 2025 15:32:00 -0700
Subject: [PATCH 3/6] resolve CI test failure

---
 sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp   | 2 ++
 sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
index 33a0f974c2a6b..ca0b6873c99f8 100644
--- a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
+++ b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
@@ -16,6 +16,8 @@
 // Temporarily disabled until the failure is addressed.
 // UNSUPPORTED: level_zero && windows
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+
 #include "copy2d_common.hpp"
 
 int main() { return test<Alloc::Device, Alloc::Host>(); }
diff --git a/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp b/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
index ff7b6c920e2a9..27e8e61ff185b 100644
--- a/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
+++ b/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
@@ -16,6 +16,8 @@
 // Temporarily disabled until the failure is addressed.
 // UNSUPPORTED: level_zero && windows
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+
 #include "memcpy2d_common.hpp"
 
 int main() { return test<Alloc::Device, Alloc::Host>(); }

From 29cb05fc96304c3c625845ca700bb60958ede25b Mon Sep 17 00:00:00 2001
From: "Zhang, Yixing" <yixing.zhang@intel.com>
Date: Fri, 26 Sep 2025 07:30:28 -0700
Subject: [PATCH 4/6] resolve CI failure. update the xfail tracker for
 bindless_image and USM tests

---
 sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp            | 1 +
 sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp          | 1 +
 .../bindless_images/array/read_write_unsampled_array.cpp        | 2 +-
 sycl/test-e2e/bindless_images/read_write_unsampled.cpp          | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
index ca0b6873c99f8..55f912ea94e4f 100644
--- a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
+++ b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
@@ -17,6 +17,7 @@
 // UNSUPPORTED: level_zero && windows
 
 // XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160892 
 
 #include "copy2d_common.hpp"
 
diff --git a/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp b/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
index 27e8e61ff185b..cf9bbb719dfeb 100644
--- a/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
+++ b/sycl/test-e2e/USM/memops2d/memcpy2d_device_to_host.cpp
@@ -17,6 +17,7 @@
 // UNSUPPORTED: level_zero && windows
 
 // XFAIL: spirv-backend && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160892
 
 #include "memcpy2d_common.hpp"
 
diff --git a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
index 0bd7357711dd8..0b84d56a24be8 100644
--- a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
@@ -5,7 +5,7 @@
 // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 // XFAIL: spirv-backend && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/llvm/llvm-project/pull/127737
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160893
 
 #include "../helpers/common.hpp"
 #include <iostream>
diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
index e9789ac404a85..3351e29fe8b37 100644
--- a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
@@ -7,7 +7,7 @@
 // RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 // XFAIL: spirv-backend && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/llvm/llvm-project/pull/127737
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160893
 
 #include "helpers/common.hpp"
 #include <iostream>

From fb827936baaa6d8f397434287617d075658b93c1 Mon Sep 17 00:00:00 2001
From: "Zhang, Yixing" <yixing.zhang@intel.com>
Date: Fri, 26 Sep 2025 07:52:05 -0700
Subject: [PATCH 5/6] solve code format issue

---
 sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
index 55f912ea94e4f..d8877abae534f 100644
--- a/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
+++ b/sycl/test-e2e/USM/memops2d/copy2d_device_to_host.cpp
@@ -17,7 +17,7 @@
 // UNSUPPORTED: level_zero && windows
 
 // XFAIL: spirv-backend && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160892 
+// XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/160892
 
 #include "copy2d_common.hpp"
 

From 9d9514c823b172ffebe258bd25bf08a02bb5d665 Mon Sep 17 00:00:00 2001
From: "Zhang, Yixing" <yixing.zhang@intel.com>
Date: Fri, 3 Oct 2025 07:59:23 -0700
Subject: [PATCH 6/6] remove empty lit.local.cfg

---
 sycl/test-e2e/USM/memops2d/lit.local.cfg | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 sycl/test-e2e/USM/memops2d/lit.local.cfg

diff --git a/sycl/test-e2e/USM/memops2d/lit.local.cfg b/sycl/test-e2e/USM/memops2d/lit.local.cfg
deleted file mode 100644
index e69de29bb2d1d..0000000000000