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

radv: Store debug info inside radv_shader

Browse source 
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29298>
This commit is contained in:
Konstantin Seurer 2024-08-25 13:57:16 +02:00 • committed by Marge Bot
parent 54c22656b8
commit aaf65d6219
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/vulkan/radv_pipeline_cache.c
View file

@ -56,6 +56,7 @@ radv_shader_destroy(struct vk_device *_device, struct vk_pipeline_cache_object *
free(shader->disasm_string);
free(shader->ir_string);
free(shader->statistics);
free(shader->debug_info);
vk_pipeline_cache_object_finish(&shader->base);
free(shader);

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

@ -2308,6 +2308,7 @@ struct radv_shader_binary_layout {
void *code;
void *ir;
void *disasm;
void *debug_info;
};
static struct radv_shader_binary_layout
@ -2329,6 +2330,9 @@ radv_shader_binary_get_layout(struct radv_shader_binary_legacy *binary)
layout.disasm = binary->data + offset;
offset += binary->disasm_size;
layout.debug_info = binary->data + offset;
offset += binary->debug_info_size;
return layout;
}
@ -2878,8 +2882,12 @@ radv_aco_build_shader_binary(void **bin, const struct ac_shader_config *config,
const struct ac_shader_debug_info *debug_info, unsigned debug_info_count)
{
struct radv_shader_binary **binary = (struct radv_shader_binary **)bin;
uint32_t debug_info_size = debug_info_count * sizeof(struct ac_shader_debug_info);
size_t size = llvm_ir_size;
size += debug_info_size;
size += disasm_size;
size += stats_size;
@ -2898,6 +2906,7 @@ radv_aco_build_shader_binary(void **bin, const struct ac_shader_config *config,
legacy_binary->code_size = code_dw * sizeof(uint32_t);
legacy_binary->ir_size = llvm_ir_size;
legacy_binary->disasm_size = disasm_size;
legacy_binary->debug_info_size = debug_info_size;
struct radv_shader_binary_layout layout = radv_shader_binary_get_layout(legacy_binary);
@ -2912,6 +2921,9 @@ radv_aco_build_shader_binary(void **bin, const struct ac_shader_config *config,
if (disasm_size)
memcpy(layout.disasm, disasm_str, disasm_size);
if (debug_info_size)
memcpy(layout.debug_info, debug_info, debug_info_size);
*binary = (struct radv_shader_binary *)legacy_binary;
}
@ -2988,6 +3000,10 @@ radv_capture_shader_executable_info(struct radv_device *device, struct radv_shad
shader->ir_string = bin->ir_size ? strdup(layout.ir) : NULL;
shader->disasm_string = bin->disasm_size ? strdup(layout.disasm) : NULL;
shader->debug_info = malloc(bin->debug_info_size);
memcpy(shader->debug_info, layout.debug_info, bin->debug_info_size);
shader->debug_info_count = bin->debug_info_size / sizeof(struct ac_shader_debug_info);
}
}

4
src/amd/vulkan/radv_shader.h
View file

@ -351,7 +351,7 @@ struct radv_shader_binary_legacy {
uint32_t ir_size;
uint32_t disasm_size;
uint32_t stats_size;
uint32_t padding;
uint32_t debug_info_size;
/* data has size of stats_size + code_size + ir_size + disasm_size + 2,
* where the +2 is for 0 of the ir strings. */
@ -451,6 +451,8 @@ struct radv_shader {
char *disasm_string;
char *ir_string;
uint32_t *statistics;
struct ac_shader_debug_info *debug_info;
uint32_t debug_info_count;
};
struct radv_shader_part {