From db012683b525db88fdd0136b18767bcaa8bad90e Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Mon, 4 Mar 2024 11:31:52 +0000 Subject: [PATCH] Use REQUIRES in Graph E2E tests for USM aspects --- sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp | 4 +++- sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp | 3 ++- .../Graph/Explicit/executable_graph_update_ordering.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task2.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task_last.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task_multiple_deps.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/host_task_successive.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/memadvise.cpp | 2 ++ sycl/test-e2e/Graph/Explicit/prefetch.cpp | 2 ++ sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp | 3 ++- sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp | 3 ++- sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp | 7 ------- sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp | 4 ---- .../Graph/Inputs/executable_graph_update_ordering.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task2.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task2_multiple_roots.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task_last.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task_multiple_deps.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task_multiple_roots.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/host_task_successive.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/memadvise.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/prefetch.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp | 4 ---- sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp | 4 ---- sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp | 4 +++- sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp | 3 ++- .../RecordReplay/executable_graph_update_ordering.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/host_task.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/host_task2.cpp | 3 ++- .../Graph/RecordReplay/host_task2_multiple_roots.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/host_task_in_order.cpp | 7 ++----- sycl/test-e2e/Graph/RecordReplay/host_task_last.cpp | 3 ++- .../Graph/RecordReplay/host_task_multiple_deps.cpp | 3 ++- .../Graph/RecordReplay/host_task_multiple_roots.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/host_task_successive.cpp | 3 ++- .../in_order_queue_with_host_managed_dependencies.cpp | 6 ++---- ...n_order_queue_with_host_managed_dependencies_memcpy.cpp | 6 ++---- ...n_order_queue_with_host_managed_dependencies_memset.cpp | 6 ++---- sycl/test-e2e/Graph/RecordReplay/memadvise.cpp | 2 ++ sycl/test-e2e/Graph/RecordReplay/prefetch.cpp | 2 ++ sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp | 3 ++- sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp | 3 ++- 52 files changed, 74 insertions(+), 112 deletions(-) diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp index 6256a43eb1f36..2d5a39a0cf868 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp index a7900dae9dd39..1f6c28f1e8105 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp @@ -4,7 +4,9 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp index e34ffdc6708c3..2f69d763a30a3 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp index 91c497a6c98c6..bd41e8e36854d 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_system_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp b/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp index 5cfcd104fd29c..c6ca7cd801ac8 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations // Skip as executable graph update and host tasks both aren't // implemented. diff --git a/sycl/test-e2e/Graph/Explicit/host_task.cpp b/sycl/test-e2e/Graph/Explicit/host_task.cpp index d520338b579cb..3402af75d6dba 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task2.cpp b/sycl/test-e2e/Graph/Explicit/host_task2.cpp index 06708fd1c75ec..b9b333cfae863 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task2.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task2.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp b/sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp index ce2d805de5664..c9d7e69f5ef4e 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task_last.cpp b/sycl/test-e2e/Graph/Explicit/host_task_last.cpp index 6bb9e464ac0b1..6ef04c16fa9a1 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task_last.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task_last.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task_multiple_deps.cpp b/sycl/test-e2e/Graph/Explicit/host_task_multiple_deps.cpp index 898c6867c387b..efcefbcbd31ac 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task_multiple_deps.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task_multiple_deps.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp b/sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp index 4750c5ff69201..eb8b683f2fc93 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task_successive.cpp b/sycl/test-e2e/Graph/Explicit/host_task_successive.cpp index aad8dfee2fefc..6dc88d1f33669 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task_successive.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task_successive.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/memadvise.cpp b/sycl/test-e2e/Graph/Explicit/memadvise.cpp index 11e0d6296290f..450a2552bc9f8 100644 --- a/sycl/test-e2e/Graph/Explicit/memadvise.cpp +++ b/sycl/test-e2e/Graph/Explicit/memadvise.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %if linux && (level_zero || cuda) %{ env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// REQUIRES: aspect-usm_shared_allocations + // Mem advise command not supported for OpenCL // UNSUPPORTED: opencl diff --git a/sycl/test-e2e/Graph/Explicit/prefetch.cpp b/sycl/test-e2e/Graph/Explicit/prefetch.cpp index 8e0e6e15c292d..8f585464987a4 100644 --- a/sycl/test-e2e/Graph/Explicit/prefetch.cpp +++ b/sycl/test-e2e/Graph/Explicit/prefetch.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %if linux && (level_zero || cuda) %{ env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// REQUIRES: aspect-usm_shared_allocations + // prefetch command not supported for OpenCL // UNSUPPORTED: opencl diff --git a/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp b/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp index f31e641ec30cf..7acd5143f6f54 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp b/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp index 3b8821f6b3b33..8b8c623f48107 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp index aacc0f37efa11..a7eb0aa3158c0 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp @@ -6,10 +6,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_host_allocations)) { - return 0; - } - using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp index 00604f29d5855..90b85c986db2b 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp @@ -6,13 +6,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - if (!Queue.get_device().has(sycl::aspect::usm_host_allocations)) { - return 0; - } - using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp index b2d0a67ffd1d3..ca3dba3813f25 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp @@ -6,10 +6,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp index 9a82584817906..a0e48d29fc3fe 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp @@ -6,10 +6,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_system_allocations)) { - return 0; - } - using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp b/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp index da51f04c39d00..c38cf6d4f5e3c 100644 --- a/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp @@ -9,10 +9,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - std::vector DataA(Size), DataB(Size), DataC(Size); std::vector HostTaskOutput(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task.cpp b/sycl/test-e2e/Graph/Inputs/host_task.cpp index 96329462d5c2d..8ec19d770dbcb 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task.cpp @@ -7,10 +7,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task2.cpp b/sycl/test-e2e/Graph/Inputs/host_task2.cpp index eb1699bfba084..6fddddf489b32 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task2.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task2.cpp @@ -7,10 +7,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task2_multiple_roots.cpp b/sycl/test-e2e/Graph/Inputs/host_task2_multiple_roots.cpp index 9376b66a909bf..c4d03e3be9e4b 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task2_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task2_multiple_roots.cpp @@ -8,10 +8,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size), Res2(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task_last.cpp b/sycl/test-e2e/Graph/Inputs/host_task_last.cpp index e5909ac9b0ec6..07cc7f1dc61ae 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task_last.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task_last.cpp @@ -7,10 +7,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task_multiple_deps.cpp b/sycl/test-e2e/Graph/Inputs/host_task_multiple_deps.cpp index 07791b98bd30f..efe0846450539 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task_multiple_deps.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task_multiple_deps.cpp @@ -8,10 +8,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task_multiple_roots.cpp b/sycl/test-e2e/Graph/Inputs/host_task_multiple_roots.cpp index c34823c5de0d9..62dc577106e37 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task_multiple_roots.cpp @@ -8,10 +8,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size), Res2(Size); diff --git a/sycl/test-e2e/Graph/Inputs/host_task_successive.cpp b/sycl/test-e2e/Graph/Inputs/host_task_successive.cpp index 9b24a03571c60..1312ea1074da9 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task_successive.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task_successive.cpp @@ -7,10 +7,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/memadvise.cpp b/sycl/test-e2e/Graph/Inputs/memadvise.cpp index 94206503aaf5f..45a5f74d95060 100644 --- a/sycl/test-e2e/Graph/Inputs/memadvise.cpp +++ b/sycl/test-e2e/Graph/Inputs/memadvise.cpp @@ -10,10 +10,6 @@ int main() { queue Queue; - if (!Queue.get_device().get_info()) { - return 0; - } - exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; T *Src = (T *)malloc_shared(sizeof(T) * Count, Queue.get_device(), diff --git a/sycl/test-e2e/Graph/Inputs/prefetch.cpp b/sycl/test-e2e/Graph/Inputs/prefetch.cpp index 7a3e60bc0111d..9e459189e6288 100644 --- a/sycl/test-e2e/Graph/Inputs/prefetch.cpp +++ b/sycl/test-e2e/Graph/Inputs/prefetch.cpp @@ -10,10 +10,6 @@ int main() { queue Queue; - if (!Queue.get_device().get_info()) { - return 0; - } - exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; T *Src = (T *)malloc_shared(sizeof(T) * Count, Queue.get_device(), diff --git a/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp b/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp index bac26b4092039..5729abf20d4d4 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp @@ -5,10 +5,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_host_allocations)) { - return 0; - } - exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; const size_t N = 10; diff --git a/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp b/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp index cafec27bdd049..a8eb04ab04204 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp @@ -5,10 +5,6 @@ int main() { queue Queue{}; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; const size_t N = 10; diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp index 0e9614e8dc986..c40c2537e3432 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp index 3877a5d8f4172..ee91a6b49b3d6 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp @@ -4,7 +4,9 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp index a26685577833f..f17d65de935e3 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp index 55902afaba9dd..ff1ee23b6f188 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_system_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp index f8f4b8a2fd0e0..71d8d7133780e 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations // Skip as executable graph update and host tasks both aren't // implemented. diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp index d939f2b46b5b3..a0ce9be30c0f2 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task2.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task2.cpp index de66aa69f3c04..c39729f0c884e 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task2.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task2.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task2_multiple_roots.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task2_multiple_roots.cpp index 09d51f36526bf..f8eb8937dceb5 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task2_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task2_multiple_roots.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task_in_order.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task_in_order.cpp index 53aeb1d50d464..d1bc7d4570fa7 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task_in_order.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task_in_order.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations // This test uses a host_task when adding a command_graph node to an // in-order queue. @@ -16,10 +17,6 @@ int main() { using T = int; - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { - return 0; - } - const T ModValue = T{7}; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task_last.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task_last.cpp index 351876bd27127..9bd6d69e64ee0 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task_last.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task_last.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_deps.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_deps.cpp index 0f6faf916fd95..119fbdb9eb854 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_deps.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_deps.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_roots.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_roots.cpp index 3bc9aaabb8681..279ac432a091f 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_roots.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task_multiple_roots.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task_successive.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task_successive.cpp index c1fa5993edd15..cb715858c8665 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task_successive.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task_successive.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies.cpp b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies.cpp index 9699a69dc7cbf..90cc06ce15587 100644 --- a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out +// REQUIRES: aspect-usm_shared_allocations + // Tests submitting a host kernel to an in-order queue before recording // commands from it. @@ -11,10 +13,6 @@ int main() { queue Queue{sycl::property::queue::in_order{}}; - // Check if device has usm shared allocation - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) - return 0; - T *TestData = sycl::malloc_shared(Size, Queue); ext::oneapi::experimental::command_graph Graph{Queue.get_context(), diff --git a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memcpy.cpp b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memcpy.cpp index a6a289de07d02..b916487e0bb5b 100644 --- a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memcpy.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memcpy.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out +// REQUIRES: aspect-usm_shared_allocations + // Tests submitting memcpy to an in-order queue before recording // commands from it. @@ -11,10 +13,6 @@ int main() { queue Queue{sycl::property::queue::in_order{}}; - // Check if device has usm shared allocation - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) - return 0; - std::vector TestDataIn(Size); T *TestData = sycl::malloc_shared(Size, Queue); T *TestDataOut = sycl::malloc_shared(Size, Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memset.cpp b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memset.cpp index dcb9340706095..fc1e1049e7613 100644 --- a/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memset.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/in_order_queue_with_host_managed_dependencies_memset.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out +// REQUIRES: aspect-usm_shared_allocations + // Tests submitting memset to an in-order queue before recording // commands from it. @@ -11,10 +13,6 @@ int main() { queue Queue{sycl::property::queue::in_order{}}; - // Check if device has usm shared allocation - if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) - return 0; - T *TestData = sycl::malloc_shared(Size, Queue); T *TestDataOut = sycl::malloc_shared(Size, Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp index a5b87f8143832..d2e28d01bc3c2 100644 --- a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %if linux && (level_zero || cuda) %{ env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// REQUIRES: aspect-usm_shared_allocations + // Mem advise command not supported for OpenCL // UNSUPPORTED: opencl diff --git a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp index dca297f7772b3..e6cf0eb8f951b 100644 --- a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp @@ -1,6 +1,8 @@ // RUN: %{build} -o %t.out // RUN: %if linux && (level_zero || cuda) %{ env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// REQUIRES: aspect-usm_shared_allocations + // prefetch command not supported for OpenCL // UNSUPPORTED: opencl diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp index da1e95536a680..0e9b3dbdb39e8 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_host_allocations #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp index 6b68f4646425a..950afd3da8b97 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp @@ -4,7 +4,8 @@ // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero && linux %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} -// + +// REQUIRES: aspect-usm_shared_allocations #define GRAPH_E2E_RECORD_REPLAY