From 399fd56d9e9604334a84d443abb7fef51176befa Mon Sep 17 00:00:00 2001 From: Taylor Yeonbok Lee Date: Wed, 1 May 2024 03:01:18 +0900 Subject: [PATCH] cleanup --- .../intel_gpu/include/intel_gpu/runtime/memory_pool.hpp | 5 ++--- src/plugins/intel_gpu/src/runtime/memory_pool.cpp | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/memory_pool.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/memory_pool.hpp index 0a37bdba0a10c5..28bd81ddc6eee5 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/memory_pool.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/memory_pool.hpp @@ -21,11 +21,10 @@ namespace cldnn { struct memory; struct shared_mem_params; class engine; + using primitive_id = std::string; -//struct memory_user; -//struct memory_user_comparer; -//using memory_set = std::set; using memory_ptr = std::shared_ptr; + struct memory_user { size_t _unique_id; uint32_t _network_id; diff --git a/src/plugins/intel_gpu/src/runtime/memory_pool.cpp b/src/plugins/intel_gpu/src/runtime/memory_pool.cpp index 3a5a88cf49b149..6f2551591d5a6e 100644 --- a/src/plugins/intel_gpu/src/runtime/memory_pool.cpp +++ b/src/plugins/intel_gpu/src/runtime/memory_pool.cpp @@ -30,10 +30,10 @@ memory::ptr memory_pool::alloc_memory(const layout& layout, allocation_type type memory_pool::~memory_pool() {} -bool memory_pool::has_conflict(const memory_set& a, +bool memory_pool::has_conflict(const memory_set& mem_cand, const std::unordered_set& restrictions, uint32_t b_network_id) { - for (auto const& mem_usr : a) { + for (const auto& mem_usr : mem_cand) { if (restrictions.find(mem_usr._unique_id) != restrictions.end()) return true; } @@ -114,10 +114,7 @@ memory::ptr memory_pool::get_from_non_padded_pool(const layout& layout, allocation_type type, bool reset) { auto it = _non_padded_pool.lower_bound(layout.bytes_count()); -// std::cout << "Get memory from pool for " << prim_id << " (" << layout.bytes_count() << ")" << std::endl; while (it != _non_padded_pool.end()) { -// std::cout << " --- check mem " << it->second._memory->get_layout().bytes_count() << std::endl; -// std::cout << " # mem deps : " << restrictions.size() << " , # mem users: " << it->second._users.size() << std::endl; if (it->second._network_id == network_id && it->second._type == type && it->second._memory->get_layout().format != format::fs_b_yx_fsv32 &&