Skip to content

Commit 32a8487

Browse files
Code formatting.
1 parent 2af3dec commit 32a8487

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

sycl/source/detail/queue_impl.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ event queue_impl::memcpyFromDeviceGlobal(
286286
sycl::detail::optional<event> queue_impl::getLastEvent() {
287287
// The external event is required to finish last if set, so it is considered
288288
// the last event if present.
289-
if (std::optional<event> ExternalEvent =
290-
MInOrderExternalEvent.read([](std::optional<event> &InOrderExternalEvent) {
291-
return InOrderExternalEvent;
292-
}))
289+
if (std::optional<event> ExternalEvent = MInOrderExternalEvent.read(
290+
[](std::optional<event> &InOrderExternalEvent) {
291+
return InOrderExternalEvent;
292+
}))
293293
return ExternalEvent;
294294

295295
std::lock_guard<std::mutex> Lock{MMutex};
@@ -618,11 +618,12 @@ void queue_impl::wait(const detail::code_location &CodeLoc) {
618618
WeakEvents.swap(MEventsWeak);
619619
SharedEvents.swap(MEventsShared);
620620

621-
MMissedCleanupRequests.get([this](MissedCleanupRequestsType &MissedCleanupRequests){
622-
for (auto &UpdatedGraph : MissedCleanupRequests)
623-
doUnenqueuedCommandCleanup(UpdatedGraph);
624-
MissedCleanupRequests.clear();
625-
});
621+
MMissedCleanupRequests.get(
622+
[this](MissedCleanupRequestsType &MissedCleanupRequests){
623+
for (auto &UpdatedGraph : MissedCleanupRequests)
624+
doUnenqueuedCommandCleanup(UpdatedGraph);
625+
MissedCleanupRequests.clear();
626+
});
626627
}
627628
// If the queue is either a host one or does not support OOO (and we use
628629
// multiple in-order queues as a result of that), wait for each event
@@ -798,9 +799,10 @@ void queue_impl::revisitUnenqueuedCommandsState(
798799
if (Lock.owns_lock())
799800
doUnenqueuedCommandCleanup(CompletedHostTask->getCommandGraph());
800801
else {
801-
MMissedCleanupRequests.put([CompletedHostTask](MissedCleanupRequestsType &MissedCleanupRequests){
802-
MissedCleanupRequests.push_back(CompletedHostTask->getCommandGraph());
803-
});
802+
MMissedCleanupRequests.put(
803+
[CompletedHostTask](MissedCleanupRequestsType &MissedCleanupRequests){
804+
MissedCleanupRequests.push_back(CompletedHostTask->getCommandGraph());
805+
});
804806
}
805807
}
806808

sycl/source/detail/queue_impl.hpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -710,17 +710,19 @@ class queue_impl {
710710
void *getTraceEvent() { return MTraceEvent; }
711711

712712
void setExternalEvent(const event &Event) {
713-
MInOrderExternalEvent.put([&Event](std::optional<event> &InOrderExternalEvent){
714-
InOrderExternalEvent = Event;
715-
});
713+
MInOrderExternalEvent.put(
714+
[&Event](std::optional<event> &InOrderExternalEvent){
715+
InOrderExternalEvent = Event;
716+
});
716717
}
717718

718719
std::optional<event> popExternalEvent() {
719720
std::optional<event> Result = std::nullopt;
720721

721-
MInOrderExternalEvent.get([&Result](std::optional<event> &InOrderExternalEvent) {
722-
std::swap(Result, InOrderExternalEvent);
723-
});
722+
MInOrderExternalEvent.get(
723+
[&Result](std::optional<event> &InOrderExternalEvent) {
724+
std::swap(Result, InOrderExternalEvent);
725+
});
724726
return Result;
725727
}
726728

@@ -836,11 +838,12 @@ class queue_impl {
836838
// dependency so in the case where some commands were not enqueued
837839
// (blocked), we track them to prevent barrier from being enqueued
838840
// earlier.
839-
MMissedCleanupRequests.get([this](MissedCleanupRequestsType &MissedCleanupRequests){
840-
for (auto &UpdatedGraph : MissedCleanupRequests)
841-
doUnenqueuedCommandCleanup(UpdatedGraph);
842-
MissedCleanupRequests.clear();
843-
});
841+
MMissedCleanupRequests.get(
842+
[this](MissedCleanupRequestsType &MissedCleanupRequests){
843+
for (auto &UpdatedGraph : MissedCleanupRequests)
844+
doUnenqueuedCommandCleanup(UpdatedGraph);
845+
MissedCleanupRequests.clear();
846+
});
844847
auto &Deps = MGraph.expired() ? MDefaultGraphDeps : MExtGraphDeps;
845848
if (Type == CGType::Barrier && !Deps.UnenqueuedCmdEvents.empty()) {
846849
Handler.depends_on(Deps.UnenqueuedCmdEvents);
@@ -1025,20 +1028,18 @@ class queue_impl {
10251028
} MDefaultGraphDeps, MExtGraphDeps;
10261029

10271030
// implement check-lock-check pattern to not lock empty MData
1028-
template <typename DataType>
1029-
class CheckLockCheck {
1031+
template <typename DataType> class CheckLockCheck {
10301032
DataType MData;
10311033
std::atomic_bool MDataPresent = false;
10321034
mutable std::mutex MDataMtx;
1035+
10331036
public:
1034-
template <typename F>
1035-
void put(F &&func) {
1037+
template <typename F> void put(F &&func) {
10361038
std::lock_guard<std::mutex> Lock(MDataMtx);
10371039
MDataPresent.store(true, std::memory_order_release);
10381040
func(MData);
10391041
}
1040-
template <typename F>
1041-
void get(F &&func) {
1042+
template <typename F> void get(F &&func) {
10421043
if (MDataPresent.load(std::memory_order_acquire)) {
10431044
std::lock_guard<std::mutex> Lock(MDataMtx);
10441045
if (MDataPresent.load(std::memory_order_acquire)) {
@@ -1047,8 +1048,7 @@ class queue_impl {
10471048
}
10481049
}
10491050
}
1050-
template <typename F>
1051-
DataType read(F &&func) {
1051+
template <typename F> DataType read(F &&func) {
10521052
if (!MDataPresent.load(std::memory_order_acquire))
10531053
return DataType{};
10541054
std::lock_guard<std::mutex> Lock(MDataMtx);
@@ -1101,8 +1101,8 @@ class queue_impl {
11011101
unsigned long long MQueueID;
11021102
static std::atomic<unsigned long long> MNextAvailableQueueID;
11031103

1104-
using MissedCleanupRequestsType =
1105-
std::deque<std::shared_ptr<ext::oneapi::experimental::detail::graph_impl>>;
1104+
using MissedCleanupRequestsType = std::deque<
1105+
std::shared_ptr<ext::oneapi::experimental::detail::graph_impl>>;
11061106
CheckLockCheck<MissedCleanupRequestsType> MMissedCleanupRequests;
11071107

11081108
friend class sycl::ext::oneapi::experimental::detail::node_impl;

0 commit comments

Comments
 (0)