From 0bbe79ff2603378d735c1fb9e05e4eb1c34416b5 Mon Sep 17 00:00:00 2001
From: Alexander Batashev <alexander.batashev@intel.com>
Date: Wed, 27 May 2020 12:44:44 +0300
Subject: [PATCH 1/2] [SYCL] Do not export utility methods from SYCLMemObjT

Signed-off-by: Alexander Batashev <alexander.batashev@intel.com>
---
 sycl/include/CL/sycl/detail/export.hpp        |  1 +
 .../include/CL/sycl/detail/sycl_mem_obj_t.hpp | 48 +++++++++----------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/sycl/include/CL/sycl/detail/export.hpp b/sycl/include/CL/sycl/detail/export.hpp
index 47d21bd894f0a..4f5fca8c9a364 100644
--- a/sycl/include/CL/sycl/detail/export.hpp
+++ b/sycl/include/CL/sycl/detail/export.hpp
@@ -39,5 +39,6 @@
 #ifndef __SYCL_EXPORT
 #define __SYCL_EXPORT
 #define __SYCL_EXPORT_DEPRECATED(x)
+#define DLL_LOCAL
 #endif
 #endif // __SYCL_DEVICE_ONLY__
diff --git a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp b/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
index 4043b2ec28b1e..55b5325fd0371 100644
--- a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
+++ b/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
@@ -86,49 +86,49 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
 
   const plugin &getPlugin() const;
 
