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 according to standard #114790

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

dklochkov-emb
Copy link
Contributor

Version of SYCL was changed according to the latest agreement:
The lower 2 digits are not formally specified, but we plan to use these to identify the month in which we submit the specification for ratification, which is similar to the C++ macro __cplusplus.

Since the SYCL 2020 specification was submitted for ratification in December of 2020, the macro's value is now 202012 for SYCL 2020.
see PR for details
KhronosGroup/SYCL-Docs#634

Copy link

github-actions bot commented Nov 4, 2024

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added the clang Clang issues not falling into any other category label Nov 4, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 4, 2024

@llvm/pr-subscribers-clang

Author: None (dklochkov-emb)

Changes

Version of SYCL was changed according to the latest agreement:
The lower 2 digits are not formally specified, but we plan to use these to identify the month in which we submit the specification for ratification, which is similar to the C++ macro __cplusplus.

Since the SYCL 2020 specification was submitted for ratification in December of 2020, the macro's value is now 202012 for SYCL 2020.
see PR for details
KhronosGroup/SYCL-Docs#634


Full diff: https://github.com/llvm/llvm-project/pull/114790.diff

2 Files Affected:

  • (modified) clang/lib/Frontend/InitPreprocessor.cpp (+1-1)
  • (modified) clang/test/Preprocessor/sycl-macro.cpp (+1-1)
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 9a0fdb175ff29e..e9c7dc338380fd 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -587,7 +587,7 @@ static void InitializeStandardPredefinedMacros(const TargetInfo &TI,
     if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2017)
       Builder.defineMacro("CL_SYCL_LANGUAGE_VERSION", "121");
     else if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2020)
-      Builder.defineMacro("SYCL_LANGUAGE_VERSION", "202001");
+      Builder.defineMacro("SYCL_LANGUAGE_VERSION", "202012");
   }
 
   // Not "standard" per se, but available even with the -undef flag.
diff --git a/clang/test/Preprocessor/sycl-macro.cpp b/clang/test/Preprocessor/sycl-macro.cpp
index eecddaa09d1c33..a509086f99e413 100644
--- a/clang/test/Preprocessor/sycl-macro.cpp
+++ b/clang/test/Preprocessor/sycl-macro.cpp
@@ -10,5 +10,5 @@
 // CHECK-NOT:#define __SYCL_DEVICE_ONLY__ 1
 // CHECK-NOT:#define CL_SYCL_LANGUAGE_VERSION 121
 // CHECK-SYCL-STD:#define CL_SYCL_LANGUAGE_VERSION 121
-// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202001
+// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202012
 // CHECK-SYCL:#define __SYCL_DEVICE_ONLY__ 1

@bader bader added the SYCL https://registry.khronos.org/SYCL label Nov 4, 2024
@dklochkov-emb
Copy link
Contributor Author

Ping
@bader Could you recommend who can be added as a reviewer to these changes?

@dklochkov-emb dklochkov-emb force-pushed the sycl-version-definition-changes branch from 691adc0 to dafdcfe Compare November 22, 2024 08:10
@keryell
Copy link
Contributor

keryell commented Nov 23, 2024

That sounds good.
Could you fix the typos in the PR title and the commit messages.
Please write SYCL in uppercase everywhere since it is a standard name.

@dklochkov-emb dklochkov-emb changed the title [SYCL] change sycl version accrodnig to standard [SYCL] change SYCL version accrodnig to standard Nov 25, 2024
@dklochkov-emb dklochkov-emb force-pushed the sycl-version-definition-changes branch from dafdcfe to e5d29f8 Compare November 25, 2024 15:42
@keryell
Copy link
Contributor

keryell commented Nov 26, 2024

That sounds good. Could you fix the typos in the PR title and the commit messages. Please write SYCL in uppercase everywhere since it is a standard name.

For the typos I mean accrodnigaccording in both the commit message and the PR title. 😄

[SYCL] make SYCL version long integer
@dklochkov-emb dklochkov-emb force-pushed the sycl-version-definition-changes branch from e5d29f8 to e854cae Compare November 26, 2024 08:12
@dklochkov-emb dklochkov-emb changed the title [SYCL] change SYCL version accrodnig to standard [SYCL] change SYCL version according to standard Nov 26, 2024
@bader bader changed the title [SYCL] change SYCL version according to standard [SYCL] Change SYCL version according to standard Nov 26, 2024
@bader bader requested a review from gmlueck November 26, 2024 16:37
@bader bader merged commit 6b07853 into llvm:main Dec 5, 2024
8 checks passed
Copy link

github-actions bot commented Dec 5, 2024

@dklochkov-emb Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

broxigarchen pushed a commit to broxigarchen/llvm-project that referenced this pull request Dec 10, 2024
Version of SYCL was changed according to the latest agreement:
The lower 2 digits are not formally specified, but we plan to use these
to identify the month in which we submit the specification for
ratification, which is similar to the C++ macro __cplusplus.

Since the SYCL 2020 specification was submitted for ratification in
December of 2020, the macro's value is now 202012 for SYCL 2020.
see PR for details 
KhronosGroup/SYCL-Docs#634
chrsmcgrr pushed a commit to RooflineAI/llvm-project that referenced this pull request Dec 12, 2024
Version of SYCL was changed according to the latest agreement:
The lower 2 digits are not formally specified, but we plan to use these
to identify the month in which we submit the specification for
ratification, which is similar to the C++ macro __cplusplus.

Since the SYCL 2020 specification was submitted for ratification in
December of 2020, the macro's value is now 202012 for SYCL 2020.
see PR for details 
KhronosGroup/SYCL-Docs#634
TIFitis pushed a commit to TIFitis/llvm-project that referenced this pull request Dec 18, 2024
Version of SYCL was changed according to the latest agreement:
The lower 2 digits are not formally specified, but we plan to use these
to identify the month in which we submit the specification for
ratification, which is similar to the C++ macro __cplusplus.

Since the SYCL 2020 specification was submitted for ratification in
December of 2020, the macro's value is now 202012 for SYCL 2020.
see PR for details 
KhronosGroup/SYCL-Docs#634
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category SYCL https://registry.khronos.org/SYCL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants