Skip to content

[SYCL] Eliminate XPTI overhead when it is disabled #18334

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
May 7, 2025
Merged

[SYCL] Eliminate XPTI overhead when it is disabled #18334

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
68c1f02
Eliminate XPTI overhead when it is disabled
vinser52 May 6, 2025
030b198
Fix issue found by CI
vinser52 May 7, 2025
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
34 changes: 20 additions & 14 deletions sycl/source/detail/graph_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,19 +795,25 @@ exec_graph_impl::enqueueNodeDirect(sycl::context Ctx,
ur_exp_command_buffer_command_handle_t NewCommand = 0;

#ifdef XPTI_ENABLE_INSTRUMENTATION
int32_t StreamID = xptiRegisterStream(sycl::detail::SYCL_STREAM_NAME);
sycl::detail::CGExecKernel *CGExec =
static_cast<sycl::detail::CGExecKernel *>(Node->MCommandGroup.get());
sycl::detail::code_location CodeLoc(CGExec->MFileName.c_str(),
CGExec->MFunctionName.c_str(),
CGExec->MLine, CGExec->MColumn);
auto [CmdTraceEvent, InstanceID] = emitKernelInstrumentationData(
StreamID, CGExec->MSyclKernel, CodeLoc, CGExec->MIsTopCodeLoc,
CGExec->MKernelName.data(), nullptr, CGExec->MNDRDesc,
CGExec->MKernelBundle, CGExec->MArgs);
if (CmdTraceEvent)
sycl::detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_task_begin, nullptr);
const bool xptiEnabled = xptiTraceEnabled();
int32_t StreamID = xpti::invalid_id;
xpti_td *CmdTraceEvent = nullptr;
uint64_t InstanceID = 0;
if (xptiEnabled) {
StreamID = xptiRegisterStream(sycl::detail::SYCL_STREAM_NAME);
sycl::detail::CGExecKernel *CGExec =
static_cast<sycl::detail::CGExecKernel *>(Node->MCommandGroup.get());
sycl::detail::code_location CodeLoc(CGExec->MFileName.c_str(),
CGExec->MFunctionName.c_str(),
CGExec->MLine, CGExec->MColumn);
std::tie(CmdTraceEvent, InstanceID) = emitKernelInstrumentationData(
StreamID, CGExec->MSyclKernel, CodeLoc, CGExec->MIsTopCodeLoc,
CGExec->MKernelName.data(), nullptr, CGExec->MNDRDesc,
CGExec->MKernelBundle, CGExec->MArgs);
if (CmdTraceEvent)
sycl::detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_task_begin, nullptr);
}
#endif

ur_result_t Res = sycl::detail::enqueueImpCommandBufferKernel(
Expand All @@ -825,7 +831,7 @@ exec_graph_impl::enqueueNodeDirect(sycl::context Ctx,
}

#ifdef XPTI_ENABLE_INSTRUMENTATION
if (CmdTraceEvent)
if (xptiEnabled && CmdTraceEvent)
sycl::detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_task_end, nullptr);
#endif
Expand Down
12 changes: 9 additions & 3 deletions sycl/source/detail/queue_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,15 @@ void queue_impl::instrumentationEpilog(void *TelemetryEvent, std::string &Name,
void queue_impl::wait(const detail::code_location &CodeLoc) {
(void)CodeLoc;
#ifdef XPTI_ENABLE_INSTRUMENTATION
const bool xptiEnabled = xptiTraceEnabled();
void *TelemetryEvent = nullptr;
uint64_t IId;
std::string Name;
int32_t StreamID = xptiRegisterStream(SYCL_STREAM_NAME);
TelemetryEvent = instrumentationProlog(CodeLoc, Name, StreamID, IId);
int32_t StreamID = xpti::invalid_id;
if (xptiEnabled) {
StreamID = xptiRegisterStream(SYCL_STREAM_NAME);
TelemetryEvent = instrumentationProlog(CodeLoc, Name, StreamID, IId);
}
#endif

if (MGraph.lock()) {
Expand Down Expand Up @@ -662,7 +666,9 @@ void queue_impl::wait(const detail::code_location &CodeLoc) {
Event->wait(Event);

#ifdef XPTI_ENABLE_INSTRUMENTATION
instrumentationEpilog(TelemetryEvent, Name, StreamID, IId);
if (xptiEnabled) {
instrumentationEpilog(TelemetryEvent, Name, StreamID, IId);
}
#endif
}

Expand Down
43 changes: 25 additions & 18 deletions sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,19 +517,23 @@ event handler::finalize() {
}

#ifdef XPTI_ENABLE_INSTRUMENTATION
// uint32_t StreamID, uint64_t InstanceID, xpti_td* TraceEvent,
int32_t StreamID = xptiRegisterStream(detail::SYCL_STREAM_NAME);
auto [CmdTraceEvent, InstanceID] = emitKernelInstrumentationData(
StreamID, MKernel, MCodeLoc, impl->MIsTopCodeLoc, MKernelName.data(),
MQueue, impl->MNDRDesc, KernelBundleImpPtr, impl->MArgs);
auto EnqueueKernel = [&, CmdTraceEvent = CmdTraceEvent,
InstanceID = InstanceID]() {
#else
auto EnqueueKernel = [&]() {
const bool xptiEnabled = xptiTraceEnabled();
#endif
auto EnqueueKernel = [&]() {
#ifdef XPTI_ENABLE_INSTRUMENTATION
detail::emitInstrumentationGeneral(StreamID, InstanceID, CmdTraceEvent,
xpti::trace_task_begin, nullptr);
int32_t StreamID = xpti::invalid_id;
xpti_td *CmdTraceEvent = nullptr;
uint64_t InstanceID = 0;
if (xptiEnabled) {
StreamID = xptiRegisterStream(detail::SYCL_STREAM_NAME);
std::tie(CmdTraceEvent, InstanceID) = emitKernelInstrumentationData(
StreamID, MKernel, MCodeLoc, impl->MIsTopCodeLoc,
MKernelName.data(), MQueue, impl->MNDRDesc, KernelBundleImpPtr,
impl->MArgs);
detail::emitInstrumentationGeneral(StreamID, InstanceID,
CmdTraceEvent,
xpti::trace_task_begin, nullptr);
}
#endif
const detail::RTDeviceBinaryImage *BinImage = nullptr;
if (detail::SYCLConfig<detail::SYCL_JIT_AMDGCN_PTX_KERNELS>::get()) {
Expand All @@ -545,14 +549,17 @@ event handler::finalize() {
impl->MKernelUsesClusterLaunch,
impl->MKernelWorkGroupMemorySize, BinImage);
#ifdef XPTI_ENABLE_INSTRUMENTATION
// Emit signal only when event is created
if (!DiscardEvent) {
detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_signal,
static_cast<const void *>(LastEventImpl->getHandle()));
if (xptiEnabled) {
// Emit signal only when event is created
if (!DiscardEvent) {
detail::emitInstrumentationGeneral(
StreamID, InstanceID, CmdTraceEvent, xpti::trace_signal,
static_cast<const void *>(LastEventImpl->getHandle()));
}
detail::emitInstrumentationGeneral(StreamID, InstanceID,
CmdTraceEvent,
xpti::trace_task_end, nullptr);
}
detail::emitInstrumentationGeneral(StreamID, InstanceID, CmdTraceEvent,
xpti::trace_task_end, nullptr);
#endif
};

Expand Down
Loading