From a2e8fd3a3e13ed14246e257189e222be70efd37f Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Tue, 20 Aug 2024 07:31:25 -0700 Subject: [PATCH 1/2] [SYCL][E2E] Reenable old tests This commit reenables a selection of tests that have previously been disabled, most for different reasons. Signed-off-by: Larsen, Steffen --- sycl/test-e2e/Basic/buffer/buffer_release.cpp | 2 -- sycl/test-e2e/Basic/buffer/subbuffer.cpp | 2 -- sycl/test-e2e/Basic/build_log.cpp | 2 +- sycl/test-e2e/Basic/enqueue_barrier.cpp | 4 ---- sycl/test-e2e/Basic/event_profiling_info.cpp | 3 --- sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp | 3 +-- sycl/test-e2e/Basic/image/image_max_size.cpp | 3 +-- sycl/test-e2e/Basic/image/image_sample.cpp | 3 +-- sycl/test-e2e/CompositeDevice/composite_device.cpp | 1 - sycl/test-e2e/DiscardEvents/invalid_event.cpp | 3 --- 10 files changed, 4 insertions(+), 22 deletions(-) diff --git a/sycl/test-e2e/Basic/buffer/buffer_release.cpp b/sycl/test-e2e/Basic/buffer/buffer_release.cpp index 658ea3f294c74..92f48f2027cd3 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_release.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_release.cpp @@ -1,6 +1,4 @@ // REQUIRES: cpu -// UNSUPPORTED: windows -// DeferredMemory Destruction not presently supported on Windows. // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/buffer/subbuffer.cpp b/sycl/test-e2e/Basic/buffer/subbuffer.cpp index f66e85ae5a54f..229f7aeb21748 100644 --- a/sycl/test-e2e/Basic/buffer/subbuffer.cpp +++ b/sycl/test-e2e/Basic/buffer/subbuffer.cpp @@ -1,8 +1,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// UNSUPPORTED: (opencl && gpu) - // //==---------- subbuffer.cpp --- sub-buffer basic test ---------------------==// // diff --git a/sycl/test-e2e/Basic/build_log.cpp b/sycl/test-e2e/Basic/build_log.cpp index 24ea1a4d7bed9..ae63b0bb5b287 100644 --- a/sycl/test-e2e/Basic/build_log.cpp +++ b/sycl/test-e2e/Basic/build_log.cpp @@ -1,5 +1,5 @@ // REQUIRES: opencl || level_zero, gpu, ocloc -// UNSUPPORTED: gpu-intel-dg1 || windows +// UNSUPPORTED: gpu-intel-dg1 // // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device dg1" %s -o %t.out // RUN: env SYCL_RT_WARNING_LEVEL=2 %{run} %t.out 2>&1 | FileCheck %s diff --git a/sycl/test-e2e/Basic/enqueue_barrier.cpp b/sycl/test-e2e/Basic/enqueue_barrier.cpp index 1e5890ae985cf..db6921000e0f3 100644 --- a/sycl/test-e2e/Basic/enqueue_barrier.cpp +++ b/sycl/test-e2e/Basic/enqueue_barrier.cpp @@ -1,10 +1,6 @@ // RUN: %{build} -o %t.out // RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s -// The test is failing sporadically on Windows OpenCL RTs -// Disabling on windows until fixed -// UNSUPPORTED: windows - #include #include diff --git a/sycl/test-e2e/Basic/event_profiling_info.cpp b/sycl/test-e2e/Basic/event_profiling_info.cpp index 3b2de4d95f8a2..8339491e93ad7 100644 --- a/sycl/test-e2e/Basic/event_profiling_info.cpp +++ b/sycl/test-e2e/Basic/event_profiling_info.cpp @@ -10,9 +10,6 @@ // //===----------------------------------------------------------------------===// -// Fails there. -// UNSUPPORTED: opencl && arch-intel_gpu_pvc - #include #include #include diff --git a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp index 0b88cf209ec27..f85b10be085da 100644 --- a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp +++ b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp @@ -1,6 +1,5 @@ // REQUIRES: aspect-ext_intel_legacy_image -// UNSUPPORTED: cuda || hip || (windows && level_zero) -// unsupported on windows (level-zero) due to fail of Jenkins/pre-ci-windows +// UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // // RUN: %{build} -o %t.out diff --git a/sycl/test-e2e/Basic/image/image_max_size.cpp b/sycl/test-e2e/Basic/image/image_max_size.cpp index 448719a2e08f2..4630fada05c10 100644 --- a/sycl/test-e2e/Basic/image/image_max_size.cpp +++ b/sycl/test-e2e/Basic/image/image_max_size.cpp @@ -2,9 +2,8 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// UNSUPPORTED: cuda || hip || (windows && opencl && gpu) +// UNSUPPORTED: cuda || hip // CUDA does not support info::device::image3d_max_width query. -// TODO: Irregular runtime fails on Windows/opencl:gpu require analysis. // The test checks that 'image' with max allowed sizes is handled correctly. diff --git a/sycl/test-e2e/Basic/image/image_sample.cpp b/sycl/test-e2e/Basic/image/image_sample.cpp index ac21ff72e65bd..f73a4fd3b0566 100644 --- a/sycl/test-e2e/Basic/image/image_sample.cpp +++ b/sycl/test-e2e/Basic/image/image_sample.cpp @@ -1,8 +1,7 @@ // REQUIRES: aspect-ext_intel_legacy_image // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// Temporarily disable test on Windows due to regressions in GPU driver. -// UNSUPPORTED: hip, windows +// UNSUPPORTED: hip #include #include diff --git a/sycl/test-e2e/CompositeDevice/composite_device.cpp b/sycl/test-e2e/CompositeDevice/composite_device.cpp index d75a6956fd2d8..e718887993529 100644 --- a/sycl/test-e2e/CompositeDevice/composite_device.cpp +++ b/sycl/test-e2e/CompositeDevice/composite_device.cpp @@ -2,7 +2,6 @@ // RUN: env ZE_FLAT_DEVICE_HIERARCHY=COMBINED %{run} %t.out // RUN: env ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE %{run} %t.out // RUN: env ZE_FLAT_DEVICE_HIERARCHY=FLAT %{run} %t.out -// UNSUPPORTED: (windows && level_zero) #include #include diff --git a/sycl/test-e2e/DiscardEvents/invalid_event.cpp b/sycl/test-e2e/DiscardEvents/invalid_event.cpp index 9f08bcdc28a31..4badd247767a8 100644 --- a/sycl/test-e2e/DiscardEvents/invalid_event.cpp +++ b/sycl/test-e2e/DiscardEvents/invalid_event.cpp @@ -1,6 +1,3 @@ -// Same hang as on Basic/barrier_order.cpp tracked in -// https://github.com/intel/llvm/issues/7330. -// UNSUPPORTED: opencl && gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out From 9441f7377cdc94dcde6d747463a5cd33403da9fc Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Wed, 21 Aug 2024 06:50:07 -0700 Subject: [PATCH 2/2] Redisable subbuffer Signed-off-by: Larsen, Steffen --- sycl/test-e2e/Basic/buffer/subbuffer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sycl/test-e2e/Basic/buffer/subbuffer.cpp b/sycl/test-e2e/Basic/buffer/subbuffer.cpp index 229f7aeb21748..ceed97d739a7b 100644 --- a/sycl/test-e2e/Basic/buffer/subbuffer.cpp +++ b/sycl/test-e2e/Basic/buffer/subbuffer.cpp @@ -1,6 +1,9 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out +// See https://github.com/intel/llvm/issues/15151 +// UNSUPPORTED: (opencl && gpu) + // //==---------- subbuffer.cpp --- sub-buffer basic test ---------------------==// //