[Mesa-dev] [PATCH 6/9] radv: store the bound pipeline pointer into the trace BO

[Samuel Pitoiset]

When a GPU hang is detected in radv_gpu_hang_occured() we know
which command buffer is faulty but the bound pipeline might
have been updated during the execution.

The pointer to the radv_pipeline object is emitted just after
the second trace ID, that way it would be easy to dump the
active shaders at the moment of the hang.

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 src/amd/vulkan/radv_cmd_buffer.c | 48 ++++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index cc11f272e8..774879e0fd 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -332,6 +332,19 @@ radv_cmd_buffer_upload_data(struct radv_cmd_buffer 
*cmd_buffer,
        return true;
 }
 
+static void
+radv_emit_write_data_packet(struct radeon_winsys_cs *cs, uint64_t va,
+                           unsigned count, uint32_t *data)
+{
+       radeon_emit(cs, PKT3(PKT3_WRITE_DATA, 2 + count, 0));
+       radeon_emit(cs, S_370_DST_SEL(V_370_MEM_ASYNC) |
+                   S_370_WR_CONFIRM(1) |
+                   S_370_ENGINE_SEL(V_370_ME));
+       radeon_emit(cs, va);
+       radeon_emit(cs, va >> 32);
+       radeon_emit_array(cs, data, count);
+}
+
 void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer *cmd_buffer)
 {
        struct radv_device *device = cmd_buffer->device;
@@ -349,17 +362,36 @@ void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer 
*cmd_buffer)
 
        ++cmd_buffer->state.trace_id;
        device->ws->cs_add_buffer(cs, device->trace_bo, 8);
-       radeon_emit(cs, PKT3(PKT3_WRITE_DATA, 3, 0));
-       radeon_emit(cs, S_370_DST_SEL(V_370_MEM_ASYNC) |
-                   S_370_WR_CONFIRM(1) |
-                   S_370_ENGINE_SEL(V_370_ME));
-       radeon_emit(cs, va);
-       radeon_emit(cs, va >> 32);
-       radeon_emit(cs, cmd_buffer->state.trace_id);
+       radv_emit_write_data_packet(cs, va, 1, &cmd_buffer->state.trace_id);
        radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
        radeon_emit(cs, AC_ENCODE_TRACE_POINT(cmd_buffer->state.trace_id));
 }
 
+static void
+radv_cmd_buffer_bound_pipeline_emit(struct radv_cmd_buffer *cmd_buffer,
+                                   struct radv_pipeline *pipeline)
+{
+       struct radv_device *device = cmd_buffer->device;
+       struct radeon_winsys_cs *cs = cmd_buffer->cs;
+       uint32_t data[2];
+       uint64_t va;
+
+       if (!device->trace_bo)
+               return;
+
+       /* The 64-bit pointer is stored after the second trace ID. */
+       va = device->ws->buffer_get_va(device->trace_bo) + 8;
+
+       MAYBE_UNUSED unsigned cdw_max = radeon_check_space(device->ws,
+                                                          cmd_buffer->cs, 6);
+
+       data[0] = (uintptr_t)pipeline;
+       data[1] = (uintptr_t)pipeline >> 32;
+
+       device->ws->cs_add_buffer(cs, device->trace_bo, 8);
+       radv_emit_write_data_packet(cs, va, 2, data);
+}
+
 static void
 radv_emit_graphics_blend_state(struct radv_cmd_buffer *cmd_buffer,
                               struct radv_pipeline *pipeline)
@@ -2351,6 +2383,8 @@ void radv_CmdBindPipeline(
                assert(!"invalid bind point");
                break;
        }
+
+       radv_cmd_buffer_bound_pipeline_emit(cmd_buffer, pipeline);
 }
 
 void radv_CmdSetViewport(
-- 
2.14.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev