Added a test and reworked solution

Signed-off-by: Ivan Karachun <[email protected]>

Author: Ivan Karachun

sycl/include/CL/sycl/handler.hpp

@@ -386,19 +386,7 @@ class __SYCL_EXPORT handler {
                        static_cast<int>(AccessTarget), ArgIndex);
   }
 
-  template <typename T> struct ShouldEnableSetArgHelper {
-    static constexpr bool value = std::is_trivially_copyable<T>::value
-#ifdef CL_SYCL_LANGUAGE_VERSION
-#if CL_SYCL_LANGUAGE_VERSION <= 121
-                                  && std::is_standard_layout<T>::value
-#endif
-#endif
-        ;
-  };
-
-  template <typename T>
-  typename std::enable_if<ShouldEnableSetArgHelper<T>::value, void>::type
-  setArgHelper(int ArgIndex, T &&Arg) {
+  template <typename T> void setArgHelper(int ArgIndex, T &&Arg) {
     void *StoredArg = (void *)storePlainArg(Arg);
 
     if (!std::is_same<cl_mem, T>::value && std::is_pointer<T>::value) {
@@ -808,13 +796,39 @@ class __SYCL_EXPORT handler {
     }
   }
 
+  template <typename T>
+  using remove_cv_ref_t =
+      typename std::remove_cv<detail::remove_reference_t<T>>::type;
+
+  template <typename T> struct ShouldEnableSetArg {
+    static constexpr bool value =
+        std::is_trivially_copyable<T>::value
+#if CL_SYCL_LANGUAGE_VERSION && CL_SYCL_LANGUAGE_VERSION <= 121
+            && std::is_standard_layout<T>::value
+#endif
+        || std::is_same<sampler, remove_cv_ref_t<T>>::value // Sampler
+        || (!std::is_same<cl_mem, remove_cv_ref_t<T>>::value &&
+            std::is_pointer<remove_cv_ref_t<T>>::value)     // USM
+        || std::is_same<cl_mem, remove_cv_ref_t<T>>::value; // Interop
+  };
+
   /// Sets argument for OpenCL interoperability kernels.
   ///
   /// Registers Arg passed as argument # ArgIndex.
   ///
   /// \param ArgIndex is a positional number of argument to be set.
   /// \param Arg is an argument value to be set.
-  template <typename T> void set_arg(int ArgIndex, T &&Arg) {
+  template <typename T>
+  typename std::enable_if<ShouldEnableSetArg<T>::value, void>::type
+  set_arg(int ArgIndex, T &&Arg) {
+    setArgHelper(ArgIndex, std::move(Arg));
+  }
+
+  template <typename DataT, int Dims, access::mode AccessMode,
+            access::target AccessTarget, access::placeholder IsPlaceholder>
+  void
+  set_arg(int ArgIndex,
+          accessor<DataT, Dims, AccessMode, AccessTarget, IsPlaceholder> Arg) {
     setArgHelper(ArgIndex, std::move(Arg));
   }
 

sycl/test/basic_tests/set_arg_error.cpp

@@ -0,0 +1,47 @@
+// RUN: %clangxx -fsycl -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning -fsyntax-only
+
+#include <CL/sycl.hpp>
+
+struct TriviallyCopyable {
+  int a;
+  int b;
+};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(NonTriviallyCopyable const &) {}
+  int a;
+  int b;
+};
+
+struct NonStdLayout {
+  int a;
+
+private:
+  int b;
+};
+
+int main() {
+  constexpr size_t size = 1;
+  cl::sycl::buffer<int> buf(size);
+  cl::sycl::queue q;
+  q.submit([&](cl::sycl::handler &h) {
+    auto global_acc = buf.get_access<cl::sycl::access::mode::write>(h);
+    cl::sycl::sampler samp(cl::sycl::coordinate_normalization_mode::normalized,
+                           cl::sycl::addressing_mode::clamp,
+                           cl::sycl::filtering_mode::nearest);
+    cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
+                       cl::sycl::access::target::local>
+        local_acc({size}, h);
+    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( // expected-error {{no matching member function for call to 'set_arg'}}
+        5, NonTriviallyCopyable{});
+#ifdef CL_SYCL_LANGUAGE_VERSION &&CL_SYCL_LANGUAGE_VERSION <= 121
+    h.set_arg( // expected-error {{no matching member function for call to 'set_arg'}}
+        4, NonStdLayout{});
+#endif
+  });
+}