radv: save and dump vertex descriptors during GPU hang detection

It might be useful to know if the VA is valid and if other info
like the stride seems correct.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7753>

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 51b4305..5f6e75a 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -656,6 +656,23 @@ radv_save_pipeline(struct radv_cmd_buffer *cmd_buffer,
        radv_emit_write_data_packet(cmd_buffer, va, 2, data);
 }
 
+static void
+radv_save_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer,
+                            uint64_t vb_ptr)
+{
+       struct radv_device *device = cmd_buffer->device;
+       uint32_t data[2];
+       uint64_t va;
+
+       va = radv_buffer_get_va(device->trace_bo);
+       va += 24;
+
+       data[0] = vb_ptr;
+       data[1] = vb_ptr >> 32;
+
+       radv_emit_write_data_packet(cmd_buffer, va, 2, data);
+}
+
 void radv_set_descriptor_set(struct radv_cmd_buffer *cmd_buffer,
                             VkPipelineBindPoint bind_point,
                             struct radv_descriptor_set *set,
@@ -680,7 +697,7 @@ radv_save_descriptors(struct radv_cmd_buffer *cmd_buffer,
        uint32_t data[MAX_SETS * 2] = {0};
        uint64_t va;
        unsigned i;
-       va = radv_buffer_get_va(device->trace_bo) + 24;
+       va = radv_buffer_get_va(device->trace_bo) + 32;
 
        for_each_bit(i, descriptors_state->valid) {
                struct radv_descriptor_set *set = descriptors_state->sets[i];
@@ -2836,6 +2853,9 @@ radv_flush_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer,
                cmd_buffer->state.vb_va = va;
                cmd_buffer->state.vb_size = count * 16;
                cmd_buffer->state.prefetch_L2_mask |= RADV_PREFETCH_VBO_DESCRIPTORS;
+
+               if (unlikely(cmd_buffer->device->trace_bo))
+                       radv_save_vertex_descriptors(cmd_buffer, (uintptr_t)vb_ptr);
        }
        cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_VERTEX_BUFFER;
 }

diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index e4ed107..56c9a00 100644 (file)
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -53,7 +53,8 @@
  * [1]: secondary trace ID
  * [2-3]: 64-bit GFX ring pipeline pointer
  * [4-5]: 64-bit COMPUTE ring pipeline pointer
- * [6-7]: 64-bit descriptor set #0 pointer
+ * [6-7]: Vertex descriptors pointer
+ * [8-9]: 64-bit descriptor set #0 pointer
  * ...
  * [68-69]: 64-bit descriptor set #31 pointer
  */
@@ -242,7 +243,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 + 4);
 
                radv_dump_descriptor_set(device, set, i, f);
        }
@@ -453,6 +454,31 @@ radv_dump_shaders(struct radv_pipeline *pipeline,
        }
 }
 
+static void
+radv_dump_vertex_descriptors(struct radv_pipeline *pipeline, FILE *f)
+{
+       void *ptr = (uint64_t *)pipeline->device->trace_id_ptr;
+       uint32_t count = pipeline->num_vertex_bindings;
+       uint32_t *vb_ptr = &((uint32_t *)ptr)[3];
+
+       if (!count)
+               return;
+
+       fprintf(f, "Num vertex bindings: %d\n", count);
+       for (uint32_t i = 0; i < count; i++) {
+               uint32_t *desc = &((uint32_t *)vb_ptr)[i * 4];
+               uint64_t va = 0;
+
+               va |= desc[0];
+               va |= (uint64_t)G_008F04_BASE_ADDRESS_HI(desc[1]) << 32;
+
+               fprintf(f, "VBO#%d:\n", i);
+               fprintf(f, "\tVA: 0x%"PRIx64"\n", va);
+               fprintf(f, "\tStride: %d\n", G_008F04_STRIDE(desc[1]));
+               fprintf(f, "\tNum records: %d (0x%x)\n", desc[2], desc[2]);
+       }
+}
+
 static struct radv_pipeline *
 radv_get_saved_pipeline(struct radv_device *device, enum ring_type ring)
 {
@@ -475,6 +501,7 @@ radv_dump_queue_state(struct radv_queue *queue, FILE *f)
                radv_dump_shaders(pipeline, pipeline->active_stages, f);
                if (!(queue->device->instance->debug_flags & RADV_DEBUG_NO_UMR))
                        radv_dump_annotated_shaders(pipeline, pipeline->active_stages, f);
+               radv_dump_vertex_descriptors(pipeline, f);
                radv_dump_descriptors(queue->device, f);
        }
 }