Fix how unsupported tests are marked

EwanC · martygrant · commit 05a3db76e54b · 2023-11-16T14:41:04.000Z
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,7 +22,7 @@ template <OperationPath PathKind, typename T> 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.

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ void CreateGraphWithCyclesTest(bool DisableCycleChecks) {`
`17`	`17`	`queue Queue;`
`18`	`18`
`19`	`19`	`if (!are_graphs_supported(Queue)) {`
`20`		`- return 0;`
	`20`	`+ return;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`property_list Props;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ template <OperationPath PathKind, typename T> void test(queue Queue) {`
`22`	`22`	`exp_ext::command_graph Graph{Queue.get_context(), Queue.get_device()};`
`23`	`23`
`24`	`24`	`if constexpr (PathKind != OperationPath::Explicit) {`
`25`		`- Graph.begin_recording(Q);`
	`25`	`+ Graph.begin_recording(Queue);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// Copy from device globals before having written anything.`