From 0ab2849597dd8ef433b55180de53d6c082637ed1 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 21 Oct 2024 11:48:40 +0300 Subject: [PATCH] anv: move pipe control debug to anv_util.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're going to add more printing. Signed-off-by: Lionel Landwerlin Reviewed-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_private.h | 14 +++++++------- src/intel/vulkan/anv_util.c | 19 +++++++++++++++++++ src/intel/vulkan/genX_cmd_buffer.c | 6 +++--- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 683ec5bc3fe..d5cc0fe4893 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -6257,19 +6257,19 @@ struct anv_video_session_params { void anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f); +void +anv_cmd_buffer_pending_pipe_debug(struct anv_cmd_buffer *cmd_buffer, + enum anv_pipe_bits bits, + const char* reason); + static inline void anv_add_pending_pipe_bits(struct anv_cmd_buffer* cmd_buffer, enum anv_pipe_bits bits, const char* reason) { cmd_buffer->state.pending_pipe_bits |= bits; - if (INTEL_DEBUG(DEBUG_PIPE_CONTROL) && bits) { - fputs("pc: add ", stdout); - anv_dump_pipe_bits(bits, stdout); - fprintf(stdout, "reason: %s\n", reason); - } - if (cmd_buffer->batch.pc_reasons_count < ARRAY_SIZE(cmd_buffer->batch.pc_reasons)) { - cmd_buffer->batch.pc_reasons[cmd_buffer->batch.pc_reasons_count++] = reason; + if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { + anv_cmd_buffer_pending_pipe_debug(cmd_buffer, bits, reason); } } diff --git a/src/intel/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c index 1003c8a5906..c51ba4960fd 100644 --- a/src/intel/vulkan/anv_util.c +++ b/src/intel/vulkan/anv_util.c @@ -56,6 +56,25 @@ __anv_perf_warn(struct anv_device *device, } } +void +anv_cmd_buffer_pending_pipe_debug(struct anv_cmd_buffer *cmd_buffer, + enum anv_pipe_bits bits, + const char* reason) +{ + if (bits == 0) + return; + + fprintf(stdout, "acc: "); + + fprintf(stdout, "bits: "); + anv_dump_pipe_bits(bits, stdout); + fprintf(stdout, "reason: %s", reason); + + if (cmd_buffer->batch.pc_reasons_count < ARRAY_SIZE(cmd_buffer->batch.pc_reasons)) + cmd_buffer->batch.pc_reasons[cmd_buffer->batch.pc_reasons_count++] = reason; + fprintf(stdout, "\n"); +} + void anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f) { diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 311b4a7fb16..22658838281 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -73,7 +73,7 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) { #define anv_debug_dump_pc(pc, reason) \ if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \ - fputs("pc: emit PC=( ", stdout); \ + fputs("pc : emit PC=( ", stdout); \ anv_dump_pipe_bits(convert_pc_to_bits(&(pc)), stdout); \ fprintf(stdout, ") reason: %s\n", reason); \ } @@ -1701,9 +1701,9 @@ genX(emit_apply_pipe_flushes)(struct anv_batch *batch, bits &= ~ANV_PIPE_NEEDS_END_OF_PIPE_SYNC_BIT; if (INTEL_DEBUG(DEBUG_PIPE_CONTROL) && bits) { - fputs("pc: add ", stderr); + fputs("acc: add ", stdout); anv_dump_pipe_bits(ANV_PIPE_END_OF_PIPE_SYNC_BIT, stdout); - fprintf(stderr, "reason: Ensure flushes done before invalidate\n"); + fprintf(stdout, "reason: Ensure flushes done before invalidate\n"); } }