enable the tests for dg2

YixingZhang007 · YixingZhang007 · commit 0ec7a01f214c · 2025-09-17T10:43:11.000-07:00
diff --git a/sycl/test-e2e/AddressSanitizer/aot/gpu.cpp b/sycl/test-e2e/AddressSanitizer/aot/gpu.cpp
@@ -13,5 +13,5 @@
 // RUN: %{run-aux} %{build} %device_asan_aot_flags -O3 -g %S/Inputs/host-usm-oob.cpp -o %t.out
 // RUN: %{run} not %t.out 2>&1 | FileCheck %S/Inputs/host-usm-oob.cpp
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
diff --git a/sycl/test-e2e/AddressSanitizer/common/kernel-filter-aot-gpu.cpp b/sycl/test-e2e/AddressSanitizer/common/kernel-filter-aot-gpu.cpp
@@ -6,5 +6,5 @@
 // RUN: %{run-aux} %{build} %device_asan_aot_flags %S/kernel-filter.cpp -g -O2 -o %t2
 // RUN: %{run} not %t2 2>&1 | FileCheck %S/kernel-filter.cpp
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
diff --git a/sycl/test-e2e/AddressSanitizer/common/kernel-filter.cpp b/sycl/test-e2e/AddressSanitizer/common/kernel-filter.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t2
 // RUN: %{run} not %t2 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/common/options-redzone.cpp b/sycl/test-e2e/AddressSanitizer/common/options-redzone.cpp
@@ -7,7 +7,7 @@
 // RUN: env UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=redzone:8 %{run} %t2.out 2>&1 | FileCheck --check-prefixes CHECK-MIN %s
 // clang-format on
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp
@@ -16,6 +16,9 @@
 // UNSUPPORTED: arch-intel_gpu_pvc
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16401
 
+// XFAIL: spirv-backend && gpu
+// XFAIL-TRACKER: CMPLRLLVM-64052
+
 #include <sycl/detail/core.hpp>
 
 #include <sycl/ext/oneapi/device_global/device_global.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out
 // RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out
 // RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out
 // RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out
 // RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out
 // RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} %device_asan_flags -DTEST2 -O0 -g -o %t2.out
 // RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK2 %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} %device_asan_flags -O1 -g -o %t2.out
 // RUN: %{run} not %t2.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp
@@ -8,7 +8,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp
@@ -8,7 +8,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory_func.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory_func.cpp
@@ -8,7 +8,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp
@@ -6,7 +6,7 @@
 // RUN: %{build} %device_asan_flags -g -O2 -o %t3.out
 // RUN: %{run} not %t3.out 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp b/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp
@@ -3,7 +3,7 @@
 // RUN: env UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:5;detect_kernel_arguments:0" UR_LOG_SANITIZER=level:info %{run} not %t 2>&1 | FileCheck %s
 #include <sycl/usm.hpp>
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 /// Quarantine Cache Test
diff --git a/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp b/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} %device_asan_flags -O0 -g -o %t
 // RUN: env UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:5;detect_kernel_arguments:0" %{run} not %t 2>&1 | FileCheck %s
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-64052
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/Basic/image/image.cpp b/sycl/test-e2e/Basic/image/image.cpp
@@ -2,6 +2,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+
 //==------------------- 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
@@ -3,6 +3,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// XFAIL: spirv-backend && gpu-intel-dg2
+
 //==------------------- 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/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct_by_pointer.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct_by_pointer.cpp
