Skip to content

Commit 0eb0a50

Browse files
committed
[SYCL] Return "generic" pointers from constant accessor methods
Signed-off-by: Mariya Podchishchaeva <[email protected]>
1 parent c1cd13e commit 0eb0a50

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

sycl/include/CL/sycl/accessor.hpp

+6-18
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,8 @@ class accessor_common {
193193
constexpr static bool IsAccessReadWrite =
194194
AccessMode == access::mode::read_write;
195195

196-
using RefType = typename std::conditional<
197-
AS == access::address_space::constant_space,
198-
typename detail::PtrValueType<DataT, AS>::type &, DataT &>::type;
199-
using PtrType = typename std::conditional<
200-
AS == access::address_space::constant_space,
201-
typename detail::PtrValueType<DataT, AS>::type *, DataT *>::type;
196+
using RefType = DataT &;
197+
using PtrType = DataT *;
202198

203199
using AccType =
204200
accessor<DataT, Dimensions, AccessMode, AccessTarget, IsPlaceholder>;
@@ -673,13 +669,9 @@ class accessor :
673669
using AccessorSubscript =
674670
typename AccessorCommonT::template AccessorSubscript<Dims>;
675671

676-
using RefType = typename std::conditional<
677-
AS == access::address_space::constant_space,
678-
typename detail::PtrValueType<DataT, AS>::type &, DataT &>::type;
672+
using RefType = DataT &;
679673
using ConcreteASPtrType = typename detail::PtrValueType<DataT, AS>::type *;
680-
using PtrType =
681-
typename std::conditional<AS == access::address_space::constant_space,
682-
ConcreteASPtrType, DataT *>::type;
674+
using PtrType = DataT *;
683675

684676
template <int Dims = Dimensions> size_t getLinearIndex(id<Dims> Id) const {
685677

@@ -1012,13 +1004,9 @@ class accessor<DataT, Dimensions, AccessMode, access::target::local,
10121004
using AccessorSubscript =
10131005
typename AccessorCommonT::template AccessorSubscript<Dims>;
10141006

1015-
using RefType = typename std::conditional<
1016-
AS == access::address_space::constant_space,
1017-
typename detail::PtrValueType<DataT, AS>::type &, DataT &>::type;
1007+
using RefType = DataT &;
10181008
using ConcreteASPtrType = typename detail::PtrValueType<DataT, AS>::type *;
1019-
using PtrType =
1020-
typename std::conditional<AS == access::address_space::constant_space,
1021-
ConcreteASPtrType, DataT *>::type;
1009+
using PtrType = DataT *;
10221010

10231011
#ifdef __SYCL_DEVICE_ONLY__
10241012
detail::LocalAccessorBaseDevice<AdjustedDim> impl;

0 commit comments

Comments
 (0)