radv: call nir_split_var_copies() before nir_lower_var_copies()

[mesa.git] / src / amd / vulkan / radv_debug.c

diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index cdf8e7a11453d377f5523e3df127bac7cec190b2..e55489d71d1ff1acb9cef71fda4aa01440e8ea2e 100644 (file)
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <sys/utsname.h>
 
+#include "util/mesa-sha1.h"
 #include "sid.h"
 #include "gfx9d.h"
 #include "ac_debug.h"
@@ -499,7 +500,13 @@ radv_dump_shader(struct radv_pipeline *pipeline,
        fprintf(f, "%s:\n\n", radv_get_shader_name(shader, stage));
 
        if (shader->spirv) {
-               fprintf(f, "SPIRV:\n");
+               unsigned char sha1[21];
+               char sha1buf[41];
+
+               _mesa_sha1_compute(shader->spirv, shader->spirv_size, sha1);
+               _mesa_sha1_format(sha1buf, sha1);
+
+               fprintf(f, "SPIRV (sha1: %s):\n", sha1buf);
                radv_print_spirv(shader->spirv, shader->spirv_size, f);
        }
 
@@ -508,7 +515,8 @@ radv_dump_shader(struct radv_pipeline *pipeline,
                nir_print_shader(shader->nir, f);
        }
 
-       fprintf(stderr, "DISASM:\n%s\n", shader->disasm_string);
+       fprintf(f, "LLVM IR:\n%s\n", shader->llvm_ir_string);
+       fprintf(f, "DISASM:\n%s\n", shader->disasm_string);
 
        radv_shader_dump_stats(pipeline->device, shader, stage, f);
 }
@@ -593,28 +601,32 @@ radv_dump_dmesg(FILE *f)
        pclose(p);
 }
 
-static void
+void
 radv_dump_enabled_options(struct radv_device *device, FILE *f)
 {
        uint64_t mask;
 
-       fprintf(f, "Enabled debug options: ");
+       if (device->instance->debug_flags) {
+               fprintf(f, "Enabled debug options: ");
 
-       mask = device->instance->debug_flags;
-       while (mask) {
-               int i = u_bit_scan64(&mask);
-               fprintf(f, "%s, ", radv_get_debug_option_name(i));
+               mask = device->instance->debug_flags;
+               while (mask) {
+                       int i = u_bit_scan64(&mask);
+                       fprintf(f, "%s, ", radv_get_debug_option_name(i));
+               }
+               fprintf(f, "\n");
        }
-       fprintf(f, "\n");
 
-       fprintf(f, "Enabled perftest options: ");
+       if (device->instance->perftest_flags) {
+               fprintf(f, "Enabled perftest options: ");
 
-       mask = device->instance->perftest_flags;
-       while (mask) {
-               int i = u_bit_scan64(&mask);
-               fprintf(f, "%s, ", radv_get_perftest_option_name(i));
+               mask = device->instance->perftest_flags;
+               while (mask) {
+                       int i = u_bit_scan64(&mask);
+                       fprintf(f, "%s, ", radv_get_perftest_option_name(i));
+               }
+               fprintf(f, "\n");
        }
-       fprintf(f, "\n");
 }
 
 static void
@@ -631,11 +643,9 @@ radv_dump_device_name(struct radv_device *device, FILE *f)
                snprintf(kernel_version, sizeof(kernel_version),
                         " / %s", uname_data.release);
 
-       if (HAVE_LLVM > 0) {
-               snprintf(llvm_string, sizeof(llvm_string),
-                        ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
-                        HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
-       }
+       snprintf(llvm_string, sizeof(llvm_string),
+                ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
+                HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
 
        fprintf(f, "Device name: %s (%s DRM %i.%i.%i%s%s)\n\n",
                chip_name, device->physical_device->name,