Skip to content

[SYCL][XPTI] Emit XPTI signal when new kernel is submitted #12123

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 2 commits into from
Dec 14, 2023
Merged

[SYCL][XPTI] Emit XPTI signal when new kernel is submitted #12123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c93faae
[SYCL] Emit XPTI signal when new kernel is submitted by fast path
jiezzhang Dec 6, 2023
495a0b6
Fix segfault caused by empty event ptr
jiezzhang Dec 12, 2023
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
23 changes: 9 additions & 14 deletions sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,12 @@ bool CurrentCodeLocationValid() {

void emitInstrumentationGeneral(uint32_t StreamID, uint64_t InstanceID,
xpti_td *TraceEvent, uint16_t Type,
const char *Txt) {
const void *Addr) {
if (!(xptiCheckTraceEnabled(StreamID, Type) && TraceEvent))
return;
// Trace event notifier that emits a Type event
xptiNotifySubscribers(StreamID, Type, detail::GSYCLGraphEvent,
static_cast<xpti_td *>(TraceEvent), InstanceID,
static_cast<const void *>(Txt));
static_cast<xpti_td *>(TraceEvent), InstanceID, Addr);
}
#endif

Expand Down Expand Up @@ -788,22 +787,18 @@ Command *Command::addDep(EventImplPtr Event,

void Command::emitEnqueuedEventSignal(sycl::detail::pi::PiEvent &PiEventAddr) {
#ifdef XPTI_ENABLE_INSTRUMENTATION
constexpr uint16_t NotificationTraceType = xpti::trace_signal;
if (!(xptiCheckTraceEnabled(MStreamID, NotificationTraceType) &&
MTraceEvent && PiEventAddr))
return;
// Asynchronous call, so send a signal with the event information as
// user_data
xptiNotifySubscribers(
MStreamID, NotificationTraceType, detail::GSYCLGraphEvent,
static_cast<xpti_td *>(MTraceEvent), MInstanceID, (void *)PiEventAddr);
emitInstrumentationGeneral(
MStreamID, MInstanceID, static_cast<xpti_td *>(MTraceEvent),
xpti::trace_signal, static_cast<const void *>(PiEventAddr));
#endif
std::ignore = PiEventAddr;
}

void Command::emitInstrumentation(uint16_t Type, const char *Txt) {
#ifdef XPTI_ENABLE_INSTRUMENTATION
return emitInstrumentationGeneral(
MStreamID, MInstanceID, static_cast<xpti_td *>(MTraceEvent), Type, Txt);
return emitInstrumentationGeneral(MStreamID, MInstanceID,
static_cast<xpti_td *>(MTraceEvent), Type,
static_cast<const void *>(Txt));
#else
std::ignore = Type;
std::ignore = Txt;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/scheduler/commands.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace detail {
bool CurrentCodeLocationValid();
void emitInstrumentationGeneral(uint32_t StreamID, uint64_t InstanceID,
xpti_td *TraceEvent, uint16_t Type,
const char *Txt);
const void *Addr);
#endif

class queue_impl;
Expand Down
6 changes: 6 additions & 0 deletions sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,12 @@ event handler::finalize() {
}
}
#ifdef XPTI_ENABLE_INSTRUMENTATION
// Emit signal only when event is created
if (NewEvent != nullptr) {
detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_signal,
static_cast<const void *>(NewEvent->getHandleRef()));
}
detail::emitInstrumentationGeneral(StreamID, InstanceID, CmdTraceEvent,
xpti::trace_task_end, nullptr);
#endif
Expand Down