radv: dump LLVM IR when a hang is detected

[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 f6f4dad65ca19c854dff80614c4fe309c8526179..a0d01b2489749ddfee5ba7044901931e55123e8d 100644 (file)
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -61,7 +61,8 @@ radv_init_trace(struct radv_device *device)
 
        device->trace_bo = ws->buffer_create(ws, TRACE_BO_SIZE, 8,
                                             RADEON_DOMAIN_VRAM,
-                                            RADEON_FLAG_CPU_ACCESS);
+                                            RADEON_FLAG_CPU_ACCESS|
+                                            RADEON_FLAG_NO_INTERPROCESS_SHARING);
        if (!device->trace_bo)
                return false;
 
@@ -373,14 +374,13 @@ radv_dump_annotated_shader(struct radv_pipeline *pipeline,
                           struct ac_wave_info *waves, unsigned num_waves,
                           FILE *f)
 {
-       struct radv_device *device = pipeline->device;
        uint64_t start_addr, end_addr;
        unsigned i;
 
        if (!shader)
                return;
 
-       start_addr = device->ws->buffer_get_va(shader->bo) + shader->bo_offset;
+       start_addr = radv_buffer_get_va(shader->bo) + shader->bo_offset;
        end_addr = start_addr + shader->code_size;
 
        /* See if any wave executes the shader. */
@@ -496,8 +496,20 @@ radv_dump_shader(struct radv_pipeline *pipeline,
        if (!shader)
                return;
 
-       fprintf(f, "%s:\n%s\n\n", radv_get_shader_name(shader, stage),
-               shader->disasm_string);
+       fprintf(f, "%s:\n\n", radv_get_shader_name(shader, stage));
+
+       if (shader->spirv) {
+               fprintf(f, "SPIRV:\n");
+               radv_print_spirv(shader->spirv, shader->spirv_size, f);
+       }
+
+       if (shader->nir) {
+               fprintf(f, "NIR:\n");
+               nir_print_shader(shader->nir, f);
+       }
+
+       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);
 }
@@ -582,28 +594,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->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
@@ -695,7 +711,7 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct radeon_winsys_cs *cs)
 }
 
 void
-radv_print_spirv(struct radv_shader_module *module, FILE *fp)
+radv_print_spirv(uint32_t *data, uint32_t size, FILE *fp)
 {
        char path[] = "/tmp/fileXXXXXX";
        char line[2048], command[128];
@@ -707,7 +723,7 @@ radv_print_spirv(struct radv_shader_module *module, FILE *fp)
        if (fd < 0)
                return;
 
-       if (write(fd, module->data, module->size) == -1)
+       if (write(fd, data, size) == -1)
                goto fail;
 
        sprintf(command, "spirv-dis %s", path);