Skip to content

[NFC][SYCL] Prepare memory_pool/async_alloc for getSyclObjImpl to return raw ref #19249

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
Jul 2, 2025
Merged

[NFC][SYCL] Prepare memory_pool/async_alloc for getSyclObjImpl to return raw ref #19249

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
12 changes: 6 additions & 6 deletions sycl/source/detail/async_alloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ std::vector<std::shared_ptr<detail::node_impl>> getDepGraphNodes(
sycl::handler &Handler, detail::queue_impl *Queue,
const std::shared_ptr<detail::graph_impl> &Graph,
const std::vector<std::shared_ptr<detail::event_impl>> &DepEvents) {
auto HandlerImpl = detail::getSyclObjImpl(Handler);
detail::handler_impl &HandlerImpl = *detail::getSyclObjImpl(Handler);
// Get dependent graph nodes from any events
auto DepNodes = Graph->getNodesForEvents(DepEvents);
// If this node was added explicitly we may have node deps in the handler as
// well, so add them to the list
DepNodes.insert(DepNodes.end(), HandlerImpl->MNodeDeps.begin(),
HandlerImpl->MNodeDeps.end());
DepNodes.insert(DepNodes.end(), HandlerImpl.MNodeDeps.begin(),
HandlerImpl.MNodeDeps.end());
// If this is being recorded from an in-order queue we need to get the last
// in-order node if any, since this will later become a dependency of the
// node being processed here.
Expand Down Expand Up @@ -119,7 +119,7 @@ __SYCL_EXPORT void *async_malloc_from_pool(sycl::handler &h, size_t size,
const memory_pool &pool) {

auto &Adapter = h.getContextImpl().getAdapter();
auto &memPoolImpl = sycl::detail::getSyclObjImpl(pool);
detail::memory_pool_impl &memPoolImpl = *detail::getSyclObjImpl(pool);

// Get CG event dependencies for this allocation.
const auto &DepEvents = h.impl->CGData.MEvents;
Expand All @@ -135,12 +135,12 @@ __SYCL_EXPORT void *async_malloc_from_pool(sycl::handler &h, size_t size,

// Memory pool is passed as the graph may use some properties of it.
alloc = Graph->getMemPool().malloc(size, pool.get_alloc_kind(), DepNodes,
sycl::detail::getSyclObjImpl(pool));
detail::getSyclObjImpl(pool).get());
} else {
ur_queue_handle_t Q = h.impl->get_queue().getHandleRef();
Adapter->call<sycl::errc::runtime,
sycl::detail::UrApiKind::urEnqueueUSMDeviceAllocExp>(
Q, memPoolImpl.get()->get_handle(), size, nullptr, UREvents.size(),
Q, memPoolImpl.get_handle(), size, nullptr, UREvents.size(),
UREvents.data(), &alloc, &Event);
}
// Async malloc must return a void* immediately.
Expand Down
10 changes: 5 additions & 5 deletions sycl/source/detail/graph/memory_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace detail {
void *
graph_mem_pool::malloc(size_t Size, usm::alloc AllocType,
const std::vector<std::shared_ptr<node_impl>> &DepNodes,
const std::shared_ptr<memory_pool_impl> &MemPool) {
memory_pool_impl *MemPool) {
// We are potentially modifying contents of this memory pool and the owning
// graph, so take a lock here.
graph_impl::WriteLock Lock(MGraph.MMutex);
Expand All @@ -41,8 +41,8 @@ graph_mem_pool::malloc(size_t Size, usm::alloc AllocType,
switch (AllocType) {
case usm::alloc::device: {

auto &CtxImpl = sycl::detail::getSyclObjImpl(MContext);
auto &Adapter = CtxImpl->getAdapter();
context_impl &CtxImpl = *getSyclObjImpl(MContext);
auto &Adapter = CtxImpl.getAdapter();

size_t Granularity = get_mem_granularity(MDevice, MContext);
uintptr_t StartPtr = 0;
Expand All @@ -60,8 +60,8 @@ graph_mem_pool::malloc(size_t Size, usm::alloc AllocType,
// If no allocation could be reused, do a new virtual reservation
Adapter->call<sycl::errc::runtime,
sycl::detail::UrApiKind::urVirtualMemReserve>(
CtxImpl->getHandleRef(), reinterpret_cast<void *>(StartPtr),
AlignedSize, &Alloc);
CtxImpl.getHandleRef(), reinterpret_cast<void *>(StartPtr), AlignedSize,
&Alloc);

AllocInfo.Size = AlignedSize;
AllocInfo.Ptr = Alloc;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/graph/memory_pool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class graph_mem_pool {
/// @return A pointer to the start of the allocation
void *malloc(size_t Size, usm::alloc AllocType,
const std::vector<std::shared_ptr<node_impl>> &DepNodes,
const std::shared_ptr<memory_pool_impl> &MemPool = nullptr);
memory_pool_impl *MemPool = nullptr);

/// Return the total amount of memory being used by this pool
size_t getMemUseCurrent() const {
Expand Down