From 35a15ca3b295204a2b489aeb09a5e1c31a5ea064 Mon Sep 17 00:00:00 2001 From: "Godavarthy Surya, Anusha" Date: Wed, 19 Mar 2025 21:16:51 +0530 Subject: [PATCH] Revert "SWDEV-492049 - Remove the handle of Phy Mem from Memobj" (#72) This reverts commit dabe311bd8ab4e3c3016e07416db9175e3ee5ac8. [ROCm/clr commit: 2259a8c01ce0399a4c2ac55a953e8df5be9a66fb] --- projects/clr/hipamd/src/hip_graph_internal.hpp | 4 ---- projects/clr/hipamd/src/hip_mempool_impl.cpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/projects/clr/hipamd/src/hip_graph_internal.hpp b/projects/clr/hipamd/src/hip_graph_internal.hpp index 5bbbd521b8..a2fafdb35c 100644 --- a/projects/clr/hipamd/src/hip_graph_internal.hpp +++ b/projects/clr/hipamd/src/hip_graph_internal.hpp @@ -2328,10 +2328,6 @@ class GraphMemAllocNode final : public GraphNode { memory_ = getMemoryObject(dptr, offset); // Retain memory object because command release will release it memory_->retain(); - - // Remove because the entry is not needed in MemObjMap after the memory_ has been saved. - // The Phy mem obj will be saved in virtual memory object during VirtualMapCommand::submit. - amd::MemObjMap::RemoveMemObj(dptr); size_ = aligned_size; // Execute the original mapping command VirtualMapCommand::submit(device); diff --git a/projects/clr/hipamd/src/hip_mempool_impl.cpp b/projects/clr/hipamd/src/hip_mempool_impl.cpp index 62076cf91b..5c180ced08 100644 --- a/projects/clr/hipamd/src/hip_mempool_impl.cpp +++ b/projects/clr/hipamd/src/hip_mempool_impl.cpp @@ -226,8 +226,6 @@ void* MemoryPool::AllocateMemory(size_t size, Stream* stream, void* dptr) { } } else { dev_ptr = memory->getSvmPtr(); - if (!amd::MemObjMap::FindMemObj(dev_ptr)) - amd::MemObjMap::AddMemObj(dev_ptr, memory); } // Place the allocated memory into the busy heap ts.AddSafeStream(stream);