Skip to content
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

[SYCL] change sycl version definition to 202012 #15890

Merged
merged 6 commits into from
Jan 10, 2025

Conversation

dklochkov-emb
Copy link
Contributor

Sycl language version macro is changed from 202001 to 202012L

@@ -141,7 +141,7 @@ using cl_double = double;
} // namespace opencl

// Vector aliases are different between SYCL 1.2.1 and SYCL 2020
Copy link
Contributor

Choose a reason for hiding this comment

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

We do not support 1.2.1 mode anymore. I think that we could use the opportunity and just drop them while we are here

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lets do it in a separate pull request

@@ -57,7 +57,7 @@
#endif // __SYCL_DEPRECATED

#ifndef __SYCL2020_DEPRECATED
#if SYCL_LANGUAGE_VERSION >= 202001 && \
#if SYCL_LANGUAGE_VERSION >= 202012L && \
Copy link
Contributor

@AlexeySachkov AlexeySachkov Oct 28, 2024

Choose a reason for hiding this comment

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

Considering that there will be a single SYCL_LANGUAGE_VERSION per SYCL specification, I'm not sure if >= is a correct comparison going forward.

If something is only deprecated in SYCL 2020, then we should check for equality. SYCL-Next is not that far away, so I suggest that we prepare for that and use == right away. >= had more sense before the recent spec change which prompted this PR, because there could be several SYCL_LANGUAGE_VERSION values matching SYCL 2020, but it is not the case anymore.

Before any changes are made, I would like to hear feedback from @intel/llvm-reviewers-runtime as well

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

@@ -68,7 +68,7 @@
// 3300+ lines of code

// SYCL_LANGUAGE_VERSION is 4 digit year followed by 2 digit revision
#if !SYCL_LANGUAGE_VERSION || SYCL_LANGUAGE_VERSION < 202001
#if !SYCL_LANGUAGE_VERSION || SYCL_LANGUAGE_VERSION < 202012L
Copy link
Contributor

Choose a reason for hiding this comment

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

Similar comment here, if we had any code paths which are specific to SYCL 1.2.1, we should probably use this opportunity to completely drop them, because we do not support SYCL 1.2.1 anymore

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lets do it in a separate pull request

@bader
Copy link
Contributor

bader commented Oct 28, 2024

SYCL_LANGUAGE_VERSION support has been upstreamed already, so we should land this patch to https://github.com/llvm/llvm-project/.

@elizabethandrews
Copy link
Contributor

SYCL_LANGUAGE_VERSION support has been upstreamed already, so we should land this patch to https://github.com/llvm/llvm-project/.

Upstream code seems to be quite updated. It has code to define CL_SYCL_LANGUAGE_VERSION, etc. It would be nice to clean that up. The code in syclos and upstream aren't an exact match though. We don't have getSYCLVersion and I don't think we can add it there since we have different code actually calling this yet.

@AlexeySachkov
Copy link
Contributor

@elizabethandrews, @bader, PR to the upstream is published here: llvm/llvm-project#114790, are you ok with merging this change to intel/llvm in advance, or should we wait for the upstream first to reduce risk of discrepancies?

@bader
Copy link
Contributor

bader commented Nov 25, 2024

@elizabethandrews, @bader, PR to the upstream is published here: llvm/llvm-project#114790, are you ok with merging this change to intel/llvm in advance, or should we wait for the upstream first to reduce risk of discrepancies?

The rule of thumb is to commit to llvm-project directly and rely on pulldown script to bring the change to intel/llvm repository. The change can be committed to intel/llvm directly if there is a justification to bypass the default process. Why do we want to merge this patch ahead of llvm/llvm-project#114790?

@AlexeySachkov
Copy link
Contributor

AlexeySachkov commented Nov 25, 2024

@elizabethandrews, @bader, PR to the upstream is published here: llvm/llvm-project#114790, are you ok with merging this change to intel/llvm in advance, or should we wait for the upstream first to reduce risk of discrepancies?

The rule of thumb is to commit to llvm-project directly and rely on pulldown script to bring the change to intel/llvm repository. The change can be committed to intel/llvm directly if there is a justification to bypass the default process. Why do we want to merge this patch ahead of llvm/llvm-project#114790?

I don't think that there is a rush with this one, but it is ready to merge, because it was approved by @elizabethandrews. Its better to explicitly request changes, or move it to draft then to prevent an accidental merge, I essentially wanted to double-check here.

@AlexeySachkov AlexeySachkov marked this pull request as draft November 25, 2024 17:07
AlexeySachkov pushed a commit that referenced this pull request Nov 26, 2024
Remove 1.2.1 code as mentioned in
#15890
@dklochkov-emb dklochkov-emb marked this pull request as ready for review January 10, 2025 09:49
@bader bader requested a review from AlexeySachkov January 10, 2025 17:06
@bader bader merged commit 1b569b7 into intel:sycl Jan 10, 2025
17 checks passed
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.

5 participants