Skip to content

[NFC][SYCL] Reduce dependencies of sycl/detail/helpers.hpp #20072

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
Sep 15, 2025
Merged

[NFC][SYCL] Reduce dependencies of sycl/detail/helpers.hpp #20072

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
7 changes: 0 additions & 7 deletions sycl/include/sycl/detail/helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
#endif

#include <cstddef> // for size_t
#include <memory> // for shared_ptr
#include <stdint.h> // for uint32_t
#include <type_traits> // for enable_if_t, integral_constant
#include <utility> // for forward, integer_sequence, mak...
#include <vector> // for vector

namespace sycl {
inline namespace _V1 {
Expand All @@ -38,11 +36,6 @@ template <typename Type, std::size_t NumElements> class marray;
enum class memory_order;

namespace detail {
class buffer_impl;

__SYCL_EXPORT void
markBufferAsInternal(const std::shared_ptr<buffer_impl> &BufImpl);

template <typename T> T *declptr() { return static_cast<T *>(nullptr); }

// Function to get or store id, item, nd_item, group for the host implementation
Expand Down
4 changes: 4 additions & 0 deletions sycl/include/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ class graph_impl;
class dynamic_parameter_impl;
} // namespace ext::oneapi::experimental::detail
namespace detail {
class buffer_impl;

__SYCL_EXPORT void
markBufferAsInternal(const std::shared_ptr<buffer_impl> &BufImpl);
Comment on lines +171 to +172
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The single use of this under include/sycl/ is in this header, hence putting it in handler.hpp and not buffer.hpp.


class type_erased_cgfo_ty {
// From SYCL 2020, command group function object:
Expand Down
5 changes: 0 additions & 5 deletions sycl/source/detail/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ __SYCL_EXPORT void waitEvents(std::vector<sycl::event> DepEvents) {
}
#endif

__SYCL_EXPORT void
markBufferAsInternal(const std::shared_ptr<buffer_impl> &BufImpl) {
BufImpl->markAsInternal();
}

const RTDeviceBinaryImage *retrieveKernelBinary(queue_impl &Queue,
KernelNameStrRefT KernelName,
CGExecKernel *KernelCG) {
Expand Down
5 changes: 5 additions & 0 deletions sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "ur_api.h"
#include <algorithm>

#include <detail/buffer_impl.hpp>
#include <detail/config.hpp>
#include <detail/global_handler.hpp>
#include <detail/graph/dynamic_impl.hpp>
Expand Down Expand Up @@ -49,6 +50,10 @@ namespace sycl {
inline namespace _V1 {

namespace detail {
__SYCL_EXPORT void
markBufferAsInternal(const std::shared_ptr<buffer_impl> &BufImpl) {
BufImpl->markAsInternal();
}

#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
// TODO: Check if two ABI exports below are still necessary.
Expand Down