[NeoMathEngine] Refactored StackAllocators (#1064)

Signed-off-by: Kirill Golikov <[email protected]>

Author: favorart

NeoMathEngine/include/NeoMathEngine/MemoryHandle.h

@@ -1,4 +1,4 @@
-/* Copyright © 2017-2020 ABBYY Production LLC
+/* Copyright © 2017-2024 ABBYY
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,30 +28,17 @@ class CMemoryHandleInternal;
 class NEOMATHENGINE_API CMemoryHandle {
 public:
 	CMemoryHandle() : mathEngine( 0 ), object( 0 ), offset( 0 ) {}
-	CMemoryHandle( const CMemoryHandle& other ) : mathEngine( other.mathEngine ), object( other.object ), offset( other.offset ) {}
-
-	CMemoryHandle& operator=( const CMemoryHandle& other )
-	{
-		mathEngine = other.mathEngine;
-		object = other.object;
-		offset = other.offset;
-		return *this;
-	}
+	CMemoryHandle( CMemoryHandle&& other ) = default;
+	CMemoryHandle( const CMemoryHandle& other ) = default;
 
+	CMemoryHandle& operator=( CMemoryHandle&& other ) = default;
+	CMemoryHandle& operator=( const CMemoryHandle& other ) = default;
+	
+	bool operator!=( const CMemoryHandle& other ) const { return !operator==( other ); }
 	bool operator==( const CMemoryHandle& other ) const
-	{
-		return mathEngine == other.mathEngine && object == other.object && offset == other.offset;
-	}
+	{ return mathEngine == other.mathEngine && object == other.object && offset == other.offset; }
 
-	bool operator!=( const CMemoryHandle& other ) const
-	{
-		return !operator==( other );
-	}
-
-	bool IsNull() const
-	{
-		return mathEngine == 0 && object == 0 && offset == 0;
-	}
+	bool IsNull() const { return mathEngine == 0 && object == 0 && offset == 0; }
 
 	IMathEngine* GetMathEngine() const { return mathEngine; }
 
@@ -62,8 +49,9 @@ class NEOMATHENGINE_API CMemoryHandle {
 
 	friend class CMemoryHandleInternal;
 
-	explicit CMemoryHandle( IMathEngine* _mathEngine, const void* _object, ptrdiff_t _offset ) : mathEngine( _mathEngine ), object( _object ), offset( _offset ) {}
-
+	CMemoryHandle( IMathEngine* _mathEngine, const void* _object, ptrdiff_t _offset ) :
+		mathEngine( _mathEngine ), object( _object ), offset( _offset )
+	{}
 	CMemoryHandle CopyMemoryHandle( ptrdiff_t shift ) const { return CMemoryHandle( mathEngine, object, offset + shift ); }
 };
 

NeoMathEngine/src/CMakeLists.txt

@@ -27,10 +27,9 @@ set(CPU_COMMON_SOURCES
     CPU/CpuMathEngineVectorMath.cpp
     CrtAllocatedObject.cpp
     DllLoader.cpp
-    MathEngineDeviceStackAllocator.cpp
     MathEngineDnnDropout.cpp
     MathEngine.cpp
-    MathEngineHostStackAllocator.cpp
+    MathEngineStackAllocator.cpp
     MemoryEngine.cpp
     MemoryPool.cpp
     ThreadPool.cpp
@@ -44,13 +43,12 @@ target_sources(${PROJECT_NAME}
     common.h
     MathEngineAllocator.h
     MathEngineCommon.h
-    MathEngineDeviceStackAllocator.h
     MathEngineDll.h
     MathEngineDnnConv.h
     MathEngineDnnDropout.h
     MathEngineDnnLrn.h
     MathEngineDnnPoolings.h
-    MathEngineHostStackAllocator.h
+    MathEngineStackAllocator.h
     MemoryEngine.h
     MemoryHandleInternal.h
     MemoryPool.h
@@ -104,7 +102,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
     UNITY_BUILD_MODE GROUP
 )
 set_property(SOURCE ${CPU_COMMON_SOURCES} PROPERTY UNITY_GROUP 1)
-set_property(SOURCE MathEngineDeviceStackAllocator.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
+set_property(SOURCE MathEngineStackAllocator.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
 
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_14)
 

NeoMathEngine/src/CPU/CpuMathEngine.cpp

@@ -17,8 +17,6 @@ limitations under the License.
 #pragma hdrstop
 
 #include <CpuMathEngine.h>
-#include <MathEngineDeviceStackAllocator.h>
-#include <MathEngineHostStackAllocator.h>
 #include <MemoryHandleInternal.h>
 #include <MathEngineCommon.h>
 #include <NeoMathEngine/SimdMathEngine.h>

NeoMathEngine/src/GPU/CUDA/CudaMathEngine.cpp

@@ -26,8 +26,6 @@ limitations under the License.
 #include <MathEngineAllocator.h>
 #include <MathEngineCommon.h>
 #include <MemoryHandleInternal.h>
-#include <MathEngineDeviceStackAllocator.h>
-#include <MathEngineHostStackAllocator.h>
 #include <cuda_runtime.h>
 #include <string>
 #include <vector>

NeoMathEngine/src/GPU/CUDA/CudaMathEngine.cu

@@ -25,8 +25,6 @@ limitations under the License.
 #include <CudaAssert.h>
 #include <MathEngineCommon.h>
 #include <MemoryHandleInternal.h>
-#include <MathEngineDeviceStackAllocator.h>
-#include <MathEngineHostStackAllocator.h>
 #include <math.h>
 #include <float.h>
 #include <cuda_runtime.h>

NeoMathEngine/src/GPU/Metal/MetalMathEngine.mm

@@ -26,7 +26,6 @@
 @import std.vector;
 
 #include <MemoryPool.h>
-#include <MathEngineDeviceStackAllocator.h>
 
 @import Foundation;
 @import MetalKit;

NeoMathEngine/src/GPU/Vulkan/VulkanMathEngine.cpp

@@ -24,8 +24,6 @@ limitations under the License.
 #include <DllLoader.h>
 #include <VulkanMathEngine.h>
 #include <MathEngineCommon.h>
-#include <MathEngineDeviceStackAllocator.h>
-#include <MathEngineHostStackAllocator.h>
 #include <MemoryHandleInternal.h>
 #include <VulkanDll.h>
 #include <VulkanCommandQueue.h>