Skip to content

[SYCL] Fix multi_ptr::prefetch regression #19013

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions sycl/include/sycl/multi_ptr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,13 @@ class __SYCL_TYPE(multi_ptr) multi_ptr {
access::address_space _Space = Space,
typename = typename std::enable_if_t<
_Space == Space && Space == access::address_space::global_space>>
void prefetch(size_t NumElements) const {
void prefetch([[maybe_unused]] size_t NumElements) const {
#ifdef __SYCL_DEVICE_ONLY__
size_t NumBytes = NumElements * sizeof(ElementType);
using ptr_t = typename detail::DecoratedType<char, Space>::type const *;
using ptr_t =
typename detail::DecoratedType<unsigned char, Space>::type const *;
__spirv_ocl_prefetch(reinterpret_cast<ptr_t>(get_decorated()), NumBytes);
#endif
}

// Arithmetic operators
Expand Down Expand Up @@ -1087,10 +1090,13 @@ class multi_ptr<ElementType, Space, access::decorated::legacy> {
access::address_space _Space = Space,
typename = typename std::enable_if_t<
_Space == Space && Space == access::address_space::global_space>>
void prefetch(size_t NumElements) const {
void prefetch([[maybe_unused]] size_t NumElements) const {
#ifdef __SYCL_DEVICE_ONLY__
size_t NumBytes = NumElements * sizeof(ElementType);
using ptr_t = typename detail::DecoratedType<char, Space>::type const *;
using ptr_t =
typename detail::DecoratedType<unsigned char, Space>::type const *;
__spirv_ocl_prefetch(reinterpret_cast<ptr_t>(m_Pointer), NumBytes);
#endif
}

private:
Expand Down
16 changes: 16 additions & 0 deletions sycl/test/regression/multiptr-prefetch.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s
// expected-no-diagnostics

#include <sycl/multi_ptr.hpp>

SYCL_EXTERNAL void
foo(sycl::multi_ptr<int, sycl::access::address_space::global_space> mptr) {
mptr.prefetch(0);
}

SYCL_EXTERNAL void
bar(sycl::multi_ptr<int, sycl::access::address_space::global_space,
sycl::access::decorated::legacy>
mptr) {
mptr.prefetch(0);
}