Skip to content

Commit

Permalink
[SYCL] Work around build issues with GCC 7+.
Browse files Browse the repository at this point in the history 
Signed-off-by: Alexey Bader <alexey.bader@intel.com>
  • Loading branch information
@bader
bader committed Feb 22, 2019
1 parent 5124d7c commit 5af7aa1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 35 deletions.
46 changes: 23 additions & 23 deletions sycl/include/CL/sycl/accessor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class subscript_obj<accessorDim, dataT, 1, accessMode, accessTarget,

dataT &operator[](size_t index) {
ids[accessorDim - 1] = index;
return accRef.__impl()->Data[getOffsetForId(
accRef.__impl()->Range, ids, accRef.__impl()->Offset)];
return accRef.__get_impl()->Data[getOffsetForId(
accRef.__get_impl()->Range, ids, accRef.__get_impl()->Offset)];
}
};

Expand All @@ -89,8 +89,8 @@ class subscript_obj<accessorDim, dataT, 1, access::mode::read, accessTarget,
typename detail::remove_AS<dataT>::type
operator[](size_t index) {
ids[accessorDim - 1] = index;
return accRef.__impl()->Data[getOffsetForId(
accRef.__impl()->Range, ids, accRef.__impl()->Offset)];
return accRef.__get_impl()->Data[getOffsetForId(
accRef.__get_impl()->Range, ids, accRef.__get_impl()->Offset)];
}
};

Expand Down Expand Up @@ -307,11 +307,11 @@ class accessor_base {
using _ImplT =
accessor_impl<dataT, dimensions, accessMode, accessTarget, isPlaceholder>;

const _ImplT *__impl() const {
const _ImplT *__get_impl() const {
return reinterpret_cast<const _ImplT *>(this);
}

_ImplT *__impl() { return reinterpret_cast<_ImplT *>(this); }
_ImplT *__get_impl() { return reinterpret_cast<_ImplT *>(this); }

static_assert(
std::is_same<typename DeviceValueType<dataT, accessTarget>::type,
Expand Down Expand Up @@ -347,15 +347,15 @@ SYCL_ACCESSOR_SUBCLASS(accessor_common, accessor_base, true /* always */) {
size_t get_size() const { return this->get_count() * sizeof(dataT); }

// Returns the number of accessed elements.
size_t get_count() const { return this->__impl()->get_count(); }
size_t get_count() const { return this->__get_impl()->get_count(); }

template <int Dimensions = dimensions>
typename std::enable_if<(Dimensions > 0), range<Dimensions>>::type
get_range() const { return this->__impl()->Range; }
get_range() const { return this->__get_impl()->Range; }

template <int Dimensions = dimensions>
typename std::enable_if<(Dimensions > 0), id<Dimensions>>::type
get_offset() const { return this->__impl()->Offset; }
get_offset() const { return this->__get_impl()->Offset; }
};

SYCL_ACCESSOR_SUBCLASS(accessor_opdata_w, accessor_common,
Expand All @@ -365,7 +365,7 @@ SYCL_ACCESSOR_SUBCLASS(accessor_opdata_w, accessor_common,
accessMode == access::mode::discard_read_write) &&
dimensions == 0) {
operator dataT &() const {
return this->__impl()->Data[0];
return this->__get_impl()->Data[0];
}
};

Expand All @@ -376,7 +376,7 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_wn, accessor_opdata_w,
accessMode == access::mode::discard_read_write) &&
dimensions > 0) {
dataT &operator[](id<dimensions> index) const {
return this->__impl()->Data[getOffsetForId(
return this->__get_impl()->Data[getOffsetForId(
this->get_range(), index, this->get_offset())];
}

Expand Down Expand Up @@ -407,23 +407,23 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_w, accessor_subscript_wn,
getOffsetForId(this->get_range(), index, this->get_offset()));
}
dataT &operator[](size_t index) const {
return this->__impl()->Data[index];
return this->__get_impl()->Data[index];
}
};

SYCL_ACCESSOR_SUBCLASS(accessor_opdata_r, accessor_subscript_w,
accessMode == access::mode::read && dimensions == 0) {
using PureType = typename detail::remove_AS<dataT>::type;
operator PureType() const {
return this->__impl()->Data[0];
return this->__get_impl()->Data[0];
}
};

SYCL_ACCESSOR_SUBCLASS(accessor_subscript_rn, accessor_opdata_r,
accessMode == access::mode::read && dimensions > 0) {
typename detail::remove_AS<dataT>::type
operator[](id<dimensions> index) const {
return this->__impl()->Data[getOffsetForId(
return this->__get_impl()->Data[getOffsetForId(
this->get_range(), index, this->get_offset())];
}

Expand All @@ -446,7 +446,7 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_r, accessor_subscript_rn,
}
typename detail::remove_AS<dataT>::type
operator[](size_t index) const {
return this->__impl()->Data[index];
return this->__get_impl()->Data[index];
}
};

Expand All @@ -468,7 +468,7 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_atomic_eq0, accessor_subscript_r,
getAddressSpace<accessTarget>::value;
operator atomic<PureType, addressSpace>() const {
return atomic<PureType, addressSpace>(
multi_ptr<PureType, addressSpace>(&(this->__impl()->Data[0])));
multi_ptr<PureType, addressSpace>(&(this->__get_impl()->Data[0])));
}
};

