Skip to content

Commit c8e3310

Browse files
authored
[SYCL] Bump SYCL_MAJOR_VERSION to "9" (#20689)
ABI breaking window has started and according to policy https://github.com/intel/llvm/blob/sycl/sycl/doc/developer/ABIPolicyGuide.md#abi-versioning-policy we bump the version at the start.
1 parent b152811 commit c8e3310

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
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="8" )
22+
PROPERTIES COMPILE_DEFINITIONS SYCL_MAJOR_VERSION="9" )
2323

2424
add_clang_library(clangDriver
2525
Action.cpp

sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ include(BuildUnifiedRuntime)
9191
#
9292
# See doc/developer/ABIPolicyGuide.md for the meaning when in the middle of
9393
# development cycle.
94-
set(SYCL_MAJOR_VERSION 8)
94+
set(SYCL_MAJOR_VERSION 9)
9595
set(SYCL_MINOR_VERSION 0)
9696
set(SYCL_PATCH_VERSION 0)
9797

sycl/test-e2e/lit.cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def open_check_file(file_name):
576576
(
577577
"%sycl_options",
578578
" "
579-
+ os.path.normpath(os.path.join(config.sycl_libs_dir + "/../lib/sycl8.lib"))
579+
+ os.path.normpath(os.path.join(config.sycl_libs_dir + "/../lib/sycl9.lib"))
580580
+ " -Xclang -isystem -Xclang "
581581
+ config.sycl_include
582582
+ " -Xclang -isystem -Xclang "
@@ -594,7 +594,7 @@ def open_check_file(file_name):
594594
config.substitutions.append(
595595
(
596596
"%sycl_options",
597-
(" -lsycl8" if platform.system() == "Windows" else " -lsycl")
597+
(" -lsycl9" if platform.system() == "Windows" else " -lsycl")
598598
+ " -isystem "
599599
+ config.sycl_include
600600
+ " -isystem "

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/sycl8.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/sycl9.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
@@ -138,7 +138,7 @@
138138
config.substitutions.append(("%fsycl-host-only", sycl_host_only_options))
139139

140140
config.substitutions.append(
141-
("%sycl_lib", " -lsycl8" if platform.system() == "Windows" else "-lsycl")
141+
("%sycl_lib", " -lsycl9" if platform.system() == "Windows" else "-lsycl")
142142
)
143143

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

0 commit comments

Comments
 (0)