Skip to content

[SYCL] Fix load method of vec according to specification #99

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
Apr 21, 2019
Merged

[SYCL] Fix load method of vec according to specification #99

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
47 changes: 47 additions & 0 deletions sycl/include/CL/sycl/multi_ptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,53 @@ template <typename ElementType, access::address_space Space> class multi_ptr {
Accessor)
: multi_ptr(Accessor.get_pointer()) {}

// The following constructors are necessary to create multi_ptr<const
// ElementType, Space> from accessor<ElementType, ...>. Constructors above
// could not be used for this purpose because it will require 2 implicit
// conversions of user types which is not allowed by C++:
// 1. from accessor<ElementType, ...> to multi_ptr<ElementType, Space>
// 2. from multi_ptr<ElementType, Space> to multi_ptr<const ElementType,
// Space>

// Only if Space == global_space and element type is const
template <
int dimensions, access::mode Mode, access::placeholder isPlaceholder,
access::address_space _Space = Space, typename ET = ElementType,
typename = typename std::enable_if<
_Space == Space && Space == access::address_space::global_space &&
std::is_const<ET>::value &&
std::is_same<ET, ElementType>::value>::type>
multi_ptr(accessor<typename std::remove_const<ET>::type, dimensions, Mode,
access::target::global_buffer, isPlaceholder>
Accessor)
: multi_ptr(Accessor.get_pointer()) {}

// Only if Space == local_space and element type is const
template <
int dimensions, access::mode Mode, access::placeholder isPlaceholder,
access::address_space _Space = Space, typename ET = ElementType,
typename = typename std::enable_if<
_Space == Space && Space == access::address_space::local_space &&
std::is_const<ET>::value &&
std::is_same<ET, ElementType>::value>::type>
multi_ptr(accessor<typename std::remove_const<ET>::type, dimensions, Mode,
access::target::local, isPlaceholder>
Accessor)
: multi_ptr(Accessor.get_pointer()) {}

// Only if Space == constant_space and element type is const
template <
int dimensions, access::mode Mode, access::placeholder isPlaceholder,
access::address_space _Space = Space, typename ET = ElementType,
typename = typename std::enable_if<
_Space == Space && Space == access::address_space::constant_space &&
std::is_const<ET>::value &&
std::is_same<ET, ElementType>::value>::type>
multi_ptr(accessor<typename std::remove_const<ET>::type, dimensions, Mode,
access::target::constant_buffer, isPlaceholder>
Accessor)
: multi_ptr(Accessor.get_pointer()) {}

// Returns the underlying OpenCL C pointer
pointer_t get() const { return m_Pointer; }

Expand Down
10 changes: 6 additions & 4 deletions sycl/include/CL/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,14 +586,16 @@ template <typename Type, int NumElements> class vec {
#error "Undefine __SYCL_LOADSTORE macro"
#endif
#define __SYCL_LOADSTORE(Space) \
void load(size_t Offset, multi_ptr<DataT, Space> Ptr) { \
void load(size_t Offset, multi_ptr<const DataT, Space> Ptr) { \
if (NumElements != 3) { \
m_Data = *multi_ptr<DataType, Space>(static_cast<DataType *>( \
static_cast<void *>(Ptr + Offset * NumElements))); \
m_Data = \
*multi_ptr<const DataType, Space>(static_cast<const DataType *>( \
static_cast<const void *>(Ptr + Offset * NumElements))); \
return; \
} \
for (int I = 0; I < NumElements; I++) { \
setValue(I, *multi_ptr<DataT, Space>(Ptr + Offset * NumElements + I)); \
setValue( \
I, *multi_ptr<const DataT, Space>(Ptr + Offset * NumElements + I)); \
} \
} \
void store(size_t Offset, multi_ptr<DataT, Space> Ptr) const { \
Expand Down