From abc4111d19761d51599330a1b13be718d0255600 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 30 Mar 2023 19:10:19 +0300 Subject: [PATCH] anv: pass steam output as argument for anv_dump_pipe_bits Just if you need to change it at some point ;) Signed-off-by: Lionel Landwerlin Reviewed-by: Felix DeGrood Part-of: --- src/intel/vulkan/anv_private.h | 8 ++++---- src/intel/vulkan/anv_util.c | 32 ++++++++++++++++---------------- src/intel/vulkan/genX_cmd_buffer.c | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 6c8c196..9ac4def 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -4167,7 +4167,7 @@ struct anv_video_session_params { }; void -anv_dump_pipe_bits(enum anv_pipe_bits bits); +anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f); static inline void anv_add_pending_pipe_bits(struct anv_cmd_buffer* cmd_buffer, @@ -4177,9 +4177,9 @@ anv_add_pending_pipe_bits(struct anv_cmd_buffer* cmd_buffer, cmd_buffer->state.pending_pipe_bits |= bits; if (INTEL_DEBUG(DEBUG_PIPE_CONTROL) && bits) { - fputs("pc: add ", stderr); - anv_dump_pipe_bits(bits); - fprintf(stderr, "reason: %s\n", reason); + fputs("pc: add ", stdout); + anv_dump_pipe_bits(bits, stdout); + fprintf(stdout, "reason: %s\n", reason); } } diff --git a/src/intel/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c index 9880102..cc3ba475 100644 --- a/src/intel/vulkan/anv_util.c +++ b/src/intel/vulkan/anv_util.c @@ -57,36 +57,36 @@ __anv_perf_warn(struct anv_device *device, } void -anv_dump_pipe_bits(enum anv_pipe_bits bits) +anv_dump_pipe_bits(enum anv_pipe_bits bits, FILE *f) { if (bits & ANV_PIPE_DEPTH_CACHE_FLUSH_BIT) - fputs("+depth_flush ", stderr); + fputs("+depth_flush ", f); if (bits & ANV_PIPE_DATA_CACHE_FLUSH_BIT) - fputs("+dc_flush ", stderr); + fputs("+dc_flush ", f); if (bits & ANV_PIPE_HDC_PIPELINE_FLUSH_BIT) - fputs("+hdc_flush ", stderr); + fputs("+hdc_flush ", f); if (bits & ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT) - fputs("+rt_flush ", stderr); + fputs("+rt_flush ", f); if (bits & ANV_PIPE_TILE_CACHE_FLUSH_BIT) - fputs("+tile_flush ", stderr); + fputs("+tile_flush ", f); if (bits & ANV_PIPE_STATE_CACHE_INVALIDATE_BIT) - fputs("+state_inval ", stderr); + fputs("+state_inval ", f); if (bits & ANV_PIPE_CONSTANT_CACHE_INVALIDATE_BIT) - fputs("+const_inval ", stderr); + fputs("+const_inval ", f); if (bits & ANV_PIPE_VF_CACHE_INVALIDATE_BIT) - fputs("+vf_inval ", stderr); + fputs("+vf_inval ", f); if (bits & ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT) - fputs("+tex_inval ", stderr); + fputs("+tex_inval ", f); if (bits & ANV_PIPE_INSTRUCTION_CACHE_INVALIDATE_BIT) - fputs("+ic_inval ", stderr); + fputs("+ic_inval ", f); if (bits & ANV_PIPE_STALL_AT_SCOREBOARD_BIT) - fputs("+pb_stall ", stderr); + fputs("+pb_stall ", f); if (bits & ANV_PIPE_PSS_STALL_SYNC_BIT) - fputs("+pss_stall ", stderr); + fputs("+pss_stall ", f); if (bits & ANV_PIPE_DEPTH_STALL_BIT) - fputs("+depth_stall ", stderr); + fputs("+depth_stall ", f); if (bits & ANV_PIPE_CS_STALL_BIT) - fputs("+cs_stall ", stderr); + fputs("+cs_stall ", f); if (bits & ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT) - fputs("+utdp_flush", stderr); + fputs("+utdp_flush", f); } diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 8dd3d09..684fd42 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -83,9 +83,9 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) { #define anv_debug_dump_pc(pc) \ if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \ - fputs("pc: emit PC=( ", stderr); \ - anv_dump_pipe_bits(convert_pc_to_bits(&(pc))); \ - fprintf(stderr, ") reason: %s\n", __func__); \ + fputs("pc: emit PC=( ", stdout); \ + anv_dump_pipe_bits(convert_pc_to_bits(&(pc)), stdout); \ + fprintf(stdout, ") reason: %s\n", __func__); \ } ALWAYS_INLINE static void -- 2.7.4