Add conflicting property checking infrastructure

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp

@@ -72,6 +72,19 @@ struct PropertyMetaInfo<
   static constexpr const char *name = "sycl-grf-size";
   static constexpr unsigned int value = 0;
 };
+
+template <typename Properties>
+struct ConflictingProperties<sycl::ext::intel::experimental::grf_size_key,
+                             Properties>
+    : ContainsProperty<sycl::ext::intel::experimental::grf_size_automatic_key,
+                       Properties> {};
+
+template <typename Properties>
+struct ConflictingProperties<
+    sycl::ext::intel::experimental::grf_size_automatic_key, Properties>
+    : ContainsProperty<sycl::ext::intel::experimental::grf_size_key,
+                       Properties> {};
+
 } // namespace detail
 } // namespace ext::oneapi::experimental
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)

sycl/include/sycl/ext/oneapi/properties/properties.hpp

@@ -131,6 +131,8 @@ template <typename PropertiesT> class properties {
                 "Properties in property list are not sorted.");
   static_assert(detail::SortedAllUnique<PropertiesT>::value,
                 "Duplicate properties in property list.");
+  static_assert(detail::NoConflictingProperties<PropertiesT>::value,
+                "Conflicting properties in property list.");
 
 public:
   template <typename... PropertyValueTs>

sycl/include/sycl/ext/oneapi/properties/property_utils.hpp

@@ -305,6 +305,37 @@ struct SizeListToStrHelper<SizeList<>, CharList<>> : CharsToStr<> {};
 template <size_t... Sizes>
 struct SizeListToStr : SizeListToStrHelper<SizeList<Sizes...>, CharList<>> {};
 
+//******************************************************************************
+// Property mutual exclusivity
+//******************************************************************************
+
+// Specializations of the following trait should not consider itself a
+// conflicting property.
+template <typename PropKey, typename Properties>
+struct ConflictingProperties : std::false_type {};
+
+template <typename Properties, typename T>
+struct NoConflictingPropertiesHelper {};
+
+template <typename Properties, typename... Ts>
+struct NoConflictingPropertiesHelper<Properties, std::tuple<Ts...>>
+    : std::true_type {};
+
+template <typename Properties, typename T, typename... Ts>
+struct NoConflictingPropertiesHelper<Properties, std::tuple<T, Ts...>>
+    : NoConflictingPropertiesHelper<Properties, std::tuple<Ts...>> {};
+
+template <typename Properties, typename... Rest, typename PropT,
+          typename... PropValuesTs>
+struct NoConflictingPropertiesHelper<
+    Properties, std::tuple<property_value<PropT, PropValuesTs...>, Rest...>>
+    : std::conditional_t<
+          ConflictingProperties<PropT, Properties>::value, std::false_type,
+          NoConflictingPropertiesHelper<Properties, std::tuple<Rest...>>> {};
+template <typename PropertiesT>
+struct NoConflictingProperties
+    : NoConflictingPropertiesHelper<PropertiesT, PropertiesT> {};
+
 } // namespace detail
 } // namespace ext::oneapi::experimental
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)

sycl/test/extensions/properties/mock_compile_time_properties.hpp

@@ -134,6 +134,15 @@ template <> struct IsCompileTimeProperty<boo_key> : std::true_type {};
 template <> struct IsRuntimeProperty<foo_key> : std::true_type {};
 template <> struct IsRuntimeProperty<foz_key> : std::true_type {};
 template <> struct IsRuntimeProperty<fir_key> : std::true_type {};
+
+template <typename Properties>
+struct ConflictingProperties<boo_key, Properties>
+    : ContainsProperty<fir_key, Properties> {};
+
+template <typename Properties>
+struct ConflictingProperties<fir_key, Properties>
+    : ContainsProperty<boo_key, Properties> {};
+
 } // namespace detail
 } // namespace experimental
 } // namespace oneapi

sycl/test/extensions/properties/properties_ctor_negative.cpp

@@ -20,5 +20,15 @@ int main() {
   auto InvalidPropertyList4 = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::bar,
       sycl::ext::oneapi::experimental::bar);
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static assertion failed due to requirement {{.+}}: Conflicting properties in property list.}}
+  auto InvalidPropertyList5 = sycl::ext::oneapi::experimental::properties(
+      sycl::ext::oneapi::experimental::boo<int>,
+      sycl::ext::oneapi::experimental::fir(3.14, false));
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static assertion failed due to requirement {{.+}}: Conflicting properties in property list.}}
+  auto InvalidPropertyList6 = sycl::ext::oneapi::experimental::properties(
+      sycl::ext::oneapi::experimental::foo{0},
+      sycl::ext::oneapi::experimental::boo<int>,
+      sycl::ext::oneapi::experimental::bar,
+      sycl::ext::oneapi::experimental::fir(3.14, false));
   return 0;
 }