fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/rmv: remove BO size parameter in radv_rmv_log_bo_allocate()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28367>
This commit is contained in:
Samuel Pitoiset 2024-03-25 09:37:05 +01:00
parent c718b19f7b
commit e863880ffb
5 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_buffer.c
View file

@ -107,7 +107,7 @@ radv_create_buffer(struct radv_device *device, const VkBufferCreateInfo *pCreate
radv_destroy_buffer(device, pAllocator, buffer);
return vk_error(device, result);
}
radv_rmv_log_bo_allocate(device, buffer->bo, buffer->vk.size, true);
radv_rmv_log_bo_allocate(device, buffer->bo, true);
}
*pBuffer = radv_buffer_to_handle(buffer);

2
src/amd/vulkan/radv_image.c
View file

@ -1323,7 +1323,7 @@ radv_image_create(VkDevice _device, const struct radv_image_create_info *create_
radv_destroy_image(device, alloc, image);
return vk_error(device, result);
}
radv_rmv_log_bo_allocate(device, image->bindings[0].bo, image->size, true);
radv_rmv_log_bo_allocate(device, image->bindings[0].bo, true);
}
if (device->instance->debug_flags & RADV_DEBUG_IMG) {

2
src/amd/vulkan/radv_private.h
View file

@ -3201,7 +3201,7 @@ void radv_rra_trace_clear_ray_history(VkDevice _device, struct radv_rra_trace_da
void radv_rra_trace_finish(VkDevice vk_device, struct radv_rra_trace_data *data);
void radv_memory_trace_init(struct radv_device *device);
void radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo, uint32_t size, bool is_internal);
void radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo, bool is_internal);
void radv_rmv_log_bo_destroy(struct radv_device *device, struct radeon_winsys_bo *bo);
void radv_rmv_log_heap_create(struct radv_device *device, VkDeviceMemory heap, bool is_internal,
VkMemoryAllocateFlags alloc_flags);

22
src/amd/vulkan/radv_rmv.c
View file

@ -489,7 +489,7 @@ radv_rmv_log_heap_create(struct radv_device *device, VkDeviceMemory heap, bool i
if (!memory->alloc_size)
return;
radv_rmv_log_bo_allocate(device, memory->bo, memory->alloc_size, false);
radv_rmv_log_bo_allocate(device, memory->bo, false);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
struct vk_rmv_resource_create_token token = {0};
@ -507,7 +507,7 @@ radv_rmv_log_heap_create(struct radv_device *device, VkDeviceMemory heap, bool i
}
void
radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo, uint32_t size, bool is_internal)
radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo, bool is_internal)
{
if (!device->vk.memory_trace_data.is_enabled)
return;
@ -518,7 +518,7 @@ radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo
token.is_in_invisible_vram = bo->vram_no_cpu_access && !device->physical_device->rad_info.all_vram_visible;
token.preferred_domains = (enum vk_rmv_kernel_memory_domain)bo->initial_domain;
token.is_driver_internal = is_internal;
token.page_count = DIV_ROUND_UP(size, 4096);
token.page_count = DIV_ROUND_UP(bo->size, 4096);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
vk_rmv_emit_token(&device->vk.memory_trace_data, VK_RMV_TOKEN_TYPE_VIRTUAL_ALLOCATE, &token);
@ -615,7 +615,7 @@ radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool _pool, bo
pool->vk.query_type != VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT)
return;
radv_rmv_log_bo_allocate(device, pool->bo, pool->size, is_internal);
radv_rmv_log_bo_allocate(device, pool->bo, is_internal);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
struct vk_rmv_resource_create_token create_token = {0};
@ -637,11 +637,7 @@ radv_rmv_log_command_buffer_bo_create(struct radv_device *device, struct radeon_
if (!device->vk.memory_trace_data.is_enabled)
return;
/* Only one of executable_size, data_size and scratch_size should be > 0 */
/* TODO: Trace CS BOs for executable data */
uint32_t size = MAX3(executable_size, data_size, scratch_size);
radv_rmv_log_bo_allocate(device, bo, size, true);
radv_rmv_log_bo_allocate(device, bo, true);
uint64_t upload_resource_identifier = (uint64_t)(uintptr_t)bo;
@ -659,7 +655,7 @@ radv_rmv_log_command_buffer_bo_create(struct radv_device *device, struct radeon_
create_token.command_buffer.app_available_scratch_size = scratch_size;
vk_rmv_emit_token(&device->vk.memory_trace_data, VK_RMV_TOKEN_TYPE_RESOURCE_CREATE, &create_token);
log_resource_bind_locked(device, upload_resource_identifier, bo, 0, size);
log_resource_bind_locked(device, upload_resource_identifier, bo, 0, bo->size);
simple_mtx_unlock(&device->vk.memory_trace_data.token_mtx);
vk_rmv_log_cpu_map(&device->vk, bo->va, false);
}
@ -687,7 +683,7 @@ radv_rmv_log_border_color_palette_create(struct radv_device *device, struct rade
if (!device->vk.memory_trace_data.is_enabled)
return;
radv_rmv_log_bo_allocate(device, bo, RADV_BORDER_COLOR_BUFFER_SIZE, true);
radv_rmv_log_bo_allocate(device, bo, true);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
uint32_t resource_id = vk_rmv_get_resource_id_locked(&device->vk, (uint64_t)(uintptr_t)bo);
@ -770,7 +766,7 @@ radv_rmv_log_descriptor_pool_create(struct radv_device *device, const VkDescript
RADV_FROM_HANDLE(radv_descriptor_pool, pool, _pool);
if (pool->bo) {
radv_rmv_log_bo_allocate(device, pool->bo, pool->size, is_internal);
radv_rmv_log_bo_allocate(device, pool->bo, is_internal);
vk_rmv_log_cpu_map(&device->vk, pool->bo->va, false);
}
@ -913,7 +909,7 @@ radv_rmv_log_event_create(struct radv_device *device, VkEvent _event, VkEventCre
RADV_FROM_HANDLE(radv_event, event, _event);
radv_rmv_log_bo_allocate(device, event->bo, 8, is_internal);
radv_rmv_log_bo_allocate(device, event->bo, is_internal);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
struct vk_rmv_resource_create_token create_token = {0};
create_token.is_driver_internal = is_internal;

2
src/amd/vulkan/radv_shader.c
View file

@ -965,7 +965,7 @@ radv_create_shader_arena(struct radv_device *device, struct radv_shader_free_lis
if (result != VK_SUCCESS)
goto fail;
radv_rmv_log_bo_allocate(device, arena->bo, arena_size, true);
radv_rmv_log_bo_allocate(device, arena->bo, true);
list_inithead(&arena->entries);
alloc = alloc_block_obj(device);