fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Convert DEBUG_PIPE_CONTROL logging to use mesa_log_stream
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Replace direct FILE* operations (fputs/fprintf to stdout) with the
mesa_log_stream API for pipe control debug output.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38157>
This commit is contained in:
Christian Gmeiner 2025-10-30 10:05:30 +01:00 • committed by Marge Bot
parent 0fe0acd4c3
commit aa71c8bfed
3 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/vulkan/anv_private.h
View file

@ -6657,7 +6657,7 @@ anv_image_av1_table_address(const struct anv_image_view *iv,
} }
void void
anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f); anv_dump_pipe_bits(enum anv_pipe_bits bits, struct log_stream *stream);
void void
anv_cmd_buffer_pending_pipe_debug(struct anv_cmd_buffer *cmd_buffer, anv_cmd_buffer_pending_pipe_debug(struct anv_cmd_buffer *cmd_buffer,

50
src/intel/vulkan/anv_util.c
View file

@ -81,55 +81,59 @@ anv_cmd_buffer_pending_pipe_debug(struct anv_cmd_buffer *cmd_buffer,
if (bits == 0) if (bits == 0)
return; return;
fprintf(stdout, "acc: "); struct log_stream *stream = mesa_log_streami();
fprintf(stdout, "bits: "); mesa_log_stream_printf(stream, "acc: ");
anv_dump_pipe_bits(bits, stdout);
fprintf(stdout, "reason: %s", reason); mesa_log_stream_printf(stream, "bits: ");
anv_dump_pipe_bits(bits, stream);
mesa_log_stream_printf(stream, "reason: %s", reason);
if (cmd_buffer->batch.pc_reasons_count < ARRAY_SIZE(cmd_buffer->batch.pc_reasons)) 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; cmd_buffer->batch.pc_reasons[cmd_buffer->batch.pc_reasons_count++] = reason;
fprintf(stdout, "\n"); mesa_log_stream_printf(stream, "\n");
mesa_log_stream_destroy(stream);
} }
void void
anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f) anv_dump_pipe_bits(enum anv_pipe_bits bits, struct log_stream *stream)
{ {
if (bits & ANV_PIPE_DEPTH_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_DEPTH_CACHE_FLUSH_BIT)
fputs("+depth_flush ", f); mesa_log_stream_printf(stream, "+depth_flush ");
if (bits & ANV_PIPE_DATA_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_DATA_CACHE_FLUSH_BIT)
fputs("+dc_flush ", f); mesa_log_stream_printf(stream, "+dc_flush ");
if (bits & ANV_PIPE_HDC_PIPELINE_FLUSH_BIT) if (bits & ANV_PIPE_HDC_PIPELINE_FLUSH_BIT)
fputs("+hdc_flush ", f); mesa_log_stream_printf(stream, "+hdc_flush ");
if (bits & ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT)
fputs("+rt_flush ", f); mesa_log_stream_printf(stream, "+rt_flush ");
if (bits & ANV_PIPE_TILE_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_TILE_CACHE_FLUSH_BIT)
fputs("+tile_flush ", f); mesa_log_stream_printf(stream, "+tile_flush ");
if (bits & ANV_PIPE_L3_FABRIC_FLUSH_BIT) if (bits & ANV_PIPE_L3_FABRIC_FLUSH_BIT)
fputs("+l3_fabric_flush ", f); mesa_log_stream_printf(stream, "+l3_fabric_flush ");
if (bits & ANV_PIPE_STATE_CACHE_INVALIDATE_BIT) if (bits & ANV_PIPE_STATE_CACHE_INVALIDATE_BIT)
fputs("+state_inval ", f); mesa_log_stream_printf(stream, "+state_inval ");
if (bits & ANV_PIPE_CONSTANT_CACHE_INVALIDATE_BIT) if (bits & ANV_PIPE_CONSTANT_CACHE_INVALIDATE_BIT)
fputs("+const_inval ", f); mesa_log_stream_printf(stream, "+const_inval ");
if (bits & ANV_PIPE_VF_CACHE_INVALIDATE_BIT) if (bits & ANV_PIPE_VF_CACHE_INVALIDATE_BIT)
fputs("+vf_inval ", f); mesa_log_stream_printf(stream, "+vf_inval ");
if (bits & ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT) if (bits & ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT)
fputs("+tex_inval ", f); mesa_log_stream_printf(stream, "+tex_inval ");
if (bits & ANV_PIPE_INSTRUCTION_CACHE_INVALIDATE_BIT) if (bits & ANV_PIPE_INSTRUCTION_CACHE_INVALIDATE_BIT)
fputs("+ic_inval ", f); mesa_log_stream_printf(stream, "+ic_inval ");
if (bits & ANV_PIPE_STALL_AT_SCOREBOARD_BIT) if (bits & ANV_PIPE_STALL_AT_SCOREBOARD_BIT)
fputs("+pb_stall ", f); mesa_log_stream_printf(stream, "+pb_stall ");
if (bits & ANV_PIPE_PSS_STALL_SYNC_BIT) if (bits & ANV_PIPE_PSS_STALL_SYNC_BIT)
fputs("+pss_stall ", f); mesa_log_stream_printf(stream, "+pss_stall ");
if (bits & ANV_PIPE_DEPTH_STALL_BIT) if (bits & ANV_PIPE_DEPTH_STALL_BIT)
fputs("+depth_stall ", f); mesa_log_stream_printf(stream, "+depth_stall ");
if (bits & ANV_PIPE_CS_STALL_BIT || if (bits & ANV_PIPE_CS_STALL_BIT ||
bits & ANV_PIPE_END_OF_PIPE_SYNC_BIT) bits & ANV_PIPE_END_OF_PIPE_SYNC_BIT)
fputs("+cs_stall ", f); mesa_log_stream_printf(stream, "+cs_stall ");
if (bits & ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT)
fputs("+utdp_flush ", f); mesa_log_stream_printf(stream, "+utdp_flush ");
if (bits & ANV_PIPE_CCS_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_CCS_CACHE_FLUSH_BIT)
fputs("+ccs_flush ", f); mesa_log_stream_printf(stream, "+ccs_flush ");
} }
const char * const char *

