Skip to content

[SYCL][Graph] Align spec and implementation for native recording mode #21974

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

Open
adamfidel wants to merge 1 commit into
base: sycl
Choose a base branch
from
Open

[SYCL][Graph] Align spec and implementation for native recording mode #21974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions sycl/source/detail/graph/graph_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ void graph_impl::beginRecordingImpl(sycl::detail::queue_impl &Queue,

// Native recording limitation: in-order queues only
if (MNativeGraphHandle && !Queue.isInOrder()) {
throw sycl::exception(make_error_code(errc::feature_not_supported),
throw sycl::exception(make_error_code(errc::invalid),
"Native recording only works with in-order queues");
}

Expand Down Expand Up @@ -1094,6 +1094,11 @@ exec_graph_impl::exec_graph_impl(sycl::context Context,
// Create native UR executable graph if the modifiable graph uses native
// recording
if (isNativeRecordingEnabledForGraph(*GraphImpl)) {
if (MIsUpdatable) {
throw sycl::exception(
sycl::make_error_code(errc::feature_not_supported),
"Updatable graphs are not supported in native recording mode");
}
context_impl &ContextImpl = *sycl::detail::getSyclObjImpl(MContext);
sycl::detail::adapter_impl &Adapter = ContextImpl.getAdapter();
ur_result_t Result =
Expand Down Expand Up @@ -1649,12 +1654,6 @@ void exec_graph_impl::duplicateNodes() {
}

void exec_graph_impl::update(std::shared_ptr<graph_impl> GraphImpl) {
if (MNativeExecutableGraphHandle) {
throw sycl::exception(
sycl::make_error_code(errc::feature_not_supported),
"Graph update is not supported in native recording mode");
}

if (MDevice != GraphImpl->getDevice()) {
throw sycl::exception(
sycl::make_error_code(errc::invalid),
Expand Down Expand Up @@ -1726,11 +1725,6 @@ void exec_graph_impl::update(node_impl &Node) {
}

void exec_graph_impl::update(nodes_range Nodes) {
if (MNativeExecutableGraphHandle) {
throw sycl::exception(
sycl::make_error_code(errc::feature_not_supported),
"Graph update is not supported in native recording mode");
}
if (!MIsUpdatable) {
throw sycl::exception(sycl::make_error_code(errc::invalid),
"update() cannot be called on a executable graph "
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/RecordReplay/NativeRecording/exception_out_of_order_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main() {

if (!expectException([&]() { Graph.begin_recording(OutOfOrderQueue); },
"begin_recording with out-of-order queue",
sycl::errc::feature_not_supported)) {
sycl::errc::invalid)) {
std::cerr << "Out-of-order queue should throw exception" << std::endl;
return 1;
}
Expand Down
16 changes: 4 additions & 12 deletions sycl/test-e2e/Graph/RecordReplay/NativeRecording/exception_update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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 %}

// Test that update() throws when called on a graph in native recording mode
// Test that finalize() throws when both enable_native_recording and updatable
// properties are set on the same graph.

#include "../../graph_common.hpp"

Expand All @@ -28,18 +29,9 @@ int main() {
});
Graph.end_recording();

auto ExecGraph = Graph.finalize({exp_ext::property::graph::updatable{}});

if (!expectException([&]() { ExecGraph.update(Graph); },
"update(graph) with native recording enabled",
sycl::errc::feature_not_supported)) {
free(Data, Queue);
return 1;
}

if (!expectException(
[&]() { ExecGraph.update(std::vector<exp_ext::node>{}); },
"update(nodes) with native recording enabled",
[&]() { Graph.finalize({exp_ext::property::graph::updatable{}}); },
"finalize() with enable_native_recording and updatable",
sycl::errc::feature_not_supported)) {
free(Data, Queue);
return 1;
Expand Down
Loading