Mesa (master): aco,radv/aco: get dissassembly for release builds if requested

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6613b813278bd8f31b777a33a945fd1ce86ede46
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6613b813278bd8f31b777a33a945fd1ce86ede46

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue Sep 24 15:21:06 2019 +0100

aco,radv/aco: get dissassembly for release builds if requested

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/compiler/aco_interface.cpp | 5 +----
 src/amd/vulkan/radv_shader.c       | 7 +------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index 6adb911e4b3..5a6556f8fad 100644
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -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;
 
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index c213b83557a..b9e83c911af 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -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) {