Skip to content

[SYCL] Support scalar accessor in handler::copy(acc,ptr) and copy(ptr… #1634

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 3 commits into from
May 7, 2020
Merged

[SYCL] Support scalar accessor in handler::copy(acc,ptr) and copy(ptr… #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f68210a
[SYCL] Support scalar accessor in handler::copy(acc,ptr) and copy(ptr…
v-klochkov May 2, 2020
ce0a0e4
[SYCL] Address reviewer comment #1
v-klochkov May 4, 2020
650ff9e
[SYCL][NFC] Replace c-style casts in handler::copy() with reinterpret…
v-klochkov May 6, 2020
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
111 changes: 82 additions & 29 deletions sycl/include/CL/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,79 @@ class __SYCL_EXPORT handler {
return true;
}

#ifndef __SYCL_DEVICE_ONLY__
/// Copies the content of memory object accessed by Src into the memory
/// pointed by Dst.
///
/// \param Src is a source SYCL accessor.
/// \param Dst is a pointer to destination memory.
template <typename TSrc, typename TDst, int Dim, access::mode AccMode,
access::target AccTarget, access::placeholder IsPH>
detail::enable_if_t<(Dim > 0)>
copyAccToPtrHost(accessor<TSrc, Dim, AccMode, AccTarget, IsPH> Src,
TDst *Dst) {
range<Dim> Range = Src.get_range();
parallel_for<class __copyAcc2Ptr<TSrc, TDst, Dim, AccMode, AccTarget, IsPH>>
(Range, [=](id<Dim> Index) {
size_t LinearIndex = Index[0];
for (int I = 1; I < Dim; ++I)
LinearIndex += Range[I] * Index[I];
(reinterpret_cast<TSrc *>(Dst))[LinearIndex] = Src[Index];
});
}

/// Copies 1 element accessed by 0-dimensional accessor Src into the memory
/// pointed by Dst.
///
/// \param Src is a source SYCL accessor.
/// \param Dst is a pointer to destination memory.
template <typename TSrc, typename TDst, int Dim, access::mode AccMode,
access::target AccTarget, access::placeholder IsPH>
detail::enable_if_t<Dim == 0>
copyAccToPtrHost(accessor<TSrc, Dim, AccMode, AccTarget, IsPH> Src,
TDst *Dst) {
single_task<class __copyAcc2Ptr<TSrc, TDst, Dim, AccMode, AccTarget, IsPH>>
([=]() {
*Dst = readFromFirstAccElement(Src);
});
}

/// Copies the memory pointed by Src into the memory accessed by Dst.
///
/// \param Src is a pointer to source memory.
/// \param Dst is a destination SYCL accessor.
template <typename TSrc, typename TDst, int Dim, access::mode AccMode,
access::target AccTarget, access::placeholder IsPH>
detail::enable_if_t<(Dim > 0)>
copyPtrToAccHost(TDst *Src,
accessor<TSrc, Dim, AccMode, AccTarget, IsPH> Dst) {
range<Dim> Range = Dst.get_range();
parallel_for<class __copyPtr2Acc<TSrc, TDst, Dim, AccMode, AccTarget, IsPH>>
(Range, [=](id<Dim> Index) {
size_t LinearIndex = Index[0];
for (int I = 1; I < Dim; ++I)
LinearIndex += Range[I] * Index[I];
Dst[Index] = (reinterpret_cast<TDst *>(Src))[LinearIndex];
});
}

/// Copies 1 element pointed by Src to memory accessed by 0-dimensional
/// accessor Dst.
///
/// \param Src is a pointer to source memory.
/// \param Dst is a destination SYCL accessor.
template <typename TSrc, typename TDst, int Dim, access::mode AccMode,
access::target AccTarget, access::placeholder IsPH>
detail::enable_if_t<Dim == 0>
copyPtrToAccHost(TDst *Src,
accessor<TSrc, Dim, AccMode, AccTarget, IsPH> Dst) {
single_task<class __copyPtr2Acc<TSrc, TDst, Dim, AccMode, AccTarget, IsPH>>
([=]() {
writeToFirstAccElement(Dst, *Src);
});
}
#endif // __SYCL_DEVICE_ONLY__

constexpr static bool isConstOrGlobal(access::target AccessTarget) {
return AccessTarget == access::target::global_buffer ||
AccessTarget == access::target::constant_buffer;
Expand Down Expand Up @@ -1206,7 +1279,7 @@ class __SYCL_EXPORT handler {

// Explicit copy operations API

/// Copies the contents of memory object accessed by Src into the memory
/// Copies the content of memory object accessed by Src into the memory
/// pointed by Dst.
///
/// Source must have at least as many bytes as the range accessed by Dst.
Expand All @@ -1228,7 +1301,7 @@ class __SYCL_EXPORT handler {
copy(Src, RawDstPtr);
}

/// Copies the contents of memory pointed by Src into the memory object
/// Copies the content of memory pointed by Src into the memory object
/// accessed by Dst.
///
/// Source must have at least as many bytes as the range accessed by Dst.
Expand All @@ -1251,14 +1324,13 @@ class __SYCL_EXPORT handler {
copy(RawSrcPtr, Dst);
}

/// Copies the contents of memory object accessed by Src into the memory
/// Copies the content of memory object accessed by Src into the memory
/// pointed by Dst.
///
/// Source must have at least as many bytes as the range accessed by Dst.
///
/// \param Src is a source SYCL accessor.
/// \param Dst is a pointer to destination memory.
// TODO: support 0-dimensional and atomic accessors.
template <typename T_Src, typename T_Dst, int Dims, access::mode AccessMode,
access::target AccessTarget,
access::placeholder IsPlaceholder = access::placeholder::false_t>
Expand All @@ -1270,17 +1342,8 @@ class __SYCL_EXPORT handler {
#ifndef __SYCL_DEVICE_ONLY__
if (MIsHost) {
// TODO: Temporary implementation for host. Should be handled by memory
// manger.
range<Dims> Range = Src.get_range();
parallel_for< class __copyAcc2Ptr< T_Src, T_Dst, Dims, AccessMode,
AccessTarget, IsPlaceholder>>
(Range, [=](id<Dims> Index) {
size_t LinearIndex = Index[0];
for (int I = 1; I < Dims; ++I)
LinearIndex += Range[I] * Index[I];
((T_Src *)Dst)[LinearIndex] = Src[Index];
});

// manager.
copyAccToPtrHost(Src, Dst);
return;
}
#endif
Expand All @@ -1297,14 +1360,13 @@ class __SYCL_EXPORT handler {
MAccStorage.push_back(std::move(AccImpl));
}

/// Copies the contents of memory pointed by Src into the memory object
/// Copies the content of memory pointed by Src into the memory object
/// accessed by Dst.
///
/// Source must have at least as many bytes as the range accessed by Dst.
///
/// \param Src is a pointer to source memory.
/// \param Dst is a destination SYCL accessor.
// TODO: support 0-dimensional and atomic accessors.
template <typename T_Src, typename T_Dst, int Dims, access::mode AccessMode,
access::target AccessTarget,
access::placeholder IsPlaceholder = access::placeholder::false_t>
Expand All @@ -1317,17 +1379,8 @@ class __SYCL_EXPORT handler {
#ifndef __SYCL_DEVICE_ONLY__
if (MIsHost) {
// TODO: Temporary implementation for host. Should be handled by memory
// manger.
range<Dims> Range = Dst.get_range();
parallel_for< class __copyPtr2Acc< T_Src, T_Dst, Dims, AccessMode,
AccessTarget, IsPlaceholder>>
(Range, [=](id<Dims> Index) {
size_t LinearIndex = Index[0];
for (int I = 1; I < Dims; ++I)
LinearIndex += Range[I] * Index[I];

Dst[Index] = ((T_Dst *)Src)[LinearIndex];
});
// manager.
copyPtrToAccHost(Src, Dst);
return;
}
#endif
Expand All @@ -1344,7 +1397,7 @@ class __SYCL_EXPORT handler {
MAccStorage.push_back(std::move(AccImpl));
}

/// Copies the contents of memory object accessed by Src to the memory
/// Copies the content of memory object accessed by Src to the memory
/// object accessed by Dst.
///
/// Dst must have at least as many bytes as the range accessed by Src.
Expand Down
46 changes: 46 additions & 0 deletions sycl/test/basic_tests/handler/handler_mem_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,20 @@ template <typename T> void test_copy_ptr_acc() {
for (size_t I = 0; I < Size; ++I) {
assert(Data[I] == Values[I]);
}

// Check copy from memory to 0-dimensional accessor.
T SrcValue = 99;
T DstValue = 0;
{
buffer<T, 1> DstBuf(&DstValue, range<1>(1));
queue Queue;
Queue.submit([&](handler &Cgh) {
accessor<T, 0, access::mode::discard_write, access::target::global_buffer>
DstAcc(DstBuf, Cgh);
Cgh.copy(&SrcValue, DstAcc);
});
}
assert(DstValue == 99);
}

template <typename T> void test_copy_acc_ptr() {
Expand All @@ -272,6 +286,38 @@ template <typename T> void test_copy_acc_ptr() {
for (size_t I = 0; I < Size; ++I) {
assert(Data[I] == Values[I]);
}

// Check copy from 0-dimensional accessor to memory
T SrcValue = 99;
T DstValue = 0;
{
buffer<T, 1> SrcBuf(&SrcValue, range<1>(1));
queue Queue;
Queue.submit([&](handler &Cgh) {
accessor<T, 0, access::mode::read, access::target::global_buffer>
SrcAcc(SrcBuf, Cgh);
Cgh.copy(SrcAcc, &DstValue);
});
}
assert(DstValue == 99);

// Check copy from 0-dimensional placeholder accessor to memory
SrcValue = 77;
DstValue = 0;
{
buffer<T, 1> SrcBuf(&SrcValue, range<1>(1));
accessor<T, 0, access::mode::read, access::target::global_buffer,
access::placeholder::true_t>
SrcAcc(SrcBuf);
{
queue Queue;
Queue.submit([&](handler &Cgh) {
Cgh.require(SrcAcc);
Cgh.copy(SrcAcc, &DstValue);
});
}
}
assert(DstValue == 77);
}

template <typename T> void test_copy_shared_ptr_acc() {
Expand Down