Merge branch 'work_group_memoy_new' of https://github.com/lbushi25/llvm into work_group_memoy_new

Author: lbushi25

sycl/include/sycl/ext/oneapi/experimental/work_group_memory.hpp

@@ -68,21 +68,21 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(work_group_memory) work_group_memory
   multi_ptr<value_type, access::address_space::local_space, IsDecorated>
   get_multi_ptr() const {
     return sycl::address_space_cast<access::address_space::local_space,
-                                    IsDecorated, value_type>(data_ptr);
+                                    IsDecorated, value_type>(ptr);
   }
   DataT *operator&() const { return ptr; }
   operator DataT &() const { return *(this->operator&()); }
   template <typename T = DataT,
             typename = std::enable_if_t<!std::is_array_v<T>>>
   const work_group_memory &operator=(const DataT &value) const {
-    *data_ptr = value;
+    *ptr = value;
     return *this;
   }
 #ifdef __SYCL_DEVICE_ONLY__
-  void __init(__OPENCL_LOCAL_AS__ DataT data) { this->data_ptr = &data; }
+  void __init(decoratedPtr ptr) { this->ptr = ptr; }
 #endif
 private:
-  decoratedPtr data_ptr;
+  decoratedPtr ptr;
 };
 } // namespace ext::oneapi::experimental
 } // namespace _V1

sycl/include/sycl/handler.hpp

@@ -699,7 +699,8 @@ class __SYCL_EXPORT handler {
           &Arg) {
     addArg(detail::kernel_param_kind_t::kind_work_group_memory, &Arg,
            detail::getWorkGroupMemoryOwnSize(
-               static_cast<ext::oneapi::experimental::work_group_memory<DataT, PropertyListT> *>(Arg)),
+               static_cast<ext::oneapi::experimental::work_group_memory<
+                   DataT, PropertyListT> *>(Arg)),
            ArgIndex);
   }
 

sycl/source/handler.cpp

@@ -792,7 +792,7 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
   }
   case kernel_param_kind_t::kind_work_group_memory: {
     addArg(kernel_param_kind_t::kind_std_layout, nullptr,
-               static_cast<detail::work_group_memory_impl *>(Ptr)->buffer_size,
+           static_cast<detail::work_group_memory_impl *>(Ptr)->buffer_size,
            Index + IndexShift);
     break;
   }