mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-09-20 06:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented VmaBlockMetadata_Linear::AddPoolStats.

Browse Source
This commit is contained in:
Adam Sawicki 2018-09-07 15:26:59 +02:00
parent 6540b19ed5
commit 21017c6cbe
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Tests.cpp
View File

@ -4133,6 +4133,10 @@ static void BasicTestBuddyAllocator()
SaveAllocatorStatsToFile(L"BuddyTest01.json");
VmaPoolStats stats = {};
vmaGetPoolStats(g_hAllocator, pool, &stats);
int DBG = 0; // Set breakpoint here to inspect `stats`.
// Destroy the buffers in random order.
while(!bufInfo.empty())
{

15
src/vk_mem_alloc.h
View File

@ -5004,10 +5004,12 @@ private:
struct ValidationContext
{
size_t calculatedAllocationCount;
size_t calculatedFreeCount;
VkDeviceSize calculatedSumFreeSize;
ValidationContext() :
calculatedAllocationCount(0),
calculatedFreeCount(0),
calculatedSumFreeSize(0) { }
};
@ -5049,6 +5051,7 @@ private:
} m_FreeList[MAX_LEVELS];
// Number of nodes in the tree with type == TYPE_ALLOCATION.
size_t m_AllocationCount;
size_t m_FreeCount;
VkDeviceSize m_SumFreeSize;
void DeleteNode(Node* node);
@ -9173,6 +9176,7 @@ void VmaBlockMetadata_Linear::CleanupAfterFree()
VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) :
m_Root(VMA_NULL),
m_AllocationCount(0),
m_FreeCount(1),
m_SumFreeSize(0)
{
memset(m_FreeList, 0, sizeof(m_FreeList));
@ -9265,7 +9269,11 @@ void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
void VmaBlockMetadata_Buddy::AddPoolStats(VmaPoolStats& inoutStats) const
{
// TODO
inoutStats.size += GetSize();
inoutStats.unusedSize += m_SumFreeSize;
inoutStats.allocationCount += m_AllocationCount;
inoutStats.unusedRangeCount += m_FreeCount;
inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());
}
#if VMA_STATS_STRING_ENABLED
@ -9386,6 +9394,7 @@ void VmaBlockMetadata_Buddy::Alloc(
++currLevel;
currNode = m_FreeList[currLevel].front;
++m_FreeCount;
}
// Remove from free list.
@ -9397,6 +9406,7 @@ void VmaBlockMetadata_Buddy::Alloc(
currNode->allocation.alloc = hAllocation;
++m_AllocationCount;
--m_FreeCount;
m_SumFreeSize -= LevelToNodeSize(currLevel);
}
@ -9421,6 +9431,7 @@ bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* pa
case Node::TYPE_FREE:
// curr->free.prev, next are validated separately.
ctx.calculatedSumFreeSize += levelNodeSize;
++ctx.calculatedFreeCount;
break;
case Node::TYPE_ALLOCATION:
++ctx.calculatedAllocationCount;
@ -9504,6 +9515,7 @@ void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offs
VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);
VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc);
++m_FreeCount;
--m_AllocationCount;
m_SumFreeSize += levelSize;
@ -9521,6 +9533,7 @@ void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offs
node = parent;
--level;
--m_FreeCount;
}
AddToFreeListFront(level, node);