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.

Sign up for GitHub

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] Add empty node implementation #112

Merged
merged 5 commits into from
Mar 31, 2023
Merged

[SYCL] Add empty node implementation #112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
748d98a
add implementation for empty node
reble Mar 21, 2023
dd322e7
Adding test for empty node
reble Mar 28, 2023
40d79ff
Adding missing function
reble Mar 28, 2023
b140df5
Update sycl/test/graph/graph-explicit-empty.cpp
reble Mar 30, 2023
f198c61
Apply suggestions from code review
reble Mar 31, 2023
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
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/experimental/graph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class __SYCL_EXPORT command_graph {
command_graph(const property_list &propList = {});

// Adding empty node with [0..n] predecessors:
node add(const std::vector<node> &dep = {});
node add(const std::vector<node> &dep = {}) { return add_impl(dep); }

// Adding device node:
template <typename T> node add(T cgf, const std::vector<node> &dep = {}) {
Expand Down
20 changes: 20 additions & 0 deletions sycl/source/detail/graph_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,26 @@ bool check_for_arg(const sycl::detail::ArgDesc &Arg,
return SuccessorAddedDep;
}

std::shared_ptr<node_impl>
graph_impl::add(const std::shared_ptr<graph_impl> &Impl,
const std::vector<std::shared_ptr<node_impl>> &Dep) {
const std::shared_ptr<node_impl> &NodeImpl =
std::make_shared<node_impl>(Impl);

// TODO: Encapsulate in separate function to avoid duplication
if (!Dep.empty()) {
for (auto N : Dep) {
N->register_successor(NodeImpl); // register successor
this->remove_root(NodeImpl); // remove receiver from root node
// list
}
} else {
this->add_root(NodeImpl);
}

return NodeImpl;
}

std::shared_ptr<node_impl>
graph_impl::add(const std::shared_ptr<graph_impl> &Impl,
std::function<void(handler &)> CGF,
Expand Down
10 changes: 9 additions & 1 deletion sycl/source/detail/graph_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ struct node_impl {

sycl::event get_event(void) const { return MEvent; }

node_impl(const std::shared_ptr<graph_impl> &Graph)
: MScheduled(false), MGraph(Graph) {}

node_impl(
const std::shared_ptr<graph_impl> &Graph,
std::shared_ptr<sycl::detail::kernel_impl> Kernel,
Expand Down Expand Up @@ -119,7 +122,8 @@ struct node_impl {
if (!Next->MScheduled)
Next->topology_sort(Schedule);
}
Schedule.push_front(std::shared_ptr<node_impl>(this));
if (MKernel != nullptr)
Schedule.push_front(std::shared_ptr<node_impl>(this));
}

bool has_arg(const sycl::detail::ArgDesc &Arg) {
Expand Down Expand Up @@ -169,6 +173,10 @@ struct graph_impl {
const std::vector<sycl::detail::ArgDesc> &Args,
const std::vector<std::shared_ptr<node_impl>> &Dep = {});

std::shared_ptr<node_impl>
add(const std::shared_ptr<graph_impl> &Impl,
const std::vector<std::shared_ptr<node_impl>> &Dep = {});

graph_impl() : MFirst(true) {}

/// Add a queue to the set of queues which are currently recording to this
Expand Down