From 7cddbaab2d2ff75ee45243ece98f7f6a7d8fa4b8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 13 Oct 2021 13:05:54 +0200 Subject: [PATCH] aco: do not return an empty string when disassembly is not supported Fixes dEQP-VK.pipeline.executable_properties.* on GFX6-7 when clrxdisasm isn't found. Other generations are also affected if RADV is built without LLVM. Cc: 21.3 mesa-stable Signed-off-by: Samuel Pitoiset Reviewed-by: Tony Wasserka Part-of: (cherry picked from commit aac4e1f8229e7978310ca81312f0ff925e3485b7) --- .pick_status.json | 2 +- src/amd/compiler/aco_interface.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fbddc7a9a90..128a1768aa8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1624,7 +1624,7 @@ "description": "aco: do not return an empty string when disassembly is not supported", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp index 82db67c45cc..d076f9f5031 100644 --- a/src/amd/compiler/aco_interface.cpp +++ b/src/amd/compiler/aco_interface.cpp @@ -213,11 +213,12 @@ aco_compile_shader(unsigned shader_count, struct nir_shader* const* shaders, size += disasm_size; free(data); } else { - fprintf(stderr, "Shader disassembly is not supported in the current configuration" + disasm = "Shader disassembly is not supported in the current configuration" #ifndef LLVM_AVAILABLE - " (LLVM not available)" + " (LLVM not available)" #endif - ".\n"); + ".\n"; + size += disasm.length(); } }