From bb7750a946fb2b112925888a9084f37509fa61d7 Mon Sep 17 00:00:00 2001 From: "Jayaprakash, Karthik" Date: Mon, 19 May 2025 05:49:16 -0400 Subject: [PATCH] Revert "SWDEV-522707 - Set phys_mem_handle type to sizeof(size_t) to avoid blocking address range. (#105)" (#348) This reverts commit 6811fd90b88eb3a7ff5fba77191bfb94249e57e3. --- rocclr/device/rocm/rocmemory.cpp | 4 ---- rocclr/platform/memory.hpp | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/rocclr/device/rocm/rocmemory.cpp b/rocclr/device/rocm/rocmemory.cpp index a886446042..bee2110c43 100644 --- a/rocclr/device/rocm/rocmemory.cpp +++ b/rocclr/device/rocm/rocmemory.cpp @@ -788,10 +788,6 @@ bool Buffer::create(bool alloc_local) { return false; } - // Update the size of memory object to size of handle, since the setting the size to the actual - // physical memory allocated would block the address range during amd::MemObjMap::FindMemObj() - // lookup. This might cause address range issue in virtual address space. - owner()->UpdatePhysMemSize(); owner()->setSvmPtr(reinterpret_cast(owner()->getUserData().hsa_handle)); return true; diff --git a/rocclr/platform/memory.hpp b/rocclr/platform/memory.hpp index d0ca853c98..214090f048 100644 --- a/rocclr/platform/memory.hpp +++ b/rocclr/platform/memory.hpp @@ -254,6 +254,7 @@ class Memory : public amd::RuntimeObject { //! Initializes the device memory array virtual void initDeviceMemory(); + void setSize(size_t size) { size_ = size; } void setInteropObj(InteropObject* obj) { interopObj_ = obj; } @@ -345,13 +346,6 @@ class Memory : public amd::RuntimeObject { Flags getMemFlags() const { return flags_; } Type getType() const { return type_; } - //! Update phys mem size to the handle, only when the ROCCLR_MEM_PHYSMEM flag is set. - void UpdatePhysMemSize() { - if (flags_ & ROCCLR_MEM_PHYMEM) { - size_ = sizeof(getUserData().hsa_handle); - } - } - const Device* getLastWriter() { return lastWriter_; } const HostMemoryReference* getHostMemRef() const { return &hostMemRef_; } void* getHostMem() const { return hostMemRef_.hostMem(); }