aco,radv/aco: get dissassembly for release builds if requested
authorRhys Perry <pendingchaos02@gmail.com>
Tue, 24 Sep 2019 14:21:06 +0000 (15:21 +0100)
committerRhys Perry <pendingchaos02@gmail.com>
Thu, 26 Sep 2019 10:08:09 +0000 (11:08 +0100)
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/compiler/aco_interface.cpp
src/amd/vulkan/radv_shader.c

index 6adb911e4b396e82050339d289b8e6a5d0ce1fde..5a6556f8fad4141840c72c58dc829801a0eb8fba 100644 (file)
@@ -125,10 +125,7 @@ void aco_compile_shader(unsigned shader_count,
    std::vector<uint32_t> code;
    unsigned exec_size = aco::emit_program(program.get(), code);
 
-   bool get_disasm = options->dump_shader;
-#ifndef NDEBUG
-   get_disasm |= options->record_llvm_ir;
-#endif
+   bool get_disasm = options->dump_shader || options->record_llvm_ir;
 
    size_t size = 0;
 
index c213b83557ad35019ffb1b344ebdca1cdf21b7fd..b9e83c911af79324cd38df65d57032abca377131 100644 (file)
@@ -1092,7 +1092,6 @@ shader_variant_compile(struct radv_device *device,
 {
        enum radeon_family chip_family = device->physical_device->rad_info.family;
        struct radv_shader_binary *binary = NULL;
-       bool init_llvm;
 
        options->family = chip_family;
        options->chip_class = device->physical_device->rad_info.chip_class;
@@ -1116,11 +1115,7 @@ shader_variant_compile(struct radv_device *device,
        else
                options->wave_size = device->physical_device->ge_wave_size;
 
-       init_llvm = !use_aco || options->dump_shader;
-#ifndef NDEBUG
-       init_llvm |= options->record_llvm_ir;
-#endif
-       if (init_llvm)
+       if (!use_aco || options->dump_shader || options->record_llvm_ir)
                ac_init_llvm_once();
 
        if (use_aco) {