@@ -4,7 +4,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 /*
diff --git a/sycl/test-e2e/InvokeSimd/Feature/SPMD_invoke_ESIMD_external.cpp b/sycl/test-e2e/InvokeSimd/Feature/SPMD_invoke_ESIMD_external.cpp
@@ -4,7 +4,7 @@
 // VISALTO enable run
 // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 /*
diff --git a/sycl/test-e2e/InvokeSimd/Feature/popcnt_emu.cpp b/sycl/test-e2e/InvokeSimd/Feature/popcnt_emu.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Feature/scale.cpp b/sycl/test-e2e/InvokeSimd/Feature/scale.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 /*
diff --git a/sycl/test-e2e/InvokeSimd/Feature/split_module/SPMD_module.cpp b/sycl/test-e2e/InvokeSimd/Feature/split_module/SPMD_module.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support of modular code structure.
diff --git a/sycl/test-e2e/InvokeSimd/Feature/void_retval.cpp b/sycl/test-e2e/InvokeSimd/Feature/void_retval.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/address_space_cast.cpp b/sycl/test-e2e/InvokeSimd/Regression/address_space_cast.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
 // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/InvokeSimd/Regression/call_vadd_1d_loop.cpp b/sycl/test-e2e/InvokeSimd/Regression/call_vadd_1d_loop.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/debug_symbols.cpp b/sycl/test-e2e/InvokeSimd/Regression/debug_symbols.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 /* Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp b/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp
@@ -7,7 +7,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 /* The test checks that invoke_simd implementation performs proper call of
diff --git a/sycl/test-e2e/InvokeSimd/Regression/matrix_add.cpp b/sycl/test-e2e/InvokeSimd/Regression/matrix_add.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// UNSUPPORTED: spirv-backend && arch-intel_gpu_pvc
+// UNSUPPORTED: spirv-backend && gpu
 // UNSUPPORTED-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/matrix_multiply_USM.cpp b/sycl/test-e2e/InvokeSimd/Regression/matrix_multiply_USM.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/matrix_multiply_accessor_get_pointer.cpp b/sycl/test-e2e/InvokeSimd/Regression/matrix_multiply_accessor_get_pointer.cpp
@@ -5,7 +5,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 // Tests invoke_simd support in the compiler/headers
diff --git a/sycl/test-e2e/InvokeSimd/Regression/slm_gather_scatter.cpp b/sycl/test-e2e/InvokeSimd/Regression/slm_gather_scatter.cpp
@@ -9,7 +9,7 @@
 // VISALTO enable run
 // RUN: env IGC_VISALTO=63 IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
 
-// XFAIL: spirv-backend && arch-intel_gpu_pvc
+// XFAIL: spirv-backend && gpu
 // XFAIL-TRACKER: CMPLRLLVM-70538
 
 /*
diff --git a/sycl/test-e2e/InvokeSimd/Regression/slm_load_store.cpp b/sycl/test-e2e/InvokeSimd/Regression/slm_load_store.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Regression/tiled_matrix_multiplication.cpp b/sycl/test-e2e/InvokeSimd/Regression/tiled_matrix_multiplication.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/ESIMD_to_unmarked_function.cpp b/sycl/test-e2e/InvokeSimd/Spec/ESIMD_to_unmarked_function.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/function_overloads.cpp b/sycl/test-e2e/InvokeSimd/Spec/function_overloads.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/multiple_SPMD_to_multiple_ESIMD.cpp b/sycl/test-e2e/InvokeSimd/Spec/multiple_SPMD_to_multiple_ESIMD.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/multiple_SPMD_to_single_ESIMD.cpp b/sycl/test-e2e/InvokeSimd/Spec/multiple_SPMD_to_single_ESIMD.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/nested_ESIMD_to_ESIMD.cpp b/sycl/test-e2e/InvokeSimd/Spec/nested_ESIMD_to_ESIMD.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/nested_SPMD_to_ESIMD.cpp b/sycl/test-e2e/InvokeSimd/Spec/nested_SPMD_to_ESIMD.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/simd_mask.cpp b/sycl/test-e2e/InvokeSimd/Spec/simd_mask.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/simd_mask_merge.cpp b/sycl/test-e2e/InvokeSimd/Spec/simd_mask_merge.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/simd_size/simd16.cpp b/sycl/test-e2e/InvokeSimd/Spec/simd_size/simd16.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/simd_size/simd8.cpp b/sycl/test-e2e/InvokeSimd/Spec/simd_size/simd8.cpp
diff --git a/sycl/test-e2e/InvokeSimd/Spec/uniform_retval.cpp b/sycl/test-e2e/InvokeSimd/Spec/uniform_retval.cpp
diff --git a/sycl/test-e2e/InvokeSimd/invoke_simd_conv.cpp b/sycl/test-e2e/InvokeSimd/invoke_simd_conv.cpp
diff --git a/sycl/test-e2e/InvokeSimd/invoke_simd_smoke.cpp b/sycl/test-e2e/InvokeSimd/invoke_simd_smoke.cpp
diff --git a/sycl/test-e2e/Sampler/lit.local.cfg b/sycl/test-e2e/Sampler/lit.local.cfg
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
diff --git a/sycl/test-e2e/bindless_images/lit.local.cfg b/sycl/test-e2e/bindless_images/lit.local.cfg
diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
