<div dir="auto"><div> <div class="gmail_quote"><div dir="ltr">On Wed, Jan 9, 2019, 2:37 PM Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">A simple Vulkan extension that allows apps to query size and usage of all exposed memory heaps. The different usage values are not really accurate because they are per drm-fd, but they should be close enough. v3: - use atomic operations in the winsys v2: - add software counters for the different heaps in the winsys Â Â - improve budget/usage computations based on these counters Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank" rel="noreferrer">samuel.pitoiset@gmail.com</a>> --- Â src/amd/vulkan/radv_device.cÂ Â Â Â Â Â Â Â Â | 72 +++++++++++++++++++ Â src/amd/vulkan/radv_extensions.pyÂ Â Â Â Â Â Â |Â 1 + Â src/amd/vulkan/radv_radeon_winsys.hÂ Â Â Â Â Â |Â 4 ++ Â src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 38 +++++++++- Â .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.c |Â 6 ++ Â .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.h |Â 4 ++ Â 6 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 279917f3e0c..4bf36f9f384 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1350,12 +1350,84 @@ void radv_GetPhysicalDeviceMemoryProperties( Â Â Â Â *pMemoryProperties = physical_device->memory_properties; Â } +static void +radv_get_memory_budget_properties(VkPhysicalDevice physicalDevice, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkPhysicalDeviceMemoryBudgetPropertiesEXT *memoryBudget) +{ +Â Â Â Â RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); +Â Â Â Â VkPhysicalDeviceMemoryProperties *memory_properties = &device->memory_properties; +Â Â Â Â uint64_t visible_vram_size = radv_get_visible_vram_size(device); +Â Â Â Â uint64_t vram_size = radv_get_vram_size(device); +Â Â Â Â uint64_t gtt_size = device->rad_info.gart_size; +Â Â Â Â uint64_t heap_budget, heap_usage; + +Â Â Â Â /* For all memory heaps, the computation of budget is as follow: +Â Â Â Â *Â Â Â heap_budget = heap_size - global_heap_usage + app_heap_usage +Â Â Â Â * +Â Â Â Â * The Vulkan spec 1.1.97 says that the budget should include any +Â Â Â Â * currently allocated device memory. +Â Â Â Â * +Â Â Â Â * Note that the application heap usages are not really accurate (eg. +Â Â Â Â * in presence of shared buffers). +Â Â Â Â */ +Â Â Â Â if (vram_size) { +Â Â Â Â Â Â Â Â heap_usage = device->ws->query_value(device->ws, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â RADEON_ALLOCATED_VRAM); + +Â Â Â Â Â Â Â Â heap_budget = vram_size - +Â Â Â Â Â Â Â Â Â Â Â Â device->ws->query_value(device->ws, RADEON_VRAM_USAGE) + +Â Â Â Â Â Â Â Â Â Â Â Â heap_usage; + +Â Â Â Â Â Â Â Â memoryBudget->heapBudget[RADV_MEM_HEAP_VRAM] = heap_budget; +Â Â Â Â Â Â Â Â memoryBudget->heapUsage[RADV_MEM_HEAP_VRAM] = heap_usage; +Â Â Â Â } + +Â Â Â Â if (visible_vram_size) { +Â Â Â Â Â Â Â Â heap_usage = device->ws->query_value(device->ws, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â RADEON_ALLOCATED_VRAM_VIS); + +Â Â Â Â Â Â Â Â heap_budget = visible_vram_size - +Â Â Â Â Â Â Â Â Â Â Â Â device->ws->query_value(device->ws, RADEON_VRAM_VIS_USAGE) + +Â Â Â Â Â Â Â Â Â Â Â Â heap_usage; + +Â Â Â Â Â Â Â Â memoryBudget->heapBudget[RADV_MEM_HEAP_VRAM_CPU_ACCESS] = heap_budget; +Â Â Â Â Â Â Â Â memoryBudget->heapUsage[RADV_MEM_HEAP_VRAM_CPU_ACCESS] = heap_usage; +Â Â Â Â } + +Â Â Â Â if (gtt_size) { +Â Â Â Â Â Â Â Â heap_usage = device->ws->query_value(device->ws, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â RADEON_ALLOCATED_GTT); + +Â Â Â Â Â Â Â Â heap_budget = gtt_size - +Â Â Â Â Â Â Â Â Â Â Â Â device->ws->query_value(device->ws, RADEON_GTT_USAGE) + +Â Â Â Â Â Â Â Â Â Â Â Â heap_usage; + +Â Â Â Â Â Â Â Â memoryBudget->heapBudget[RADV_MEM_HEAP_GTT] = heap_budget; +Â Â Â Â Â Â Â Â memoryBudget->heapUsage[RADV_MEM_HEAP_GTT] = heap_usage; +Â Â Â Â } + +Â Â Â Â /* The heapBudget and heapUsage values must be zero for array elements +Â Â Â Â * greater than or equal to +Â Â Â Â * VkPhysicalDeviceMemoryProperties::memoryHeapCount. +Â Â Â Â */ +Â Â Â Â for (uint32_t i = memory_properties->memoryHeapCount; i < VK_MAX_MEMORY_HEAPS; i++) { +Â Â Â Â Â Â Â Â memoryBudget->heapBudget[i] = 0; +Â Â Â Â Â Â Â Â memoryBudget->heapUsage[i] = 0; +Â Â Â Â } +} + Â void radv_GetPhysicalDeviceMemoryProperties2( Â Â Â Â VkPhysicalDeviceÂ Â Â Â Â Â Â Â Â Â Â Â Â Â physicalDevice, Â Â Â Â VkPhysicalDeviceMemoryProperties2Â Â Â Â Â *pMemoryProperties) Â { Â Â Â Â radv_GetPhysicalDeviceMemoryProperties(physicalDevice, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pMemoryProperties->memoryProperties); + +Â Â Â Â VkPhysicalDeviceMemoryBudgetPropertiesEXT *memory_budget = +Â Â Â Â Â Â Â Â vk_find_struct(pMemoryProperties->pNext, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT); +Â Â Â Â if (memory_budget) +Â Â Â Â Â Â Â Â radv_get_memory_budget_properties(physicalDevice, memory_budget); Â } Â VkResult radv_GetMemoryHostPointerPropertiesEXT( diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 9952bb9c1c6..491ed9d94c3 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -105,6 +105,7 @@ EXTENSIONS = [ Â Â Â Extension('VK_EXT_external_memory_dma_buf',Â Â Â Â Â Â 1, True), Â Â Â Extension('VK_EXT_external_memory_host',Â Â Â Â Â Â Â 1, 'device->rad_info.has_userptr'), Â Â Â Extension('VK_EXT_global_priority',Â Â Â Â Â Â Â Â Â Â 1, 'device->rad_info.has_ctx_priority'), +Â Â Extension('VK_EXT_memory_budget',Â Â Â Â Â Â Â Â Â Â Â 1, True), Â Â Â Extension('VK_EXT_pci_bus_info',Â Â Â Â Â Â Â Â Â Â Â 2, True), Â Â Â Extension('VK_EXT_sampler_filter_minmax',Â Â Â Â Â Â Â 1, 'device->rad_info.chip_class >= CIK'), Â Â Â Extension('VK_EXT_scalar_block_layout',Â Â Â Â Â Â Â Â 1, 'device->rad_info.chip_class >= CIK'), diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index e9d541ab150..d9b46d89cf3 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -84,6 +84,9 @@ enum radeon_ctx_priority { Â }; Â enum radeon_value_id { +Â Â Â Â RADEON_ALLOCATED_VRAM, +Â Â Â Â RADEON_ALLOCATED_VRAM_VIS, +Â Â Â Â RADEON_ALLOCATED_GTT, Â Â Â Â RADEON_TIMESTAMP, Â Â Â Â RADEON_NUM_BYTES_MOVED, Â Â Â Â RADEON_NUM_EVICTIONS, @@ -164,6 +167,7 @@ struct radeon_winsys_fence; Â struct radeon_winsys_bo { Â Â Â Â uint64_t va; Â Â Â Â bool is_local; +Â Â Â Â bool vram_cpu_access; Â }; Â struct radv_winsys_sem_counts { Â Â Â Â uint32_t syncobj_count; diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c index a9bd55eac8f..7194d5a3236 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c @@ -249,6 +249,7 @@ radv_amdgpu_winsys_bo_virtual_bind(struct radeon_winsys_bo *_parent, Â static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo) Â { Â Â Â Â struct radv_amdgpu_winsys_bo *bo = radv_amdgpu_winsys_bo(_bo); +Â Â Â Â struct radv_amdgpu_winsys *ws = bo->ws; Â Â Â Â if (p_atomic_dec_return(&bo->ref_count)) Â Â Â Â Â Â Â Â return; @@ -269,6 +270,17 @@ static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo) Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, AMDGPU_VA_OP_UNMAP); Â Â Â Â Â Â Â Â amdgpu_bo_free(bo->bo); Â Â Â Â } + +Â Â Â Â if (bo->initial_domain & RADEON_DOMAIN_VRAM) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_vram, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â -align64(bo->size, ws->info.gart_page_size)); +Â Â Â Â if (bo->base.vram_cpu_access) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_vram_vis, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â -align64(bo->size, ws->info.gart_page_size)); +Â Â Â Â if (bo->initial_domain & RADEON_DOMAIN_GTT) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_gtt, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â -align64(bo->size, ws->info.gart_page_size)); </blockquote></div></div><div dir="auto"> </div><div dir="auto">Isn't bo_size page aligned already? Saves some align operations. Otherwise rb for the series</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + Â Â Â Â amdgpu_va_range_free(bo->va_handle); Â Â Â Â FREE(bo); Â } @@ -344,8 +356,10 @@ radv_amdgpu_winsys_bo_create(struct radeon_winsys *_ws, Â Â Â Â if (initial_domain & RADEON_DOMAIN_GTT) Â Â Â Â Â Â Â Â request.preferred_heap |= AMDGPU_GEM_DOMAIN_GTT; -Â Â Â Â if (flags & RADEON_FLAG_CPU_ACCESS) +Â Â Â Â if (flags & RADEON_FLAG_CPU_ACCESS) { +Â Â Â Â Â Â Â Â bo->base.vram_cpu_access = initial_domain & RADEON_DOMAIN_VRAM; Â Â Â Â Â Â Â Â request.flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED; +Â Â Â Â } Â Â Â Â if (flags & RADEON_FLAG_NO_CPU_ACCESS) Â Â Â Â Â Â Â Â request.flags |= AMDGPU_GEM_CREATE_NO_CPU_ACCESS; Â Â Â Â if (flags & RADEON_FLAG_GTT_WC) @@ -378,6 +392,17 @@ radv_amdgpu_winsys_bo_create(struct radeon_winsys *_ws, Â Â Â Â bo->bo = buf_handle; Â Â Â Â bo->initial_domain = initial_domain; Â Â Â Â bo->is_shared = false; + +Â Â Â Â if (initial_domain & RADEON_DOMAIN_VRAM) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_vram, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); +Â Â Â Â if (bo->base.vram_cpu_access) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_vram_vis, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); +Â Â Â Â if (initial_domain & RADEON_DOMAIN_GTT) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_gtt, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); + Â Â Â Â radv_amdgpu_add_buffer_to_global_list(bo); Â Â Â Â return (struct radeon_winsys_bo *)bo; Â error_va_map: @@ -474,6 +499,9 @@ radv_amdgpu_winsys_bo_from_ptr(struct radeon_winsys *_ws, Â Â Â Â bo->bo = buf_handle; Â Â Â Â bo->initial_domain = RADEON_DOMAIN_GTT; +Â Â Â Â p_atomic_add(&ws->allocated_gtt, +Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); + Â Â Â Â radv_amdgpu_add_buffer_to_global_list(bo); Â Â Â Â return (struct radeon_winsys_bo *)bo; @@ -538,6 +566,14 @@ radv_amdgpu_winsys_bo_from_fd(struct radeon_winsys *_ws, Â Â Â Â bo->is_shared = true; Â Â Â Â bo->ws = ws; Â Â Â Â bo->ref_count = 1; + +Â Â Â Â if (bo->initial_domain & RADEON_DOMAIN_VRAM) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_vram, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); +Â Â Â Â if (bo->initial_domain & RADEON_DOMAIN_GTT) +Â Â Â Â Â Â Â Â p_atomic_add(&ws->allocated_gtt, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â align64(bo->size, ws->info.gart_page_size)); + Â Â Â Â radv_amdgpu_add_buffer_to_global_list(bo); Â Â Â Â return (struct radeon_winsys_bo *)bo; Â error_va_map: diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index 9706c04e8cd..d3a57f6b4f3 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -72,6 +72,12 @@ static uint64_t radv_amdgpu_winsys_query_value(struct radeon_winsys *rws, Â Â Â Â uint64_t retval = 0; Â Â Â Â switch (value) { +Â Â Â Â case RADEON_ALLOCATED_VRAM: +Â Â Â Â Â Â Â Â return ws->allocated_vram; +Â Â Â Â case RADEON_ALLOCATED_VRAM_VIS: +Â Â Â Â Â Â Â Â return ws->allocated_vram_vis; +Â Â Â Â case RADEON_ALLOCATED_GTT: +Â Â Â Â Â Â Â Â return ws->allocated_gtt; Â Â Â Â case RADEON_TIMESTAMP: Â Â Â Â Â Â Â Â amdgpu_query_info(ws->dev, AMDGPU_INFO_TIMESTAMP, 8, &retval); Â Â Â Â Â Â Â Â return retval; diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h index 80a1c6f2926..edec0a1ed78 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -52,6 +52,10 @@ struct radv_amdgpu_winsys { Â Â Â Â pthread_mutex_t global_bo_list_lock; Â Â Â Â struct list_head global_bo_list; + +Â Â Â Â uint64_t allocated_vram; +Â Â Â Â uint64_t allocated_vram_vis; +Â Â Â Â uint64_t allocated_gtt; Â }; Â static inline struct radv_amdgpu_winsys * -- 2.20.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div></div></div>