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.

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

Conversation

againull
Copy link
Contributor

@againull againull commented Oct 26, 2023

  • Fix unused parameters of function.
  • Fix error caused by capturing structured binding which is available in C++20 only.

@againull againull requested a review from a team as a code owner October 26, 2023 22:42
@@ -239,9 +239,11 @@ 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(
auto InstrumentationData = emitKernelInstrumentationData(
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd rather keep the structured binding and re-write the lambda like this: https://godbolt.org/z/ofqcoaTGr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, fixed.

Comment on lines 55 to 56
const void *, uint64_t InstanceID,
bool IsBegin) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
const void *, uint64_t InstanceID,
bool IsBegin) {
[[maybe_unused]] const void *UserData,
uint64_t InstanceID, bool IsBegin) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, fixed.

@@ -76,7 +76,7 @@ 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) {
const void *, bool IsCreation) {
Copy link
Contributor

Choose a reason for hiding this comment

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

likewise.

@againull againull temporarily deployed to WindowsCILock October 26, 2023 23:12 — with GitHub Actions Inactive
@againull againull temporarily deployed to WindowsCILock October 26, 2023 23:36 — with GitHub Actions Inactive
@againull againull merged commit 54bb098 into intel:sycl Oct 27, 2023
@KseniyaTikhomirova
Copy link
Contributor

@againull, @aelovikov-intel thank you for fixing this

Comment on lines +247 to +248
auto EnqueueKernel = [&, CmdTraceEvent = CmdTraceEvent,
InstanceID = InstanceID]() {
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

@againull againull deleted the post_commit branch December 22, 2023 04:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants