[SYCL][ABI-Break] Add noexcept to has_property (#6539)

steffenlarsen · web-flow · commit 417b5a29b195 · 2022-08-12T09:34:02.000+01:00
SYCL 2020 adds noexcept to has_property on SYCL objects that take
property_list arguments. This changes adjust the existing implementation
accordingly.

Signed-off-by: Steffen Larsen &lt;steffen.larsen@intel.com&gt;
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
@@ -30,7 +30,7 @@ set(SYCL_MINOR_VERSION 7)
 set(SYCL_PATCH_VERSION 0)
 # Don't forget to re-enable sycl_symbols_windows.dump once we leave ABI-breaking
 # window!
-set(SYCL_DEV_ABI_VERSION 6)
+set(SYCL_DEV_ABI_VERSION 7)
 if (SYCL_ADD_DEV_VERSION_POSTFIX)
   set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
 endif()
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
@@ -523,7 +523,7 @@ class buffer {
         impl, range<1>{sz / sizeof(ReinterpretT)}, OffsetInBytes, IsSubBuffer);
   }
 
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> bool has_property() const noexcept {
     return impl->template has_property<propertyT>();
   }
 
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
@@ -178,7 +178,7 @@ class __SYCL_EXPORT context {
   /// Checks if this context has a property of type propertyT.
   ///
   /// \return true if this context has a property of type propertyT.
-  template <typename propertyT> bool has_property() const;
+  template <typename propertyT> bool has_property() const noexcept;
 
   /// Gets the specified property of this context.
   ///
diff --git a/sycl/include/sycl/detail/property_list_base.hpp b/sycl/include/sycl/detail/property_list_base.hpp
@@ -60,7 +60,7 @@ class PropertyListBase {
   template <typename PropT>
   typename detail::enable_if_t<
       std::is_base_of<DataLessPropertyBase, PropT>::value, bool>
-  has_property_helper() const {
+  has_property_helper() const noexcept {
     const int PropKind = static_cast<int>(PropT::getKind());
     if (PropKind > detail::DataLessPropKind::LastKnownDataLessPropKind)
       return false;
@@ -70,7 +70,7 @@ class PropertyListBase {
   template <typename PropT>
   typename detail::enable_if_t<
       std::is_base_of<PropertyWithDataBase, PropT>::value, bool>
-  has_property_helper() const {
+  has_property_helper() const noexcept {
     const int PropKind = static_cast<int>(PropT::getKind());
     for (const std::shared_ptr<PropertyWithDataBase> &Prop : MPropsWithData)
       if (Prop->isSame(PropKind))
diff --git a/sycl/include/sycl/detail/sycl_mem_obj_t.hpp b/sycl/include/sycl/detail/sycl_mem_obj_t.hpp
@@ -94,7 +94,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     return (getSize() + AllocatorValueSize - 1) / AllocatorValueSize;
   }
 
-  template <typename propertyT> __SYCL_DLL_LOCAL bool has_property() const {
+  template <typename propertyT>
+  __SYCL_DLL_LOCAL bool has_property() const noexcept {
     return MProps.has_property<propertyT>();
   }
 
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
@@ -247,7 +247,7 @@ class image {
   bool operator!=(const image &rhs) const { return !(*this == rhs); }
 
   /* -- property interface members -- */
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> bool has_property() const noexcept {
     return impl->template has_property<propertyT>();
   }
 
diff --git a/sycl/include/sycl/property_list.hpp b/sycl/include/sycl/property_list.hpp
@@ -47,7 +47,7 @@ class property_list : protected detail::PropertyListBase {
     return get_property_helper<PropT>();
   }
 
-  template <typename PropT> bool has_property() const {
+  template <typename PropT> bool has_property() const noexcept {
     return has_property_helper<PropT>();
   }
 
diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
@@ -462,7 +462,7 @@ class __SYCL_EXPORT queue {
 
   /// \return true if the queue was constructed with property specified by
   /// PropertyT.
-  template <typename PropertyT> bool has_property() const;
+  template <typename PropertyT> bool has_property() const noexcept;
 
   /// \return a copy of the property of type PropertyT that the queue was
   /// constructed with. If the queue was not constructed with the PropertyT
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
@@ -88,7 +88,7 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS sampler {
   /// Checks if this sampler has a property of type propertyT.
   ///
   /// \return true if this sampler has a property of type propertyT.
-  template <typename propertyT> bool has_property() const;
+  template <typename propertyT> bool has_property() const noexcept;
 
   /// Gets the specified property of this sampler.
   ///
diff --git a/sycl/source/context.cpp b/sycl/source/context.cpp
@@ -103,7 +103,8 @@ context::get_info() const {
 #undef __SYCL_PARAM_TRAITS_SPEC
 
 #define __SYCL_PARAM_TRAITS_SPEC(param_type)                                   \
-  template <> __SYCL_EXPORT bool context::has_property<param_type>() const {   \
+  template <>                                                                  \
+  __SYCL_EXPORT bool context::has_property<param_type>() const noexcept {      \
     return impl->has_property<param_type>();                                   \
   }
 #include <sycl/detail/properties_traits.def>
diff --git a/sycl/source/detail/context_impl.hpp b/sycl/source/detail/context_impl.hpp
@@ -74,7 +74,7 @@ class context_impl {
   /// Checks if this context_impl has a property of type propertyT.
   ///
   /// \return true if this context_impl has a property of type propertyT.
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> bool has_property() const noexcept {
     return MPropList.has_property<propertyT>();
   }
 
diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp
@@ -380,7 +380,7 @@ class queue_impl {
 
   /// \return true if the queue was constructed with property specified by
   /// PropertyT.
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> bool has_property() const noexcept {
     return MPropList.has_property<propertyT>();
   }
 
diff --git a/sycl/source/detail/sampler_impl.hpp b/sycl/source/detail/sampler_impl.hpp
@@ -42,7 +42,7 @@ class __SYCL_EXPORT sampler_impl {
   /// Checks if this sampler_impl has a property of type propertyT.
   ///
   /// \return true if this sampler_impl has a property of type propertyT.
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> bool has_property() const noexcept {
     return MPropList.has_property<propertyT>();
   }
 
diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp
@@ -175,7 +175,7 @@ queue::get_info() const {
 
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-template <typename PropertyT> bool queue::has_property() const {
+template <typename PropertyT> bool queue::has_property() const noexcept {
   return impl->has_property<PropertyT>();
 }
 
@@ -184,7 +184,7 @@ template <typename PropertyT> PropertyT queue::get_property() const {
 }
 
 template __SYCL_EXPORT bool
-queue::has_property<property::queue::enable_profiling>() const;
+queue::has_property<property::queue::enable_profiling>() const noexcept;
 template __SYCL_EXPORT property::queue::enable_profiling
 queue::get_property<property::queue::enable_profiling>() const;
 
diff --git a/sycl/source/sampler.cpp b/sycl/source/sampler.cpp
@@ -44,7 +44,8 @@ bool sampler::operator!=(const sampler &rhs) const {
 }
 
 #define __SYCL_PARAM_TRAITS_SPEC(param_type)                                   \
-  template <> __SYCL_EXPORT bool sampler::has_property<param_type>() const {   \
+  template <>                                                                  \
+  __SYCL_EXPORT bool sampler::has_property<param_type>() const noexcept {      \
     return impl->has_property<param_type>();                                   \
   }
 #include <sycl/detail/properties_traits.def>

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ class buffer {`
`523`	`523`	`impl, range<1>{sz / sizeof(ReinterpretT)}, OffsetInBytes, IsSubBuffer);`
`524`	`524`	`}`
`525`	`525`
`526`		`- template <typename propertyT> bool has_property() const {`
	`526`	`+ template <typename propertyT> bool has_property() const noexcept {`
`527`	`527`	`return impl->template has_property<propertyT>();`
`528`	`528`	`}`
`529`	`529`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {`
`94`	`94`	`return (getSize() + AllocatorValueSize - 1) / AllocatorValueSize;`
`95`	`95`	`}`
`96`	`96`
`97`		`- template <typename propertyT> __SYCL_DLL_LOCAL bool has_property() const {`
	`97`	`+ template <typename propertyT>`
	`98`	`+ __SYCL_DLL_LOCAL bool has_property() const noexcept {`
`98`	`99`	`return MProps.has_property<propertyT>();`
`99`	`100`	`}`
`100`	`101`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ class image {`
`247`	`247`	`bool operator!=(const image &rhs) const { return !(*this == rhs); }`
`248`	`248`
`249`	`249`	`/* -- property interface members -- */`
`250`		`- template <typename propertyT> bool has_property() const {`
	`250`	`+ template <typename propertyT> bool has_property() const noexcept {`
`251`	`251`	`return impl->template has_property<propertyT>();`
`252`	`252`	`}`
`253`	`253`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class property_list : protected detail::PropertyListBase {`
`47`	`47`	`return get_property_helper<PropT>();`
`48`	`48`	`}`
`49`	`49`
`50`		`- template <typename PropT> bool has_property() const {`
	`50`	`+ template <typename PropT> bool has_property() const noexcept {`
`51`	`51`	`return has_property_helper<PropT>();`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@ context::get_info() const {`
`103`	`103`	`#undef __SYCL_PARAM_TRAITS_SPEC`
`104`	`104`
`105`	`105`	`#define __SYCL_PARAM_TRAITS_SPEC(param_type) \`
`106`		`- template <> __SYCL_EXPORT bool context::has_property<param_type>() const { \`
	`106`	`+ template <> \`
	`107`	`+ __SYCL_EXPORT bool context::has_property<param_type>() const noexcept { \`
`107`	`108`	`return impl->has_property<param_type>(); \`
`108`	`109`	`}`
`109`	`110`	`#include <sycl/detail/properties_traits.def>`