Expand All @@ -481,8 +481,8 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_atomic_gt0,
getAddressSpace<accessTarget>::value;
atomic<PureType, addressSpace> operator[](id<dimensions> index) const {
return atomic<PureType, addressSpace>(
multi_ptr<PureType, addressSpace>(&(this->__impl()->Data[getOffsetForId(
this->__impl()->Range, index, this->__impl()->Offset)])));
multi_ptr<PureType, addressSpace>(&(this->__get_impl()->Data[getOffsetForId(
this->__get_impl()->Range, index, this->__get_impl()->Offset)])));
}
};

Expand All @@ -495,7 +495,7 @@ SYCL_ACCESSOR_SUBCLASS(accessor_subscript_atomic_eq1,
getAddressSpace<accessTarget>::value;
atomic<PureType, addressSpace> operator[](size_t index) const {
return atomic<PureType, addressSpace>(
multi_ptr<PureType, addressSpace>(&(this->__impl()->Data[index])));
multi_ptr<PureType, addressSpace>(&(this->__get_impl()->Data[index])));
}
};

Expand All @@ -510,31 +510,31 @@ SYCL_ACCESSOR_SUBCLASS(accessor_pointer, accessor_subscript_atomic_eq1, true) {
typename std::enable_if<(AccessTarget == access::target::host_buffer),
dataT *>::type
get_pointer() const {
return this->__impl()->Data;
return this->__get_impl()->Data;
}
/* Available only when: accessTarget == access::target::global_buffer */
template <typename DataT = typename detail::remove_AS<dataT>::type,
access::target AccessTarget = accessTarget>
typename std::enable_if<(AccessTarget == access::target::global_buffer),
global_ptr<DataT>>::type
get_pointer() const {
return global_ptr<DataT>(this->__impl()->Data);
return global_ptr<DataT>(this->__get_impl()->Data);
}
/* Available only when: accessTarget == access::target::constant_buffer */
template <typename DataT = typename detail::remove_AS<dataT>::type,
access::target AccessTarget = accessTarget>
typename std::enable_if<(AccessTarget == access::target::constant_buffer),
constant_ptr<DataT>>::type
get_pointer() const {
return constant_ptr<DataT>(this->__impl()->Data);
return constant_ptr<DataT>(this->__get_impl()->Data);
}
/* Available only when: accessTarget == access::target::local */
template <typename DataT = typename detail::remove_AS<dataT>::type,
access::target AccessTarget = accessTarget>
typename std::enable_if<(AccessTarget == access::target::local),
local_ptr<DataT>>::type
get_pointer() const {
return local_ptr<DataT>(this->__impl()->Data);
return local_ptr<DataT>(this->__get_impl()->Data);
}
};

Expand Down
17 changes: 5 additions & 12 deletions sycl/include/CL/sycl/detail/scheduler/scheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ void Node::addAccRequirement(
accessor<dataT, dimensions, accessMode, accessTarget, isPlaceholder> &&Acc,
int argIndex) {
detail::buffer_impl<buffer_allocator<char>> *buf =
Acc.template accessor_base<dataT, dimensions, accessMode, accessTarget,
isPlaceholder>::__impl()
->m_Buf;
Acc.__get_impl()->m_Buf;
addBufRequirement<accessMode, accessTarget>(*buf);
addInteropArg(nullptr, buf->get_size(), argIndex,
getReqForBuffer(m_Bufs, *buf));
Expand Down Expand Up @@ -126,8 +124,7 @@ template <typename T, int Dimensions, access::mode mode, access::target tgt,
access::placeholder isPlaceholder>
void Node::addExplicitMemOp(
accessor<T, Dimensions, mode, tgt, isPlaceholder> &Dest, T Src) {
auto *DestBase = Dest.template accessor_base<T, Dimensions, mode, tgt,
isPlaceholder>::__impl();
auto *DestBase = Dest.__get_impl();
assert(DestBase != nullptr &&
"Accessor should have an initialized accessor_base");
detail::buffer_impl<buffer_allocator<char>> *Buf = DestBase->m_Buf;
Expand All @@ -151,13 +148,10 @@ template <typename T_src, int dim_src, access::mode mode_src,
void Node::addExplicitMemOp(
accessor<T_src, dim_src, mode_src, tgt_src, isPlaceholder_src> Src,
accessor<T_dest, dim_dest, mode_dest, tgt_dest, isPlaceholder_dest> Dest) {
auto *SrcBase = Src.template accessor_base<T_src, dim_src, mode_src, tgt_src,
isPlaceholder_src>::__impl();
auto *SrcBase = Src.__get_impl();
assert(SrcBase != nullptr &&
"Accessor should have an initialized accessor_base");
auto *DestBase =
Dest.template accessor_base<T_dest, dim_dest, mode_dest, tgt_dest,
isPlaceholder_dest>::__impl();
auto *DestBase = Dest.__get_impl();
assert(DestBase != nullptr &&
"Accessor should have an initialized accessor_base");

Expand Down Expand Up @@ -191,8 +185,7 @@ template <typename T, int Dimensions, access::mode mode, access::target tgt,
void Scheduler::updateHost(
accessor<T, Dimensions, mode, tgt, isPlaceholder> &Acc,
cl::sycl::event &Event) {
auto *AccBase = Acc.template accessor_base<T, Dimensions, mode, tgt,
isPlaceholder>::__impl();
auto *AccBase = Acc.__get_impl();
assert(AccBase != nullptr &&
"Accessor should have an initialized accessor_base");
detail::buffer_impl<buffer_allocator<char>> *Buf = AccBase->m_Buf;
Expand Down

0 comments on commit 5af7aa1

Please sign in to comment.