Skip to content

[SYCL] Bump the version 6.2.0->7.0.0 and update the versioning section in docs #6856

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.

Sign up for GitHub

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
againull merged 6 commits into from
Apr 24, 2023
Merged

[SYCL] Bump the version 6.2.0->7.0.0 and update the versioning section in docs #6856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6acb04c
[Draft][SYCL][Doc] Change versioning process
aelovikov-intel Sep 22, 2022
eaa6932
Assume ABI-breaking releases are known in advance.
aelovikov-intel Sep 23, 2022
f129cdc
Bump the version 6.2.0 -> 7.0.0
aelovikov-intel Apr 20, 2023
a3e8f42
Update LIT's %sycl_lib substitution
aelovikov-intel Apr 21, 2023
c7b65d0
Merge remote-tracking branch 'origin/sycl' into versioning-change
aelovikov-intel Apr 24, 2023
1e1cd8a
Update substitutions for sycl/test-e2e as well
aelovikov-intel Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/lib/Driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif()

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

add_clang_library(clangDriver
Action.cpp
Expand Down
4 changes: 2 additions & 2 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ include(SYCLUtils)
#
# See doc/developer/ABIPolicyGuide.md for the meaning when in the middle of
# development cycle.
set(SYCL_MAJOR_VERSION 6)
set(SYCL_MINOR_VERSION 2)
set(SYCL_MAJOR_VERSION 7)
set(SYCL_MINOR_VERSION 0)
set(SYCL_PATCH_VERSION 0)

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

## `__SYCL_EXPORT` Macro

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
config.substitutions.append( ('%opencl_include_dir', config.opencl_include_dir) )

if cl_options:
config.substitutions.append( ('%sycl_options', ' ' + config.sycl_libs_dir + '/../lib/sycl6.lib /I' +
config.substitutions.append( ('%sycl_options', ' ' + config.sycl_libs_dir + '/../lib/sycl7.lib /I' +
config.sycl_include + ' /I' + os.path.join(config.sycl_include, 'sycl')) )
config.substitutions.append( ('%include_option', '/FI' ) )
config.substitutions.append( ('%debug_option', '/DEBUG' ) )
Expand All @@ -206,7 +206,7 @@
config.substitutions.append( ('%shared_lib', '/LD') )
else:
config.substitutions.append( ('%sycl_options',
(' -lsycl6' if platform.system() == "Windows" else " -lsycl") + ' -I' +
(' -lsycl7' if platform.system() == "Windows" else " -lsycl") + ' -I' +
config.sycl_include + ' -I' + os.path.join(config.sycl_include, 'sycl') +
' -L' + config.sycl_libs_dir) )
config.substitutions.append( ('%include_option', '-include' ) )
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DO NOT EDIT IT MANUALLY. Refer to sycl/doc/developer/ABIPolicyGuide.md for more info.
################################################################################

# 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
# 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
# REQUIRES: windows
# UNSUPPORTED: libcxx

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
sycl_host_only_options += ' -isystem %s' % include_dir
config.substitutions.append( ('%fsycl-host-only', sycl_host_only_options) )

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

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

Expand Down