[SYCL] Add property validation to sycl object ctors

sycl/include/sycl/detail/property_helper.hpp

@@ -90,6 +90,7 @@ class PropertyWithDataBase {
   PropertyWithDataBase(int ID) : MID(ID) {}
   bool isSame(int ID) const { return ID == MID; }
   virtual ~PropertyWithDataBase() = default;
+  int getKind() const { return MID; }
 
 private:
   int MID = -1;
@@ -101,7 +102,7 @@ class PropertyWithDataBase {
 template <int ID> class PropertyWithData : public PropertyWithDataBase {
 public:
   PropertyWithData() : PropertyWithDataBase(ID) {}
-  static int getKind() { return ID; }
+  static constexpr int getKind() { return ID; }
 };
 
 } // namespace detail

sycl/include/sycl/detail/property_list_base.hpp

@@ -126,6 +126,25 @@ class PropertyListBase {
     }
   }
 
+  void checkPropsAndThrow(std::function<bool(int)> FunctionForDataless,
+                          std::function<bool(int)> FunctionForData) const {
+    static const auto ErrorCode = sycl::make_error_code(errc::invalid);
+    static const auto ErrorMessage = "The property list contains property "
+                                     "unsupported for the current object";
+
+    for (int PropertyKind = 0;
+         PropertyKind < static_cast<int>(MDataLessProps.size());
+         PropertyKind++) {
+      if (MDataLessProps[PropertyKind] && !FunctionForDataless(PropertyKind))
+        throw sycl::exception(ErrorCode, ErrorMessage);
+    }
+
+    for (const auto &PropertyItem : MPropsWithData) {
+      if (!FunctionForData(PropertyItem->getKind()))
+        throw sycl::exception(ErrorCode, ErrorMessage);
+    }
+  }
+
   // Stores enabled/disabled for simple properties
   std::bitset<DataLessPropKind::DataLessPropKindSize> MDataLessProps;
   // Stores shared_ptrs to complex properties

sycl/include/sycl/properties/accessor_properties.hpp

