From a484e538f92efe867dcd24bfe30dddd54afe7924 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Tue, 7 Jan 2025 17:32:48 -0800 Subject: [PATCH 1/6] Remove XFAIL for tests passing on PVC --- .../device_architecture_comparison_on_device_aot.cpp | 3 --- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 2 -- .../KernelAndProgram/persistent-cache-multi-device.cpp | 3 --- .../Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 2 +- .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 2 +- sycl/test-e2e/MemorySanitizer/lit.local.cfg | 6 +++--- .../ProgramManager/multi_device_bundle/build_twice.cpp | 3 --- .../multi_device_bundle/device_libs_and_caching.cpp | 3 --- sycl/test-e2e/Regression/multithread_write_accessor.cpp | 3 --- sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp | 3 --- 10 files changed, 5 insertions(+), 25 deletions(-) diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp index 88f55d00aa903..10dcf2f5b528f 100644 --- a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp +++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp @@ -1,8 +1,5 @@ // REQUIRES: arch-intel_gpu_pvc, ocloc -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index 1e5b085d207d6..b3d02a7fea35c 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -14,8 +14,6 @@ // compiler option // REQUIRES: arch-intel_gpu_pvc -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 // RUN: %{build} -Wno-error=deprecated-declarations -o %t1.out // RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR diff --git a/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp b/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp index 24cfb57341e12..48a9bdf74d8cf 100644 --- a/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp +++ b/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp @@ -5,9 +5,6 @@ // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir env -u XDG_CACHE_HOME env -u HOME %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-BUILD // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir env -u XDG_CACHE_HOME env -u HOME %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-CACHE -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - // Test checks that persistent cache works correctly with multiple devices. #include diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index bd30efe1b217c..a0b4945c769b5 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -14,7 +14,7 @@ // Waiting for the commit in IGC to be pulled into the driver to resolve the // test. -// XFAIL: (!igc-dev || gpu-intel-dg2) && run-mode +// XFAIL: gpu-intel-dg2 && run-mode // XFAIL-TRACKER: GSD-10510 #include "common.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index ff30d4c40f6a7..8643bc8286280 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -14,7 +14,7 @@ // Waiting for the commit in IGC to be pulled into the driver to resolve the // test. -// XFAIL: (!igc-dev || gpu-intel-dg2) && run-mode +// XFAIL: gpu-intel-dg2 && run-mode // XFAIL-TRACKER: GSD-10510 #include "common.hpp" diff --git a/sycl/test-e2e/MemorySanitizer/lit.local.cfg b/sycl/test-e2e/MemorySanitizer/lit.local.cfg index f9437ee4a9048..78d9403e68fc2 100644 --- a/sycl/test-e2e/MemorySanitizer/lit.local.cfg +++ b/sycl/test-e2e/MemorySanitizer/lit.local.cfg @@ -1,8 +1,8 @@ # TRACKER: https://github.com/intel/llvm/issues/16184 # TRACKER for PVC: https://github.com/intel/llvm/issues/16401 -#has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) -#if not has_arch_gpu_intel_pvc: -config.unsupported_features += ['gpu'] +has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) +if not has_arch_gpu_intel_pvc: + config.unsupported_features += ['gpu'] config.substitutions.append( ("%device_msan_flags", "-Xarch_device -fsanitize=memory") diff --git a/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp b/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp index a0069d81fe2d6..d4aaea78c7173 100644 --- a/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp +++ b/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp @@ -6,9 +6,6 @@ // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - #include #include diff --git a/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp b/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp index 9b8a070a31bcf..1534b2330f552 100644 --- a/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp +++ b/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp @@ -29,9 +29,6 @@ // Check the case when in-memory caching of the programs is disabled. // RUN: env SYCL_CACHE_IN_MEM=0 NEOReadDebugKeys=1 CreateMultipleRootDevices=4 %{run} %t.out -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - #include #include #include diff --git a/sycl/test-e2e/Regression/multithread_write_accessor.cpp b/sycl/test-e2e/Regression/multithread_write_accessor.cpp index 87299ed3e4d5c..995d57c28cf92 100644 --- a/sycl/test-e2e/Regression/multithread_write_accessor.cpp +++ b/sycl/test-e2e/Regression/multithread_write_accessor.cpp @@ -1,9 +1,6 @@ // RUN: %{build} -o %t.out %threads_lib // RUN: %{run} %t.out -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - #include #include diff --git a/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp b/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp index 033f5c99d74e1..b5c82af8938df 100644 --- a/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp +++ b/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp @@ -26,9 +26,6 @@ // UNSUPPORTED: linux && opencl && (gpu-intel-gen12 || gpu-intel-dg2) // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15275 -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - #include #include #include From e8b2be9e4d5e78458ab636fd838bb124f6bbb9fa Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Tue, 7 Jan 2025 17:38:50 -0800 Subject: [PATCH 2/6] Remove XFAIL tracker --- sycl/test-e2e/MemorySanitizer/lit.local.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/MemorySanitizer/lit.local.cfg b/sycl/test-e2e/MemorySanitizer/lit.local.cfg index 78d9403e68fc2..99fbea7b507e6 100644 --- a/sycl/test-e2e/MemorySanitizer/lit.local.cfg +++ b/sycl/test-e2e/MemorySanitizer/lit.local.cfg @@ -1,5 +1,4 @@ # TRACKER: https://github.com/intel/llvm/issues/16184 -# TRACKER for PVC: https://github.com/intel/llvm/issues/16401 has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) if not has_arch_gpu_intel_pvc: config.unsupported_features += ['gpu'] From cff47ed14e38203d04dc225349916f9cd5389877 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 8 Jan 2025 12:22:02 -0800 Subject: [PATCH 3/6] XFAIL some tests failing on opencl --- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 3 +++ sycl/test-e2e/Regression/multithread_write_accessor.cpp | 3 +++ sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index b3d02a7fea35c..619b53e06176a 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -14,6 +14,9 @@ // compiler option // REQUIRES: arch-intel_gpu_pvc +// XFAIL: arch-intel_gpu_pvc && opencl +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 + // RUN: %{build} -Wno-error=deprecated-declarations -o %t1.out // RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR diff --git a/sycl/test-e2e/Regression/multithread_write_accessor.cpp b/sycl/test-e2e/Regression/multithread_write_accessor.cpp index 995d57c28cf92..b1d927517079c 100644 --- a/sycl/test-e2e/Regression/multithread_write_accessor.cpp +++ b/sycl/test-e2e/Regression/multithread_write_accessor.cpp @@ -1,6 +1,9 @@ // RUN: %{build} -o %t.out %threads_lib // RUN: %{run} %t.out +// XFAIL: arch-intel_gpu_pvc && opencl +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 + #include #include diff --git a/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp b/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp index b5c82af8938df..fa253b8f1666f 100644 --- a/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp +++ b/sycl/test-e2e/syclcompat/launch/launch_policy_lmem.cpp @@ -23,7 +23,7 @@ // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out // RUN: %{run} %t.out -// UNSUPPORTED: linux && opencl && (gpu-intel-gen12 || gpu-intel-dg2) +// UNSUPPORTED: linux && opencl && (gpu-intel-gen12 || gpu-intel-dg2 || arch-intel_gpu_pvc) // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15275 #include From 0f3174aa2c6e0ee3526897e3c600de70abebb139 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 8 Jan 2025 12:50:50 -0800 Subject: [PATCH 4/6] Disable MemorySanitizer tests on PVC igc-dev --- sycl/test-e2e/MemorySanitizer/lit.local.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sycl/test-e2e/MemorySanitizer/lit.local.cfg b/sycl/test-e2e/MemorySanitizer/lit.local.cfg index 99fbea7b507e6..ae875daca989c 100644 --- a/sycl/test-e2e/MemorySanitizer/lit.local.cfg +++ b/sycl/test-e2e/MemorySanitizer/lit.local.cfg @@ -2,6 +2,9 @@ has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) if not has_arch_gpu_intel_pvc: config.unsupported_features += ['gpu'] +else: + # TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401 + config.unsupported_features += ['igc-dev'] config.substitutions.append( ("%device_msan_flags", "-Xarch_device -fsanitize=memory") From 4272f7c36caab4c4b5b0cc4b8cfc35541253aa27 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 8 Jan 2025 12:53:16 -0800 Subject: [PATCH 5/6] Remove whiteline --- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index 619b53e06176a..3642483e52566 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -17,7 +17,6 @@ // XFAIL: arch-intel_gpu_pvc && opencl // XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - // RUN: %{build} -Wno-error=deprecated-declarations -o %t1.out // RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR // RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR From 57491bfba1a6bc4604c25d074bd68e91fd0b91cc Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 8 Jan 2025 13:18:03 -0800 Subject: [PATCH 6/6] Mark device_architecture_comparison_on_device_aot test XFAIL on PVC,igc-dev,opencl --- .../device_architecture_comparison_on_device_aot.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp index 10dcf2f5b528f..6076834aac650 100644 --- a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp +++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp @@ -1,5 +1,8 @@ // REQUIRES: arch-intel_gpu_pvc, ocloc +// XFAIL: arch-intel_gpu_pvc && opencl && igc-dev +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 + // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out // RUN: %{run} %t.out