Skip to content

Commit dfe6e4e

Browse files
[SYCL] Bump the version 6.2.0->7.0.0 and update the versioning section in docs (#6856)
1 parent 0ce9b5f commit dfe6e4e

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

clang/lib/Driver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif()
1919

2020
# This must be in sync with llvm/sycl/CMakeLists.txt.
2121
SET_SOURCE_FILES_PROPERTIES( ToolChains/MSVC.cpp ToolChains/Clang.cpp
22-
PROPERTIES COMPILE_DEFINITIONS SYCL_MAJOR_VERSION="6" )
22+
PROPERTIES COMPILE_DEFINITIONS SYCL_MAJOR_VERSION="7" )
2323

2424
add_clang_library(clangDriver
2525
Action.cpp

sycl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ include(SYCLUtils)
3232
#
3333
# See doc/developer/ABIPolicyGuide.md for the meaning when in the middle of
3434
# development cycle.
35-
set(SYCL_MAJOR_VERSION 6)
36-
set(SYCL_MINOR_VERSION 2)
35+
set(SYCL_MAJOR_VERSION 7)
36+
set(SYCL_MINOR_VERSION 0)
3737
set(SYCL_PATCH_VERSION 0)
3838

3939
set(SYCL_DEV_ABI_VERSION 0)

sycl/doc/developer/ABIPolicyGuide.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ Adding a new exported symbol is considered to be non-breaking change.
3535
The release version of the DPC++ runtime library follows
3636
[Semantic Versioning](https://semver.org/) scheme: `MAJOR.MINOR.PATCH`. `MAJOR`
3737
version indicates breaking change. Version `X` is backwards incompatible with
38-
version `X-1`. `MINOR` indicates a non-breaking change. The development version
39-
of the library has a postfix `-V` that indicates breaking changes between
40-
releases. Every time a pull request introduces a breaking change, it must also
41-
uplift `V`. It is pull request author responsibility to accordingly update
42-
`V` part of library version. If `V > 0` on release date, then `MAJOR_VERSION`
43-
is uplifted and `V` is set to zero. `MAJOR`, `MINOR`, and `PATCH` versions are
44-
not updated between releases.
38+
version `X-1`. `MINOR` indicates a non-breaking change. We bump the versions
39+
immediately after the previous release had been branched off. As such, if next
40+
release is allowed/expected to be ABI-breaking we bump `MAJOR` and drop `MINOR`
41+
to zero otherwise increment `MINOR` in the beginning of the development cycles.
4542

4643
## `__SYCL_EXPORT` Macro
4744

sycl/test-e2e/lit.cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
config.substitutions.append( ('%opencl_include_dir', config.opencl_include_dir) )
198198

199199
if cl_options:
200-
config.substitutions.append( ('%sycl_options', ' ' + config.sycl_libs_dir + '/../lib/sycl6.lib /I' +
200+
config.substitutions.append( ('%sycl_options', ' ' + config.sycl_libs_dir + '/../lib/sycl7.lib /I' +
201201
config.sycl_include + ' /I' + os.path.join(config.sycl_include, 'sycl')) )
202202
config.substitutions.append( ('%include_option', '/FI' ) )
203203
config.substitutions.append( ('%debug_option', '/DEBUG' ) )
@@ -206,7 +206,7 @@
206206
config.substitutions.append( ('%shared_lib', '/LD') )
207207
else:
208208
config.substitutions.append( ('%sycl_options',
209-
(' -lsycl6' if platform.system() == "Windows" else " -lsycl") + ' -I' +
209+
(' -lsycl7' if platform.system() == "Windows" else " -lsycl") + ' -I' +
210210
config.sycl_include + ' -I' + os.path.join(config.sycl_include, 'sycl') +
211211
' -L' + config.sycl_libs_dir) )
212212
config.substitutions.append( ('%include_option', '-include' ) )

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT EDIT IT MANUALLY. Refer to sycl/doc/developer/ABIPolicyGuide.md for more info.
44
################################################################################
55

6-
# RUN: env LLVM_BIN_PATH=%llvm_build_bin_dir %python %sycl_tools_src_dir/abi_check.py --mode check_symbols --reference %s %llvm_build_bin_dir/sycl6.dll
6+
# RUN: env LLVM_BIN_PATH=%llvm_build_bin_dir %python %sycl_tools_src_dir/abi_check.py --mode check_symbols --reference %s %llvm_build_bin_dir/sycl7.dll
77
# REQUIRES: windows
88
# UNSUPPORTED: libcxx
99

sycl/test/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
sycl_host_only_options += ' -isystem %s' % include_dir
103103
config.substitutions.append( ('%fsycl-host-only', sycl_host_only_options) )
104104

105-
config.substitutions.append( ('%sycl_lib', ' -lsycl6' if platform.system() == "Windows" else '-lsycl') )
105+
config.substitutions.append( ('%sycl_lib', ' -lsycl7' if platform.system() == "Windows" else '-lsycl') )
106106

107107
llvm_config.add_tool_substitutions(['llvm-spirv'], [config.sycl_tools_dir])
108108

0 commit comments

Comments
 (0)