Module: Mesa Branch: main Commit: 2c8d101c715cbd36d19c4e78ed6a0d36487844b1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c8d101c715cbd36d19c4e78ed6a0d36487844b1
Author: Daniel Schürmann <[email protected]> Date: Fri Mar 17 00:19:05 2023 +0100 radv: separate radv_capture_shader_executable_info() from radv_shader_create() Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22029> --- src/amd/vulkan/radv_pipeline_cache.c | 2 +- src/amd/vulkan/radv_shader.c | 88 +++++++++++++++++++++++------------- src/amd/vulkan/radv_shader.h | 3 +- 3 files changed, 58 insertions(+), 35 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 9727b3f3e09..89b56c0702b 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -374,7 +374,7 @@ radv_create_shaders_from_pipeline_cache(struct radv_device *device, memcpy(binary, p, entry->binary_sizes[i]); p += entry->binary_sizes[i]; - entry->shaders[i] = radv_shader_create(device, binary, false); + entry->shaders[i] = radv_shader_create(device, binary); free(binary); } else if (entry->binary_sizes[i]) { diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 7e833fc065c..1f68bc845f1 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2375,8 +2375,7 @@ radv_shader_dma_submit(struct radv_device *device, struct radv_shader_dma_submis struct radv_shader * -radv_shader_create(struct radv_device *device, const struct radv_shader_binary *binary, - bool keep_shader_info) +radv_shader_create(struct radv_device *device, const struct radv_shader_binary *binary) { struct radv_shader *shader = calloc(1, sizeof(struct radv_shader)); if (!shader) @@ -2393,7 +2392,6 @@ radv_shader_create(struct radv_device *device, const struct radv_shader_binary * free(shader); return NULL; #else - struct radv_shader_binary_rtld *bin = (struct radv_shader_binary_rtld *)binary; struct ac_rtld_binary rtld_binary = {0}; if (!radv_open_rtld_binary(device, binary, &rtld_binary)) { @@ -2403,23 +2401,6 @@ radv_shader_create(struct radv_device *device, const struct radv_shader_binary * shader->code_size = rtld_binary.rx_size; shader->exec_size = rtld_binary.exec_size; - - if (keep_shader_info || (device->instance->debug_flags & RADV_DEBUG_DUMP_SHADERS)) { - const char *disasm_data; - size_t disasm_size; - if (!ac_rtld_get_section_by_name(&rtld_binary, ".AMDGPU.disasm", &disasm_data, - &disasm_size)) { - radv_shader_unref(device, shader); - ac_rtld_close(&rtld_binary); - return NULL; - } - - shader->ir_string = - bin->llvm_ir_size ? strdup((const char *)(bin->data + bin->elf_size)) : NULL; - shader->disasm_string = malloc(disasm_size + 1); - memcpy(shader->disasm_string, disasm_data, disasm_size); - shader->disasm_string[disasm_size] = 0; - } ac_rtld_close(&rtld_binary); #endif } else { @@ -2427,12 +2408,6 @@ radv_shader_create(struct radv_device *device, const struct radv_shader_binary * shader->code_size = radv_get_shader_binary_size(bin->code_size); shader->exec_size = bin->exec_size; - shader->ir_string = - bin->ir_size ? strdup((const char *)(bin->data + bin->stats_size + bin->code_size)) : NULL; - shader->disasm_string = - bin->disasm_size - ? strdup((const char *)(bin->data + bin->stats_size + bin->code_size + bin->ir_size)) - : NULL; if (bin->stats_size) { shader->statistics = calloc(bin->stats_size, 1); @@ -2649,6 +2624,51 @@ radv_fill_nir_compiler_options(struct radv_nir_compiler_options *options, options->enable_mrt_output_nan_fixup = options->key.ps.epilog.enable_mrt_output_nan_fixup; } +static void +radv_capture_shader_executable_info(struct radv_device *device, struct radv_shader *shader, + struct nir_shader *const *shaders, int shader_count, + const struct radv_shader_binary *binary) +{ + shader->nir_string = radv_dump_nir_shaders(shaders, shader_count); + + if (binary->type == RADV_BINARY_TYPE_RTLD) { +#if !defined(USE_LIBELF) + return; +#else + struct radv_shader_binary_rtld *bin = (struct radv_shader_binary_rtld *)binary; + struct ac_rtld_binary rtld_binary = {0}; + + if (!radv_open_rtld_binary(device, binary, &rtld_binary)) { + return; + } + + const char *disasm_data; + size_t disasm_size; + if (!ac_rtld_get_section_by_name(&rtld_binary, ".AMDGPU.disasm", &disasm_data, + &disasm_size)) { + return; + } + + shader->ir_string = + bin->llvm_ir_size ? strdup((const char *)(bin->data + bin->elf_size)) : NULL; + shader->disasm_string = malloc(disasm_size + 1); + memcpy(shader->disasm_string, disasm_data, disasm_size); + shader->disasm_string[disasm_size] = 0; + + ac_rtld_close(&rtld_binary); +#endif + } else { + struct radv_shader_binary_legacy *bin = (struct radv_shader_binary_legacy *)binary; + + shader->ir_string = + bin->ir_size ? strdup((const char *)(bin->data + bin->stats_size + bin->code_size)) : NULL; + shader->disasm_string = + bin->disasm_size + ? strdup((const char *)(bin->data + bin->stats_size + bin->code_size + bin->ir_size)) + : NULL; + } +} + static struct radv_shader * shader_compile(struct radv_device *device, struct nir_shader *const *shaders, int shader_count, gl_shader_stage stage, const struct radv_shader_info *info, @@ -2694,12 +2714,16 @@ shader_compile(struct radv_device *device, struct nir_shader *const *shaders, in free(binary); return NULL; } - struct radv_shader *shader = radv_shader_create(device, binary, keep_shader_info); + struct radv_shader *shader = radv_shader_create(device, binary); if (!shader) { free(binary); return NULL; } + if (keep_shader_info || options.dump_shader) { + radv_capture_shader_executable_info(device, shader, shaders, shader_count, binary); + } + if (options.dump_shader) { fprintf(stderr, "%s", radv_get_shader_name(info, shaders[0]->info.stage)); for (int i = 1; i < shader_count; ++i) @@ -2708,10 +2732,6 @@ shader_compile(struct radv_device *device, struct nir_shader *const *shaders, in fprintf(stderr, "\ndisasm:\n%s\n", shader->disasm_string); } - if (keep_shader_info) { - shader->nir_string = radv_dump_nir_shaders(shaders, shader_count); - } - *binary_out = binary; return shader; } @@ -2847,10 +2867,14 @@ radv_create_rt_prolog(struct radv_device *device) binary->info = info; radv_postprocess_binary_config(device, binary, &in_args); - prolog = radv_shader_create(device, binary, device->keep_shader_info); + prolog = radv_shader_create(device, binary); if (!prolog) goto fail; + if (device->keep_shader_info || options.dump_shader) { + radv_capture_shader_executable_info(device, prolog, NULL, 0, binary); + } + if (options.dump_shader) { fprintf(stderr, "Raytracing prolog"); fprintf(stderr, "\ndisasm:\n%s\n", prolog->disasm_string); diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index b3b2e5aa9b9..b370436bac3 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -581,8 +581,7 @@ void radv_destroy_shader_upload_queue(struct radv_device *device); struct radv_shader_args; struct radv_shader *radv_shader_create(struct radv_device *device, - const struct radv_shader_binary *binary, - bool keep_shader_info); + const struct radv_shader_binary *binary); struct radv_shader *radv_shader_nir_to_asm( struct radv_device *device, struct radv_pipeline_stage *stage, struct nir_shader *const *shaders, int shader_count, const struct radv_pipeline_key *key, bool keep_shader_info, bool keep_statistic_info,
