[NFC][SYCL] Update Graph E2E-tests

sycl/test-e2e/Graph/Explicit/buffer_copy_host2target.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_2d.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/buffer_copy_host2target_offset.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/buffer_copy_target2host.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_2d.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/buffer_copy_target2host_offset.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/host_task2_multiple_roots.cpp

@@ -5,9 +5,9 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended - Concurrent access to shared USM allocations is not supported by
-// CUDA on Windows
 // UNSUPPORTED: cuda && windows
+// UNSUPPORTED-INTENDED: Concurrent access to shared USM allocations is not supported by
+// CUDA on Windows
 
 // Test is flaky on Windows for all targets, disable until it can be fixed
 // UNSUPPORTED: windows

sycl/test-e2e/Graph/Explicit/host_task_multiple_roots.cpp

@@ -5,9 +5,9 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended Concurrent access to shared USM allocations is not supported by
-// CUDA on Windows
 // UNSUPPORTED: cuda && windows
+// UNSUPPORTED-INTENDED: Concurrent access to shared USM allocations is not supported by
+// CUDA on Windows
 
 // Test is flaky on Windows for all targets, disable until it can be fixed
 // UNSUPPORTED: windows

sycl/test-e2e/Graph/Explicit/memadvise.cpp

@@ -3,8 +3,8 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended - Mem advise command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Mem advise command not supported for OpenCL
 
 // Since Mem advise is only a memory hint that doesn't
 // impact results but only performances, we verify

sycl/test-e2e/Graph/Explicit/prefetch.cpp

@@ -3,8 +3,8 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended - prefetch command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: prefetch command not supported for OpenCL
 
 // Since Prefetch is only a memory hint that doesn't
 // impact results but only performances, we verify

sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp

@@ -4,9 +4,9 @@
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
 
-// Intended - The following limitation is not restricted to Sycl-Graph
-// but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
 // UNSUPPORTED: hip
+// UNSUPPORTED-INTENDED: The following limitation is not restricted to Sycl-Graph
+// but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp

@@ -4,12 +4,12 @@
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
 
-// Intended OpenCL fail due to backend:
+// UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: OpenCL fail due to backend:
 // The OpenCL emulation layer does not return `CL_INVALID_WORK_GROUP_SIZE` as it
 // should. So the Sycl graph support cannot correctly catch the error and throw
 // the appropriate exception for negative test. An issue has been reported
 // https://github.com/bashbaug/SimpleOpenCLSamples/issues/95
-// UNSUPPORTED: opencl
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_2d.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_host2target_offset.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Host to device copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Host to device copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_2d.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/buffer_copy_target2host_offset.cpp

@@ -3,8 +3,8 @@
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// Intended - Device to host copy command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Device to host copy command not supported for OpenCL
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/host_task2_multiple_roots.cpp

@@ -5,9 +5,9 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended - Concurrent access to shared USM allocations is not supported by
-// CUDA on Windows
 // UNSUPPORTED: cuda && windows
+// UNSUPPORTED-INTENDED: Concurrent access to shared USM allocations is not supported by
+// CUDA on Windows
 
 // Test is flaky on Windows for all targets, disable until it can be fixed
 // UNSUPPORTED: windows

sycl/test-e2e/Graph/RecordReplay/host_task_multiple_roots.cpp

@@ -5,9 +5,9 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Concurrent access to shared USM allocations is not supported by
-// CUDA on Windows
 // UNSUPPORTED: cuda && windows
+// UNSUPPORTED-INTENDED: Concurrent access to shared USM allocations is not supported by
+// CUDA on Windows
 
 // Test is flaky on Windows for all targets, disable until it can be fixed
 // UNSUPPORTED: windows

sycl/test-e2e/Graph/RecordReplay/memadvise.cpp

@@ -3,8 +3,8 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Intended - Mem advise command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: Mem advise command not supported for OpenCL
 
 // Since Mem advise is only a memory hint that doesn't
 // impact results but only performances, we verify