-  size_t getSize() const override { return MSizeInBytes; }
-  size_t get_count() const {
+  DLL_LOCAL size_t getSize() const override { return MSizeInBytes; }
+  DLL_LOCAL size_t get_count() const {
     size_t AllocatorValueSize = MAllocator->getValueSize();
     return (getSize() + AllocatorValueSize - 1) / AllocatorValueSize;
   }
 
-  template <typename propertyT> bool has_property() const {
+  template <typename propertyT> DLL_LOCAL bool has_property() const {
     return MProps.has_property<propertyT>();
   }
 
-  template <typename propertyT> propertyT get_property() const {
+  template <typename propertyT> DLL_LOCAL propertyT get_property() const {
     return MProps.get_property<propertyT>();
   }
 
-  template <typename AllocatorT> AllocatorT get_allocator() const {
+  template <typename AllocatorT> DLL_LOCAL AllocatorT get_allocator() const {
     return MAllocator->getAllocator<AllocatorT>();
   }
 
-  void *allocateHostMem() override { return MAllocator->allocate(get_count()); }
+  DLL_LOCAL void *allocateHostMem() override { return MAllocator->allocate(get_count()); }
 
-  void releaseHostMem(void *Ptr) override {
+  DLL_LOCAL void releaseHostMem(void *Ptr) override {
     if (Ptr)
       MAllocator->deallocate(Ptr, get_count());
   }
 
   void releaseMem(ContextImplPtr Context, void *MemAllocation) override;
 
-  void *getUserPtr() const {
+  DLL_LOCAL void *getUserPtr() const {
     return MOpenCLInterop ? static_cast<void *>(MInteropMemObject) : MUserPtr;
   }
 
-  void set_write_back(bool NeedWriteBack) { MNeedWriteBack = NeedWriteBack; }
+  DLL_LOCAL void set_write_back(bool NeedWriteBack) { MNeedWriteBack = NeedWriteBack; }
 
-  void set_final_data(std::nullptr_t) { MUploadDataFunctor = nullptr; }
+  DLL_LOCAL void set_final_data(std::nullptr_t) { MUploadDataFunctor = nullptr; }
 
   template <template <typename T> class PtrT, typename T>
-  enable_if_t<std::is_convertible<PtrT<T>, weak_ptr_class<T>>::value>
+  DLL_LOCAL enable_if_t<std::is_convertible<PtrT<T>, weak_ptr_class<T>>::value>
   set_final_data(PtrT<T> FinalData) {
     weak_ptr_class<T> TempFinalData(FinalData);
     set_final_data(TempFinalData);
   }
 
-  template <typename T> void set_final_data(weak_ptr_class<T> FinalData) {
+  template <typename T> DLL_LOCAL void set_final_data(weak_ptr_class<T> FinalData) {
     MUploadDataFunctor = [this, FinalData]() {
       if (shared_ptr_class<T> LockedFinalData = FinalData.lock()) {
         updateHostMemory(LockedFinalData.get());
@@ -136,7 +136,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     };
   }
 
-  void set_final_data_from_storage() {
+  DLL_LOCAL void set_final_data_from_storage() {
     MUploadDataFunctor = [this]() {
       if (!MSharedPtrStorage.unique()) {
         void *FinalData = const_cast<void *>(MSharedPtrStorage.get());
@@ -146,7 +146,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   }
 
   template <typename Destination>
-  EnableIfOutputPointerT<Destination> set_final_data(Destination FinalData) {
+  DLL_LOCAL EnableIfOutputPointerT<Destination> set_final_data(Destination FinalData) {
     if (!FinalData)
       MUploadDataFunctor = nullptr;
     else
@@ -156,7 +156,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   }
 
   template <typename Destination>
-  EnableIfOutputIteratorT<Destination> set_final_data(Destination FinalData) {
+  DLL_LOCAL EnableIfOutputIteratorT<Destination> set_final_data(Destination FinalData) {
     MUploadDataFunctor = [this, FinalData]() {
       using DestinationValueT = iterator_value_type_t<Destination>;
       // TODO if Destination is ContiguousIterator then don't create
@@ -179,18 +179,18 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   // members must be alive.
   void updateHostMemory();
 
-  bool useHostPtr() {
+  DLL_LOCAL bool useHostPtr() {
     return has_property<property::buffer::use_host_ptr>() ||
            has_property<property::image::use_host_ptr>();
   }
 
-  bool canReuseHostPtr(void *HostPtr, const size_t RequiredAlign) {
+  DLL_LOCAL bool canReuseHostPtr(void *HostPtr, const size_t RequiredAlign) {
     bool Aligned =
         (reinterpret_cast<std::uintptr_t>(HostPtr) % RequiredAlign) == 0;
     return Aligned || useHostPtr();
   }
 
-  void handleHostData(void *HostPtr, const size_t RequiredAlign) {
+  DLL_LOCAL void handleHostData(void *HostPtr, const size_t RequiredAlign) {
     if (!MHostPtrReadOnly)
       set_final_data(reinterpret_cast<char *>(HostPtr));
 
@@ -204,13 +204,13 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     }
   }
 
-  void handleHostData(const void *HostPtr, const size_t RequiredAlign) {
+  DLL_LOCAL void handleHostData(const void *HostPtr, const size_t RequiredAlign) {
     MHostPtrReadOnly = true;
     handleHostData(const_cast<void *>(HostPtr), RequiredAlign);
   }
 
   template <typename T>
-  void handleHostData(const shared_ptr_class<T> &HostPtr,
+  DLL_LOCAL void handleHostData(const shared_ptr_class<T> &HostPtr,
                       const size_t RequiredAlign) {
     MSharedPtrStorage = HostPtr;
     MHostPtrReadOnly = std::is_const<T>::value;
@@ -230,7 +230,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   }
 
   template <class InputIterator>
-  void handleHostData(InputIterator First, InputIterator Last,
+  DLL_LOCAL void handleHostData(InputIterator First, InputIterator Last,
                       const size_t RequiredAlign) {
     MHostPtrReadOnly = iterator_to_const_type_t<InputIterator>::value;
     setAlign(RequiredAlign);
@@ -254,14 +254,14 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
               static_cast<IteratorPointerToNonConstValueType>(MUserPtr));
   }
 
-  void setAlign(size_t RequiredAlign) {
+  DLL_LOCAL void setAlign(size_t RequiredAlign) {
     MAllocator->setAlignment(RequiredAlign);
   }
 
   static size_t getBufSizeForContext(const ContextImplPtr &Context,
                                      cl_mem MemObject);
 
-  void *allocateMem(ContextImplPtr Context, bool InitFromUserData,
+  DLL_LOCAL void *allocateMem(ContextImplPtr Context, bool InitFromUserData,
                     void *HostPtr, RT::PiEvent &InteropEvent) override {
     (void)Context;
     (void)InitFromUserData;
@@ -270,7 +270,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     throw runtime_error("Not implemented", PI_INVALID_OPERATION);
   }
 
-  MemObjType getType() const override { return UNDEFINED; }
+  DLL_LOCAL MemObjType getType() const override { return UNDEFINED; }
 
 protected:
   // Allocator used for allocation memory on host.

From b3e58a10b0fa5cbb35bac1c680ffe4d69ecfdd2b Mon Sep 17 00:00:00 2001
From: Alexander Batashev <alexander.batashev@intel.com>
Date: Thu, 28 May 2020 11:23:49 +0300
Subject: [PATCH 2/2] Run clang-format

---
 .../include/CL/sycl/detail/sycl_mem_obj_t.hpp | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp b/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
index 55b5325fd0371..bb3bf2d82059b 100644
--- a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
+++ b/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
@@ -104,7 +104,9 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     return MAllocator->getAllocator<AllocatorT>();
   }
 
-  DLL_LOCAL void *allocateHostMem() override { return MAllocator->allocate(get_count()); }
+  DLL_LOCAL void *allocateHostMem() override {
+    return MAllocator->allocate(get_count());
+  }
 
   DLL_LOCAL void releaseHostMem(void *Ptr) override {
     if (Ptr)
@@ -117,9 +119,13 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     return MOpenCLInterop ? static_cast<void *>(MInteropMemObject) : MUserPtr;
   }
 
-  DLL_LOCAL void set_write_back(bool NeedWriteBack) { MNeedWriteBack = NeedWriteBack; }
+  DLL_LOCAL void set_write_back(bool NeedWriteBack) {
+    MNeedWriteBack = NeedWriteBack;
+  }
 
-  DLL_LOCAL void set_final_data(std::nullptr_t) { MUploadDataFunctor = nullptr; }
+  DLL_LOCAL void set_final_data(std::nullptr_t) {
+    MUploadDataFunctor = nullptr;
+  }
 
   template <template <typename T> class PtrT, typename T>
   DLL_LOCAL enable_if_t<std::is_convertible<PtrT<T>, weak_ptr_class<T>>::value>
@@ -128,7 +134,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     set_final_data(TempFinalData);
   }
 
-  template <typename T> DLL_LOCAL void set_final_data(weak_ptr_class<T> FinalData) {
+  template <typename T>
+  DLL_LOCAL void set_final_data(weak_ptr_class<T> FinalData) {
     MUploadDataFunctor = [this, FinalData]() {
       if (shared_ptr_class<T> LockedFinalData = FinalData.lock()) {
         updateHostMemory(LockedFinalData.get());
@@ -146,7 +153,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   }
 
   template <typename Destination>
-  DLL_LOCAL EnableIfOutputPointerT<Destination> set_final_data(Destination FinalData) {
+  DLL_LOCAL EnableIfOutputPointerT<Destination>
+  set_final_data(Destination FinalData) {
     if (!FinalData)
       MUploadDataFunctor = nullptr;
     else
@@ -156,7 +164,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   }
 
   template <typename Destination>
-  DLL_LOCAL EnableIfOutputIteratorT<Destination> set_final_data(Destination FinalData) {
+  DLL_LOCAL EnableIfOutputIteratorT<Destination>
+  set_final_data(Destination FinalData) {
     MUploadDataFunctor = [this, FinalData]() {
       using DestinationValueT = iterator_value_type_t<Destination>;
       // TODO if Destination is ContiguousIterator then don't create
@@ -204,14 +213,15 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
     }
   }
 
-  DLL_LOCAL void handleHostData(const void *HostPtr, const size_t RequiredAlign) {
+  DLL_LOCAL void handleHostData(const void *HostPtr,
+                                const size_t RequiredAlign) {
     MHostPtrReadOnly = true;
     handleHostData(const_cast<void *>(HostPtr), RequiredAlign);
   }
 
   template <typename T>
   DLL_LOCAL void handleHostData(const shared_ptr_class<T> &HostPtr,
-                      const size_t RequiredAlign) {
+                                const size_t RequiredAlign) {
     MSharedPtrStorage = HostPtr;
     MHostPtrReadOnly = std::is_const<T>::value;
     if (HostPtr) {
@@ -231,7 +241,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
 
   template <class InputIterator>
   DLL_LOCAL void handleHostData(InputIterator First, InputIterator Last,
-                      const size_t RequiredAlign) {
+                                const size_t RequiredAlign) {
     MHostPtrReadOnly = iterator_to_const_type_t<InputIterator>::value;
     setAlign(RequiredAlign);
     if (useHostPtr())
@@ -262,7 +272,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
                                      cl_mem MemObject);
 
   DLL_LOCAL void *allocateMem(ContextImplPtr Context, bool InitFromUserData,
-                    void *HostPtr, RT::PiEvent &InteropEvent) override {
+                              void *HostPtr,
+                              RT::PiEvent &InteropEvent) override {
     (void)Context;
     (void)InitFromUserData;
     (void)HostPtr;