Skip to content

[SYCL][UR] move UR headers to dedicated unified-runtime include directory #21399

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
ldorau wants to merge 1 commit into
base: sycl
Choose a base branch
from
Open

[SYCL][UR] move UR headers to dedicated unified-runtime include directory #21399

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
30 changes: 11 additions & 19 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ install(FILES
file(GLOB_RECURSE HEADERS_IN_SYCL_DIR CONFIGURE_DEPENDS "${sycl_inc_dir}/sycl/*")
file(GLOB_RECURSE HEADERS_IN_CL_DIR CONFIGURE_DEPENDS "${sycl_inc_dir}/CL/*")
file(GLOB_RECURSE HEADERS_IN_STD_DIR CONFIGURE_DEPENDS "${sycl_inc_dir}/std/*")
file(GLOB_RECURSE HEADERS_IN_UR_DIR CONFIGURE_DEPENDS "${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime/*")
list(REMOVE_ITEM HEADERS_IN_UR_DIR
"${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime/ur_ddi.h"
"${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime/ur_print.h")

string(REPLACE "${sycl_inc_dir}" "${SYCL_INCLUDE_BUILD_DIR}"
OUT_HEADERS_IN_SYCL_DIR "${HEADERS_IN_SYCL_DIR}")
Expand All @@ -258,23 +262,16 @@ string(REPLACE "${sycl_inc_dir}" "${SYCL_INCLUDE_BUILD_DIR}"
OUT_HEADERS_IN_STD_DIR "${HEADERS_IN_STD_DIR}")
string(REPLACE "${sycl_inc_dir}" "${SYCL_INCLUDE_BUILD_DIR}"
OUT_HEADERS_IN_SYCLCOMPAT_DIR "${HEADERS_IN_SYCLCOMPAT_DIR}")

set(OUT_UR_HEADERS
${SYCL_INCLUDE_BUILD_DIR}/ur_api.h
${SYCL_INCLUDE_BUILD_DIR}/ur_api_funcs.def
${SYCL_INCLUDE_BUILD_DIR}/ur_print.hpp)
set(UR_HEADERS_TO_COPY
${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h
${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api_funcs.def
${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_print.hpp)
string(REPLACE "${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime" "${SYCL_INCLUDE_BUILD_DIR}/unified-runtime"
OUT_HEADERS_IN_UR_DIR "${HEADERS_IN_UR_DIR}")

# Copy SYCL headers from sources to build directory
add_custom_target(sycl-headers
DEPENDS ${OUT_HEADERS_IN_SYCL_DIR}
${OUT_HEADERS_IN_CL_DIR}
${OUT_HEADERS_IN_STD_DIR}
${OUT_HEADERS_IN_SYCLCOMPAT_DIR}
${OUT_UR_HEADERS}
${OUT_HEADERS_IN_UR_DIR}
sycl-device-aspect-macros-header
)

Expand All @@ -283,28 +280,23 @@ add_custom_command(
${OUT_HEADERS_IN_CL_DIR}
${OUT_HEADERS_IN_STD_DIR}
${OUT_HEADERS_IN_SYCLCOMPAT_DIR}
${OUT_UR_HEADERS}
${OUT_HEADERS_IN_UR_DIR}
DEPENDS ${HEADERS_IN_SYCL_DIR}
${HEADERS_IN_CL_DIR}
${HEADERS_IN_STD_DIR}
${HEADERS_IN_SYCLCOMPAT_DIR}
${UR_HEADERS_TO_COPY}
${HEADERS_IN_UR_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/sycl ${SYCL_INCLUDE_BUILD_DIR}/sycl
COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/std ${SYCL_INCLUDE_BUILD_DIR}/std
COMMAND ${CMAKE_COMMAND} -E copy ${UR_HEADERS_TO_COPY} ${SYCL_INCLUDE_BUILD_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime ${SYCL_INCLUDE_BUILD_DIR}/unified-runtime
COMMENT "Copying SYCL headers ...")

# Copy SYCL headers from source to install directory
install(DIRECTORY "${sycl_inc_dir}/sycl" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
install(DIRECTORY "${sycl_inc_dir}/CL" DESTINATION ${SYCL_INCLUDE_DIR}/ COMPONENT sycl-headers)
install(DIRECTORY "${sycl_inc_dir}/std" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
install(FILES "${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h" DESTINATION ${SYCL_INCLUDE_DIR}
COMPONENT sycl-headers)
install(FILES "${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api_funcs.def" DESTINATION ${SYCL_INCLUDE_DIR}
COMPONENT sycl-headers)
install(FILES "${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_print.hpp" DESTINATION ${SYCL_INCLUDE_DIR}
COMPONENT sycl-headers)
install(DIRECTORY "${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)

if (WIN32)
set(SYCL_RT_LIBS sycl${SYCL_MAJOR_VERSION})
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/backend.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <sycl/kernel_bundle_enums.hpp> // for bundle_state
#include <sycl/platform.hpp> // for platform, get_n...
#include <sycl/queue.hpp> // for queue, get_native
#include <ur_api.h> // for ur_native_handle_t
#include <unified-runtime/ur_api.h> // for ur_native_handle_t

#if SYCL_BACKEND_OPENCL
#include <sycl/detail/backend_traits_opencl.hpp> // for interop
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <sycl/id.hpp>
#include <sycl/property_list.hpp>
#include <sycl/range.hpp>
#include <ur_api.h> // for ur_native_handle_t
#include <unified-runtime/ur_api.h> // for ur_native_handle_t

#include <cstddef> // for size_t, nullptr_t
#include <functional> // for function
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <sycl/detail/owner_less_base.hpp> // for OwnerLessBase
#include <sycl/property_list.hpp> // for property_list
#include <sycl/usm/usm_enums.hpp> // for usm::alloc
#include <ur_api.h> // for ur_native_handle_t
#include <unified-runtime/ur_api.h> // for ur_native_handle_t

#ifdef __SYCL_INTERNAL_API
#include <sycl/detail/cl.h>
Expand Down
12 changes: 6 additions & 6 deletions sycl/include/sycl/detail/ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <sycl/detail/export.hpp>
#include <sycl/detail/os_util.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <type_traits>
#include <vector>
Expand Down Expand Up @@ -48,13 +48,13 @@ namespace detail {

enum class UrApiKind {
#define _UR_API(api) api,
#include <ur_api_funcs.def>
#include <unified-runtime/ur_api_funcs.def>
#undef _UR_API
};

struct UrFuncPtrMapT {
#define _UR_API(api) decltype(&::api) pfn_##api = nullptr;
#include <ur_api_funcs.def>
#include <unified-runtime/ur_api_funcs.def>
#undef _UR_API
};

Expand All @@ -65,7 +65,7 @@ void *GetWinProcAddress(void *module, const char *funcName);
inline void PopulateUrFuncPtrTable(UrFuncPtrMapT *funcs, void *module) {
#define _UR_API(api) \
funcs->pfn_##api = (decltype(&::api))GetWinProcAddress(module, #api);
#include <ur_api_funcs.def>
#include <unified-runtime/ur_api_funcs.def>
#undef _UR_API
}

Expand All @@ -80,7 +80,7 @@ inline void PopulateUrFuncPtrTable(UrFuncPtrMapT *funcs, void *module) {
return (FuncPtrT)GetWinProcAddress(module, #api); \
} \
};
#include <ur_api_funcs.def>
#include <unified-runtime/ur_api_funcs.def>
#undef _UR_API
#else
#define _UR_API(api) \
Expand All @@ -90,7 +90,7 @@ inline void PopulateUrFuncPtrTable(UrFuncPtrMapT *funcs, void *module) {
constexpr inline FuncPtrT getFuncPtr(const void *) { return &api; } \
constexpr inline FuncPtrT getFuncPtrFromModule(void *) { return &api; } \
};
#include <ur_api_funcs.def>
#include <unified-runtime/ur_api_funcs.def>
#undef _UR_API
#endif

Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <sycl/ext/oneapi/experimental/device_architecture.hpp>
#include <sycl/info/info_desc.hpp>
#include <sycl/kernel_bundle_enums.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#ifdef __SYCL_INTERNAL_API
#include <sycl/detail/cl.h>
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/event.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <sycl/detail/export.hpp> // for __SYCL_EXPORT
#include <sycl/detail/info_desc_helpers.hpp> // for is_event_info_desc, is_...
#include <sycl/detail/owner_less_base.hpp> // for OwnerLessBase
#include <ur_api.h> // for ur_native_handle_t
#include <unified-runtime/ur_api.h> // for ur_native_handle_t

#ifdef __SYCL_INTERNAL_API
#include <sycl/detail/cl.h>
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "interop_common.hpp" // For external_mem_handle_type.

#include <stddef.h> // For size_t.
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/bindless_images_mem_handle.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 <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/bindless_images_sampler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

#include <sycl/sampler.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <sycl/range.hpp> // for range, rangeTo...
#include <sycl/sampler.hpp> // for image_sampler
#include <sycl/vector.hpp> // for vec
#include <ur_api.h> // for ur_native_hand...
#include <unified-runtime/ur_api.h> // for ur_native_hand...

#include <cstddef> // for size_t, nullptr_t
#include <functional> // for function
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/info/info_desc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

// FIXME: .def files included to this file use all sorts of SYCL objects like
// id, range, traits, etc. We have to include some headers before including .def
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/interop_handle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <sycl/ext/oneapi/accessor_property_list.hpp> // for accessor_property_list
#include <sycl/ext/oneapi/experimental/graph.hpp> // for command_graph
#include <sycl/image.hpp> // for image
#include <ur_api.h> // for ur_mem_handle_t, ur...
#include <unified-runtime/ur_api.h> // for ur_mem_handle_t, ur...

#include <memory> // for shared_ptr
#include <stdint.h> // for int32_t
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/kernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <sycl/detail/owner_less_base.hpp> // for OwnerLessBase
#include <sycl/detail/util.hpp>
#include <sycl/kernel_bundle_enums.hpp> // for bundle_state
#include <ur_api.h> // for ur_native_handle_t
#include <unified-runtime/ur_api.h> // for ur_native_handle_t

#include <cstddef> // for size_t
#include <memory> // for shared_ptr, hash, opera...
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/kernel_bundle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <sycl/kernel_bundle_enums.hpp> // for bundle_state
#include <sycl/property_list.hpp> // for property_list
#include <sycl/sycl_span.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <sycl/ext/oneapi/experimental/free_function_traits.hpp>
#include <sycl/ext/oneapi/properties/properties.hpp> // PropertyT
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/platform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <sycl/detail/util.hpp>
#include <sycl/device_selector.hpp>
#include <sycl/info/info_desc.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#ifdef __SYCL_INTERNAL_API
#include <sycl/detail/cl.h>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/adapter_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <sycl/detail/iostream_proxy.hpp>
#include <sycl/detail/type_traits.hpp>

#include <ur_api.h>
#include <unified-runtime/ur_api.h>
#ifdef XPTI_ENABLE_INSTRUMENTATION
// Include the headers necessary for emitting traces using the trace framework
#include "xpti/xpti_trace_framework.h"
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <sycl/detail/common.hpp>

#include <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/device_binary_image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <sycl/detail/common.hpp>
#include <sycl/detail/os_util.hpp>
#include <sycl/detail/ur.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <sycl/detail/iostream_proxy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/error_handling/error_handling.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <detail/cg.hpp>
#include <detail/device_impl.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <sycl/detail/impl_utils.hpp>
#include <sycl/detail/type_traits.hpp>

#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <algorithm>
#include <iterator>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/mem_alloc_helper.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 <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/memory_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include "ur_api.h"
#include "unified-runtime/ur_api.h"
#include <detail/context_impl.hpp>
#include <detail/device_image_impl.hpp>
#include <detail/event_impl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/memory_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <sycl/property_list.hpp>
#include <sycl/range.hpp>

#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <memory>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
//===----------------------------------------------------------------------===//

#include "ur_api.h"
#include "unified-runtime/ur_api.h"
#include <detail/error_handling/error_handling.hpp>

#include <detail/context_impl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/spec_constant_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <sycl/detail/iostream_proxy.hpp>
#include <sycl/detail/util.hpp>
#include <sycl/exception.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <cstring>

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/sycl_mem_obj_i.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 <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/ur.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sycl/detail/stl_type_traits.hpp>
#include <sycl/detail/ur.hpp>
#include <sycl/version.hpp>
#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <bitset>
#include <cstdarg>
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#pragma once

#include <ur_api.h>
#include <unified-runtime/ur_api.h>

#include <sycl/detail/export.hpp>

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/ur_info_code.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <sycl/detail/info_desc_helpers.hpp>

#include <ur_api.h>
#include <unified-runtime/ur_api.h>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//

#include "sycl/detail/helpers.hpp"
#include "ur_api.h"
#include "unified-runtime/ur_api.h"
#include <algorithm>

#include <detail/buffer_impl.hpp>
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 @@ -12,7 +12,7 @@
#include "xpti/xpti_trace_framework.h"

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

#include <iostream>
#include <mutex>
Expand Down
Loading
Loading