Skip to content

[SYCL][UR][L0 v2] fix ur_queue_handle_t_ after #17118 #18520

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.

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 2 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion unified-runtime/source/adapters/level_zero/v2/event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,9 @@ ur_result_t urEventGetInfo(ur_event_handle_t hEvent, ur_event_info_t propName,
return returnValue(hEvent->RefCount.load());
}
case UR_EVENT_INFO_COMMAND_QUEUE: {
return returnValue(hEvent->getQueue());
auto urQueueHandle = reinterpret_cast<uintptr_t>(hEvent->getQueue()) -
ur_queue_handle_t_::queue_offset;
return returnValue(urQueueHandle);
}
case UR_EVENT_INFO_CONTEXT: {
return returnValue(hEvent->getContext());
Expand Down
19 changes: 17 additions & 2 deletions unified-runtime/source/adapters/level_zero/v2/queue_handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,32 @@

#pragma once

#include "../common.hpp"
#include "queue_immediate_in_order.hpp"
#include <ur_api.h>
#include <variant>

struct ur_queue_handle_t_ {
struct ur_queue_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter> {
using data_variant = std::variant<v2::ur_queue_immediate_in_order_t>;
data_variant queue_data;

static constexpr uintptr_t queue_offset =
sizeof(ur::handle_base<ur::level_zero::ddi_getter>);

template <typename T, class... Args>
ur_queue_handle_t_(std::in_place_type_t<T>, Args &&...args)
: ur::handle_base<ur::level_zero::ddi_getter>(),
queue_data(std::in_place_type<T>, std::forward<Args>(args)...) {
assert(queue_offset ==
(std::visit([](auto &q) { return reinterpret_cast<uintptr_t>(&q); },
queue_data) -
reinterpret_cast<uintptr_t>(this)));
}

template <typename T, class... Args>
static ur_queue_handle_t_ *create(Args &&...args) {
return new ur_queue_handle_t_{data_variant{std::in_place_type<T>, args...}};
return new ur_queue_handle_t_(std::in_place_type<T>,
std::forward<Args>(args)...);
}

ur_queue_t_ &get() {
Expand Down
Loading