radv: add initial trap handler support with RADV_TRAP_HANDLER=1

[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 68d361f41dd6c12063f4b12aadf61357e3abcb3b..6ce76b77eaaa133c9cb410524032951b795b2f2d 100644 (file)
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -36,6 +36,7 @@
 #include "radv_shader.h"
 
 #define TRACE_BO_SIZE 4096
+#define TMA_BO_SIZE 4096
 
 #define COLOR_RESET    "\033[0m"
 #define COLOR_RED      "\033[31m"
@@ -62,7 +63,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_NO_INTERPROCESS_SHARING,
+                                            RADEON_FLAG_NO_INTERPROCESS_SHARING |
+                                            RADEON_FLAG_ZERO_VRAM,
                                             RADV_BO_PRIORITY_UPLOAD_BUFFER);
        if (!device->trace_bo)
                return false;
@@ -71,8 +73,6 @@ radv_init_trace(struct radv_device *device)
        if (!device->trace_id_ptr)
                return false;
 
-       memset(device->trace_id_ptr, 0, TRACE_BO_SIZE);
-
        ac_vm_fault_occured(device->physical_device->rad_info.chip_class,
                            &device->dmesg_timestamp, NULL);
 
@@ -248,7 +248,7 @@ radv_dump_descriptors(struct radv_device *device, FILE *f)
        fprintf(f, "Descriptors:\n");
        for (i = 0; i < MAX_SETS; i++) {
                struct radv_descriptor_set *set =
-                       (struct radv_descriptor_set *)ptr[i + 3];
+                       *(struct radv_descriptor_set **)(ptr + i + 3);
 
                radv_dump_descriptor_set(device, set, i, f);
        }
@@ -274,6 +274,12 @@ static void si_add_split_disasm(const char *disasm,
                struct radv_shader_inst *inst = &instructions[*num];
                unsigned len = next - disasm;
 
+               if (!memchr(disasm, ';', len)) {
+                       /* Ignore everything that is not an instruction. */
+                       disasm = next + 1;
+                       continue;
+               }
+
                assert(len < ARRAY_SIZE(inst->text));
                memcpy(inst->text, disasm, len);
                inst->text[len] = 0;
@@ -433,7 +439,9 @@ radv_dump_shader(struct radv_pipeline *pipeline,
                fprintf(f, "NIR:\n%s\n", shader->nir_string);
        }
 
-       fprintf(f, "LLVM IR:\n%s\n", shader->ir_string);
+       fprintf(f, "%s IR:\n%s\n",
+               pipeline->device->physical_device->use_llvm ? "LLVM" : "ACO",
+               shader->ir_string);
        fprintf(f, "DISASM:\n%s\n", shader->disasm_string);
 
        radv_shader_dump_stats(pipeline->device, shader, stage, f);
@@ -497,7 +505,7 @@ radv_get_saved_graphics_pipeline(struct radv_device *device)
 {
        uint64_t *ptr = (uint64_t *)device->trace_id_ptr;
 
-       return (struct radv_pipeline *)ptr[1];
+       return *(struct radv_pipeline **)(ptr + 1);
 }
 
 static struct radv_pipeline *
@@ -505,7 +513,7 @@ radv_get_saved_compute_pipeline(struct radv_device *device)
 {
        uint64_t *ptr = (uint64_t *)device->trace_id_ptr;
 
-       return (struct radv_pipeline *)ptr[2];
+       return *(struct radv_pipeline **)(ptr + 2);
 }
 
 static void
@@ -568,8 +576,7 @@ radv_dump_device_name(struct radv_device *device, FILE *f)
                snprintf(kernel_version, sizeof(kernel_version),
                         " / %s", uname_data.release);
 
-       fprintf(f, "Device name: %s (%s DRM %i.%i.%i%s, LLVM "
-               MESA_LLVM_VERSION_STRING ")\n\n",
+       fprintf(f, "Device name: %s (%s / DRM %i.%i.%i%s)\n\n",
                chip_name, device->physical_device->name,
                info->drm_major, info->drm_minor, info->drm_patchlevel,
                kernel_version);
@@ -672,3 +679,58 @@ fail:
        close(fd);
        unlink(path);
 }
+
+bool
+radv_trap_handler_init(struct radv_device *device)
+{
+       struct radeon_winsys *ws = device->ws;
+
+       /* Create the trap handler shader and upload it like other shaders. */
+       device->trap_handler_shader = radv_create_trap_handler_shader(device);
+       if (!device->trap_handler_shader) {
+               fprintf(stderr, "radv: failed to create the trap handler shader.\n");
+               return false;
+       }
+
+       device->tma_bo = ws->buffer_create(ws, TMA_BO_SIZE, 8,
+                                          RADEON_DOMAIN_VRAM,
+                                          RADEON_FLAG_CPU_ACCESS |
+                                          RADEON_FLAG_NO_INTERPROCESS_SHARING |
+                                          RADEON_FLAG_ZERO_VRAM,
+                                          RADV_BO_PRIORITY_SCRATCH);
+       if (!device->tma_bo)
+               return false;
+
+       device->tma_ptr = ws->buffer_map(device->tma_bo);
+       if (!device->tma_ptr)
+               return false;
+
+       /* Upload a buffer descriptor to store various info from the trap. */
+       uint64_t tma_va = radv_buffer_get_va(device->tma_bo) + 16;
+       uint32_t desc[4];
+
+       desc[0] = tma_va;
+       desc[1] = S_008F04_BASE_ADDRESS_HI(tma_va >> 32);
+       desc[2] = TMA_BO_SIZE;
+       desc[3] = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
+                 S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
+                 S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
+                 S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W) |
+                 S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
+
+       memcpy(device->tma_ptr, desc, sizeof(desc));
+
+       return true;
+}
+
+void
+radv_trap_handler_finish(struct radv_device *device)
+{
+       struct radeon_winsys *ws = device->ws;
+
+       if (unlikely(device->trap_handler_shader))
+               radv_shader_variant_destroy(device, device->trap_handler_shader);
+
+       if (unlikely(device->tma_bo))
+               ws->buffer_destroy(device->tma_bo);
+}