Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYCL][Graph] Adding new graph enqueue function to spec #15677

Merged
merged 20 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
EwanC marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,34 @@ optimize such partial barriers.
_{endnote}_]
|====

==== Command Graph

The functions in this section are only available if the
link:./sycl_ext_oneapi_graph.asciidoc[
sycl_ext_oneapi_graph] extension is supported.

|====
a|
[frame=all,grid=none]
!====
a!
[source,c++]
----
namespace sycl::ext::oneapi::experimental {

void execute_graph(sycl::queue q, command_graph<graph_state::executable> &g);

void execute_graph(sycl::handler &h, command_graph<graph_state::executable> &g);

reble marked this conversation as resolved.
Show resolved Hide resolved
}
----
!====
_Constraints_: Device and context associated with queue need to be identical
to device and context provided at command graph creation.

_Effects_: Submits an executable command graph to the `sycl::queue` or `sycl::handler`.

|====

== Issues

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,9 @@ Removing this restriction is something we may look at for future revisions of

The command submission functions defined in
link:../experimental/sycl_ext_oneapi_enqueue_functions.asciidoc[sycl_ext_oneapi_enqueue_functions]
can be used to add nodes to a graph when creating a graph from queue recording.
can be used adding nodes to a graph when creating a graph from queue recording.
New methods are also defined that enable submitting an executable graph,
e.g. directly to a queue without returning an event.

== Examples and Usage Guide

Expand Down
12 changes: 12 additions & 0 deletions sycl/include/sycl/ext/oneapi/experimental/enqueue_functions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <sycl/detail/common.hpp>
#include <sycl/event.hpp>
#include <sycl/ext/oneapi/experimental/graph.hpp>
#include <sycl/ext/oneapi/properties/properties.hpp>
#include <sycl/handler.hpp>
#include <sycl/nd_range.hpp>
Expand Down Expand Up @@ -366,6 +367,17 @@ inline void partial_barrier(queue Q, const std::vector<event> &Events,
submit(Q, [&](handler &CGH) { partial_barrier(CGH, Events); }, CodeLoc);
}

inline void execute_graph(queue Q, command_graph<graph_state::executable> &G,
const sycl::detail::code_location &CodeLoc =
sycl::detail::code_location::current()) {
Q.ext_oneapi_graph(G, CodeLoc);
}

inline void execute_graph(handler &CGH,
command_graph<graph_state::executable> &G) {
CGH.ext_oneapi_graph(G);
}

} // namespace ext::oneapi::experimental
} // namespace _V1
} // namespace sycl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int main() {

auto GraphExec = Graph.finalize();

InOrderQueue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); });
exp_ext::execute_graph(InOrderQueue, GraphExec);
InOrderQueue.wait_and_throw();

free(PtrA, InOrderQueue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int main() {

auto GraphExec = Graph.finalize();

Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); });
exp_ext::execute_graph(Queue, GraphExec);
Queue.wait_and_throw();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ int main() {

auto GraphExec = Graph.finalize();

Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(GraphExec); });
Queue.wait_and_throw();
exp_ext::submit_with_event(Queue, [&](handler &CGH) {
exp_ext::execute_graph(CGH, GraphExec);
}).wait();

free(PtrA, Queue);
free(PtrB, Queue);
Expand Down
Loading