Skip to content

Commit 1b569b7

Browse files
[SYCL] Change SYCL version definition to 202012 (#15890)
SYCL language version macro is changed from 202001 to 202012L
1 parent d05e33e commit 1b569b7

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

clang/lib/Basic/Version.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ std::string getClangFullCPPVersion() {
128128
llvm::SmallVector<std::pair<llvm::StringRef, llvm::StringRef>, 2>
129129
getSYCLVersionMacros(const LangOptions &LangOpts) {
130130
if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2020)
131-
return {{"SYCL_LANGUAGE_VERSION", "202001"}};
131+
return {{"SYCL_LANGUAGE_VERSION", "202012L"}};
132132
llvm_unreachable("SYCL standard should be set");
133133
}
134134
} // end namespace clang

clang/test/CodeGenSYCL/integration_header_ppmacros.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int main() {
1717
sycl::kernel_single_task<class first_kernel>([]() {});
1818
}
1919
// CHECK: #ifndef SYCL_LANGUAGE_VERSION
20-
// CHECK-NEXT: #define SYCL_LANGUAGE_VERSION 202001
20+
// CHECK-NEXT: #define SYCL_LANGUAGE_VERSION 202012
2121
// CHECK-NEXT: #endif //SYCL_LANGUAGE_VERSION
2222

2323
// CHECK-RANGE: #ifndef __SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__

clang/test/Preprocessor/sycl-macro.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
// CHECK-NOT:#define SYCL_EXTERNAL
1717
// CHECK-NOT:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
1818

19-
// CHECK-SYCL-STD:#define SYCL_LANGUAGE_VERSION 202001
19+
// CHECK-SYCL-STD:#define SYCL_LANGUAGE_VERSION 202012L
2020

2121
// CHECK-SYCL-STD:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
2222

23-
// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202001
23+
// CHECK-SYCL-STD-2020:#define SYCL_LANGUAGE_VERSION 202012
2424
// CHECK-SYCL-STD-2020:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1
2525

2626
// CHECK-SYCL-STD-DEVICE:#define __SYCL_DEVICE_ONLY__ 1

sycl/include/sycl/detail/defines_elementary.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#endif // __SYCL_DEPRECATED
5858

5959
#ifndef __SYCL2020_DEPRECATED
60-
#if SYCL_LANGUAGE_VERSION >= 202001 && \
60+
#if SYCL_LANGUAGE_VERSION == 202012L && \
6161
!defined(SYCL2020_DISABLE_DEPRECATION_WARNINGS)
6262
#define __SYCL2020_DEPRECATED(message) __SYCL_DEPRECATED(message)
6363
#else

sycl/include/sycl/handler.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,8 @@ class __SYCL_EXPORT handler {
11471147
// Range rounding is supported only for newer SYCL standards.
11481148
#if !defined(__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__) && \
11491149
!defined(DPCPP_HOST_DEVICE_OPENMP) && \
1150-
!defined(DPCPP_HOST_DEVICE_PERF_NATIVE) && SYCL_LANGUAGE_VERSION >= 202001
1150+
!defined(DPCPP_HOST_DEVICE_PERF_NATIVE) && \
1151+
SYCL_LANGUAGE_VERSION >= 202012L
11511152
auto [RoundedRange, HasRoundedRange] = getRoundedRange(UserRange);
11521153
if (HasRoundedRange) {
11531154
using NameWT = typename detail::get_kernel_wrapper_name_t<NameT>::name;
@@ -1177,7 +1178,7 @@ class __SYCL_EXPORT handler {
11771178
} else
11781179
#endif // !__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ &&
11791180
// !DPCPP_HOST_DEVICE_OPENMP && !DPCPP_HOST_DEVICE_PERF_NATIVE &&
1180-
// SYCL_LANGUAGE_VERSION >= 202001
1181+
// SYCL_LANGUAGE_VERSION >= 202012L
11811182
{
11821183
(void)UserRange;
11831184
(void)Props;

0 commit comments

Comments
 (0)