fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tu: Add heap_memory_percent driconf support

Browse source 
Also remove the clamping to va_size in the budget calculation
since the heap_size is already clamped to va_size and the budget
is clamped to heap_size.

This also introduces a new tier since the common helper exposes
25% of memory as heap on devices with <=1GiB memory. Previously
50% was being used.

Signed-off-by: Karmjit Mahil <karmjit.mahil@igalia.com>
This commit is contained in:
Karmjit Mahil 2026-04-27 15:46:55 +01:00
parent 57d7ce06b6
commit 9e52b99500
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/freedreno/vulkan/tu_device.cc
View file

@ -19,10 +19,12 @@
#include "util/driconf.h"
#include "util/hex.h"
#include "util/os_misc.h"
#include "util/u_atomic.h"
#include "util/u_debug.h"
#include "util/u_process.h"
#include "vk_android.h"
#include "vk_debug_utils.h"
#include "vk_physical_device.h"
#include "vk_shader_module.h"
#include "vk_util.h"
@ -1832,6 +1834,7 @@ static const driOptionDescription tu_dri_options[] = {
DRI_CONF_SECTION_END
DRI_CONF_SECTION_MISCELLANEOUS
DRI_CONF_HEAP_MEMORY_PERCENT(OS_GPU_HEAP_SIZE_HEURISTIC)
DRI_CONF_DISABLE_CONSERVATIVE_LRZ(false)
DRI_CONF_TU_DONT_RESERVE_DESCRIPTOR_SET(false)
DRI_CONF_TU_ALLOW_OOB_INDIRECT_UBO_LOADS(false)
@ -1857,6 +1860,9 @@ tu_init_dri_options(struct tu_instance *instance)
driQueryOptioni(&instance->dri_options, "force_vk_vendor");
instance->dont_care_as_load =
driQueryOptionb(&instance->dri_options, "vk_dont_care_as_load");
instance->heap_memory_percent =
driQueryOptionf(&instance->dri_options, "heap_memory_percent");
instance->conservative_lrz =
!driQueryOptionb(&instance->dri_options, "disable_conservative_lrz");
instance->reserve_descriptor_set =
@ -2032,19 +2038,10 @@ tu_GetPhysicalDeviceQueueFamilyProperties2(
uint64_t
tu_get_system_heap_size(struct tu_physical_device *physical_device)
{
uint64_t total_ram = 0;
ASSERTED bool has_physical_memory =
os_get_total_physical_memory(&total_ram);
assert(has_physical_memory);
float *percent = &physical_device->instance->heap_memory_percent;
/* We don't want to burn too much ram with the GPU. If the user has 4GiB
* or less, we use at most half. If they have more than 4GiB, we use 3/4.
*/
uint64_t available_ram;
if (total_ram <= 4ull * 1024ull * 1024ull * 1024ull)
available_ram = total_ram / 2;
else
available_ram = total_ram * 3 / 4;
uint64_t available_ram = os_get_gpu_heap_size(*percent, percent);
assert(available_ram);
if (physical_device->va_size)
available_ram = MIN2(available_ram, physical_device->va_size);
@ -2052,25 +2049,23 @@ tu_get_system_heap_size(struct tu_physical_device *physical_device)
return available_ram;
}
static VkDeviceSize
static inline VkDeviceSize
tu_get_budget_memory(struct tu_physical_device *physical_device)
{
uint64_t heap_size = physical_device->heap.size;
uint64_t heap_used = physical_device->heap.used;
uint64_t sys_available;
ASSERTED bool has_available_memory =
os_get_available_system_memory(&sys_available);
assert(has_available_memory);
struct tu_instance *instance = physical_device->instance;
if (physical_device->va_size)
sys_available = MIN2(sys_available, physical_device->va_size);
uint64_t heap_size = physical_device->heap.size;
uint64_t heap_used = p_atomic_read(&physical_device->heap.used);
/*
* Let's not incite the app to starve the system: report at most 90% of
* available system memory.
*/
uint64_t heap_available = sys_available * 9 / 10;
return MIN2(heap_size, heap_used + heap_available);
const float percent = 0.9f;
return vk_physical_device_heap_budget_from_system(&physical_device->vk,
percent, heap_size,
heap_used);
}
VKAPI_ATTR void VKAPI_CALL

1
src/freedreno/vulkan/tu_device.h
View file

@ -189,6 +189,7 @@ struct tu_instance
uint32_t force_vk_vendor;
bool dont_care_as_load;
float heap_memory_percent;
/* Conservative LRZ (default true) invalidates LRZ on draws with
* blend and depth-write enabled, because this can lead to incorrect