@@ -67,13 +67,12 @@ bool CurrentCodeLocationValid() {
67
67
68
68
void emitInstrumentationGeneral (uint32_t StreamID, uint64_t InstanceID,
69
69
xpti_td *TraceEvent, uint16_t Type,
70
- const char *Txt ) {
70
+ const void *Addr ) {
71
71
if (!(xptiCheckTraceEnabled (StreamID, Type) && TraceEvent))
72
72
return ;
73
73
// Trace event notifier that emits a Type event
74
74
xptiNotifySubscribers (StreamID, Type, detail::GSYCLGraphEvent,
75
- static_cast <xpti_td *>(TraceEvent), InstanceID,
76
- static_cast <const void *>(Txt));
75
+ static_cast <xpti_td *>(TraceEvent), InstanceID, Addr);
77
76
}
78
77
#endif
79
78
@@ -788,22 +787,18 @@ Command *Command::addDep(EventImplPtr Event,
788
787
789
788
void Command::emitEnqueuedEventSignal (sycl::detail::pi::PiEvent &PiEventAddr) {
790
789
#ifdef XPTI_ENABLE_INSTRUMENTATION
791
- constexpr uint16_t NotificationTraceType = xpti::trace_signal;
792
- if (!(xptiCheckTraceEnabled (MStreamID, NotificationTraceType) &&
793
- MTraceEvent && PiEventAddr))
794
- return ;
795
- // Asynchronous call, so send a signal with the event information as
796
- // user_data
797
- xptiNotifySubscribers (
798
- MStreamID, NotificationTraceType, detail::GSYCLGraphEvent,
799
- static_cast <xpti_td *>(MTraceEvent), MInstanceID, (void *)PiEventAddr);
790
+ emitInstrumentationGeneral (
791
+ MStreamID, MInstanceID, static_cast <xpti_td *>(MTraceEvent),
792
+ xpti::trace_signal, static_cast <const void *>(PiEventAddr));
800
793
#endif
794
+ std::ignore = PiEventAddr;
801
795
}
802
796
803
797
void Command::emitInstrumentation (uint16_t Type, const char *Txt) {
804
798
#ifdef XPTI_ENABLE_INSTRUMENTATION
805
- return emitInstrumentationGeneral (
806
- MStreamID, MInstanceID, static_cast <xpti_td *>(MTraceEvent), Type, Txt);
799
+ return emitInstrumentationGeneral (MStreamID, MInstanceID,
800
+ static_cast <xpti_td *>(MTraceEvent), Type,
801
+ static_cast <const void *>(Txt));
807
802
#else
808
803
std::ignore = Type;
809
804
std::ignore = Txt;
0 commit comments