Skip to content

Commit

Permalink
[SYCL][Graph] Including changes from PR intel#10033 to fix clang-form…
Browse files Browse the repository at this point in the history
…at issues (#262)
  • Loading branch information
reble authored Jul 13, 2023
1 parent be99575 commit a9dd962
Show file tree
Hide file tree
Showing 26 changed files with 11 additions and 31 deletions.
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// This test adds a new node with the explicit API to an already finalized
// modifiable graph, before finalizing and executing the graph for a second
// time.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/basic_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests adding nodes to a graph using explicit API, and submitting the graph
// using buffers accessors for inputs and outputs.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/basic_usm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests basic adding of nodes using explicit API with USM pointers,
// and submission of the graph.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/buffer_copy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests adding a buffer copy node using the explicit API and submitting
// the graph.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests adding buffer 2d copy nodes using the explicit API and submitting
// the graph.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests that buffer accessors exhibit the correct behaviour when:
// * A node is added to the graph between two queue submissions which
// use the same buffer, but are not added to the graph.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/depends_on.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests that an event returned from adding a graph node using the queue
// recording API can be passed to `handler::depends_on` inside a node
// added using the explicit API. This should create a graph edge.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests constructing a graph using the explicit API to perform a dotp
// operation using USM memory.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests creating a dotp operation through explicit graph creation with
// buffers.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_buffer_reduction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Expected fail as reduction support is not complete.
// XFAIL: *

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_host_mem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests using USM host memory with an explicitly constructed graph.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_host_shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests using USM shared and host memory with an explicitly constructed graph.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_mixed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests mixing buffers and USM in the same graph.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_shared_mem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests using USM shared memory with an explicitly constructed graph.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_system_mem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests using USM system memory with an explicitly constructed graph.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/dotp_usm_reduction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Expected fail as reduction support is not complete.
// XFAIL: *

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/double_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Expected fail as executable graph update isn't implemented yet
// XFAIL: *

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/empty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests the explicit API interface for adding empty nodes, and that
// no_cycle_check is accepted as a command_graph construction property.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/Explicit/enqueue_ordering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ int main() {

// Free the allocated memory
sycl::free(Arr, Queue);

return 0;
}
6 changes: 3 additions & 3 deletions sycl/test-e2e/Graph/Explicit/event_status_querying.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
// We therefore only check that the complete state of the event
// in this test.


#include "../graph_common.hpp"

std::string event_status_name(sycl::info::event_command_status status) {
Expand Down Expand Up @@ -125,8 +124,9 @@ int main() {
Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); });
auto Info = Event.get_info<info::event::command_execution_status>();
std::cout << event_status_name(Info) << std::endl;
while ((Info = Event.get_info<sycl::info::event::command_execution_status>()) !=
sycl::info::event_command_status::complete) {
while (
(Info = Event.get_info<sycl::info::event::command_execution_status>()) !=
sycl::info::event_command_status::complete) {
}
std::cout << event_status_name(Info) << std::endl;

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/usm_fill_shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests adding a shared USM fill operation as a graph node with the explicit
// API.
// The second run is to check that there are no leaks reported with the embedded
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/Explicit/while_recording.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Expected Fail as exception not implemented yet
// XFAIL: *

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
//
// CHECK-NOT: LEAK

// Tests a dotp operation using device USM and an in-order queue with empty nodes.
// The second run is to check that there are no leaks reported with the embedded
// ZE_DEBUG=4 testing capability.
// Tests a dotp operation using device USM and an in-order queue with empty
// nodes. The second run is to check that there are no leaks reported with the
// embedded ZE_DEBUG=4 testing capability.

#include "../graph_common.hpp"

Expand Down
5 changes: 3 additions & 2 deletions sycl/test-e2e/Graph/RecordReplay/event_status_querying.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ int main() {
Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); });
auto Info = Event.get_info<info::event::command_execution_status>();
std::cout << event_status_name(Info) << std::endl;
while ((Info = Event.get_info<sycl::info::event::command_execution_status>()) !=
sycl::info::event_command_status::complete) {
while (
(Info = Event.get_info<sycl::info::event::command_execution_status>()) !=
sycl::info::event_command_status::complete) {
}
std::cout << event_status_name(Info) << std::endl;

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Graph/RecordReplay/subgraph_in_order.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//
// CHECK-NOT: LEAK


// Tests adding a sub-graph to an in-order queue.

#include "../graph_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/graph_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Test constants.
constexpr size_t Size = 1024; // Number of data elements in a buffer.
constexpr unsigned Iterations = 5; // Iterations of graph to execute.
constexpr size_t Offset = 100; // Number of offset elements for Buffer accessors
constexpr size_t Offset = 100; // Number of offset elements for Buffer accessors

// Namespace alias to use in test code.
namespace exp_ext = sycl::ext::oneapi::experimental;
Expand Down

0 comments on commit a9dd962

Please sign in to comment.