Skip to content

[SYCL] Bump SYCL_MAJOR_VERSION to "9" #20689

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
merged 1 commit into from
Nov 20, 2025
+6 −6
Merged

[SYCL] Bump SYCL_MAJOR_VERSION to "9" #20689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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="8" )
PROPERTIES COMPILE_DEFINITIONS SYCL_MAJOR_VERSION="9" )

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

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 @@ -576,7 +576,7 @@ def open_check_file(file_name):
(
"%sycl_options",
" "
+ os.path.normpath(os.path.join(config.sycl_libs_dir + "/../lib/sycl8.lib"))
+ os.path.normpath(os.path.join(config.sycl_libs_dir + "/../lib/sycl9.lib"))
+ " -Xclang -isystem -Xclang "
+ config.sycl_include
+ " -Xclang -isystem -Xclang "
Expand All @@ -594,7 +594,7 @@ def open_check_file(file_name):
config.substitutions.append(
(
"%sycl_options",
(" -lsycl8" if platform.system() == "Windows" else " -lsycl")
(" -lsycl9" if platform.system() == "Windows" else " -lsycl")
+ " -isystem "
+ config.sycl_include
+ " -isystem "
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/sycl8.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/sycl9.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 @@ -138,7 +138,7 @@
config.substitutions.append(("%fsycl-host-only", sycl_host_only_options))

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

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