Skip to content

[SYCL] Move spinlock out of sycl header tree #22270

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

Open
koparasy wants to merge 3 commits into
base: sycl
Choose a base branch
from
Open

[SYCL] Move spinlock out of sycl header tree #22270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b80d425
Move spinlock out of sycl header tree
koparasy Jun 9, 2026
d82a68b
Create new directory for 'internal' header files
koparasy Jun 9, 2026
b99b5c3
Format
koparasy Jun 9, 2026
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
1 change: 1 addition & 0 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ set(SYCL_EXT_ONEAPI_BACKEND_HIP ${LLVM_HAS_AMDGPU_TARGET})
# Configure SYCL version macro
set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include)
set(sycl_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/source)
set(sycl_internal_dir ${CMAKE_CURRENT_SOURCE_DIR}/internal)

if(NOT DEFINED SYCL_COMPILER_VERSION)
find_package(Git QUIET)
Expand Down
1 change: 1 addition & 0 deletions sycl/cmake/modules/AddSYCLUnitTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ function(add_sycl_unittest_internal test_dirname link_variant is_preview)
target_include_directories(${test_dirname}
PRIVATE SYSTEM
${sycl_inc_dir}
${sycl_internal_dir}
${SYCL_SOURCE_DIR}/source/
${SYCL_SOURCE_DIR}/unittests/
)
Expand Down
0 sycl/include/sycl/detail/spinlock.hpp → sycl/internal/spinlock.hpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions sycl/source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
${LIB_OBJ_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${sycl_internal_dir}
${sycl_inc_dir}
)

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/device_kernel_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <detail/hashers.hpp>
#include <detail/kernel_arg_mask.hpp>
#include <hash_table8.hpp>
#include <spinlock.hpp>
#include <sycl/detail/compile_time_kernel_info.hpp>
#include <sycl/detail/spinlock.hpp>
#include <sycl/detail/ur.hpp>
#include <sycl/kernel_bundle.hpp>

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/global_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <detail/thread_pool.hpp>
#include <detail/ur.hpp>
#include <detail/xpti_registry.hpp>
#include <spinlock.hpp>
#include <sycl/detail/device_filter.hpp>
#include <sycl/detail/spinlock.hpp>

#ifdef _WIN32
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/global_handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>
#include <sycl/detail/util.hpp>

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/kernel_program_cache.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <detail/kernel_arg_mask.hpp>
#include <detail/platform_impl.hpp>
#include <detail/unordered_multimap.hpp>
#include <spinlock.hpp>
#include <sycl/detail/common.hpp>
#include <sycl/detail/locked.hpp>
#include <sycl/detail/os_util.hpp>
#include <sycl/detail/spinlock.hpp>
#include <sycl/detail/ur.hpp>
#include <sycl/detail/util.hpp>

Expand Down
1 change: 1 addition & 0 deletions sycl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ set(SYCL_THREADS_LIB ${CMAKE_THREAD_LIBS_INIT})
# TEST_INCLUDE_PATH is used for syntax-only verification of type information.
list(APPEND test_includes ${SYCL_INCLUDE})
list(APPEND test_includes ${SYCL_SOURCE_DIR}/source)
list(APPEND test_includes ${sycl_internal_dir})
if(SYCL_ENABLE_EXTENSION_JIT)
list(APPEND test_includes ${LLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR}/jit-compiler/include)
list(APPEND test_includes ${LLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR}/common/include)
Expand Down
3 changes: 3 additions & 0 deletions sycl/tools/sycl-trace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if ("level_zero" IN_LIST SYCL_ENABLE_BACKENDS)
add_dependencies(sycl-trace ze_trace_collector)
target_include_directories(ze_trace_collector PRIVATE
"${sycl_inc_dir}"
"${sycl_internal_dir}"
)
endif()

Expand All @@ -34,6 +35,7 @@ if ("cuda" IN_LIST SYCL_ENABLE_BACKENDS)
add_dependencies(sycl-trace cuda_trace_collector)
target_include_directories(cuda_trace_collector PRIVATE
"${sycl_inc_dir}"
"${sycl_internal_dir}"
)
endif()

Expand Down Expand Up @@ -88,6 +90,7 @@ target_include_directories(sycl_ur_trace_collector PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"
"${sycl_inc_dir}"
"${sycl_src_dir}"
"${sycl_internal_dir}"
"${CMAKE_CURRENT_BINARY_DIR}"
)

Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <dlfcn.h>
#include <iostream>
#include <mutex>
#include <spinlock.hpp>
#include <string>
#include <sycl/detail/spinlock.hpp>

sycl::detail::SpinLock GlobalLock;

Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/cuda_trace_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "xpti/xpti_trace_framework.h"

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>

#include <cuda.h>
#include <cupti.h>
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/sycl_trace_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "xpti/xpti_trace_framework.hpp"

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>

#include <iostream>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/ur_trace_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "xpti/xpti_trace_framework.h"

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>
#include <unified-runtime/ur_print.hpp>

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/verification_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "usm_analyzer.hpp"

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>

#include <iostream>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/ze_trace_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "xpti/xpti_trace_framework.h"

#include <sycl/detail/spinlock.hpp>
#include <spinlock.hpp>

#include <zet_api.h>

Expand Down
Loading