From 1b2f5fbce1a07a638b4766598746978cddda5259 Mon Sep 17 00:00:00 2001 From: Anusha Godavarthy Surya Date: Mon, 4 Jul 2022 11:50:33 -0700 Subject: [PATCH] SWDEV-299940 - Query global memory available on device with HSA attribute HSA_AMD_AGENT_INFO_MEMORY_AVAIL Change-Id: Ifcfb95f59d110b3b037a7131be21d5348601d2e2 [ROCm/clr commit: 73021582d341385db124c48267adde914b0aebe4] --- projects/clr/rocclr/device/rocm/rocdevice.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/device/rocm/rocdevice.cpp b/projects/clr/rocclr/device/rocm/rocdevice.cpp index 0b8e7f9930..6d0427ee08 100644 --- a/projects/clr/rocclr/device/rocm/rocdevice.cpp +++ b/projects/clr/rocclr/device/rocm/rocdevice.cpp @@ -1665,10 +1665,23 @@ device::VirtualDevice* Device::createVirtualDevice(amd::CommandQueue* queue) { bool Device::globalFreeMemory(size_t* freeMemory) const { const uint TotalFreeMemory = 0; const uint LargestFreeBlock = 1; + uint64_t globalAvailMemory; + // Queries memory available in bytes across all global pools owned by the agent + if (HSA_STATUS_SUCCESS != + hsa_agent_get_info(bkendDevice_, + static_cast(HSA_AMD_AGENT_INFO_MEMORY_AVAIL), + &globalAvailMemory)) { + LogError("HSA_AMD_AGENT_INFO_MEMORY_AVAIL query failed."); + } - freeMemory[TotalFreeMemory] = freeMem_ / Ki; - freeMemory[TotalFreeMemory] -= (freeMemory[TotalFreeMemory] > HIP_HIDDEN_FREE_MEM * Ki) ? - HIP_HIDDEN_FREE_MEM * Ki : 0; + globalAvailMemory = globalAvailMemory / Ki; + if (globalAvailMemory > HIP_HIDDEN_FREE_MEM * Ki) { + globalAvailMemory -= HIP_HIDDEN_FREE_MEM * Ki; + } else { + globalAvailMemory = 0; + } + + freeMemory[TotalFreeMemory] = globalAvailMemory; // since there is no memory heap on ROCm, the biggest free block is // equal to total free local memory freeMemory[LargestFreeBlock] = freeMemory[TotalFreeMemory];