Mesa (master): aco: fix printing ASM on GFX6-7 if clrxdisasm is not found

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jun 19 16:11:07 2020 +0200

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 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5560>

---

 src/amd/compiler/aco_print_asm.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);