16
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -76,9 +76,11 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) {
#define anv_debug_dump_pc(pc, reason) \ #define anv_debug_dump_pc(pc, reason) \
if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \ if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \
fputs("pc : emit PC=( ", stdout); \ struct log_stream *stream = mesa_log_streami(); \
anv_dump_pipe_bits(convert_pc_to_bits(&(pc)), stdout); \ mesa_log_stream_printf(stream, "pc : emit PC=( "); \
fprintf(stdout, ") reason: %s\n", reason); \ anv_dump_pipe_bits(convert_pc_to_bits(&(pc)), stream); \
mesa_log_stream_printf(stream, ") reason: %s\n", reason); \
mesa_log_stream_destroy(stream); \
} }
static inline void static inline void
@ -1713,9 +1715,11 @@ genX(emit_apply_pipe_flushes)(struct anv_batch *batch,
bits &= ~ANV_PIPE_NEEDS_END_OF_PIPE_SYNC_BIT; bits &= ~ANV_PIPE_NEEDS_END_OF_PIPE_SYNC_BIT;
if (INTEL_DEBUG(DEBUG_PIPE_CONTROL) && bits) { if (INTEL_DEBUG(DEBUG_PIPE_CONTROL) && bits) {
fputs("acc: add ", stdout); struct log_stream *stream = mesa_log_streami();
anv_dump_pipe_bits(ANV_PIPE_END_OF_PIPE_SYNC_BIT, stdout); mesa_log_stream_printf(stream, "acc: add ");
fprintf(stdout, "reason: Ensure flushes done before invalidate\n"); anv_dump_pipe_bits(ANV_PIPE_END_OF_PIPE_SYNC_BIT, stream);
mesa_log_stream_printf(stream, "reason: Ensure flushes done before invalidate\n");
mesa_log_stream_destroy(stream);
} }
} }