8000 [NFC][SYCL] Pass `context_impl` by raw ptr/ref in `scheduler.hpp` by aelovikov-intel · Pull Request #18980 · intel/llvm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[NFC][SYCL] Pass context_impl by raw ptr/ref in scheduler.hpp #18980

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

Merged
merged 1 commit into from
Jun 13, 2025
Merged

[NFC][SYCL] Pass context_impl by raw ptr/ref in scheduler.hpp #18980

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
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 @@ -455,7 +455,7 @@ event queue_impl::submitMemOpHelper(const std::vector<event> &DepEvents,
// If we have a command graph set we need to capture the op through the
// handler rather than by-passing the scheduler.
if (MGraph.expired() && Scheduler::areEventsSafeForSchedulerBypass(
ExpandedDepEvents, MContext)) {
ExpandedDepEvents, *MContext)) {
auto isNoEventsMode = trySwitchingToNoEventsMode();
if (!CallerNeedsEvent && isNoEventsMode) {
NestedCallsTracker tracker;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
return false;

if (MDefaultGraphDeps.LastEventPtr != nullptr &&
!Scheduler::CheckEventReadiness(MContext,
!Scheduler::CheckEventReadiness(*MContext,
MDefaultGraphDeps.LastEventPtr))
return false;

Expand Down
6 changes: 3 additions & 3 deletions sycl/source/detail/scheduler/graph_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,16 @@ Scheduler::GraphBuilder::getOrInsertMemObjRecord(const QueueImplPtr &Queue,
Dev, InteropCtxPtr, async_handler{}, property_list{});

MemObject->MRecord.reset(
new MemObjRecord{InteropCtxPtr, LeafLimit, AllocateDependency});
new MemObjRecord{InteropCtxPtr.get(), LeafLimit, AllocateDependency});
std::vector<Command *> ToEnqueue;
getOrCreateAllocaForReq(MemObject->MRecord.get(), Req, InteropQueuePtr,
ToEnqueue);
assert(ToEnqueue.empty() && "Creation of the first alloca for a record "
"shouldn't lead to any enqueuing (no linked "
"alloca or exceeding the leaf limit).");
} else
MemObject->MRecord.reset(new MemObjRecord{queue_impl::getContext(Queue),
LeafLimit, AllocateDependency});
MemObject->MRecord.reset(new MemObjRecord{
queue_impl::getContext(Queue).get(), LeafLimit, AllocateDependency});

MMemObjs.push_back(MemObject);
return MemObject->MRecord.get();
Expand Down
8 changes: 4 additions & 4 deletions sycl/source/detail/scheduler/scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ EventImplPtr Scheduler::addCommandGraphUpdate(
return NewCmdEvent;
}

bool Scheduler::CheckEventReadiness(const ContextImplPtr &Context,
bool Scheduler::CheckEventReadiness(context_impl &Context,
const EventImplPtr &SyclEventImplPtr) {
// Events that don't have an initialized context are throwaway events that
// don't represent actual dependencies. Calling getContextImpl() would set
Expand All @@ -691,7 +691,7 @@ bool Scheduler::CheckEventReadiness(const ContextImplPtr &Context,
return SyclEventImplPtr->isCompleted();
}
// Cross-context dependencies can't be passed to the backend directly.
if (SyclEventImplPtr->getContextImpl() != Context)
if (SyclEventImplPtr->getContextImpl().get() != &Context)
return false;

// A nullptr here means that the commmand does not produce a UR event or it
Expand All @@ -700,7 +700,7 @@ bool Scheduler::CheckEventReadiness(const ContextImplPtr &Context,
}

bool Scheduler::areEventsSafeForSchedulerBypass(
const std::vector<sycl::event> &DepEvents, const ContextImplPtr &Context) {
const std::vector<sycl::event> &DepEvents, context_impl &Context) {

return std::all_of(
DepEvents.begin(), DepEvents.end(), [&Context](const sycl::event &Event) {
Expand All @@ -710,7 +710,7 @@ bool Scheduler::areEventsSafeForSchedulerBypass(
}

bool Scheduler::areEventsSafeForSchedulerBypass(
const std::vector<EventImplPtr> &DepEvents, const ContextImplPtr &Context) {
const std::vector<EventImplPtr> &DepEvents, context_impl &Context) {

return std::all_of(DepEvents.begin(), DepEvents.end(),
[&Context](const EventImplPtr &SyclEventImplPtr) {
Expand Down
14 changes: 8 additions & 6 deletions sycl/source/detail/scheduler/scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#pragma once

#include <detail/cg.hpp>
#include <detail/context_impl.hpp>
#include <detail/scheduler/commands.hpp>
#include <detail/scheduler/leaves_collection.hpp>
#include <detail/sycl_mem_obj_i.hpp>
Expand Down Expand Up @@ -198,10 +199,11 @@ using CommandPtr = std::unique_ptr<Command>;
///
/// \ingroup sycl_graph
struct MemObjRecord {
MemObjRecord(ContextImplPtr Ctx, std::size_t LeafLimit,
MemObjRecord(context_impl *Ctx, std::size_t LeafLimit,
LeavesCollection::AllocateDependencyF AllocateDependency)
: MReadLeaves{this, LeafLimit, AllocateDependency},
MWriteLeaves{this, LeafLimit, AllocateDependency}, MCurContext{Ctx} {}
MWriteLeaves{this, LeafLimit, AllocateDependency},
MCurContext{Ctx ? Ctx->shared_from_this() : nullptr} {}
// Contains all allocation commands for the memory object.
std::vector<AllocaCommandBase *> MAllocaCommands;

Expand All @@ -212,7 +214,7 @@ struct MemObjRecord {
LeavesCollection MWriteLeaves;

// The context which has the latest state of the memory object.
ContextImplPtr MCurContext;
std::shared_ptr<context_impl> MCurContext;

// The mode this object can be accessed from the host (host_accessor).
// Valid only if the current usage is on host.
Expand Down Expand Up @@ -477,15 +479,15 @@ class Scheduler {
const QueueImplPtr &Queue, std::vector<Requirement *> Requirements,
std::vector<detail::EventImplPtr> &Events);

static bool CheckEventReadiness(const ContextImplPtr &Context,
static bool CheckEventReadiness(context_impl &Context,
const EventImplPtr &SyclEventImplPtr);

static bool
areEventsSafeForSchedulerBypass(const std::vector<sycl::event> &DepEvents,
const ContextImplPtr &Context);
context_impl &Context);
static bool
areEventsSafeForSchedulerBypass(const std::vector<EventImplPtr> &DepEvents,
const ContextImplPtr &Context);
context_impl &Context);

protected:
using RWLockT = std::shared_timed_mutex;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ event handler::finalize() {
(Queue && !Graph && !impl->MSubgraphNode && !Queue->hasCommandGraph() &&
!impl->CGData.MRequirements.size() && !MStreamStorage.size() &&
detail::Scheduler::areEventsSafeForSchedulerBypass(
impl->CGData.MEvents, Queue->getContextImplPtr()));
impl->CGData.MEvents, Queue->getContextImpl()));

// Extract arguments from the kernel lambda, if required.
// Skipping this is currently limited to simple kernels on the fast path.
Expand Down
0