Skip to content

[NFC][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute #2399

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 13 commits into from
Sep 3, 2020

Conversation

smanna12
Copy link
Contributor

@smanna12 smanna12 commented Sep 1, 2020

Commit b2da2c8 added support for new spelling [[intel::reqd_sub_group_size()]]
and deprecated previous spelling [[cl::intel_reqd_sub_group_size()]] of the
IntelReqdSubGroupSize attribute to match with spec.

This patch removes that deprecated spelling and updates several tests
of IntelReqdSubGroupSize attribute with new spelling.

Signed-off-by: Soumi Manna [email protected]

Commit b2da2c8 added support for new spelling [[intel::reqd_sub_group_size()]]
and deprecated previous spelling [[cl::intel_reqd_sub_group_size()]] of the
IntelReqdSubGroupSize attribute.

This patch removes that deprecated spelling and updates several tests
of IntelReqdSubGroupSize attribute.

Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
@smanna12 smanna12 changed the title [SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute [Do Not Review][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute Sep 1, 2020
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
@smanna12 smanna12 changed the title [Do Not Review][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute [Do Not Review][NFC][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute Sep 1, 2020
@smanna12 smanna12 changed the title [Do Not Review][NFC][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute [NFC][SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute Sep 1, 2020
@smanna12 smanna12 marked this pull request as ready for review September 1, 2020 05:47
alexbatashev
alexbatashev previously approved these changes Sep 1, 2020
Copy link
Contributor

@alexbatashev alexbatashev left a comment

Choose a reason for hiding this comment

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

sycl/ contents LGTM

Comment on lines 22 to 23
cl::sycl::range<1>{this->getOutputBufferSize()}, [=
](cl::sycl::id<1> wiID) [[intel::reqd_sub_group_size(16)]] {
Copy link
Contributor

Choose a reason for hiding this comment

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

clang-format does bad job on this constructs. I'd prefer it to be like this:

Suggested change
cl::sycl::range<1>{this->getOutputBufferSize()}, [=
](cl::sycl::id<1> wiID) [[intel::reqd_sub_group_size(16)]] {
// clang-format off
cl::sycl::range<1>{this->getOutputBufferSize()},
[=](cl::sycl::id<1> wiID) [[intel::reqd_sub_group_size(16)]] {
// clang-format on

If you agree, please apply to all such cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I agree. I will update all cases.

Comment on lines 31 to 33
asm("barrier");
#endif
});
});
Copy link
Contributor

Choose a reason for hiding this comment

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

These changes seem to be unrelated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this is unrelated. Clang-format complained about this. I will change this to the original.

Comment on lines 32 to 33
[[intel::reqd_sub_group_size(
16)]] {
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
[[intel::reqd_sub_group_size(
16)]] {
// clang-format off
[[intel::reqd_sub_group_size(16)]] {
// clang-format on

Same as above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will update this too.

Comment on lines 60 to 61
"rw"(&b[i] + 16), "rw"(&a[i]), "rw"(&a[i] + 16),
"rw"(&c[i]), "rw"(&c[i] + 16));
Copy link
Contributor

Choose a reason for hiding this comment

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

These changes are also irrelevant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this is unrelated. Clang-format complained about this. I will change this to the original.

Fznamznon
Fznamznon previously approved these changes Sep 1, 2020
Copy link
Contributor

@Fznamznon Fznamznon left a comment

Choose a reason for hiding this comment

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

FE changes look fine

Copy link
Contributor

@elizabethandrews elizabethandrews left a comment

Choose a reason for hiding this comment

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

FE changes LGTM

@bader
Copy link
Contributor

bader commented Sep 2, 2020

@smanna12, could you address the comments from @alexbatashev, please?

Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
premanandrao
premanandrao previously approved these changes Sep 2, 2020
Copy link
Contributor

@premanandrao premanandrao left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Signed-off-by: Soumi Manna <[email protected]>
Copy link
Contributor Author

@smanna12 smanna12 left a comment

Choose a reason for hiding this comment

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

I have updated tests. @alexbatashev, could you please review them?

Comment on lines +44 to 48
// clang-format off
a[idx[0]]++;
// clang-format on
#endif
});
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Clang-format makes unrelated change here. I have turned the format off.

Comment on lines +62 to 65
// clang-format off
"rw"(&b[i] + 16), "rw"(&a[i]), "rw"(&a[i] + 16), "rw"(&c[i]),
"rw"(&c[i] + 16));
#else
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Clang-format makes unrelated change here. I have turned the format off.

Copy link
Contributor

@elizabethandrews elizabethandrews left a comment

Choose a reason for hiding this comment

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

FE changes LGTM

@smanna12
Copy link
Contributor Author

smanna12 commented Sep 3, 2020

Thanks everyone for the review.

@bader bader merged commit 9dda36f into intel:sycl Sep 3, 2020
Chenyang-L pushed a commit that referenced this pull request Feb 18, 2025
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.

6 participants