Skip to content

[SYCL] Fix multi_ptr ctor for extended address spaces #9869

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
Jun 14, 2023
Merged

[SYCL] Fix multi_ptr ctor for extended address spaces #9869

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
17 changes: 12 additions & 5 deletions sycl/include/sycl/multi_ptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ class multi_ptr {
multi_ptr(accessor<ElementType, Dimensions, Mode, access::target::device,
isPlaceholder, PropertyListT>
Accessor)
: multi_ptr(Accessor.template get_multi_ptr<DecorateAddress>()) {}
: multi_ptr(detail::cast_AS<decorated_type *>(
Accessor.template get_multi_ptr<DecorateAddress>()
.get_decorated())) {}

// Only if Space == local_space || generic_space
template <int Dimensions, access::mode Mode,
Expand Down Expand Up @@ -186,8 +188,9 @@ class multi_ptr {
multi_ptr(accessor<typename std::remove_const_t<RelayElementType>, Dimensions,
Mode, access::target::device, isPlaceholder, PropertyListT>
Accessor)
: m_Pointer(Accessor.template get_multi_ptr<DecorateAddress>()
.get_decorated()) {}
: m_Pointer(detail::cast_AS<decorated_type *>(
Accessor.template get_multi_ptr<DecorateAddress>()
.get_decorated())) {}

// Only if Space == local_space || generic_space and element type is const
template <int Dimensions, access::mode Mode,
Expand Down Expand Up @@ -450,7 +453,9 @@ class multi_ptr<const void, Space, DecorateAddress> {
multi_ptr(accessor<ElementType, Dimensions, Mode, access::target::device,
isPlaceholder, PropertyListT>
Accessor)
: multi_ptr(Accessor.template get_multi_ptr<DecorateAddress>()) {}
: multi_ptr(detail::cast_AS<decorated_type *>(
Accessor.template get_multi_ptr<DecorateAddress>()
.get_decorated())) {}

// Only if Space == local_space
template <
Expand Down Expand Up @@ -575,7 +580,9 @@ class multi_ptr<void, Space, DecorateAddress> {
multi_ptr(accessor<ElementType, Dimensions, Mode, access::target::device,
isPlaceholder, PropertyListT>
Accessor)
: multi_ptr(Accessor.template get_multi_ptr<DecorateAddress>()) {}
: multi_ptr(detail::cast_AS<decorated_type *>(
Accessor.template get_multi_ptr<DecorateAddress>()
.get_decorated())) {}

// Only if Space == local_space
template <
Expand Down
33 changes: 33 additions & 0 deletions sycl/test/multi_ptr/ext_addr_spaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// RUN: %clangxx -fsycl -D__ENABLE_USM_ADDR_SPACE__ -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
// expected-no-diagnostics

// Checks that extended address spaces are allowed when creating multi_ptr from
// accessors.

#include <sycl/sycl.hpp>

using namespace sycl;

int main() {
queue Q;

buffer<int> Buf{1};
Q.submit([&](handler &CGH) {
accessor Acc{Buf, CGH, read_write};
CGH.single_task([=]() {
device_ptr<int, access::decorated::yes> MPtr1{Acc};
device_ptr<int, access::decorated::no> MPtr2{Acc};
device_ptr<int, access::decorated::legacy> MPtr3{Acc};
device_ptr<const int, access::decorated::yes> MPtr4{Acc};
device_ptr<const int, access::decorated::no> MPtr5{Acc};
device_ptr<const int, access::decorated::legacy> MPtr6{Acc};
device_ptr<void, access::decorated::yes> MPtr7{Acc};
device_ptr<void, access::decorated::no> MPtr8{Acc};
device_ptr<void, access::decorated::legacy> MPtr9{Acc};
device_ptr<const void, access::decorated::yes> MPtr10{Acc};
device_ptr<const void, access::decorated::no> MPtr11{Acc};
device_ptr<const void, access::decorated::legacy> MPtr12{Acc};
});
}).wait_and_throw();
return 0;
}