Skip to content

[SYCL] Fix coverity hits in queue & graph #20617

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
wants to merge 4 commits into
base: sycl
Choose a base branch
from
Open

[SYCL] Fix coverity hits in queue & graph #20617

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afb29b2
[SYCL] Fix coverity hits in queue & graph
KseniyaTikhomirova Nov 12, 2025
d9c4e9f
return comment back
KseniyaTikhomirova Nov 12, 2025
84fc53d
revert KData changes
KseniyaTikhomirova Nov 13, 2025
5c2cd7f
fix comments
KseniyaTikhomirova Nov 13, 2025
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
23 changes: 13 additions & 10 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 @@ -327,7 +327,7 @@ graph_impl::graph_impl(const sycl::context &SyclContext,

graph_impl::~graph_impl() {
try {
clearQueues();
clearQueues(false /*Needs lock*/);
for (auto &MemObj : MMemObjs) {
MemObj->markNoLongerBeingUsedInGraph();
}
Expand Down Expand Up @@ -564,17 +564,21 @@ void graph_impl::removeQueue(sycl::detail::queue_impl &RecordingQueue) {
MRecordingQueues.erase(RecordingQueue.weak_from_this());
}

bool graph_impl::clearQueues() {
bool AnyQueuesCleared = false;
for (auto &Queue : MRecordingQueues) {
void graph_impl::clearQueues(bool NeedsLock) {
Copy link
Contributor Author

@KseniyaTikhomirova KseniyaTikhomirova Nov 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the intention is to avoid lock of queue_impl::MMutex (setCommandGraph) under graph_impl::MMutex lock since we have exact reverse order lock in submission path.

graph_impl::RecQueuesStorage ToSwap;
if (NeedsLock) {
graph_impl::WriteLock Lock(MMutex);
std::swap(MRecordingQueues, ToSwap);
}
graph_impl::RecQueuesStorage &QueuesToClear =
NeedsLock ? ToSwap : MRecordingQueues;

for (auto &Queue : QueuesToClear) {
if (auto ValidQueue = Queue.lock(); ValidQueue) {
ValidQueue->setCommandGraph(nullptr);
AnyQueuesCleared = true;
}
}
MRecordingQueues.clear();

return AnyQueuesCleared;
QueuesToClear.clear();
}

bool graph_impl::checkForCycles() {
Expand Down Expand Up @@ -1964,8 +1968,7 @@ void modifiable_command_graph::begin_recording(
}

void modifiable_command_graph::end_recording() {
graph_impl::WriteLock Lock(impl->MMutex);
impl->clearQueues();
impl->clearQueues(true /*Needs lock*/);
}

void modifiable_command_graph::end_recording(queue &RecordingQueue) {
Expand Down
12 changes: 6 additions & 6 deletions sycl/source/detail/graph/graph_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,7 @@ class graph_impl : public std::enable_shared_from_this<graph_impl> {

/// Remove all queues which are recording to this graph, also sets all queues
/// cleared back to the executing state.
///
/// @return True if any queues were removed.
bool clearQueues();
void clearQueues(bool NeedsLock);

/// Associate a sycl event with a node in the graph.
/// @param EventImpl Event to associate with a node in map.
Expand Down Expand Up @@ -561,10 +559,12 @@ class graph_impl : public std::enable_shared_from_this<graph_impl> {
/// Device associated with this graph. All graph nodes will execute on this
/// device.
sycl::device MDevice;

using RecQueuesStorage =
std::set<std::weak_ptr<sycl::detail::queue_impl>,
std::owner_less<std::weak_ptr<sycl::detail::queue_impl>>>;
/// Unique set of queues which are currently recording to this graph.
std::set<std::weak_ptr<sycl::detail::queue_impl>,
std::owner_less<std::weak_ptr<sycl::detail::queue_impl>>>
MRecordingQueues;
RecQueuesStorage MRecordingQueues;
/// Map of events to their associated recorded nodes.
std::unordered_map<std::shared_ptr<sycl::detail::event_impl>, node_impl *>
MEventsMap;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/queue_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ EventImplPtr queue_impl::submit_kernel_direct_impl(
KData.getNDRDesc(), std::move(HostKernelPtr),
nullptr, // Kernel
nullptr, // KernelBundle
std::move(CGData), std::move(KData).getArgs(),
std::move(CGData), std::move(KData.getArgs()),
*KData.getDeviceKernelInfoPtr(), std::move(StreamStorage),
std::move(AuxiliaryResources), detail::CGType::Kernel,
KData.getKernelCacheConfig(), KData.isCooperative(),
Expand Down
6 changes: 4 additions & 2 deletions sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,8 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
bool CallerNeedsEvent);

void setCommandGraphUnlocked(
std::shared_ptr<ext::oneapi::experimental::detail::graph_impl> Graph) {
const std::shared_ptr<ext::oneapi::experimental::detail::graph_impl>
Copy link
Contributor Author

@KseniyaTikhomirova KseniyaTikhomirova Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing "copy instead of move"

&Graph) {
MGraph = Graph;
MExtGraphDeps.reset();

Expand All @@ -614,7 +615,8 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
}

void setCommandGraph(
std::shared_ptr<ext::oneapi::experimental::detail::graph_impl> Graph) {
const std::shared_ptr<ext::oneapi::experimental::detail::graph_impl>
&Graph) {
std::lock_guard<std::mutex> Lock(MMutex);
setCommandGraphUnlocked(Graph);
}
Expand Down
Loading