Skip to content

[SYCL] Mark sycl::marray device copyable #4427

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
Sep 6, 2021
Merged

[SYCL] Mark sycl::marray device copyable #4427

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
66861f8
[SYCL] Mark sycl::marray device copyable
vladimirlaz Aug 30, 2021
0a26837
Make extra change to get clang-format happy
vladimirlaz Aug 30, 2021
c6449a1
Added check for missing device copyable types
vladimirlaz Aug 31, 2021
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
9 changes: 8 additions & 1 deletion sycl/include/CL/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@
#error "SYCL device compiler is built without ext_vector_type support"
#endif // __HAS_EXT_VECTOR_TYPE__

#include <CL/sycl/aliases.hpp>
#include <CL/sycl/access/access.hpp>
#include <CL/sycl/aliases.hpp>
#include <CL/sycl/detail/common.hpp>
#include <CL/sycl/detail/helpers.hpp>
#include <CL/sycl/detail/type_traits.hpp>
#include <CL/sycl/half_type.hpp>
#include <CL/sycl/marray.hpp>
#include <CL/sycl/multi_ptr.hpp>

#include <array>
Expand Down Expand Up @@ -2333,6 +2334,12 @@ struct is_device_copyable<std::tuple<T, Ts...>>
: detail::bool_constant<is_device_copyable<T>::value &&
is_device_copyable<std::tuple<Ts...>>::value> {};

// marray is device copyable if element type is device copyable
template <typename T, std::size_t N>
struct is_device_copyable<sycl::marray<T, N>,
std::enable_if_t<is_device_copyable<T>::value>>
: std::true_type {};

namespace detail {
template <typename T, typename = void>
struct IsDeprecatedDeviceCopyable : std::false_type {};
Expand Down
8 changes: 8 additions & 0 deletions sycl/test/basic_tests/is_device_copyable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,20 @@ void test() {
BCopyable IamBadButCopyable(1);
C IamAlsoGood;
DCopyable IamAlsoBadButCopyable{0};
marray<int, 5> MarrayForCopyableIsCopyable(0);
range<2> Range{1,2};
id<3> Id{1,2,3};
vec<int, 3> VecForCopyableIsCopyable{3};
queue Q;
Q.single_task<class TestA>([=] {
int A = IamGood.i;
int B = IamBadButCopyable.i;
int C = IamAlsoBadButCopyable.i;
int D = IamAlsoGood.i;
int E = MarrayForCopyableIsCopyable[0];
int F = Range[1];
int G = Id[2];
int H = VecForCopyableIsCopyable[0];
});

Q.single_task<class TestB>(FunctorA{});
Expand Down
13 changes: 9 additions & 4 deletions sycl/test/basic_tests/is_device_copyable_neg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ struct FunctorB : public D {
void test() {
A IamBad(1);
B IamAlsoBad{0};
marray<B, 2> MarrayForNotCopyable;
queue Q;
Q.single_task<class TestA>([=] {
int A = IamBad.i;
int B = IamAlsoBad.i;
int MB = MarrayForNotCopyable[0].i;
});

FunctorA FA;
Expand All @@ -69,13 +71,16 @@ void test() {
}

// CHECK: static_assert failed due to requirement 'is_device_copyable<A, void>
// CHECK: is_device_copyable_neg.cpp:59:5: note: in instantiation of function
// CHECK: is_device_copyable_neg.cpp:60:5: note: in instantiation of function

// CHECK: static_assert failed due to requirement 'is_device_copyable<B, void>
// CHECK: is_device_copyable_neg.cpp:59:5: note: in instantiation of function
// CHECK: is_device_copyable_neg.cpp:60:5: note: in instantiation of function

// CHECK: static_assert failed due to requirement 'is_device_copyable<sycl::marray<B, 2>, void>
// CHECK: is_device_copyable_neg.cpp:60:5: note: in instantiation of function

// CHECK: static_assert failed due to requirement 'is_device_copyable<C, void>
// CHECK: is_device_copyable_neg.cpp:65:5: note: in instantiation of function
// CHECK: is_device_copyable_neg.cpp:67:5: note: in instantiation of function

// CHECK: static_assert failed due to requirement 'is_device_copyable<D, void>
// CHECK: is_device_copyable_neg.cpp:68:5: note: in instantiation of function
// CHECK: is_device_copyable_neg.cpp:70:5: note: in instantiation of function