From c52129248ae2270bb1294c9332f48e446d99ebad Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 18 Oct 2024 11:50:08 -0700 Subject: [PATCH 1/8] Fix typos in REQUIRES: lines --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 2 +- sycl/test-e2e/ESIMD/noinline_call_recursive.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index c2bb68918d270..1ca4d26ea0d9b 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,4 +1,4 @@ -// REQUIRES: CUDA || HIP +// REQUIRES: cuda || hip // RUN: %{build} %if hip %{ -DSYCL_EXT_ONEAPI_BACKEND_HIP %} %else %{ %if cuda %{ -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL %} %else %{ %if level_zero %{ -DSYCL_EXT_ONEAPI_BACKEND_L0 %} %} %} -o %t.out #include diff --git a/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp b/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp index d11026688c602..f220108717e7e 100644 --- a/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp +++ b/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // Recursion is not supported in ESIMD (intel/llvm PR#3390) -// REQUIRES: TEMPORARY_DISBLED +// REQUIRES: TEMPORARY_DISABLED // RUN: %{build} -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %{run} %t.out // From 88db4cf678e3eb57c2f948c11790e03c00851f12 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 21 Oct 2024 09:59:49 -0700 Subject: [PATCH 2/8] Revert change to ESIMD test --- sycl/test-e2e/ESIMD/noinline_call_recursive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp b/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp index f220108717e7e..d11026688c602 100644 --- a/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp +++ b/sycl/test-e2e/ESIMD/noinline_call_recursive.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // Recursion is not supported in ESIMD (intel/llvm PR#3390) -// REQUIRES: TEMPORARY_DISABLED +// REQUIRES: TEMPORARY_DISBLED // RUN: %{build} -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %{run} %t.out // From 10a0773e2425e47eca32c6a9ddfe3481b343b938 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 21 Oct 2024 10:44:58 -0700 Subject: [PATCH 3/8] Use `any-device-is-` in build line of test --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index 1ca4d26ea0d9b..5c7a6560a916e 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,5 +1,5 @@ // REQUIRES: cuda || hip -// RUN: %{build} %if hip %{ -DSYCL_EXT_ONEAPI_BACKEND_HIP %} %else %{ %if cuda %{ -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL %} %else %{ %if level_zero %{ -DSYCL_EXT_ONEAPI_BACKEND_L0 %} %} %} -o %t.out +// RUN: %{build} %if any-device-is-hip %{ -DSYCL_EXT_ONEAPI_BACKEND_HIP %} %else %{ %if any-device-is-cuda %{ -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL %} %else %{ %if any-device-is-level_zero %{ -DSYCL_EXT_ONEAPI_BACKEND_L0 %} %} %} -o %t.out #include #include From 2881596ca68f8e6a6deae9431082c5f00c67161a Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 22 Oct 2024 07:06:30 -0700 Subject: [PATCH 4/8] Split build line and add level_zero --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index 5c7a6560a916e..3dda79955f9c5 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,5 +1,7 @@ -// REQUIRES: cuda || hip -// RUN: %{build} %if any-device-is-hip %{ -DSYCL_EXT_ONEAPI_BACKEND_HIP %} %else %{ %if any-device-is-cuda %{ -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL %} %else %{ %if any-device-is-level_zero %{ -DSYCL_EXT_ONEAPI_BACKEND_L0 %} %} %} -o %t.out +// REQUIRES: cuda || hip || level_zero +// RUN: %if any-device-is-hip %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_HIP -o %t-hip.out %} +// RUN: %if any-device-is-cuda %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL -o %t-cuda.out %} +// RUN: %if any-device-is-level_zero %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_L0 -o %t-l0.out %} #include #include From 9bc41b63698e82aa181744441c1a2f83587a65ea Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 22 Oct 2024 12:46:58 -0700 Subject: [PATCH 5/8] Restructure test --- .../Basic/interop/interop_all_backends.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index 3dda79955f9c5..e6f5ca0ce8f24 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,7 +1,7 @@ -// REQUIRES: cuda || hip || level_zero -// RUN: %if any-device-is-hip %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_HIP -o %t-hip.out %} -// RUN: %if any-device-is-cuda %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL -o %t-cuda.out %} -// RUN: %if any-device-is-level_zero %{ %{build} -DSYCL_EXT_ONEAPI_BACKEND_L0 -o %t-l0.out %} +// RUN: %if any-device-is-opencl %{ %{build} -o %t-opencl.out %} +// RUN: %if any-device-is-level_zero %{ %{build} -DBUILD_FOR_L0 -o %t-l0.out %} +// RUN: %if any-device-is-cuda %{ %{build} -DBUILD_FOR_CUDA -o %t-cuda.out %} +// RUN: %if any-device-is-hip %{ %{build} -DBUILD_FOR_HIP -o %t-hip.out %} #include #include @@ -9,19 +9,19 @@ #include using namespace sycl; -#ifdef SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL +#ifdef BUILD_FOR_CUDA #include constexpr auto BACKEND = backend::ext_oneapi_cuda; using nativeDevice = CUdevice; using nativeQueue = CUstream; using nativeEvent = CUevent; -#elif defined(SYCL_EXT_ONEAPI_BACKEND_HIP) +#elif defined(BUILD_FOR_HIP) #include constexpr auto BACKEND = backend::ext_oneapi_hip; using nativeDevice = hipDevice_t; using nativeQueue = hipStream_t; using nativeEvent = hipEvent_t; -#elif defined(SYCL_EXT_ONEAPI_BACKEND_L0) +#elif defined(BUILD_FOR_L0) constexpr auto BACKEND = backend::ext_oneapi_level_zero; using nativeDevice = ze_device_handle_t; using nativeQueue = ze_command_queue_handle_t; From 33913ef54000da043a48b674eeae24deefe1486a Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 22 Oct 2024 14:13:33 -0700 Subject: [PATCH 6/8] Add XFAIL to test --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index e6f5ca0ce8f24..59645e8a90a37 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,3 +1,5 @@ +// XFAIL: * +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15819 // RUN: %if any-device-is-opencl %{ %{build} -o %t-opencl.out %} // RUN: %if any-device-is-level_zero %{ %{build} -DBUILD_FOR_L0 -o %t-l0.out %} // RUN: %if any-device-is-cuda %{ %{build} -DBUILD_FOR_CUDA -o %t-cuda.out %} From a1d3bcf4c574ba6ea5e3b78d5ce428037e732796 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 22 Oct 2024 14:18:44 -0700 Subject: [PATCH 7/8] change xfail * to specific xfail --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index 59645e8a90a37..65bb7981e3ede 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,4 +1,4 @@ -// XFAIL: * +// XFAIL: any-device-is-opencl, any-device-is-cuda // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15819 // RUN: %if any-device-is-opencl %{ %{build} -o %t-opencl.out %} // RUN: %if any-device-is-level_zero %{ %{build} -DBUILD_FOR_L0 -o %t-l0.out %} From 754f763cd9529af52845e20574b7d87c602134f4 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 25 Oct 2024 08:07:10 -0700 Subject: [PATCH 8/8] Add xfail for windows level_zero --- sycl/test-e2e/Basic/interop/interop_all_backends.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp index 65bb7981e3ede..762cfc86889ae 100644 --- a/sycl/test-e2e/Basic/interop/interop_all_backends.cpp +++ b/sycl/test-e2e/Basic/interop/interop_all_backends.cpp @@ -1,4 +1,4 @@ -// XFAIL: any-device-is-opencl, any-device-is-cuda +// XFAIL: any-device-is-opencl, any-device-is-cuda, (windows && any-device-is-level_zero) // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15819 // RUN: %if any-device-is-opencl %{ %{build} -o %t-opencl.out %} // RUN: %if any-device-is-level_zero %{ %{build} -DBUILD_FOR_L0 -o %t-l0.out %}