[SYCL] Fix return type of the accessor::get_pointer and local_accessor::get_pointer. (#8493)

* accessor::get_pointer and local_accessor::get_pointer return
`std::add_pointer_t<value_type>`
* Modifies multi_ptr ctors accepting local_accessor.
* Improves existing test to check the return type of get_pointer.

---------

Co-authored-by: Steffen Larsen <[email protected]>

Author: mmoadeli

sycl/include/sycl/accessor.hpp

@@ -2087,8 +2087,9 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
   }
 
   template <access::target AccessTarget_ = AccessTarget,
-            typename = detail::enable_if_t<AccessTarget_ ==
-                                           access::target::host_buffer>>
+            typename = detail::enable_if_t<
+                (AccessTarget_ == access::target::host_buffer) ||
+                (AccessTarget_ == access::target::host_task)>>
 #if SYCL_LANGUAGE_VERSION >= 202001
   std::add_pointer_t<value_type> get_pointer() const noexcept
 #else
@@ -2663,10 +2664,6 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
     return AccessorSubscript<Dims - 1>(*this, Index);
   }
 
-  local_ptr<DataT> get_pointer() const {
-    return local_ptr<DataT>(getQualifiedPtr());
-  }
-
   bool operator==(const local_accessor_base &Rhs) const {
     return impl == Rhs.impl;
   }
@@ -2695,6 +2692,11 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS accessor<
   // Use base classes constructors
   using local_acc::local_acc;
 
+public:
+  local_ptr<DataT> get_pointer() const {
+    return local_ptr<DataT>(local_acc::getQualifiedPtr());
+  }
+
 #ifdef __SYCL_DEVICE_ONLY__
 
   // __init needs to be defined within the class not through inheritance.
@@ -2801,6 +2803,10 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(local_accessor) local_accessor
     return const_reverse_iterator(begin());
   }
 
+  std::add_pointer_t<value_type> get_pointer() const noexcept {
+    return std::add_pointer_t<value_type>(local_acc::getQualifiedPtr());
+  }
+
   template <access::decorated IsDecorated>
   accessor_ptr<IsDecorated> get_multi_ptr() const noexcept {
     return accessor_ptr<IsDecorated>(local_acc::getQualifiedPtr());

sycl/include/sycl/multi_ptr.hpp

@@ -149,7 +149,7 @@ class multi_ptr {
                 (Space == access::address_space::generic_space ||
                  Space == access::address_space::local_space)>>
   multi_ptr(local_accessor<ElementType, Dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer().get()) {}
+      : m_Pointer(detail::cast_AS<decorated_type *>(Accessor.get_pointer())) {}
 
   // The following constructors are necessary to create multi_ptr<const
   // ElementType, Space, DecorateAddress> from accessor<ElementType, ...>.
@@ -210,7 +210,7 @@ class multi_ptr {
   multi_ptr(local_accessor<typename detail::remove_const_t<RelayElementType>,
                            Dimensions>
                 Accessor)
-      : multi_ptr(Accessor.get_pointer().get()) {}
+      : m_Pointer(detail::cast_AS<decorated_type *>(Accessor.get_pointer())) {}
 
   // Assignment and access operators
   multi_ptr &operator=(const multi_ptr &) = default;
@@ -465,7 +465,7 @@ class multi_ptr<const void, Space, DecorateAddress> {
       typename = typename detail::enable_if_t<
           RelaySpace == Space && Space == access::address_space::local_space>>
   multi_ptr(local_accessor<ElementType, Dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer().get()) {}
+      : m_Pointer(detail::cast_AS<decorated_type *>(Accessor.get_pointer())) {}
 
   // Assignment operators
   multi_ptr &operator=(const multi_ptr &) = default;
@@ -591,7 +591,7 @@ class multi_ptr<void, Space, DecorateAddress> {
       typename = typename detail::enable_if_t<
           RelaySpace == Space && Space == access::address_space::local_space>>
   multi_ptr(local_accessor<ElementType, Dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer().get()) {}
+      : m_Pointer(detail::cast_AS<decorated_type *>(Accessor.get_pointer())) {}
 
   // Assignment operators
   multi_ptr &operator=(const multi_ptr &) = default;
@@ -848,7 +848,7 @@ class multi_ptr<ElementType, Space, access::decorated::legacy> {
           std::is_const<ET>::value && std::is_same<ET, ElementType>::value>>
   multi_ptr(
       local_accessor<typename detail::remove_const_t<ET>, dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer()) {}
+      : m_Pointer(detail::cast_AS<pointer_t>(Accessor.get_pointer())) {}
 
   // Only if Space == constant_space and element type is const
   template <
@@ -1089,7 +1089,7 @@ class multi_ptr<void, Space, access::decorated::legacy> {
           _Space == Space && (Space == access::address_space::generic_space ||
                               Space == access::address_space::local_space)>>
   multi_ptr(local_accessor<ElementType, dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer()) {}
+      : m_Pointer(detail::cast_AS<pointer_t>(Accessor.get_pointer())) {}
 
   // Only if Space == constant_space
   template <
@@ -1232,7 +1232,7 @@ class multi_ptr<const void, Space, access::decorated::legacy> {
           _Space == Space && (Space == access::address_space::generic_space ||
                               Space == access::address_space::local_space)>>
   multi_ptr(local_accessor<ElementType, dimensions> Accessor)
-      : multi_ptr(Accessor.get_pointer()) {}
+      : m_Pointer(detail::cast_AS<pointer_t>(Accessor.get_pointer())) {}
 
   // Only if Space == constant_space
   template <

sycl/test/basic_tests/accessor/accessor_get_pointer.cpp

@@ -0,0 +1,27 @@
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only
+
+#include <cassert>
+#include <sycl/sycl.hpp>
+#include <type_traits>
+
+using namespace sycl;
+
+constexpr static int size = 1;
+
+void test_get_multi_ptr(handler &cgh, buffer<int, size> &buffer) {
+  using target_local_accessor_t =
+      accessor<int, size, access::mode::read_write, access::target::local>;
+  using local_accessor_t = local_accessor<int, size>;
+
+  auto acc = buffer.get_access<access_mode::read_write, target::host_task>(cgh);
+  auto target_local_acc = target_local_accessor_t({size}, cgh);
+  auto local_acc = local_accessor_t({size}, cgh);
+
+  auto acc_ptr = acc.get_pointer();
+  auto target_local_ptr = target_local_acc.get_pointer();
+  auto local_pointer = local_acc.get_pointer();
+  static_assert(std::is_same_v<decltype(acc_ptr), std::add_pointer_t<int>>);
+  static_assert(std::is_same_v<decltype(target_local_ptr), local_ptr<int>>);
+  static_assert(
+      std::is_same_v<decltype(local_pointer), std::add_pointer_t<int>>);
+}