From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Fri, 19 Jun 2020 14:11:07 +0000 (+0200)
Subject: aco: fix printing ASM on GFX6-7 if clrxdisasm is not found
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c95d258d1bcde8d29e28aa182050a5da33a74456;p=mesa.git

aco: fix printing ASM on GFX6-7 if clrxdisasm is not found

Fixes some dEQP-VK.pipeline.executable_properties.* which expect
a valid string to be returned.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5560>
---

diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp
index f2b924bffe0..2e6519fe57b 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -69,7 +69,9 @@ void print_asm_gfx6_gfx7(Program *program, std::vector<uint32_t>& binary,
    sprintf(command, "clrxdisasm --gpuType=%s -r %s", gpu_type, path);
 
    p = popen(command, "r");
-   if (p) {
+   if (!p || errno == ENOENT) {
+      out << "clrxdisasm not found\n";
+   } else {
       while (fgets(line, sizeof(line), p))
          out << line;
       pclose(p);