Skip to content

[UR][L0] Fix barrier event cleanup on urEventRelease #21340

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
kswiecicki merged 1 commit into from
Apr 2, 2026
+35 −3
Merged

[UR][L0] Fix barrier event cleanup on urEventRelease #21340

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
38 changes: 35 additions & 3 deletions unified-runtime/source/adapters/level_zero/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ ur_result_t ur_context_handle_t_::finalize() {
std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
for (auto &EventCache : EventCaches) {
for (auto &Event : EventCache) {
if (checkL0LoaderTeardown()) {
if (Event->ZeEvent && checkL0LoaderTeardown()) {
auto ZeResult = ZE_CALL_NOCHECK(zeEventDestroy, (Event->ZeEvent));
// Gracefully handle the case that L0 was already unloaded.
if (ZeResult && (ZeResult != ZE_RESULT_ERROR_UNINITIALIZED &&
Expand Down Expand Up @@ -516,6 +516,21 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
ze_event_pool_handle_t *ZePool = &ZePoolCache->front();
Index = 0;
// Create one event ZePool per MaxNumEventsPerPool events
if (*ZePool == nullptr) {
// Before creating a new pool, scan the cache tail for a fully-recycled
// pool that can be reused (all events released, all slots available).
for (auto it = std::next(ZePoolCache->begin()); it != ZePoolCache->end();
++it) {
if (*it != nullptr && NumEventsUnreleasedInEventPool.count(*it) &&
NumEventsUnreleasedInEventPool[*it] == 0 &&
NumEventsAvailableInEventPool.count(*it) &&
NumEventsAvailableInEventPool[*it] == MaxNumEventsPerPool) {
ZePoolCache->front() = *it;
ZePoolCache->erase(it);
break;
}
}
}
if (*ZePool == nullptr) {
Comment thread
winstonzhang-intel marked this conversation as resolved.
ze_event_pool_counter_based_exp_desc_t counterBasedExt = {
ZE_STRUCTURE_TYPE_COUNTER_BASED_EVENT_POOL_EXP_DESC, nullptr, 0};
Expand Down Expand Up @@ -682,9 +697,26 @@ ur_context_handle_t_::decrementUnreleasedEventsInPool(ur_event_handle_t Event) {
die("Invalid event release: event pool doesn't have unreleased events");
if (--NumEventsUnreleasedInEventPool[Event->ZeEventPool] == 0) {
if (ZePoolCache->front() != Event->ZeEventPool) {
ZePoolCache->push_back(Event->ZeEventPool);
bool hasFrontPool =
!ZePoolCache->empty() && ZePoolCache->front() != nullptr;
if (hasFrontPool && checkL0LoaderTeardown()) {
ZE_CALL_NOCHECK(zeEventPoolDestroy, (Event->ZeEventPool));
NumEventsAvailableInEventPool.erase(Event->ZeEventPool);
NumEventsUnreleasedInEventPool.erase(Event->ZeEventPool);
// Remove the destroyed pool handle from the cache to prevent
// double-free in finalize().
ZePoolCache->remove(Event->ZeEventPool);
Event->ZeEventPool = nullptr;
} else if (!ZePoolCache->empty() && ZePoolCache->front() == nullptr) {
ZePoolCache->front() = Event->ZeEventPool;
NumEventsAvailableInEventPool[Event->ZeEventPool] = MaxNumEventsPerPool;
} else {
ZePoolCache->push_back(Event->ZeEventPool);
NumEventsAvailableInEventPool[Event->ZeEventPool] = MaxNumEventsPerPool;
}
} else {
NumEventsAvailableInEventPool[Event->ZeEventPool] = MaxNumEventsPerPool;
}
NumEventsAvailableInEventPool[Event->ZeEventPool] = MaxNumEventsPerPool;
}

return UR_RESULT_SUCCESS;
Expand Down
Loading