[SYCL][ABI-Break] Implement property interface for local_accessor &

usm_allocator

Author: KornevNikita

sycl/include/sycl/accessor.hpp

@@ -2167,8 +2167,8 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
     (void)propList;
   }
 #else
-      : LocalAccessorBaseHost(range<3>{1, 1, 1}, AdjustedDim, sizeof(DataT)) {
-    (void)propList;
+      : LocalAccessorBaseHost(range<3>{1, 1, 1}, AdjustedDim, sizeof(DataT),
+                              propList) {
     detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
                                     access::target::local, AccessMode, CodeLoc);
   }
@@ -2200,8 +2200,7 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 #else
       : LocalAccessorBaseHost(detail::convertToArrayOfN<3, 1>(AllocationSize),
-                              AdjustedDim, sizeof(DataT)) {
-    (void)propList;
+                              AdjustedDim, sizeof(DataT), propList) {
     detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
                                     access::target::local, AccessMode, CodeLoc);
   }
@@ -2345,6 +2344,23 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(local_accessor) local_accessor
   }
 
 #endif
+
+public:
+  template <typename Property> bool has_property() const noexcept {
+#ifndef __SYCL_DEVICE_ONLY__
+    return this->getPropList().template has_property<Property>();
+#else
+    return false;
+#endif
+  }
+
+  template <typename Property> Property get_property() const {
+#ifndef __SYCL_DEVICE_ONLY__
+    return this->getPropList().template get_property<Property>();
+#else
+    return Property();
+#endif
+  }
 };
 
 /// Image accessors.

sycl/include/sycl/detail/accessor_impl.hpp

@@ -180,23 +180,27 @@ class __SYCL_EXPORT LocalAccessorImplHost {
 public:
   // Allocate ElemSize more data to have sufficient padding to enforce
   // alignment.
-  LocalAccessorImplHost(sycl::range<3> Size, int Dims, int ElemSize)
+  LocalAccessorImplHost(sycl::range<3> Size, int Dims, int ElemSize,
+                        const property_list &PropertyList)
       : MSize(Size), MDims(Dims), MElemSize(ElemSize),
-        MMem(Size[0] * Size[1] * Size[2] * ElemSize + ElemSize) {}
+        MMem(Size[0] * Size[1] * Size[2] * ElemSize + ElemSize),
+        MPropertyList(PropertyList) {}
 
   sycl::range<3> MSize;
   int MDims;
   int MElemSize;
   std::vector<char> MMem;
+  property_list MPropertyList;
 };
 
 using LocalAccessorImplPtr = std::shared_ptr<LocalAccessorImplHost>;
 
 class LocalAccessorBaseHost {
 public:
-  LocalAccessorBaseHost(sycl::range<3> Size, int Dims, int ElemSize) {
+  LocalAccessorBaseHost(sycl::range<3> Size, int Dims, int ElemSize,
+                        const property_list &PropertyList = {}) {
     impl = std::shared_ptr<LocalAccessorImplHost>(
-        new LocalAccessorImplHost(Size, Dims, ElemSize));
+        new LocalAccessorImplHost(Size, Dims, ElemSize, PropertyList));
   }
   sycl::range<3> &getSize() { return impl->MSize; }
   const sycl::range<3> &getSize() const { return impl->MSize; }
@@ -218,6 +222,7 @@ class LocalAccessorBaseHost {
 
   int getNumOfDims() { return impl->MDims; }
   int getElementSize() { return impl->MElemSize; }
+  const property_list &getPropList() const { return impl->MPropertyList; }
 
 protected:
   template <class Obj>

sycl/include/sycl/usm/usm_allocator.hpp

@@ -106,6 +106,14 @@ class usm_allocator {
              (One.MDevice == Two.MDevice));
   }
 
+  template <typename Property> bool has_property() const noexcept {
+    return MPropList.has_property<Property>();
+  }
+
+  template <typename Property> Property get_property() const {
+    return MPropList.get_property<Property>();
+  }
+
 private:
   constexpr size_t getAlignment() const { return max(alignof(T), Alignment); }
 

sycl/test/abi/layout_accessors_host.cpp

@@ -58,8 +58,22 @@ using namespace sycl;
 // CHECK:      32 |           pointer _M_start
 // CHECK-NEXT: 40 |           pointer _M_finish
 // CHECK-NEXT: 48 |           pointer _M_end_of_storage
-// CHECK-NEXT:    | [sizeof=56, dsize=56, align=8,
-// CHECK-NEXT:    |  nvsize=56, nvalign=8]
+// CHECK-NEXT: 56 |   class sycl::property_list MPropertyList
+// CHECK-NEXT: 56 |     class sycl::detail::PropertyListBase (base)
+// CHECK-NEXT: 56 |       class std::bitset<32> MDataLessProps
+// CHECK-NEXT: 56 |         struct std::_Base_bitset<1> (base)
+// CHECK-NEXT: 56 |           _WordT _M_w
+// CHECK-NEXT: 64 |       class std::vector<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > MPropsWithData
+// CHECK-NEXT: 64 |         struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > > (base)
+// CHECK-NEXT: 64 |           struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl _M_impl
+// CHECK-NEXT: 64 |             class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
+// CHECK-NEXT: 64 |               class __gnu_cxx::new_allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
+// CHECK-NEXT: 64 |             struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl_data (base)
+// CHECK-NEXT: 64 |               pointer _M_start
+// CHECK-NEXT: 72 |               pointer _M_finish
+// CHECK-NEXT: 80 |               pointer _M_end_of_storage
+// CHECK-NEXT:    | [sizeof=88, dsize=88, align=8,
+// CHECK-NEXT:    |  nvsize=88, nvalign=8]
 
 //----------------------------------------------------------------------------//
 // Host buffer accessor.

sycl/test/abi/symbol_size_alignment.cpp

@@ -45,7 +45,7 @@ int main() {
   check<detail::LocalAccessorBaseDevice<1>, 24, 8>();
   check<detail::AccessorImplHost, 160, 8>();
   check<detail::AccessorBaseHost, 16, 8>();
-  check<detail::LocalAccessorImplHost, 56, 8>();
+  check<detail::LocalAccessorImplHost, 88, 8>();
   check<buffer<int>, 40, 8>();
   check<context, 16, 8>();
   check<cpu_selector, 8, 8>();