From 2054243a10785680e571765c9dd83c36a329b6a1 Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Thu, 6 Mar 2025 17:55:46 -0500 Subject: [PATCH] [CI] Add Windows BMG testing in precommit (#17105) We got a Windows BMG machine, so add Windows BMG testing. There are two categories of failures here: consistent failures/timeouts and really slow tests causing CI to take 30min extra. I disabled both of these and made two GH issues: [one](https://github.com/intel/llvm/issues/17165), [two](https://github.com/intel/llvm/issues/17255). --------- Signed-off-by: Sarnie, Nick --- .github/workflows/sycl-windows-precommit.yml | 12 ++++++++++-- sycl/test-e2e/Adapters/level_zero_eager_init.cpp | 3 +++ sycl/test-e2e/Adapters/level_zero_events_caching.cpp | 3 +++ .../DeviceLib/std_complex_math_fp64_test.cpp | 2 ++ sycl/test-e2e/Graph/RecordReplay/lit.local.cfg | 4 ++++ sycl/test-e2e/Graph/Update/lit.local.cfg | 4 ++++ sycl/test-e2e/Graph/lit.local.cfg | 0 .../KernelCompiler/kernel_compiler_sycl_jit.cpp | 3 +++ sycl/test-e2e/Matrix/lit.local.cfg | 4 ++++ sycl/test-e2e/Regression/static-buffer-dtor.cpp | 3 +++ sycl/test-e2e/WorkGroupMemory/basic_usage.cpp | 2 ++ 11 files changed, 38 insertions(+), 2 deletions(-) delete mode 100644 sycl/test-e2e/Graph/lit.local.cfg diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml index 9dafe3e862f8..1095eeab957f 100644 --- a/.github/workflows/sycl-windows-precommit.yml +++ b/.github/workflows/sycl-windows-precommit.yml @@ -50,8 +50,16 @@ jobs: always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' + strategy: + fail-fast: false + matrix: + include: + - name: Intel GEN12 Graphics with Level Zero + runner: '["Windows","gen12"]' + - name: Intel Battlemage Graphics with Level Zero + runner: '["Windows","bmg"]' uses: ./.github/workflows/sycl-windows-run-tests.yml with: - name: Intel GEN12 Graphics with Level Zero - runner: '["Windows","gen12"]' + name: ${{ matrix.name }} + runner: ${{ matrix.runner }} sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }} diff --git a/sycl/test-e2e/Adapters/level_zero_eager_init.cpp b/sycl/test-e2e/Adapters/level_zero_eager_init.cpp index 2b910a6967f0..f0d1964bcfce 100644 --- a/sycl/test-e2e/Adapters/level_zero_eager_init.cpp +++ b/sycl/test-e2e/Adapters/level_zero_eager_init.cpp @@ -3,6 +3,9 @@ // UNSUPPORTED-INTENDED: ze_debug UR emits summary of leaks that contains // function names that we match in the test. +// XFAIL: windows && arch-intel_gpu_bmg_g21 +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17165 + // RUN: %{build} -Wno-error=deprecated-declarations %level_zero_options -o %t.out // RUN: env UR_L0_DEBUG=1 SYCL_EAGER_INIT=1 %{run} %t.out 2>&1 | FileCheck %s // diff --git a/sycl/test-e2e/Adapters/level_zero_events_caching.cpp b/sycl/test-e2e/Adapters/level_zero_events_caching.cpp index 40e0349f5d35..3d03694ce54b 100644 --- a/sycl/test-e2e/Adapters/level_zero_events_caching.cpp +++ b/sycl/test-e2e/Adapters/level_zero_events_caching.cpp @@ -1,5 +1,8 @@ // REQUIRES: gpu, level_zero +// UNSUPPORTED: windows && arch-intel_gpu_bmg_g21 +// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17255 + // RUN: %{build} -o %t.out // RUN: %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp index b722759faa25..2a55331a2c10 100644 --- a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp @@ -1,5 +1,7 @@ // REQUIRES: aspect-fp64 // UNSUPPORTED: target-amd || target-nvidia +// XFAIL: windows && arch-intel_gpu_bmg_g21 +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17165 // RUN: %{build} -o %t1.out // RUN: %{run} %t1.out diff --git a/sycl/test-e2e/Graph/RecordReplay/lit.local.cfg b/sycl/test-e2e/Graph/RecordReplay/lit.local.cfg index f01e2216db41..63981724286c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/lit.local.cfg +++ b/sycl/test-e2e/Graph/RecordReplay/lit.local.cfg @@ -1 +1,5 @@ config.required_features += ['aspect-ext_oneapi_limited_graph'] + +# https://github.com/intel/llvm/issues/17165 +if 'windows' in config.available_features: + config.unsupported_features += ['arch-intel_gpu_bmg_g21'] diff --git a/sycl/test-e2e/Graph/Update/lit.local.cfg b/sycl/test-e2e/Graph/Update/lit.local.cfg index 9c0c4cc84629..88c5abc4dd77 100644 --- a/sycl/test-e2e/Graph/Update/lit.local.cfg +++ b/sycl/test-e2e/Graph/Update/lit.local.cfg @@ -1 +1,5 @@ config.required_features += ['aspect-ext_oneapi_graph'] + +# https://github.com/intel/llvm/issues/17165 +if 'windows' in config.available_features: + config.unsupported_features += ['arch-intel_gpu_bmg_g21'] diff --git a/sycl/test-e2e/Graph/lit.local.cfg b/sycl/test-e2e/Graph/lit.local.cfg deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp index e223b7f6ec06..200b6bd284d7 100644 --- a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp +++ b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp @@ -12,6 +12,9 @@ // UNSUPPORTED: accelerator // UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there. +// UNSUPPORTED: windows && arch-intel_gpu_bmg_g21 +// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17255 + // RUN: %{build} -o %t.out // RUN: %{run} %t.out 1 // RUN: %{l0_leak_check} %{run} %t.out 1 diff --git a/sycl/test-e2e/Matrix/lit.local.cfg b/sycl/test-e2e/Matrix/lit.local.cfg index 6f297c3012e1..87cb2e5b27d1 100644 --- a/sycl/test-e2e/Matrix/lit.local.cfg +++ b/sycl/test-e2e/Matrix/lit.local.cfg @@ -3,6 +3,10 @@ # drivers version, so we temporarily mark it as unsupported (CMPLRLLVM-64705). config.unsupported_features += ['spirv-backend'] +# https://github.com/intel/llvm/issues/17165 +if 'windows' in config.available_features: + config.unsupported_features += ['arch-intel_gpu_bmg_g21'] + config.substitutions.append(("%helper-includes", "-I {}/Inputs".format(os.path.dirname(os.path.abspath(__file__))))) original_clangxx="" for substitution in config.substitutions: diff --git a/sycl/test-e2e/Regression/static-buffer-dtor.cpp b/sycl/test-e2e/Regression/static-buffer-dtor.cpp index e84d3a062978..474c2b756d3f 100644 --- a/sycl/test-e2e/Regression/static-buffer-dtor.cpp +++ b/sycl/test-e2e/Regression/static-buffer-dtor.cpp @@ -18,6 +18,9 @@ // Windows doesn't yet have full shutdown(). // UNSUPPORTED: ze_debug && windows +// UNSUPPORTED: windows && arch-intel_gpu_bmg_g21 +// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17255 + #include int main() { diff --git a/sycl/test-e2e/WorkGroupMemory/basic_usage.cpp b/sycl/test-e2e/WorkGroupMemory/basic_usage.cpp index 4dbc2073d700..564906ad134c 100644 --- a/sycl/test-e2e/WorkGroupMemory/basic_usage.cpp +++ b/sycl/test-e2e/WorkGroupMemory/basic_usage.cpp @@ -1,3 +1,5 @@ +// UNSUPPORTED: windows && arch-intel_gpu_bmg_g21 +// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17255 // RUN: %{build} -o %t.out // RUN: %{run} %t.out #include