OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: dont store disasm string unless keep_shader_info flag set

Browse Source 
This fixes the memory use regression from bug 111107.

Fixes: 726a31df70 ("radv: Add the concept of radv shader binaries.")

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111107
This commit is contained in:
Timothy Arceri
2019-07-17 14:20:55 +10:00
parent 82a2f10529
commit a20a9d0c5e
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/amd/vulkan/radv_shader.c
View File

@@ -1011,18 +1011,20 @@ radv_shader_variant_create(struct radv_device *device,
return NULL; return NULL;
} }
const char *disasm_data; if (device->keep_shader_info) {
size_t disasm_size; const char *disasm_data;
if (!ac_rtld_get_section_by_name(&rtld_binary, ".AMDGPU.disasm", &disasm_data, &disasm_size)) { size_t disasm_size;
radv_shader_variant_destroy(device, variant); if (!ac_rtld_get_section_by_name(&rtld_binary, ".AMDGPU.disasm", &disasm_data, &disasm_size)) {
ac_rtld_close(&rtld_binary); radv_shader_variant_destroy(device, variant);
return NULL; ac_rtld_close(&rtld_binary);
} return NULL;
}
variant->llvm_ir_string = bin->llvm_ir_size ? strdup((const char*)(bin->data + bin->elf_size)) : NULL; variant->llvm_ir_string = bin->llvm_ir_size ? strdup((const char*)(bin->data + bin->elf_size)) : NULL;
variant->disasm_string = malloc(disasm_size + 1); variant->disasm_string = malloc(disasm_size + 1);
memcpy(variant->disasm_string, disasm_data, disasm_size); memcpy(variant->disasm_string, disasm_data, disasm_size);
variant->disasm_string[disasm_size] = 0; variant->disasm_string[disasm_size] = 0;
}
ac_rtld_close(&rtld_binary); ac_rtld_close(&rtld_binary);
} else { } else {