Skip to content
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

[SYCL] Fixed check for set_arg #2203

Merged
merged 2 commits into from
Jul 29, 2020
Merged

[SYCL] Fixed check for set_arg #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1402ba4
[SYCL] Fixed check for set_arg
Jul 29, 2020
e50ce25
Remove reference only
Jul 29, 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
4 changes: 2 additions & 2 deletions sycl/include/CL/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,9 +805,9 @@ class __SYCL_EXPORT handler {

template <typename T> struct ShouldEnableSetArg {
static constexpr bool value =
std::is_trivially_copyable<T>::value
std::is_trivially_copyable<detail::remove_reference_t<T>>::value
#if CL_SYCL_LANGUAGE_VERSION && CL_SYCL_LANGUAGE_VERSION <= 121
&& std::is_standard_layout<T>::value
&& std::is_standard_layout<detail::remove_reference_t<T>>::value
#endif
|| is_same_type<sampler, T>::value // Sampler
|| (!is_same_type<cl_mem, T>::value &&
Expand Down
12 changes: 10 additions & 2 deletions sycl/test/basic_tests/set_arg_error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,23 @@ int main() {
cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
cl::sycl::access::target::local>
local_acc({size}, h);
TriviallyCopyable tc{1, 2};
NonTriviallyCopyable ntc;
h.set_arg(0, local_acc);
h.set_arg(1, global_acc);
h.set_arg(2, samp);
h.set_arg(3, TriviallyCopyable{});
h.set_arg(3, tc);
h.set_arg(4, TriviallyCopyable{});
h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
5, ntc);
h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
4, NonTriviallyCopyable{});
KarachunIvan marked this conversation as resolved.
Show resolved Hide resolved
#if CL_SYCL_LANGUAGE_VERSION && CL_SYCL_LANGUAGE_VERSION <= 121
NonStdLayout nstd;
h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
6, nstd);
h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
5, NonStdLayout{});
7, NonStdLayout{});
#endif
});
}