sycl/test-e2e/Graph/RecordReplay/prefetch.cpp

@@ -3,8 +3,8 @@
 
 // REQUIRES: aspect-usm_shared_allocations
 
-// Inteded - prefetch command not supported for OpenCL
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: prefetch command not supported for OpenCL
 
 // Since Prefetch is only a memory hint that doesn't
 // impact results but only performances, we verify

sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp

@@ -4,9 +4,9 @@
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
 
-// Intended - The following limitation is not restricted to Sycl-Graph
-// but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
 // UNSUPPORTED: hip
+// UNSUPPORTED-INTENDED: The following limitation is not restricted to Sycl-Graph
+// but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp

@@ -4,12 +4,12 @@
 // RUN: %if level_zero %{%{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
 //
-// Intended - OpenCL fail due to backend
+// UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: OpenCL fail due to backend
 // The OpenCL emulation layer does not return `CL_INVALID_WORK_GROUP_SIZE` as it
 // should. So the Sycl graph support cannot correctly catch the error and throw
 // the approriate exception for negative test. An issue has been reported
 // https://github.com/bashbaug/SimpleOpenCLSamples/issues/95
-// UNSUPPORTED: opencl
 
 #define GRAPH_E2E_RECORD_REPLAY
 

sycl/test-e2e/Graph/UnsupportedDevice/device_query.cpp

@@ -1,8 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// Intended - OpenCL support depends on extensions
 // UNSUPPORTED: opencl
+// UNSUPPORTED-INTENDED: OpenCL support depends on extensions
 
 // Tests the using device query for graphs support, and that the return value
 // matches expectations.

sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp

@@ -54,7 +54,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 178
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 153
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -122,33 +122,8 @@
 // CHECK-NEXT: ESIMD/regression/copyto_char_test.cpp
 // CHECK-NEXT: ESIMD/regression/variable_gather_mask.cpp
 // CHECK-NEXT: ESIMD/slm_init_no_inline.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_host2target.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_host2target_2d.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_host2target_offset.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_target2host.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_target2host_2d.cpp
-// CHECK-NEXT: Graph/Explicit/buffer_copy_target2host_offset.cpp
-// CHECK-NEXT: Graph/Explicit/host_task2_multiple_roots.cpp
-// CHECK-NEXT: Graph/Explicit/host_task_multiple_roots.cpp
 // CHECK-NEXT: Graph/Explicit/interop-level-zero-launch-kernel.cpp
-// CHECK-NEXT: Graph/Explicit/memadvise.cpp
-// CHECK-NEXT: Graph/Explicit/prefetch.cpp
-// CHECK-NEXT: Graph/Explicit/spec_constants_kernel_bundle_api.cpp
-// CHECK-NEXT: Graph/Explicit/work_group_size_prop.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_host2target.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_host2target_2d.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_host2target_offset.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_target2host.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_target2host_2d.cpp
-// CHECK-NEXT: Graph/RecordReplay/buffer_copy_target2host_offset.cpp
-// CHECK-NEXT: Graph/RecordReplay/host_task2_multiple_roots.cpp
-// CHECK-NEXT: Graph/RecordReplay/host_task_multiple_roots.cpp
 // CHECK-NEXT: Graph/RecordReplay/interop-level-zero-launch-kernel.cpp
-// CHECK-NEXT: Graph/RecordReplay/memadvise.cpp
-// CHECK-NEXT: Graph/RecordReplay/prefetch.cpp
-// CHECK-NEXT: Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp
-// CHECK-NEXT: Graph/RecordReplay/work_group_size_prop.cpp
-// CHECK-NEXT: Graph/UnsupportedDevice/device_query.cpp
 // CHECK-NEXT: GroupAlgorithm/root_group.cpp
 // CHECK-NEXT: HierPar/hier_par_wgscope.cpp
 // CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp