Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!28507 Add persist pool in kernel by kernel mode 

Merge pull request !28507 from laiyongqiang/persist_pool
This commit is contained in:
i-robot 2022-01-05 02:55:04 +00:00 committed by Gitee
parent b0c4a2fee8 6fcfb19d6b
commit 0bbab01a0f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc
View File

@ -131,11 +131,11 @@ size_t DynamicMemPoolBestFit::MemAllocUnitSize(bool from_persistent_mem) const {
return from_persistent_mem ? persistent_mem_->unit_size_ : common_mem_->unit_size_;
}
void DynamicMemPoolBestFit::SetMemAllocUintSize(size_t size) {
persistent_mem_->unit_size_ = DYNAMIC_MEM_ALLOC_UNIT_SIZE;
common_mem_->unit_size_ = size;
config_unit_size_ = size;
MS_LOG(INFO) << "Set mem alloc unit size " << size;
void DynamicMemPoolBestFit::SetMemAllocUintSize(size_t common_size, size_t persist_size) {
persistent_mem_->unit_size_ = persist_size;
common_mem_->unit_size_ = common_size;
config_unit_size_ = common_size;
MS_LOG(INFO) << "Set mem alloc unit size, common " << common_size << " persistent " << persist_size;
}
void DynamicMemPoolBestFit::SetMemPoolBlockSize(size_t available_device_mem_size) {

2
mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.h
View File

@ -120,7 +120,7 @@ class DynamicMemPoolBestFit {
// Get the minimum memory unit size using for dynamic extend.
size_t MemAllocUnitSize(bool from_persistent_mem = false) const;
// Set the minimum memory unit size using for dynamic extend.
void SetMemAllocUintSize(size_t size);
void SetMemAllocUintSize(size_t common_size, size_t persist_size = DYNAMIC_MEM_ALLOC_UNIT_SIZE);
// Set mem pool block size
void SetMemPoolBlockSize(size_t available_device_mem_size);
size_t TotalMemStatistics() const {

42
mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc
View File

@ -24,10 +24,27 @@
namespace mindspore {
namespace device {
namespace ascend {
// The minimum unit size (8MB) of memory block used for dynamic extend in graph mode.
static const size_t ASCEND_DYNAMIC_MEM_ALLOC_UNIT_SIZE_FOR_GRAPH = 8 << 20;
// The minimum unit size (8MB) of memory block used for dynamic extend in graph task sink mode.
static const size_t ASCEND_COMMON_POOL_ALLOC_UNIT_SIZE_FOR_GRAPH = 8 << 20;
constexpr float kCommonMemoryRatio = 0.9667; // 29/30
constexpr float kPersistMemoryRatio = 0.0333; // 1/30
void AscendMemoryPool::Init() { SetMemPoolBlockSize(AscendMemAdapter::GetInstance().GetMsUsedHbmSize()); }
void AscendMemoryPool::Init() {
auto ms_context = MsContext::GetInstance();
MS_EXCEPTION_IF_NULL(ms_context);
const bool pynative_mode = (ms_context->get_param<int>(MS_CTX_EXECUTION_MODE) == kPynativeMode);
const bool task_sink = ms_context->get_param<bool>(MS_CTX_ENABLE_TASK_SINK);
auto total_size = AscendMemAdapter::GetInstance().GetMsUsedHbmSize();
if (pynative_mode) {
SetMemPoolBlockSize(total_size);
} else {
if (task_sink) {
SetMemAllocUintSize(ASCEND_COMMON_POOL_ALLOC_UNIT_SIZE_FOR_GRAPH, ASCEND_COMMON_POOL_ALLOC_UNIT_SIZE_FOR_GRAPH);
} else {
SetMemAllocUintSize(total_size * kCommonMemoryRatio, total_size * kPersistMemoryRatio);
}
}
}
size_t AscendMemoryPool::CalMemBlockAllocSize(size_t size, bool from_persistent_mem) {
auto device_free_mem_size = free_mem_size();
@ -48,23 +65,20 @@ size_t AscendMemoryPool::CalMemBlockAllocSize(size_t size, bool from_persistent_
auto ms_context = MsContext::GetInstance();
MS_EXCEPTION_IF_NULL(ms_context);
const bool pynative_mode = (ms_context->get_param<int>(MS_CTX_EXECUTION_MODE) == kPynativeMode);
const bool task_sink = ms_context->get_param<bool>(MS_CTX_ENABLE_TASK_SINK);
auto alloc_mem_unit_size = MemAllocUnitSize(from_persistent_mem);
MS_LOG(DEBUG) << "Get unit block size " << alloc_mem_unit_size;
alloc_mem_size = alloc_mem_unit_size;
if (pynative_mode) {
alloc_mem_size = MemAllocUnitSize(from_persistent_mem);
// Growing at twice of alloc size
MS_LOG(DEBUG) << "Get unit block size " << alloc_mem_size;
// Growing at twice of alloc unit size
constexpr size_t kDouble = 2;
while (alloc_mem_size < size) {
alloc_mem_size = alloc_mem_size * kDouble;
}
} else if (task_sink) {
// The graph mode controls itself independently
alloc_mem_size = ASCEND_DYNAMIC_MEM_ALLOC_UNIT_SIZE_FOR_GRAPH;
while (alloc_mem_size < size) {
alloc_mem_size = alloc_mem_size + ASCEND_DYNAMIC_MEM_ALLOC_UNIT_SIZE_FOR_GRAPH;
}
} else {
alloc_mem_size = device_free_mem_size;
// Growing at adding alloc unit size
while (alloc_mem_size < size) {
alloc_mem_size = alloc_mem_size + alloc_mem_unit_size;
}
}
alloc_mem_size = std::min(alloc_mem_size, device_free_mem_size);
return alloc_mem_size;