Skip to content

[SYCL] Fix post-commit issues after PR#11548 #11682

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
Oct 27, 2023
Merged

[SYCL] Fix post-commit issues after PR#11548 #11682

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
ed62e03
[SYCL] Fix post-commit issues after PR#11548
againull Oct 26, 2023
a85b828
Address review comments
againull Oct 26, 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
3 changes: 2 additions & 1 deletion sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ event handler::finalize() {
KernelBundleImpPtr, MArgs);
#endif

auto EnqueueKernel = [&]() {
auto EnqueueKernel = [&, CmdTraceEvent = CmdTraceEvent,
InstanceID = InstanceID]() {
Comment on lines +247 to +248
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks compilation when XPTI_ENABLE_INSTRUMENTATION is not defined.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix is here: #11742

// 'Result' for single point of return
pi_int32 Result = PI_ERROR_INVALID_VALUE;
#ifdef XPTI_ENABLE_INSTRUMENTATION
Expand Down
7 changes: 4 additions & 3 deletions sycl/tools/sycl-trace/sycl_trace_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ void TraceDiagnosticsMessage(xpti::trace_event_data_t * /*Parent*/,

void TraceTaskExecutionSignals(xpti::trace_event_data_t * /*Parent*/,
xpti::trace_event_data_t *Event,
const void *UserData, uint64_t InstanceID,
bool IsBegin) {
[[maybe_unused]] const void *UserData,
uint64_t InstanceID, bool IsBegin) {
if (!Event)
return;

Expand All @@ -76,7 +76,8 @@ void TraceTaskExecutionSignals(xpti::trace_event_data_t * /*Parent*/,

void TraceQueueLifetimeSignals(xpti::trace_event_data_t * /*Parent*/,
xpti::trace_event_data_t *Event,
const void *UserData, bool IsCreation) {
[[maybe_unused]] const void *UserData,
bool IsCreation) {
if (!Event)
return;

Expand Down