From f8abcec145d7414563792b1660c03b31e3a22594 Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Tue, 14 Nov 2023 12:45:40 +0000 Subject: [PATCH 1/5] [SYCL][Graph] Add new 'are_graphs_supported' helper function to determine platform support for Graphs at runtime rather than the lit '// REQUIRES: ' check at compile time. Fixed a bug in the usm_ tests of trying to instantiate an int with a float value. --- .../Explicit/add_node_while_recording.cpp | 5 ++- .../Explicit/add_nodes_after_finalize.cpp | 1 - .../assume_buffer_outlives_graph_property.cpp | 1 - sycl/test-e2e/Graph/Explicit/basic_buffer.cpp | 1 - sycl/test-e2e/Graph/Explicit/basic_usm.cpp | 1 - .../Graph/Explicit/basic_usm_host.cpp | 1 - .../Graph/Explicit/basic_usm_mixed.cpp | 1 - .../Graph/Explicit/basic_usm_shared.cpp | 1 - .../Graph/Explicit/basic_usm_system.cpp | 1 - sycl/test-e2e/Graph/Explicit/buffer_copy.cpp | 1 - .../Graph/Explicit/buffer_copy_2d.cpp | 1 - .../Explicit/buffer_copy_host2target.cpp | 1 - .../Explicit/buffer_copy_host2target_2d.cpp | 1 - .../buffer_copy_host2target_offset.cpp | 1 - .../Graph/Explicit/buffer_copy_offsets.cpp | 1 - .../Explicit/buffer_copy_target2host.cpp | 1 - .../Explicit/buffer_copy_target2host_2d.cpp | 1 - .../buffer_copy_target2host_offset.cpp | 1 - .../Graph/Explicit/buffer_ordering.cpp | 1 - sycl/test-e2e/Graph/Explicit/cycle_error.cpp | 5 ++- .../Graph/Explicit/debug_print_graph.cpp | 1 - .../Explicit/debug_print_graph_verbose.cpp | 1 - sycl/test-e2e/Graph/Explicit/depends_on.cpp | 6 ++- .../Graph/Explicit/dotp_buffer_reduction.cpp | 3 +- .../Graph/Explicit/dotp_usm_reduction.cpp | 3 +- .../test-e2e/Graph/Explicit/double_buffer.cpp | 3 +- sycl/test-e2e/Graph/Explicit/empty_node.cpp | 1 - .../Graph/Explicit/enqueue_ordering.cpp | 6 ++- .../Graph/Explicit/event_status_querying.cpp | 1 - .../Explicit/executable_graph_update.cpp | 3 +- .../executable_graph_update_ordering.cpp | 1 - sycl/test-e2e/Graph/Explicit/host_task.cpp | 1 - .../test-e2e/Graph/Explicit/kernel_bundle.cpp | 1 - .../Graph/Explicit/multiple_exec_graphs.cpp | 1 - .../Explicit/multiple_kernel_bundles.cpp | 1 - .../test-e2e/Graph/Explicit/node_ordering.cpp | 6 ++- .../Graph/Explicit/queue_shortcuts.cpp | 1 - .../test-e2e/Graph/Explicit/repeated_exec.cpp | 1 - sycl/test-e2e/Graph/Explicit/single_node.cpp | 6 ++- .../Explicit/spec_constants_handler_api.cpp | 1 - .../spec_constants_kernel_bundle_api.cpp | 1 - sycl/test-e2e/Graph/Explicit/stream.cpp | 3 +- sycl/test-e2e/Graph/Explicit/sub_graph.cpp | 1 - .../sub_graph_execute_without_parent.cpp | 1 - .../sub_graph_multiple_submission.cpp | 1 - .../Graph/Explicit/sub_graph_nested.cpp | 1 - .../Graph/Explicit/sub_graph_reduction.cpp | 3 +- .../Explicit/sub_graph_two_parent_graphs.cpp | 1 - .../Explicit/temp_buffer_reinterpret.cpp | 1 - sycl/test-e2e/Graph/Explicit/usm_copy.cpp | 1 - sycl/test-e2e/Graph/Explicit/usm_fill.cpp | 1 - .../test-e2e/Graph/Explicit/usm_fill_host.cpp | 1 - .../Graph/Explicit/usm_fill_shared.cpp | 1 - .../Graph/Inputs/add_nodes_after_finalize.cpp | 4 ++ .../assume_buffer_outlives_graph_property.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/basic_buffer.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/basic_usm.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp | 4 ++ .../test-e2e/Graph/Inputs/basic_usm_mixed.cpp | 4 ++ .../Graph/Inputs/basic_usm_shared.cpp | 4 ++ .../Graph/Inputs/basic_usm_system.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/buffer_copy.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp | 4 ++ .../Graph/Inputs/buffer_copy_host2target.cpp | 4 ++ .../Inputs/buffer_copy_host2target_2d.cpp | 4 ++ .../Inputs/buffer_copy_host2target_offset.cpp | 4 ++ .../Graph/Inputs/buffer_copy_offsets.cpp | 4 ++ .../Graph/Inputs/buffer_copy_target2host.cpp | 4 ++ .../Inputs/buffer_copy_target2host_2d.cpp | 4 ++ .../Inputs/buffer_copy_target2host_offset.cpp | 4 ++ .../test-e2e/Graph/Inputs/buffer_ordering.cpp | 4 ++ .../Graph/Inputs/debug_print_graph.cpp | 4 ++ .../Inputs/debug_print_graph_verbose.cpp | 4 ++ .../Graph/Inputs/dotp_buffer_reduction.cpp | 5 ++- .../Graph/Inputs/dotp_usm_reduction.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/double_buffer.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/empty_node.cpp | 4 ++ .../Graph/Inputs/event_status_querying.cpp | 4 ++ .../Graph/Inputs/executable_graph_update.cpp | 4 ++ .../executable_graph_update_ordering.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/host_task.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp | 4 ++ .../Graph/Inputs/multiple_exec_graphs.cpp | 4 ++ .../Graph/Inputs/multiple_kernel_bundles.cpp | 4 ++ .../test-e2e/Graph/Inputs/queue_shortcuts.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/repeated_exec.cpp | 5 ++- .../Inputs/spec_constants_handler_api.cpp | 4 ++ .../spec_constants_kernel_bundle_api.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/stream.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/sub_graph.cpp | 4 ++ .../sub_graph_execute_without_parent.cpp | 4 ++ .../Inputs/sub_graph_multiple_submission.cpp | 4 ++ .../Graph/Inputs/sub_graph_nested.cpp | 4 ++ .../Graph/Inputs/sub_graph_reduction.cpp | 4 ++ .../Inputs/sub_graph_two_parent_graphs.cpp | 4 ++ .../Graph/Inputs/temp_buffer_reinterpret.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/usm_copy.cpp | 4 ++ sycl/test-e2e/Graph/Inputs/usm_fill.cpp | 7 +++- sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp | 8 +++- .../test-e2e/Graph/Inputs/usm_fill_shared.cpp | 7 +++- .../RecordReplay/add_nodes_after_finalize.cpp | 1 - .../test-e2e/Graph/RecordReplay/after_use.cpp | 5 ++- .../assume_buffer_outlives_graph_property.cpp | 1 - .../Graph/RecordReplay/barrier_with_work.cpp | 5 ++- .../Graph/RecordReplay/basic_buffer.cpp | 1 - .../test-e2e/Graph/RecordReplay/basic_usm.cpp | 1 - .../Graph/RecordReplay/basic_usm_host.cpp | 1 - .../Graph/RecordReplay/basic_usm_mixed.cpp | 1 - .../Graph/RecordReplay/basic_usm_shared.cpp | 1 - .../Graph/RecordReplay/basic_usm_system.cpp | 1 - .../Graph/RecordReplay/buffer_copy.cpp | 1 - .../Graph/RecordReplay/buffer_copy_2d.cpp | 1 - .../RecordReplay/buffer_copy_host2target.cpp | 1 - .../buffer_copy_host2target_2d.cpp | 1 - .../buffer_copy_host2target_offset.cpp | 1 - .../RecordReplay/buffer_copy_offsets.cpp | 1 - .../RecordReplay/buffer_copy_target2host.cpp | 1 - .../buffer_copy_target2host_2d.cpp | 1 - .../buffer_copy_target2host_offset.cpp | 1 - .../Graph/RecordReplay/buffer_ordering.cpp | 1 - .../Graph/RecordReplay/concurrent_queue.cpp | 5 ++- .../Graph/RecordReplay/debug_print_graph.cpp | 1 - .../debug_print_graph_verbose.cpp | 1 - .../RecordReplay/dotp_buffer_reduction.cpp | 3 +- .../Graph/RecordReplay/dotp_in_order.cpp | 5 ++- .../dotp_in_order_with_empty_nodes.cpp | 5 ++- .../RecordReplay/dotp_multiple_queues.cpp | 6 ++- .../Graph/RecordReplay/dotp_usm_reduction.cpp | 3 +- .../Graph/RecordReplay/double_buffer.cpp | 3 +- .../Graph/RecordReplay/empty_node.cpp | 1 - .../RecordReplay/event_status_querying.cpp | 1 - .../exception_inconsistent_contexts.cpp | 5 ++- .../exception_inconsistent_devices.cpp | 4 ++ .../RecordReplay/executable_graph_update.cpp | 3 +- .../executable_graph_update_ordering.cpp | 1 - .../RecordReplay/finalize_while_recording.cpp | 5 ++- .../test-e2e/Graph/RecordReplay/host_task.cpp | 1 - .../Graph/RecordReplay/kernel_bundle.cpp | 1 - .../RecordReplay/multiple_exec_graphs.cpp | 1 - .../RecordReplay/multiple_kernel_bundles.cpp | 1 - .../Graph/RecordReplay/queue_shortcuts.cpp | 1 - .../Graph/RecordReplay/repeated_exec.cpp | 1 - .../Graph/RecordReplay/return_values.cpp | 6 ++- .../spec_constants_handler_api.cpp | 1 - .../spec_constants_kernel_bundle_api.cpp | 1 - sycl/test-e2e/Graph/RecordReplay/stream.cpp | 3 +- .../test-e2e/Graph/RecordReplay/sub_graph.cpp | 3 +- .../sub_graph_execute_without_parent.cpp | 1 - .../Graph/RecordReplay/sub_graph_in_order.cpp | 5 ++- .../sub_graph_multiple_submission.cpp | 1 - .../Graph/RecordReplay/sub_graph_nested.cpp | 1 - .../RecordReplay/sub_graph_reduction.cpp | 3 +- .../sub_graph_two_parent_graphs.cpp | 1 - .../Graph/RecordReplay/temp_buffer.cpp | 7 +++- .../RecordReplay/temp_buffer_reinterpret.cpp | 1 - .../Graph/RecordReplay/temp_scope.cpp | 6 ++- sycl/test-e2e/Graph/RecordReplay/usm_copy.cpp | 1 - .../Graph/RecordReplay/usm_copy_in_order.cpp | 5 ++- sycl/test-e2e/Graph/RecordReplay/usm_fill.cpp | 1 - .../Graph/RecordReplay/usm_fill_host.cpp | 1 - .../Graph/RecordReplay/usm_fill_shared.cpp | 1 - .../Graph/RecordReplay/valid_no_end.cpp | 5 ++- sycl/test-e2e/Graph/Threading/submit.cpp | 5 ++- sycl/test-e2e/Graph/device_query.cpp | 4 ++ sycl/test-e2e/Graph/empty_graph.cpp | 5 ++- sycl/test-e2e/Graph/finalize_twice.cpp | 5 ++- sycl/test-e2e/Graph/graph_common.hpp | 9 ++++ ...raph_exception_global_device_extension.cpp | 42 ++++++++++--------- .../Graph/immediate_command_list_error.cpp | 4 ++ sycl/test-e2e/Graph/invalid_depends_on.cpp | 5 ++- sycl/test-e2e/Graph/invalid_event_wait.cpp | 5 ++- sycl/test-e2e/Graph/invalid_queue_wait.cpp | 5 ++- .../Graph/submission_while_executing.cpp | 5 ++- 173 files changed, 360 insertions(+), 167 deletions(-) diff --git a/sycl/test-e2e/Graph/Explicit/add_node_while_recording.cpp b/sycl/test-e2e/Graph/Explicit/add_node_while_recording.cpp index 8745a10e7ab9..0e8e0b775078 100644 --- a/sycl/test-e2e/Graph/Explicit/add_node_while_recording.cpp +++ b/sycl/test-e2e/Graph/Explicit/add_node_while_recording.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -14,6 +13,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + bool Success = false; exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp b/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp index d41484a28560..b8ded9340335 100644 --- a/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp +++ b/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/assume_buffer_outlives_graph_property.cpp b/sycl/test-e2e/Graph/Explicit/assume_buffer_outlives_graph_property.cpp index 91754164259e..29feb8fa9a9f 100644 --- a/sycl/test-e2e/Graph/Explicit/assume_buffer_outlives_graph_property.cpp +++ b/sycl/test-e2e/Graph/Explicit/assume_buffer_outlives_graph_property.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp b/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp index 60d83b985078..7b9ec947ac6b 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm.cpp index b6d765c60090..22a6b543518f 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp index ac4564ce5797..7a0a5cdf38bf 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp index 17a282737266..279cba30a736 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_mixed.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp index 39843f07ff87..bbe7f2811cd6 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_shared.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp index 2a8c69c2afca..722e080d0ae5 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp index 09b6e47608e1..bab2d1245d06 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp index 65084bfb186d..87c00e471fb8 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target.cpp index c8f8f3980472..da21eec096d4 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_2d.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_2d.cpp index da31f17c0c7d..e070dfa0a0b3 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_2d.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_offset.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_offset.cpp index d29520d5ac9c..d9f624f77b5c 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_offset.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_offset.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_offsets.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_offsets.cpp index 920828cac20d..29dd8e938022 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_offsets.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_offsets.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host.cpp index 9b5175567f9b..a8a01c9d4cb7 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_2d.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_2d.cpp index 09762d7b9789..5e80d6ec723d 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_2d.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_offset.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_offset.cpp index 012b9df7dfe3..6bf7b01799db 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_offset.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_offset.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp b/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp index 2c2edd374feb..0ca1cd25c497 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/cycle_error.cpp b/sycl/test-e2e/Graph/Explicit/cycle_error.cpp index bb0558c43f26..c4c38ef3b114 100644 --- a/sycl/test-e2e/Graph/Explicit/cycle_error.cpp +++ b/sycl/test-e2e/Graph/Explicit/cycle_error.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -17,6 +16,10 @@ void CreateGraphWithCyclesTest(bool DisableCycleChecks) { queue Queue; + if (!are_graphs_supported(Queue)) { + return 0; + } + property_list Props; if (DisableCycleChecks) { diff --git a/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp b/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp index d35fb1a92351..f8b56bffd35d 100644 --- a/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp +++ b/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero || cuda, gpu // RUN: %{build} -o %t.out // RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} // RUN: %if windows %{ %{run} %t.out %} diff --git a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp index 2fa6ed85ccf7..7e91c14bb810 100644 --- a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero || cuda, gpu // RUN: %{build} -o %t.out // RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} // RUN: %if windows %{ %{run} %t.out %} diff --git a/sycl/test-e2e/Graph/Explicit/depends_on.cpp b/sycl/test-e2e/Graph/Explicit/depends_on.cpp index 77e979f3edf4..8d6ba2febf0e 100644 --- a/sycl/test-e2e/Graph/Explicit/depends_on.cpp +++ b/sycl/test-e2e/Graph/Explicit/depends_on.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -13,9 +12,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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/Explicit/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp index 9557bfd81424..442941903ae5 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp index df66e5e9bb14..5a30b33221fc 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp index 2468592c0f0c..329c258cd00d 100644 --- a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp +++ b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update isn't implemented yet -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/empty_node.cpp b/sycl/test-e2e/Graph/Explicit/empty_node.cpp index 638ccbde77e1..72065fe02231 100644 --- a/sycl/test-e2e/Graph/Explicit/empty_node.cpp +++ b/sycl/test-e2e/Graph/Explicit/empty_node.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp b/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp index 198da9a7129d..d28c61b4d321 100644 --- a/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -12,9 +11,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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/Explicit/event_status_querying.cpp b/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp index 6a4c1db81cfe..c954fd59b364 100644 --- a/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp +++ b/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out 2>&1 | FileCheck %s // diff --git a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp index 9a56e18724d7..8a2e8286f632 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not implemented yet -// XFAIL: * +// UNSUPPORTED: * #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 caed7820467d..2dd63930d407 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/host_task.cpp b/sycl/test-e2e/Graph/Explicit/host_task.cpp index 3aff7e2807ee..601a8a770be0 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp index 0d301200b089..2ec26de313d9 100644 --- a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %if ext_oneapi_cuda %{ %{run} %t.out %} // RUN: %if ext_oneapi_level_zero %{env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s %} diff --git a/sycl/test-e2e/Graph/Explicit/multiple_exec_graphs.cpp b/sycl/test-e2e/Graph/Explicit/multiple_exec_graphs.cpp index 9de3fd735eee..28cf36552b3e 100644 --- a/sycl/test-e2e/Graph/Explicit/multiple_exec_graphs.cpp +++ b/sycl/test-e2e/Graph/Explicit/multiple_exec_graphs.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/multiple_kernel_bundles.cpp b/sycl/test-e2e/Graph/Explicit/multiple_kernel_bundles.cpp index 19a05d610e13..9731ade77ed7 100644 --- a/sycl/test-e2e/Graph/Explicit/multiple_kernel_bundles.cpp +++ b/sycl/test-e2e/Graph/Explicit/multiple_kernel_bundles.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/node_ordering.cpp b/sycl/test-e2e/Graph/Explicit/node_ordering.cpp index 6e3d965619c9..75f5855f4109 100644 --- a/sycl/test-e2e/Graph/Explicit/node_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/node_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -12,9 +11,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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/Explicit/queue_shortcuts.cpp b/sycl/test-e2e/Graph/Explicit/queue_shortcuts.cpp index 61d6ddad5a62..35bb2a8baec4 100644 --- a/sycl/test-e2e/Graph/Explicit/queue_shortcuts.cpp +++ b/sycl/test-e2e/Graph/Explicit/queue_shortcuts.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/repeated_exec.cpp b/sycl/test-e2e/Graph/Explicit/repeated_exec.cpp index 495a5c3e7b2f..faf83d080d51 100644 --- a/sycl/test-e2e/Graph/Explicit/repeated_exec.cpp +++ b/sycl/test-e2e/Graph/Explicit/repeated_exec.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/single_node.cpp b/sycl/test-e2e/Graph/Explicit/single_node.cpp index 0fae78023b49..95bb0a967f24 100644 --- a/sycl/test-e2e/Graph/Explicit/single_node.cpp +++ b/sycl/test-e2e/Graph/Explicit/single_node.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -11,9 +10,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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/Explicit/spec_constants_handler_api.cpp b/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp index 823786de3d69..e0c41c21965c 100644 --- a/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp +++ b/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp b/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp index 3417dbc9754b..3b6e15d863d2 100644 --- a/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp +++ b/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/stream.cpp b/sycl/test-e2e/Graph/Explicit/stream.cpp index eaa55adafa30..3140fc4262e0 100644 --- a/sycl/test-e2e/Graph/Explicit/stream.cpp +++ b/sycl/test-e2e/Graph/Explicit/stream.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out %GPU_CHECK_PLACEHOLDER // RUN: %if ext_oneapi_level_zero %{env ZE_DEBUG=4 %{run} %t.out %GPU_CHECK_PLACEHOLDER 2>&1 | FileCheck %s %} @@ -6,7 +5,7 @@ // CHECK-NOT: LEAK // Expected fail as sycl streams aren't implemented yet -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph.cpp index ff3a8c1b2eea..51b0f29885a3 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_execute_without_parent.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_execute_without_parent.cpp index ad0badd14ed9..e4a503cd8b24 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_execute_without_parent.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_execute_without_parent.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_multiple_submission.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_multiple_submission.cpp index bc66115d8fa3..0883dc4411e8 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_multiple_submission.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_multiple_submission.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_nested.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_nested.cpp index a1dc0e479da7..0d4a4736c124 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_nested.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_nested.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp index 97e437cbc0f5..b7bb5a29a7c9 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_two_parent_graphs.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_two_parent_graphs.cpp index 7847981a8657..e7dbf124c595 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_two_parent_graphs.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_two_parent_graphs.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/temp_buffer_reinterpret.cpp b/sycl/test-e2e/Graph/Explicit/temp_buffer_reinterpret.cpp index c8fd1d803266..c0dc132aa8ab 100644 --- a/sycl/test-e2e/Graph/Explicit/temp_buffer_reinterpret.cpp +++ b/sycl/test-e2e/Graph/Explicit/temp_buffer_reinterpret.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/usm_copy.cpp b/sycl/test-e2e/Graph/Explicit/usm_copy.cpp index 6025d1429ae8..e8a34aa1f75c 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_copy.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_copy.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/usm_fill.cpp b/sycl/test-e2e/Graph/Explicit/usm_fill.cpp index 0605004c6b11..46279fdb1cf9 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_fill.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_fill.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp b/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp index e1fdd8a40fbd..5ca3ad3e766f 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_fill_host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp b/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp index 064dc2027354..9980cce327de 100644 --- a/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp b/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp index 3a11b20cb997..aa39218bc5f9 100644 --- a/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp +++ b/sycl/test-e2e/Graph/Inputs/add_nodes_after_finalize.cpp @@ -7,6 +7,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = unsigned int; std::vector DataA(Size), DataB(Size), DataC(Size), DataOut(Size); diff --git a/sycl/test-e2e/Graph/Inputs/assume_buffer_outlives_graph_property.cpp b/sycl/test-e2e/Graph/Inputs/assume_buffer_outlives_graph_property.cpp index 415767c7888d..4024b3bd6b49 100644 --- a/sycl/test-e2e/Graph/Inputs/assume_buffer_outlives_graph_property.cpp +++ b/sycl/test-e2e/Graph/Inputs/assume_buffer_outlives_graph_property.cpp @@ -6,6 +6,10 @@ int main() { queue Queue; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = unsigned short; buffer Buffer{range<1>{1}}; diff --git a/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp b/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp index 91308be25761..ea46da424dcc 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_buffer.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = unsigned short; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm.cpp index 6caa3a5d42ae..c5674ba6b4f6 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm.cpp @@ -7,6 +7,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const unsigned NumThreads = std::thread::hardware_concurrency(); diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp index 59447ee3a213..153ef5ec0b95 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_host.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_host_allocations)) { return 0; } diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp index 3db89123a69f..91d8977a6f8c 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_mixed.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { return 0; } diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp index d769b4af3407..2ae585e09580 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_shared.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { return 0; } diff --git a/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp b/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp index 1b199cc55a4a..07deda4a18b3 100644 --- a/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/Inputs/basic_usm_system.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_system_allocations)) { return 0; } diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp index 76be8ec03053..26bcb74dfc49 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy.cpp @@ -5,6 +5,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const T ModValue = 7; diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp index 3476e4a53452..a29139b997a8 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_2d.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const T ModValue = 7; diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp index 3cafeec7068b..68146e55c2fd 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp index 48081164859b..87da3daf26bd 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_2d.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size * Size), DataB(Size * Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp index 42a9d7a4f69b..315c70835691 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_host2target_offset.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size + Offset), DataB(Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp index ae70dfd4c44d..3d1974e883e0 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; size_t OffsetSrc = 2 * size_t(Size / 4); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp index a37b941ac40e..911b18b6cd32 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp index 5f5058814f26..e5888dc4efb9 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_2d.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size * Size), DataB(Size * Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp index 9f6338a7436b..2db984e64a99 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_copy_target2host_offset.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size); diff --git a/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp b/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp index e317857f43fe..2cfe245c9e42 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp @@ -15,6 +15,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + const size_t N = 10; std::vector Arr(N, 0); diff --git a/sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp b/sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp index c6ee2bd4f5ae..3acef35788c3 100644 --- a/sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp +++ b/sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = unsigned short; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp index f6fc761f6da0..018953de3ee1 100644 --- a/sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = unsigned short; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp index a3a3f7a57ad2..f42764db749c 100644 --- a/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/Inputs/dotp_buffer_reduction.cpp @@ -3,9 +3,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + int DotpData = 0; const size_t N = 10; diff --git a/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp index 2c076765893d..3b4d941b167a 100644 --- a/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/Inputs/dotp_usm_reduction.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; int *Dotp = malloc_device(1, Queue); diff --git a/sycl/test-e2e/Graph/Inputs/double_buffer.cpp b/sycl/test-e2e/Graph/Inputs/double_buffer.cpp index 413a9bc10543..9fafdfccecdf 100644 --- a/sycl/test-e2e/Graph/Inputs/double_buffer.cpp +++ b/sycl/test-e2e/Graph/Inputs/double_buffer.cpp @@ -7,6 +7,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/empty_node.cpp b/sycl/test-e2e/Graph/Inputs/empty_node.cpp index 63efccebb4a5..fedb8c281877 100644 --- a/sycl/test-e2e/Graph/Inputs/empty_node.cpp +++ b/sycl/test-e2e/Graph/Inputs/empty_node.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + auto MyProperties = property_list{exp_ext::property::graph::no_cycle_check()}; exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device(), MyProperties}; diff --git a/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp b/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp index 2ed308bfccad..a68b78c4ca37 100644 --- a/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp +++ b/sycl/test-e2e/Graph/Inputs/event_status_querying.cpp @@ -36,6 +36,10 @@ std::string event_status_name(sycl::info::event_command_status status) { int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const T ModValue = 7; diff --git a/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp b/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp index 9e5aca403420..b8ad1c789a13 100644 --- a/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/Inputs/executable_graph_update.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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 e920daf7addf..96d1ec510d10 100644 --- a/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/Inputs/executable_graph_update_ordering.cpp @@ -7,6 +7,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { diff --git a/sycl/test-e2e/Graph/Inputs/host_task.cpp b/sycl/test-e2e/Graph/Inputs/host_task.cpp index bfc00bde4577..f7f1d0d30f39 100644 --- a/sycl/test-e2e/Graph/Inputs/host_task.cpp +++ b/sycl/test-e2e/Graph/Inputs/host_task.cpp @@ -5,6 +5,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { diff --git a/sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp b/sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp index 38571971064b..444473c769c2 100644 --- a/sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp @@ -14,6 +14,10 @@ int main() { Dev, {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + sycl::kernel_id KernelID = sycl::get_kernel_id(); sycl::kernel_bundle KernelBundleInput = diff --git a/sycl/test-e2e/Graph/Inputs/multiple_exec_graphs.cpp b/sycl/test-e2e/Graph/Inputs/multiple_exec_graphs.cpp index 21b4ed1ba414..18a922d91c69 100644 --- a/sycl/test-e2e/Graph/Inputs/multiple_exec_graphs.cpp +++ b/sycl/test-e2e/Graph/Inputs/multiple_exec_graphs.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/multiple_kernel_bundles.cpp b/sycl/test-e2e/Graph/Inputs/multiple_kernel_bundles.cpp index a250bb5037c2..fdf6cd47357a 100644 --- a/sycl/test-e2e/Graph/Inputs/multiple_kernel_bundles.cpp +++ b/sycl/test-e2e/Graph/Inputs/multiple_kernel_bundles.cpp @@ -18,6 +18,10 @@ int main() { Dev, {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + sycl::kernel_id Kernel1ID = sycl::get_kernel_id(); sycl::kernel_id Kernel2ID = sycl::get_kernel_id(); diff --git a/sycl/test-e2e/Graph/Inputs/queue_shortcuts.cpp b/sycl/test-e2e/Graph/Inputs/queue_shortcuts.cpp index 45041b748670..0e16ba16242c 100644 --- a/sycl/test-e2e/Graph/Inputs/queue_shortcuts.cpp +++ b/sycl/test-e2e/Graph/Inputs/queue_shortcuts.cpp @@ -5,6 +5,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/repeated_exec.cpp b/sycl/test-e2e/Graph/Inputs/repeated_exec.cpp index 13349d51f2e1..0819cd75a063 100644 --- a/sycl/test-e2e/Graph/Inputs/repeated_exec.cpp +++ b/sycl/test-e2e/Graph/Inputs/repeated_exec.cpp @@ -3,9 +3,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + 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/spec_constants_handler_api.cpp b/sycl/test-e2e/Graph/Inputs/spec_constants_handler_api.cpp index a27837865584..03e24cef2ad0 100644 --- a/sycl/test-e2e/Graph/Inputs/spec_constants_handler_api.cpp +++ b/sycl/test-e2e/Graph/Inputs/spec_constants_handler_api.cpp @@ -36,6 +36,10 @@ int main() { queue Queue{ExceptionHandler, {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + unsigned Errors = 0; if (!test_default_values(Queue)) { std::cout << "Test for default values of specialization constants failed!" diff --git a/sycl/test-e2e/Graph/Inputs/spec_constants_kernel_bundle_api.cpp b/sycl/test-e2e/Graph/Inputs/spec_constants_kernel_bundle_api.cpp index 63b8f350c38a..d9311c72d42e 100644 --- a/sycl/test-e2e/Graph/Inputs/spec_constants_kernel_bundle_api.cpp +++ b/sycl/test-e2e/Graph/Inputs/spec_constants_kernel_bundle_api.cpp @@ -33,6 +33,10 @@ int main() { queue Queue{ExceptionHandler, {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + unsigned Errors = 0; if (!test_default_values(Queue)) { std::cout << "Test for default values of specialization constants failed!" diff --git a/sycl/test-e2e/Graph/Inputs/stream.cpp b/sycl/test-e2e/Graph/Inputs/stream.cpp index edf27513c268..dc6527c9ddf8 100644 --- a/sycl/test-e2e/Graph/Inputs/stream.cpp +++ b/sycl/test-e2e/Graph/Inputs/stream.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; size_t WorkItems = 16; diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph.cpp index b1cb2a8299f0..725aacc778d9 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = short; // Values used to modify data inside kernels. diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_execute_without_parent.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_execute_without_parent.cpp index 54077ac3b679..8c930e06a238 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph_execute_without_parent.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph_execute_without_parent.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_multiple_submission.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_multiple_submission.cpp index 4c895feffe4b..190853f585b4 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph_multiple_submission.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph_multiple_submission.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_nested.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_nested.cpp index 588e91351f36..82f56e606e2c 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph_nested.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph_nested.cpp @@ -26,6 +26,10 @@ int reference(size_t i) { int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph XSubSubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp index 1982924dd22b..3813fdb96d81 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph_reduction.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Inputs/sub_graph_two_parent_graphs.cpp b/sycl/test-e2e/Graph/Inputs/sub_graph_two_parent_graphs.cpp index 3edabb3f7b00..b3f11d21eea7 100644 --- a/sycl/test-e2e/Graph/Inputs/sub_graph_two_parent_graphs.cpp +++ b/sycl/test-e2e/Graph/Inputs/sub_graph_two_parent_graphs.cpp @@ -6,6 +6,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph GraphA{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph GraphB{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp b/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp index f98a2bac8896..2a251d2edb68 100644 --- a/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp +++ b/sycl/test-e2e/Graph/Inputs/temp_buffer_reinterpret.cpp @@ -8,6 +8,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/Inputs/usm_copy.cpp b/sycl/test-e2e/Graph/Inputs/usm_copy.cpp index ca75bb844b74..9904b2da7dd4 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_copy.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_copy.cpp @@ -5,6 +5,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const T ModValue = 7; diff --git a/sycl/test-e2e/Graph/Inputs/usm_fill.cpp b/sycl/test-e2e/Graph/Inputs/usm_fill.cpp index 677a949c88e9..e2872efd5aff 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_fill.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_fill.cpp @@ -3,15 +3,18 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; const size_t N = 10; int *Arr = malloc_device(N, Queue); - int Pattern = 3.14f; + int Pattern = 3; auto NodeA = add_node(Graph, Queue, [&](handler &CGH) { CGH.fill(Arr, Pattern, N); }); diff --git a/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp b/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp index 0fd2b30ab769..3954f2807af8 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_fill_host.cpp @@ -3,8 +3,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_host_allocations)) { return 0; } @@ -14,7 +18,7 @@ int main() { const size_t N = 10; int *Arr = malloc_host(N, Queue); - int Pattern = 3.14f; + int Pattern = 3; auto NodeA = add_node(Graph, Queue, [&](handler &CGH) { CGH.fill(Arr, Pattern, N); }); diff --git a/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp b/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp index 84fca03a44ac..1782dd58ff43 100644 --- a/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/Inputs/usm_fill_shared.cpp @@ -3,9 +3,12 @@ #include "../graph_common.hpp" int main() { - queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + if (!Queue.get_device().has(sycl::aspect::usm_shared_allocations)) { return 0; } @@ -15,7 +18,7 @@ int main() { const size_t N = 10; int *Arr = malloc_shared(N, Queue); - int Pattern = 3.14f; + int Pattern = 3; auto NodeA = add_node(Graph, Queue, [&](handler &CGH) { CGH.fill(Arr, Pattern, N); }); diff --git a/sycl/test-e2e/Graph/RecordReplay/add_nodes_after_finalize.cpp b/sycl/test-e2e/Graph/RecordReplay/add_nodes_after_finalize.cpp index 711a7c0838a1..ff7d92c01bfb 100644 --- a/sycl/test-e2e/Graph/RecordReplay/add_nodes_after_finalize.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/add_nodes_after_finalize.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/after_use.cpp b/sycl/test-e2e/Graph/RecordReplay/after_use.cpp index 01cc5aa51a1a..d506619d9a4d 100644 --- a/sycl/test-e2e/Graph/RecordReplay/after_use.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/after_use.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -14,6 +13,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/RecordReplay/assume_buffer_outlives_graph_property.cpp b/sycl/test-e2e/Graph/RecordReplay/assume_buffer_outlives_graph_property.cpp index 5a561a0835cb..57f352d89321 100644 --- a/sycl/test-e2e/Graph/RecordReplay/assume_buffer_outlives_graph_property.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/assume_buffer_outlives_graph_property.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/barrier_with_work.cpp b/sycl/test-e2e/Graph/RecordReplay/barrier_with_work.cpp index d88706474430..e199e8fa9b2d 100644 --- a/sycl/test-e2e/Graph/RecordReplay/barrier_with_work.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/barrier_with_work.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -64,6 +63,10 @@ event run_kernels_usm_with_barrier(queue Q, const size_t Size, T *DataA, int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp index aeee4b6f4cf2..195dec15b8eb 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm.cpp index 988e22b75d04..6ba2a9a1a9b9 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp index d60dc0f45424..9f2ff2e15435 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp index 4645f079cd00..c80e358c43d0 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_mixed.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp index 51747fa00f7a..e0515e86e3b5 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_shared.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp index 360cb915f757..e4891371e085 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_usm_system.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp index b78ee6d16039..52e5dfd3dcdc 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_2d.cpp index f72ed81b5856..3cac441875d9 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_2d.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target.cpp index b72759f0a406..be52a35bfeeb 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_2d.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_2d.cpp index 5af65c7a679a..ed0d52deb596 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_2d.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_offset.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_offset.cpp index da446a0d1108..b366b40395e1 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_offset.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_offset.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_offsets.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_offsets.cpp index 75fab329068c..e4b26eab3c58 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_offsets.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_offsets.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host.cpp index bc5889d6c4f6..3bc14b0dbb99 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_2d.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_2d.cpp index 46091b899edc..b7dfee6f132c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_2d.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_2d.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_offset.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_offset.cpp index 72b1f5772ffc..f9d57efc1179 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_offset.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_offset.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp index 9910cc82d6e6..5d3b75e51cdf 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/concurrent_queue.cpp b/sycl/test-e2e/Graph/RecordReplay/concurrent_queue.cpp index b48ce2f65df5..1b621ab12a97 100644 --- a/sycl/test-e2e/Graph/RecordReplay/concurrent_queue.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/concurrent_queue.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -14,6 +13,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + bool Success = false; exp_ext::command_graph GraphA{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp index 18757f5d9aba..a576558b0d8f 100644 --- a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero || cuda, gpu // RUN: %{build} -o %t.out // RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} // RUN: %if windows %{ %{run} %t.out %} diff --git a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp index 799a8261bb0f..3f58ff0e8a75 100644 --- a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero || cuda, gpu // RUN: %{build} -o %t.out // RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} // RUN: %if windows %{ %{run} %t.out %} diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp index 8a3de6278402..0b5405456e08 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_in_order.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_in_order.cpp index 505a8716dab1..00ba8841c54e 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_in_order.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_in_order.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -16,6 +15,10 @@ int main() { sycl::ext::intel::property::queue::no_immediate_command_list{}}; queue Queue{Properties}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; int *Dotp = malloc_device(1, Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_in_order_with_empty_nodes.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_in_order_with_empty_nodes.cpp index 20aae12d3b2e..79254737a393 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_in_order_with_empty_nodes.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_in_order_with_empty_nodes.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -18,6 +17,10 @@ int main() { sycl::ext::intel::property::queue::no_immediate_command_list{}}; queue Queue{Properties}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; int *Dotp = malloc_device(1, Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_multiple_queues.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_multiple_queues.cpp index 08d2655d2e29..a8c009c3d173 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_multiple_queues.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_multiple_queues.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -16,6 +15,11 @@ int main() { property::queue::in_order{}, sycl::ext::intel::property::queue::no_immediate_command_list{}}; queue QueueA{Properties}; + + if (!are_graphs_supported(QueueA)) { + return 0; + } + queue QueueB{QueueA.get_context(), QueueA.get_device(), Properties}; exp_ext::command_graph Graph{QueueA.get_context(), QueueA.get_device()}; diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp index c16582dd20f8..c8d1e7f68add 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp index 5eeb2207ec78..4aa92cbc8e96 100644 --- a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not yet implemented -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/empty_node.cpp b/sycl/test-e2e/Graph/RecordReplay/empty_node.cpp index 95cf1baa6283..a9adb7aa9d4d 100644 --- a/sycl/test-e2e/Graph/RecordReplay/empty_node.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/empty_node.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp b/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp index 6b2b383fbb2f..94c61490cd08 100644 --- a/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp @@ -1,4 +1,3 @@ -// REQUIRES: level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out 2>&1 | FileCheck %s // diff --git a/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_contexts.cpp b/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_contexts.cpp index b7057a96879f..5770ee817005 100644 --- a/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_contexts.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_contexts.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // @@ -12,6 +11,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + context InOrderContext; exp_ext::command_graph Graph{InOrderContext, Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_devices.cpp b/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_devices.cpp index cd8fd46a72b6..329922e8b5c4 100644 --- a/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_devices.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/exception_inconsistent_devices.cpp @@ -32,6 +32,10 @@ int main() { queue Queue{Dev1}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Dev0}; std::error_code ExceptionCode = make_error_code(sycl::errc::success); diff --git a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp index 59759b2eb6c7..c3a0bab8e557 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not implemented yet -// XFAIL: * +// UNSUPPORTED: * #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 9e429f7d06a2..34e219fa8e89 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/finalize_while_recording.cpp b/sycl/test-e2e/Graph/RecordReplay/finalize_while_recording.cpp index b681ac07ac36..5417da4932d5 100644 --- a/sycl/test-e2e/Graph/RecordReplay/finalize_while_recording.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/finalize_while_recording.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -14,6 +13,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; Graph.begin_recording(Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp index a8c6bd2d6678..f4538af94d4c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp b/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp index cf30f29ebc88..b2e843f4ca91 100644 --- a/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %if ext_oneapi_cuda %{ %{run} %t.out %} // RUN: %if ext_oneapi_level_zero %{env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s %} diff --git a/sycl/test-e2e/Graph/RecordReplay/multiple_exec_graphs.cpp b/sycl/test-e2e/Graph/RecordReplay/multiple_exec_graphs.cpp index 1a6754619f7d..82a9891b143e 100644 --- a/sycl/test-e2e/Graph/RecordReplay/multiple_exec_graphs.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/multiple_exec_graphs.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/multiple_kernel_bundles.cpp b/sycl/test-e2e/Graph/RecordReplay/multiple_kernel_bundles.cpp index 0d9030ebbae8..97cb14df7c85 100644 --- a/sycl/test-e2e/Graph/RecordReplay/multiple_kernel_bundles.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/multiple_kernel_bundles.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/queue_shortcuts.cpp b/sycl/test-e2e/Graph/RecordReplay/queue_shortcuts.cpp index 423fc47a3fe1..9471464bf49c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/queue_shortcuts.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/queue_shortcuts.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/repeated_exec.cpp b/sycl/test-e2e/Graph/RecordReplay/repeated_exec.cpp index 4e5f0d35dbdd..97e20cf4f0a6 100644 --- a/sycl/test-e2e/Graph/RecordReplay/repeated_exec.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/repeated_exec.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/return_values.cpp b/sycl/test-e2e/Graph/RecordReplay/return_values.cpp index 7804ae837793..1cf5a8e943f8 100644 --- a/sycl/test-e2e/Graph/RecordReplay/return_values.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/return_values.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -13,6 +12,11 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; bool ChangedState = Graph.end_recording(); diff --git a/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp b/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp index c602e6e7d280..d03f25e5ae74 100644 --- a/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp b/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp index da0ed273e102..ac036515dc76 100644 --- a/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/stream.cpp b/sycl/test-e2e/Graph/RecordReplay/stream.cpp index d395b624d505..73b037ec52b0 100644 --- a/sycl/test-e2e/Graph/RecordReplay/stream.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/stream.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out %GPU_CHECK_PLACEHOLDER // RUN: %if ext_oneapi_level_zero %{env ZE_DEBUG=4 %{run} %t.out %GPU_CHECK_PLACEHOLDER 2>&1 | FileCheck %s %} @@ -6,7 +5,7 @@ // CHECK-NOT: LEAK // Expected fail as sycl::stream is not implemented yet -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph.cpp index 11f89afad5f2..9fbed24d3503 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -8,4 +7,4 @@ #define GRAPH_E2E_RECORD_REPLAY -#include "../Inputs/sub_graph.cpp" \ No newline at end of file +#include "../Inputs/sub_graph.cpp" diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_execute_without_parent.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_execute_without_parent.cpp index afa6ec38574a..92e2837026e9 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_execute_without_parent.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_execute_without_parent.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_in_order.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_in_order.cpp index 9bc0d33b92f1..52061b4ceb0d 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_in_order.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_in_order.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -16,6 +15,10 @@ int main() { sycl::ext::intel::property::queue::no_immediate_command_list{}}; queue Queue{Properties}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; exp_ext::command_graph SubGraph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_multiple_submission.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_multiple_submission.cpp index 767cf279b7c0..a4f439ae3b75 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_multiple_submission.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_multiple_submission.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_nested.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_nested.cpp index 75865f6f0869..d405ff198997 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_nested.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_nested.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp index 358a90603556..c1feeafdb66e 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// XFAIL: * +// UNSUPPORTED: * #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_two_parent_graphs.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_two_parent_graphs.cpp index 382d1ab67fb1..ca9f55a69e0c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_two_parent_graphs.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_two_parent_graphs.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp index 97aa3e836687..441119f72083 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -7,7 +6,7 @@ // CHECK-NOT: LEAK // Fail that needs investigation -// XFAIL: * +// UNSUPPORTED: * // This test creates a temporary buffer which is used in kernels, but // destroyed before finalization and execution of the graph. @@ -17,6 +16,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; std::vector DataA(Size), DataB(Size), DataC(Size); diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_buffer_reinterpret.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_buffer_reinterpret.cpp index 1a124ae49d3b..c7e17b9a736c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_buffer_reinterpret.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_buffer_reinterpret.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_scope.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_scope.cpp index dfad2e35a664..22c0c3e00739 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_scope.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_scope.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -26,10 +25,13 @@ void run_some_kernel(queue Queue, int *Data) { } int main() { - queue Queue{default_selector_v, {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; int *Arr = malloc_device(N, Queue); diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_copy.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_copy.cpp index b9ddfb58189c..e5070d01d984 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_copy.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_copy.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_copy_in_order.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_copy_in_order.cpp index 2a1d45a6494b..bd7f753763c0 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_copy_in_order.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_copy_in_order.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -16,6 +15,10 @@ int main() { sycl::ext::intel::property::queue::no_immediate_command_list{}}; queue Queue{Properties}; + if (!are_graphs_supported(Queue)) { + 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/usm_fill.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_fill.cpp index 4b48ef5fb4b5..c0221b14b214 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_fill.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_fill.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp index ce53c03a22b5..b9c85fdfaa35 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_fill_host.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp b/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp index 9b99e85c634c..e141c433fcb3 100644 --- a/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/usm_fill_shared.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/valid_no_end.cpp b/sycl/test-e2e/Graph/RecordReplay/valid_no_end.cpp index ae6847b9c8a8..65916526aded 100644 --- a/sycl/test-e2e/Graph/RecordReplay/valid_no_end.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/valid_no_end.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using ZE_DEBUG @@ -14,6 +13,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; { queue MyQueue(Queue.get_context(), Queue.get_device()); diff --git a/sycl/test-e2e/Graph/Threading/submit.cpp b/sycl/test-e2e/Graph/Threading/submit.cpp index 33ba51988ac2..9397c063a6cd 100644 --- a/sycl/test-e2e/Graph/Threading/submit.cpp +++ b/sycl/test-e2e/Graph/Threading/submit.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build_pthread_inc} -o %t.out // RUN: %{run} %t.out // RUN: %if ext_oneapi_level_zero %{env ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck %s %} @@ -21,6 +20,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; const unsigned NumThreads = std::thread::hardware_concurrency(); diff --git a/sycl/test-e2e/Graph/device_query.cpp b/sycl/test-e2e/Graph/device_query.cpp index d9fbe99a16e2..51746ae62988 100644 --- a/sycl/test-e2e/Graph/device_query.cpp +++ b/sycl/test-e2e/Graph/device_query.cpp @@ -10,6 +10,10 @@ int main() { queue Queue; + if (!are_graphs_supported(Queue)) { + return 0; + } + auto Device = Queue.get_device(); exp_ext::graph_support_level SupportsGraphs = diff --git a/sycl/test-e2e/Graph/empty_graph.cpp b/sycl/test-e2e/Graph/empty_graph.cpp index 376facc78417..eae37bae5a72 100644 --- a/sycl/test-e2e/Graph/empty_graph.cpp +++ b/sycl/test-e2e/Graph/empty_graph.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -10,6 +9,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + ext::oneapi::experimental::command_graph Graph{Queue.get_context(), Queue.get_device()}; diff --git a/sycl/test-e2e/Graph/finalize_twice.cpp b/sycl/test-e2e/Graph/finalize_twice.cpp index 8c4dbb08e559..9ac7f3cab633 100644 --- a/sycl/test-e2e/Graph/finalize_twice.cpp +++ b/sycl/test-e2e/Graph/finalize_twice.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -9,6 +8,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + ext::oneapi::experimental::command_graph Graph{Queue.get_context(), Queue.get_device()}; auto GraphExec = Graph.finalize(); diff --git a/sycl/test-e2e/Graph/graph_common.hpp b/sycl/test-e2e/Graph/graph_common.hpp index eda7f3255f4b..8905bbda7264 100644 --- a/sycl/test-e2e/Graph/graph_common.hpp +++ b/sycl/test-e2e/Graph/graph_common.hpp @@ -457,3 +457,12 @@ bool inline check_value(const size_t index, const T &Ref, const T &Got, return true; } + +bool are_graphs_supported(queue &Queue) { + auto Device = Queue.get_device(); + + exp_ext::graph_support_level SupportsGraphs = + Device.get_info(); + + return SupportsGraphs != exp_ext::graph_support_level::unsupported; +} diff --git a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp index 0e43f6a802ef..d702fdc80022 100644 --- a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp +++ b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // @@ -17,11 +16,10 @@ sycl::ext::oneapi::experimental::device_global enum OperationPath { Explicit, RecordReplay, Shortcut }; -template void test() { - queue Q{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; +template void test(queue Queue) { int MemcpyWrite = 42, CopyWrite = 24, MemcpyRead = 1, CopyRead = 2; - exp_ext::command_graph Graph{Q.get_context(), Q.get_device()}; + exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; if constexpr (PathKind != OperationPath::Explicit) { Graph.begin_recording(Q); @@ -31,10 +29,10 @@ template void test() { std::error_code ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.memcpy(&MemcpyRead, MemcpyDeviceGlobal); + Queue.memcpy(&MemcpyRead, MemcpyDeviceGlobal); } if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit([&](handler &CGH) { + Queue.submit([&](handler &CGH) { return CGH.memcpy(&MemcpyRead, MemcpyDeviceGlobal); }); } @@ -51,10 +49,10 @@ template void test() { ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.copy(CopyDeviceGlobal, &CopyRead); + Queue.copy(CopyDeviceGlobal, &CopyRead); } if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit( + Queue.submit( [&](handler &CGH) { return CGH.copy(CopyDeviceGlobal, &CopyRead); }); } if constexpr (PathKind == OperationPath::Explicit) { @@ -70,10 +68,10 @@ template void test() { ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.memcpy(MemcpyDeviceGlobal, &MemcpyWrite); + Queue.memcpy(MemcpyDeviceGlobal, &MemcpyWrite); } if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit([&](handler &CGH) { + Queue.submit([&](handler &CGH) { return CGH.memcpy(MemcpyDeviceGlobal, &MemcpyWrite); }); } @@ -90,9 +88,9 @@ template void test() { ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.copy(&CopyWrite, CopyDeviceGlobal); + Queue.copy(&CopyWrite, CopyDeviceGlobal); } else if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit( + Queue.submit( [&](handler &CGH) { return CGH.copy(&CopyWrite, CopyDeviceGlobal); }); } else if constexpr (PathKind == OperationPath::Explicit) { Graph.add( @@ -106,9 +104,9 @@ template void test() { ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.memcpy(&MemcpyRead, MemcpyDeviceGlobal); + Queue.memcpy(&MemcpyRead, MemcpyDeviceGlobal); } else if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit([&](handler &CGH) { + Queue.submit([&](handler &CGH) { return CGH.memcpy(&MemcpyRead, MemcpyDeviceGlobal); }); } else if constexpr (PathKind == OperationPath::Explicit) { @@ -124,9 +122,9 @@ template void test() { ExceptionCode = make_error_code(sycl::errc::success); try { if constexpr (PathKind == OperationPath::Shortcut) { - Q.copy(CopyDeviceGlobal, &CopyRead); + Queue.copy(CopyDeviceGlobal, &CopyRead); } else if constexpr (PathKind == OperationPath::RecordReplay) { - Q.submit( + Queue.submit( [&](handler &CGH) { return CGH.copy(CopyDeviceGlobal, &CopyRead); }); } else if constexpr (PathKind == OperationPath::Explicit) { Graph.add( @@ -143,8 +141,14 @@ template void test() { } int main() { - test(); - test(); - test(); + queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + + if (!are_graphs_supported(Queue)) { + return 0; + } + + test(Queue); + test(Queue); + test(Queue); return 0; } diff --git a/sycl/test-e2e/Graph/immediate_command_list_error.cpp b/sycl/test-e2e/Graph/immediate_command_list_error.cpp index bad3fac48007..f56e0bcb611f 100644 --- a/sycl/test-e2e/Graph/immediate_command_list_error.cpp +++ b/sycl/test-e2e/Graph/immediate_command_list_error.cpp @@ -18,6 +18,10 @@ int main() { QueueImmediate.get_device(), {sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(QueueNoImmediate)) { + return 0; + } + exp_ext::command_graph Graph{QueueNoImmediate.get_context(), QueueNoImmediate.get_device()}; diff --git a/sycl/test-e2e/Graph/invalid_depends_on.cpp b/sycl/test-e2e/Graph/invalid_depends_on.cpp index dd8fb7ee423e..9caf5494a96a 100644 --- a/sycl/test-e2e/Graph/invalid_depends_on.cpp +++ b/sycl/test-e2e/Graph/invalid_depends_on.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -10,6 +9,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + ext::oneapi::experimental::command_graph Graph{Queue.get_context(), Queue.get_device()}; ext::oneapi::experimental::command_graph Graph2{Queue.get_context(), diff --git a/sycl/test-e2e/Graph/invalid_event_wait.cpp b/sycl/test-e2e/Graph/invalid_event_wait.cpp index 5d72f4095471..173374c08dc1 100644 --- a/sycl/test-e2e/Graph/invalid_event_wait.cpp +++ b/sycl/test-e2e/Graph/invalid_event_wait.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -10,6 +9,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + ext::oneapi::experimental::command_graph Graph{Queue.get_context(), Queue.get_device()}; Graph.begin_recording(Queue); diff --git a/sycl/test-e2e/Graph/invalid_queue_wait.cpp b/sycl/test-e2e/Graph/invalid_queue_wait.cpp index 003c840ead39..2653b8fe3eb1 100644 --- a/sycl/test-e2e/Graph/invalid_queue_wait.cpp +++ b/sycl/test-e2e/Graph/invalid_queue_wait.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out @@ -9,6 +8,10 @@ int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + ext::oneapi::experimental::command_graph Graph{Queue.get_context(), Queue.get_device()}; Graph.begin_recording(Queue); diff --git a/sycl/test-e2e/Graph/submission_while_executing.cpp b/sycl/test-e2e/Graph/submission_while_executing.cpp index 1cad91e6bab4..15f79cf3fd7b 100644 --- a/sycl/test-e2e/Graph/submission_while_executing.cpp +++ b/sycl/test-e2e/Graph/submission_while_executing.cpp @@ -1,4 +1,3 @@ -// REQUIRES: cuda || level_zero, gpu // RUN: %{build} -o %t.out // RUN: %{run} %t.out // RUN: %if ext_oneapi_level_zero %{env ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck %s %} @@ -20,6 +19,10 @@ isSubmittedOrRunningCommand(sycl::info::event_command_status Status) { int main() { queue Queue{{sycl::ext::intel::property::queue::no_immediate_command_list{}}}; + if (!are_graphs_supported(Queue)) { + return 0; + } + using T = int; size_t LargeSize = From 05a3db76e54be9698253326bf1612a9a7bf39214 Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Wed, 15 Nov 2023 13:40:12 +0000 Subject: [PATCH 2/5] Fix how unsupported tests are marked --- sycl/test-e2e/Graph/Explicit/cycle_error.cpp | 2 +- sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp | 5 ++--- sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp | 3 +-- sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp | 2 +- sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp | 2 +- sycl/test-e2e/Graph/Explicit/double_buffer.cpp | 2 +- sycl/test-e2e/Graph/Explicit/event_status_querying.cpp | 2 +- sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp | 2 +- sycl/test-e2e/Graph/Explicit/stream.cpp | 2 +- sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp | 5 ++--- .../Graph/RecordReplay/debug_print_graph_verbose.cpp | 5 ++--- sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/stream.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp | 2 +- .../Graph/graph_exception_global_device_extension.cpp | 2 +- 21 files changed, 24 insertions(+), 28 deletions(-) diff --git a/sycl/test-e2e/Graph/Explicit/cycle_error.cpp b/sycl/test-e2e/Graph/Explicit/cycle_error.cpp index c4c38ef3b114..762cf4fdcec6 100644 --- a/sycl/test-e2e/Graph/Explicit/cycle_error.cpp +++ b/sycl/test-e2e/Graph/Explicit/cycle_error.cpp @@ -17,7 +17,7 @@ void CreateGraphWithCyclesTest(bool DisableCycleChecks) { queue Queue; if (!are_graphs_supported(Queue)) { - return 0; + return; } property_list Props; diff --git a/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp b/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp index f8b56bffd35d..17b20d5f40c8 100644 --- a/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp +++ b/sycl/test-e2e/Graph/Explicit/debug_print_graph.cpp @@ -1,10 +1,9 @@ // RUN: %{build} -o %t.out -// RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} -// RUN: %if windows %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not -// trigger errors or throw execeptions. +// trigger errors or throw exceptions. // // CHECK: digraph dot { // CHECK-NEXT: "0x[[#%x,NODE1:]]" diff --git a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp index 7e91c14bb810..c572774ac325 100644 --- a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp @@ -1,6 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} -// RUN: %if windows %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not diff --git a/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp index 442941903ae5..fae79201b78f 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp index 5a30b33221fc..88162508f2e2 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp index 329c258cd00d..b3524b70044d 100644 --- a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp +++ b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update isn't implemented yet -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp b/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp index c954fd59b364..8e2745805637 100644 --- a/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp +++ b/sycl/test-e2e/Graph/Explicit/event_status_querying.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %{run} %t.out 2>&1 | FileCheck %s +// RUN: %if ext_oneapi_level_zero || ext_oneapi_cuda %{ %{run} %t.out 2>&1 | FileCheck %s %} %else %{ %{run} %t.out %} // // CHECK: complete // diff --git a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp index 8a2e8286f632..89aacb4e97bd 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not implemented yet -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/stream.cpp b/sycl/test-e2e/Graph/Explicit/stream.cpp index 3140fc4262e0..2b2af9f0794a 100644 --- a/sycl/test-e2e/Graph/Explicit/stream.cpp +++ b/sycl/test-e2e/Graph/Explicit/stream.cpp @@ -5,7 +5,7 @@ // CHECK-NOT: LEAK // Expected fail as sycl streams aren't implemented yet -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp index b7bb5a29a7c9..5556b19b8639 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp index a576558b0d8f..9c7356cfeb4c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph.cpp @@ -1,10 +1,9 @@ // RUN: %{build} -o %t.out -// RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} -// RUN: %if windows %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not -// trigger errors or throw execeptions. +// trigger errors or throw exceptions. // // CHECK: digraph dot { // CHECK-NEXT: "0x[[#%x,NODE1:]]" diff --git a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp index 3f58ff0e8a75..b6e4de4ad744 100644 --- a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp @@ -1,10 +1,9 @@ // RUN: %{build} -o %t.out -// RUN: %if linux %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} -// RUN: %if windows %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not -// trigger errors or throw execeptions. +// trigger errors or throw exceptions. // // // CHECK: digraph dot { diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp index 0b5405456e08..6ffcc88d9ae7 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp index c8d1e7f68add..2a4e2ff58cbe 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp index 4aa92cbc8e96..6dfcc4f378d3 100644 --- a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not yet implemented -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp b/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp index 94c61490cd08..4013f4eb7561 100644 --- a/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %{run} %t.out 2>&1 | FileCheck %s +// RUN: %if ext_oneapi_level_zero || ext_oneapi_cuda %{ %{run} %t.out 2>&1 | FileCheck %s %} %else %{ %{run} %t.out %} // // CHECK: complete // diff --git a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp index c3a0bab8e557..b83a266c8e1d 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as executable graph update not implemented yet -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/stream.cpp b/sycl/test-e2e/Graph/RecordReplay/stream.cpp index 73b037ec52b0..5539e65a9eb1 100644 --- a/sycl/test-e2e/Graph/RecordReplay/stream.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/stream.cpp @@ -5,7 +5,7 @@ // CHECK-NOT: LEAK // Expected fail as sycl::stream is not implemented yet -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp index c1feeafdb66e..f50382161a5c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Expected fail as reduction support is not complete. -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp index 441119f72083..24522fb57f17 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp @@ -6,7 +6,7 @@ // CHECK-NOT: LEAK // Fail that needs investigation -// UNSUPPORTED: * +// REQUIRES: NOT_YET_IMPLEMENTED // This test creates a temporary buffer which is used in kernels, but // destroyed before finalization and execution of the graph. diff --git a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp index d702fdc80022..755f86f05f55 100644 --- a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp +++ b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp @@ -22,7 +22,7 @@ template void test(queue Queue) { exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()}; if constexpr (PathKind != OperationPath::Explicit) { - Graph.begin_recording(Q); + Graph.begin_recording(Queue); } // Copy from device globals before having written anything. From ffbd76cb057460b383d97f1736dd60be4f54f55a Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Wed, 15 Nov 2023 14:21:19 +0000 Subject: [PATCH 3/5] Change some XFAILS to skips --- sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp | 2 +- sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp | 2 +- sycl/test-e2e/Graph/Explicit/double_buffer.cpp | 2 +- sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp | 2 +- .../Graph/Explicit/executable_graph_update_ordering.cpp | 4 ++-- sycl/test-e2e/Graph/Explicit/host_task.cpp | 4 ++-- sycl/test-e2e/Graph/Explicit/stream.cpp | 2 +- sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp | 2 +- .../Graph/RecordReplay/executable_graph_update_ordering.cpp | 4 ++-- sycl/test-e2e/Graph/RecordReplay/host_task.cpp | 4 ++-- sycl/test-e2e/Graph/RecordReplay/stream.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp | 5 +++-- 17 files changed, 23 insertions(+), 22 deletions(-) diff --git a/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp index fae79201b78f..4e0efb64844c 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp index 88162508f2e2..81a57f291f9a 100644 --- a/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp index b3524b70044d..5b85a7b86219 100644 --- a/sycl/test-e2e/Graph/Explicit/double_buffer.cpp +++ b/sycl/test-e2e/Graph/Explicit/double_buffer.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update isn't implemented yet +// Skip as executable graph update isn't implemented yet // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp index 89aacb4e97bd..438bd1161d14 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update not implemented yet +// Skip as executable graph update not implemented yet // REQUIRES: NOT_YET_IMPLEMENTED #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 2dd63930d407..ccece1daf181 100644 --- a/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/executable_graph_update_ordering.cpp @@ -5,9 +5,9 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update and host tasks both aren't +// Skip as executable graph update and host tasks both aren't // implemented. -// XFAIL: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/host_task.cpp b/sycl/test-e2e/Graph/Explicit/host_task.cpp index 601a8a770be0..68c6df74ed86 100644 --- a/sycl/test-e2e/Graph/Explicit/host_task.cpp +++ b/sycl/test-e2e/Graph/Explicit/host_task.cpp @@ -5,8 +5,8 @@ // // CHECK-NOT: LEAK -// Expected fail as host tasks aren't implemented yet. -// XFAIL: * +// Skip as host tasks aren't implemented yet. +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/stream.cpp b/sycl/test-e2e/Graph/Explicit/stream.cpp index 2b2af9f0794a..c547c43a537b 100644 --- a/sycl/test-e2e/Graph/Explicit/stream.cpp +++ b/sycl/test-e2e/Graph/Explicit/stream.cpp @@ -4,7 +4,7 @@ // // CHECK-NOT: LEAK -// Expected fail as sycl streams aren't implemented yet +// Skip as sycl streams aren't implemented yet // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp index 5556b19b8639..fda0628d2e21 100644 --- a/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/Explicit/sub_graph_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp index 6ffcc88d9ae7..7e0de1981f6c 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_buffer_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp index 2a4e2ff58cbe..16914440a173 100644 --- a/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/dotp_usm_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp index 6dfcc4f378d3..852164713faf 100644 --- a/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/double_buffer.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update not yet implemented +// Skip as executable graph update not yet implemented // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp index b83a266c8e1d..1294400e06c4 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update not implemented yet +// Skip as executable graph update not implemented yet // REQUIRES: NOT_YET_IMPLEMENTED #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 34e219fa8e89..9d514a604577 100644 --- a/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/executable_graph_update_ordering.cpp @@ -5,9 +5,9 @@ // // CHECK-NOT: LEAK -// Expected fail as executable graph update and host tasks both aren't +// Skip as executable graph update and host tasks both aren't // implemented. -// XFAIL: * +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp index f4538af94d4c..5cb294ebab84 100644 --- a/sycl/test-e2e/Graph/RecordReplay/host_task.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/host_task.cpp @@ -5,8 +5,8 @@ // // CHECK-NOT: LEAK -// Expected fail as host tasks are not implemented yet -// XFAIL: * +// Skip as host tasks aren't implemented yet. +// REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/stream.cpp b/sycl/test-e2e/Graph/RecordReplay/stream.cpp index 5539e65a9eb1..f0f25e4c58b0 100644 --- a/sycl/test-e2e/Graph/RecordReplay/stream.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/stream.cpp @@ -4,7 +4,7 @@ // // CHECK-NOT: LEAK -// Expected fail as sycl::stream is not implemented yet +// Skip as sycl::stream is not implemented yet // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp index f50382161a5c..129a7410d9b1 100644 --- a/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/sub_graph_reduction.cpp @@ -5,7 +5,7 @@ // // CHECK-NOT: LEAK -// Expected fail as reduction support is not complete. +// Skip as reduction support is not complete. // REQUIRES: NOT_YET_IMPLEMENTED #define GRAPH_E2E_RECORD_REPLAY diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp index 24522fb57f17..9d7603845e34 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp @@ -5,8 +5,9 @@ // // CHECK-NOT: LEAK -// Fail that needs investigation -// REQUIRES: NOT_YET_IMPLEMENTED +// This test should be removed as using buffers that don't exceed the +// lifetime of the graph doesn't satisfy the graphs extension spec. +// XFAIL: * // This test creates a temporary buffer which is used in kernels, but // destroyed before finalization and execution of the graph. From 91e5446aee95193da185702bdd2a566d0b71db3e Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Wed, 15 Nov 2023 14:53:37 +0000 Subject: [PATCH 4/5] Use correct file for verbose dot printing filecheck --- sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp | 2 +- .../Graph/RecordReplay/debug_print_graph_verbose.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp index c572774ac325..d322b9e91b31 100644 --- a/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/Explicit/debug_print_graph_verbose.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not diff --git a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp index b6e4de4ad744..afd9503d6df1 100644 --- a/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/debug_print_graph_verbose.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph.dot %} %else %{ %{run} %t.out %} +// RUN: %if linux && (ext_oneapi_level_zero || ext_oneapi_cuda) %{ %{run} %t.out ; FileCheck %s --input-file graph_verbose.dot %} %else %{ %{run} %t.out %} // Windows output format differs from linux format. // The filecheck-based output checking is suited to linux standards. // On Windows, we only test that printing takes place correctly and does not diff --git a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp index 9d7603845e34..61b9ae7217ba 100644 --- a/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/temp_buffer.cpp @@ -5,9 +5,10 @@ // // CHECK-NOT: LEAK -// This test should be removed as using buffers that don't exceed the -// lifetime of the graph doesn't satisfy the graphs extension spec. -// XFAIL: * +// This test should be removed or modified as using buffers that don't exceed +// the lifetime of the graph doesn't satisfy valid usage of the graphs +// extension. +// REQUIRES: NOT_YET_IMPLEMENTED // This test creates a temporary buffer which is used in kernels, but // destroyed before finalization and execution of the graph. From 5eaf1941721f5696298f1cec7728ab71b588d231 Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Thu, 16 Nov 2023 15:27:10 +0000 Subject: [PATCH 5/5] Remove template parameter. --- sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp index 755f86f05f55..6c3e3e9d44e9 100644 --- a/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp +++ b/sycl/test-e2e/Graph/graph_exception_global_device_extension.cpp @@ -16,7 +16,7 @@ sycl::ext::oneapi::experimental::device_global enum OperationPath { Explicit, RecordReplay, Shortcut }; -template void test(queue Queue) { +template void test(queue Queue) { int MemcpyWrite = 42, CopyWrite = 24, MemcpyRead = 1, CopyRead = 2; exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()};