@@ -20,19 +20,17 @@
 
 namespace sycl {
 inline namespace _V1 {
-namespace property {
-
-class no_init : public detail::DataLessProperty<detail::NoInit> {};
-
-class __SYCL2020_DEPRECATED("spelling is now: no_init") noinit
-    : public detail::DataLessProperty<detail::NoInit> {};
-
-} // namespace property
-
-inline constexpr property::no_init no_init;
 
-__SYCL2020_DEPRECATED("spelling is now: no_init")
-inline constexpr property::noinit noinit;
+#define __SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS(NS_QUALIFIER, PROP_NAME,        \
+                                               ENUM_VAL, WARNING)              \
+  namespace NS_QUALIFIER {                                                     \
+  class WARNING PROP_NAME                                                      \
+      : public sycl::detail::DataLessProperty<sycl::detail::ENUM_VAL> {};      \
+  }                                                                            \
+  WARNING inline constexpr NS_QUALIFIER::PROP_NAME PROP_NAME;
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  __SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS(NS_QUALIFIER, PROP_NAME, ENUM_VAL, )
+#include <sycl/properties/runtime_accessor_properties.def>
 
 namespace ext::intel {
 namespace property {

sycl/include/sycl/properties/buffer_properties.def

@@ -0,0 +1,19 @@
+// --*- c++ -*---
+#ifndef __SYCL_DATA_LESS_PROP
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
+#endif
+#ifndef __SYCL_MANUALLY_DEFINED_PROP
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#endif
+
+__SYCL_DATA_LESS_PROP(property::buffer, use_host_ptr, BufferUseHostPtr)
+__SYCL_DATA_LESS_PROP(ext::oneapi::property::buffer, use_pinned_host_memory, BufferUsePinnedHostMemory)
+
+// Contains data field, defined explicitly.
+__SYCL_MANUALLY_DEFINED_PROP(property::buffer, use_mutex)
+__SYCL_MANUALLY_DEFINED_PROP(property::buffer, context_bound)
+__SYCL_MANUALLY_DEFINED_PROP(property::buffer, mem_channel)
+__SYCL_MANUALLY_DEFINED_PROP(property::buffer::detail, buffer_location)
+
+#undef __SYCL_DATA_LESS_PROP
+#undef __SYCL_MANUALLY_DEFINED_PROP

sycl/include/sycl/properties/buffer_properties.hpp

@@ -19,11 +19,14 @@
 
 namespace sycl {
 inline namespace _V1 {
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  namespace NS_QUALIFIER {                                                     \
+  class PROP_NAME                                                              \
+      : public sycl::detail::DataLessProperty<sycl::detail::ENUM_VAL> {};      \
+  }
+#include <sycl/properties/buffer_properties.def>
 
 namespace property::buffer {
-class use_host_ptr : public detail::DataLessProperty<detail::BufferUseHostPtr> {
-};
-
 class use_mutex : public detail::PropertyWithData<detail::BufferUseMutex> {
 public:
   use_mutex(std::mutex &MutexRef) : MMutex(MutexRef) {}
@@ -69,41 +72,19 @@ class buffer_location
 } // namespace detail
 } // namespace property::buffer
 
-namespace ext::oneapi::property::buffer {
-
-class use_pinned_host_memory : public sycl::detail::DataLessProperty<
-                                   sycl::detail::BufferUsePinnedHostMemory> {};
-} // namespace ext::oneapi::property::buffer
-
 // Forward declaration
 template <typename T, int Dimensions, typename AllocatorT, typename Enable>
 class buffer;
 
-// Buffer property trait specializations
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<property::buffer::use_host_ptr,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<property::buffer::use_mutex,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<property::buffer::detail::buffer_location,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<property::buffer::context_bound,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<property::buffer::mem_channel,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
-template <typename T, int Dimensions, typename AllocatorT>
-struct is_property_of<ext::oneapi::property::buffer::use_pinned_host_memory,
-                      buffer<T, Dimensions, AllocatorT, void>>
-    : std::true_type {};
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)                  \
+  template <typename T, int Dimensions, typename AllocatorT>                   \
+  struct is_property_of<NS_QUALIFIER::PROP_NAME,                               \
+                        buffer<T, Dimensions, AllocatorT, void>>               \
+      : std::true_type {};
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+
+#include <sycl/properties/buffer_properties.def>
 
 } // namespace _V1
 } // namespace sycl

sycl/include/sycl/properties/image_properties.def

@@ -0,0 +1,16 @@
+// --*- c++ -*---
+#ifndef __SYCL_DATA_LESS_PROP
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
+#endif
+#ifndef __SYCL_MANUALLY_DEFINED_PROP
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#endif
+
+__SYCL_DATA_LESS_PROP(property::image, use_host_ptr, ImageUseHostPtr)
+
+// Contains data field, defined explicitly.
+__SYCL_MANUALLY_DEFINED_PROP(property::image, use_mutex)
+__SYCL_MANUALLY_DEFINED_PROP(property::image, context_bound)
+
+#undef __SYCL_DATA_LESS_PROP
+#undef __SYCL_MANUALLY_DEFINED_PROP

sycl/include/sycl/properties/image_properties.hpp

@@ -18,10 +18,14 @@
 
 namespace sycl {
 inline namespace _V1 {
-namespace property::image {
-class use_host_ptr : public detail::DataLessProperty<detail::ImageUseHostPtr> {
-};
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  namespace NS_QUALIFIER {                                                     \
+  class PROP_NAME                                                              \
+      : public sycl::detail::DataLessProperty<sycl::detail::ENUM_VAL> {};      \
+  }
+#include <sycl/properties/image_properties.def>
 
+namespace property::image {
 class use_mutex : public detail::PropertyWithData<detail::ImageUseMutex> {
 public:
   use_mutex(std::mutex &MutexRef) : MMutex(MutexRef) {}
@@ -50,41 +54,32 @@ template <int Dimensions, typename AllocatorT> class sampled_image;
 template <int Dimensions, typename AllocatorT> class unsampled_image;
 
 // SYCL 1.2.1 image property trait specializations
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_host_ptr,
-                      image<Dimensions, AllocatorT>> : std::true_type {};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_mutex, image<Dimensions, AllocatorT>>
-    : std::true_type {};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::context_bound,
-                      image<Dimensions, AllocatorT>> : std::true_type {};
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)                  \
+  template <int Dimensions, typename AllocatorT>                               \
+  struct is_property_of<NS_QUALIFIER::PROP_NAME,                               \
+                        image<Dimensions, AllocatorT>> : std::true_type {};
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#include <sycl/properties/image_properties.def>
 
 // SYCL 2020 image property trait specializations
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_host_ptr,
-                      sampled_image<Dimensions, AllocatorT>> : std::true_type {
-};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_mutex,
-                      sampled_image<Dimensions, AllocatorT>> : std::true_type {
-};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::context_bound,
-                      sampled_image<Dimensions, AllocatorT>> : std::true_type {
-};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_host_ptr,
-                      unsampled_image<Dimensions, AllocatorT>>
-    : std::true_type {};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::use_mutex,
-                      unsampled_image<Dimensions, AllocatorT>>
-    : std::true_type {};
-template <int Dimensions, typename AllocatorT>
-struct is_property_of<property::image::context_bound,
-                      unsampled_image<Dimensions, AllocatorT>>
-    : std::true_type {};
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)                  \
+  template <int Dimensions, typename AllocatorT>                               \
+  struct is_property_of<NS_QUALIFIER::PROP_NAME,                               \
+                        sampled_image<Dimensions, AllocatorT>>                 \
+      : std::true_type {};
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#include <sycl/properties/image_properties.def>
+
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)                  \
+  template <int Dimensions, typename AllocatorT>                               \
+  struct is_property_of<NS_QUALIFIER::PROP_NAME,                               \
+                        unsampled_image<Dimensions, AllocatorT>>               \
+      : std::true_type {};
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#include <sycl/properties/image_properties.def>
 
 } // namespace _V1
 } // namespace sycl

sycl/include/sycl/properties/reduction_properties.def

@@ -0,0 +1,12 @@
+// --*- c++ -*---
+#ifndef __SYCL_DATA_LESS_PROP
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
+#endif
+#ifndef __SYCL_MANUALLY_DEFINED_PROP
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#endif
+
+__SYCL_DATA_LESS_PROP(property::reduction, initialize_to_identity, InitializeToIdentity)
+
+#undef __SYCL_DATA_LESS_PROP
+#undef __SYCL_MANUALLY_DEFINED_PROP

sycl/include/sycl/properties/reduction_properties.hpp

@@ -12,10 +12,12 @@
 
 namespace sycl {
 inline namespace _V1 {
-namespace property::reduction {
-class initialize_to_identity
-    : public detail::DataLessProperty<detail::InitializeToIdentity> {};
-} // namespace property::reduction
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
+  namespace NS_QUALIFIER {                                                     \
+  class PROP_NAME                                                              \
+      : public sycl::detail::DataLessProperty<sycl::detail::ENUM_VAL> {};      \
+  }
+#include <sycl/properties/reduction_properties.def>
 
 // Reduction property trait specializations
 } // namespace _V1

sycl/include/sycl/properties/runtime_accessor_properties.def

@@ -0,0 +1,17 @@
+// --*- c++ -*---
+#ifndef __SYCL_DATA_LESS_PROP
+#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
+#endif
+#ifndef __SYCL_MANUALLY_DEFINED_PROP
+#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME)
+#endif
+#ifndef __SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS
+#define __SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS(NS_QUALIFIER, PROP_NAME, ENUM_VAL, WARNING)
+#endif
+
+__SYCL_DATA_LESS_PROP(property, no_init, NoInit)
+__SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS(property, noinit, NoInit, __SYCL2020_DEPRECATED("spelling is now: no_init"))
+
+#undef __SYCL_DATA_LESS_PROP
+#undef __SYCL_MANUALLY_DEFINED_PROP
+#undef __SYCL_DATA_LESS_PROP_DEPRECATED_ALIAS

sycl/include/sycl/property_list.hpp

@@ -23,6 +23,9 @@ inline namespace _V1 {
 namespace ext::oneapi {
 template <typename... PropsT> class accessor_property_list;
 } // namespace ext::oneapi
+namespace detail {
+class PropertyValidator;
+} // namespace detail
 
 /// Objects of the property_list class are containers for the SYCL properties
 ///
@@ -72,7 +75,19 @@ class property_list : protected detail::PropertyListBase {
 
   template <typename... PropsT>
   friend class ext::oneapi::accessor_property_list;
+  friend class detail::PropertyValidator;
 };
 
+namespace detail {
+class PropertyValidator {
+public:
+  static void checkPropsAndThrow(const property_list &PropList,
+                                 std::function<bool(int)> FunctionForDataless,
+                                 std::function<bool(int)> FunctionForData) {
+    PropList.checkPropsAndThrow(FunctionForDataless, FunctionForData);
+  }
+};
+} // namespace detail
+
 } // namespace _V1
 } // namespace sycl

sycl/include/sycl/reduction.hpp

@@ -503,6 +503,8 @@ class ReducerElement {
 private:
   value_type MValue;
 };
+
+__SYCL_EXPORT void verifyReductionProps(const property_list &Props);
 } // namespace detail
 
 // We explicitly claim std::optional as device-copyable in sycl/types.hpp.
@@ -2842,6 +2844,7 @@ template <typename T, typename AllocatorT, typename BinaryOperation>
 auto reduction(buffer<T, 1, AllocatorT> Var, handler &CGH,
                BinaryOperation Combiner, const property_list &PropList = {}) {
   std::ignore = CGH;
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 0, 1, false>(
@@ -2856,6 +2859,7 @@ auto reduction(buffer<T, 1, AllocatorT> Var, handler &CGH,
 template <typename T, typename BinaryOperation>
 auto reduction(T *Var, BinaryOperation Combiner,
                const property_list &PropList = {}) {
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 0, 1, false>(
@@ -2869,6 +2873,7 @@ template <typename T, typename AllocatorT, typename BinaryOperation>
 auto reduction(buffer<T, 1, AllocatorT> Var, handler &CGH, const T &Identity,
                BinaryOperation Combiner, const property_list &PropList = {}) {
   std::ignore = CGH;
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 0, 1, true>(
@@ -2881,6 +2886,7 @@ auto reduction(buffer<T, 1, AllocatorT> Var, handler &CGH, const T &Identity,
 template <typename T, typename BinaryOperation>
 auto reduction(T *Var, const T &Identity, BinaryOperation Combiner,
                const property_list &PropList = {}) {
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 0, 1, true>(
@@ -2896,6 +2902,7 @@ template <typename T, size_t Extent, typename BinaryOperation,
           typename = std::enable_if_t<Extent != dynamic_extent>>
 auto reduction(span<T, Extent> Span, BinaryOperation Combiner,
                const property_list &PropList = {}) {
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 1, Extent, false>(
@@ -2909,6 +2916,7 @@ template <typename T, size_t Extent, typename BinaryOperation,
           typename = std::enable_if_t<Extent != dynamic_extent>>
 auto reduction(span<T, Extent> Span, const T &Identity,
                BinaryOperation Combiner, const property_list &PropList = {}) {
+  detail::verifyReductionProps(PropList);
   bool InitializeToIdentity =
       PropList.has_property<property::reduction::initialize_to_identity>();
   return detail::make_reduction<BinaryOperation, 1, Extent, true>(