[Mesa-dev] [PATCH 20/23] radeonsi: move si_shader_dump call out of si_shader_binary_read

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_compute.c |  8 +++++---
 src/gallium/drivers/radeonsi/si_shader.c  | 21 +++++++++------------
 src/gallium/drivers/radeonsi/si_shader.h  | 12 +++++++-----
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 3562bd8..ffa941b 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -138,9 +138,11 @@ static void *si_create_compute_state(
 	 * the shader code to the GPU.
 	 */
 	init_scratch_buffer(sctx, program);
-	si_shader_binary_read(sctx->screen, &program->shader.binary,
-			      &program->shader.config, &sctx->b.debug,
-			      TGSI_PROCESSOR_COMPUTE);
+	si_shader_binary_read(&program->shader.binary,
+			      &program->shader.config);
+	si_shader_dump(sctx->screen, &program->shader.binary,
+		       &program->shader.config, &sctx->b.debug,
+		       TGSI_PROCESSOR_COMPUTE);
 	si_shader_binary_upload(sctx->screen, &program->shader);
 
 #endif
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 95cdf8a..1f334af 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3873,11 +3873,11 @@ static void si_shader_dump_stats(struct si_screen *sscreen,
 			   conf->lds_size, conf->scratch_bytes_per_wave);
 }
 
-static void si_shader_dump(struct si_screen *sscreen,
-			   struct radeon_shader_binary *binary,
-			   struct si_shader_config *conf,
-			   struct pipe_debug_callback *debug,
-			   unsigned processor)
+void si_shader_dump(struct si_screen *sscreen,
+		    struct radeon_shader_binary *binary,
+		    struct si_shader_config *conf,
+		    struct pipe_debug_callback *debug,
+		    unsigned processor)
 {
 	if (r600_can_dump_shader(&sscreen->b, processor))
 		if (!(sscreen->b.debug_flags & DBG_NO_ASM))
@@ -3886,14 +3886,10 @@ static void si_shader_dump(struct si_screen *sscreen,
 	si_shader_dump_stats(sscreen, conf, binary->code_size, debug, processor);
 }
 
-void si_shader_binary_read(struct si_screen *sscreen,
-			   struct radeon_shader_binary *binary,
-			   struct si_shader_config *conf,
-			   struct pipe_debug_callback *debug,
-			   unsigned processor)
+void si_shader_binary_read(struct radeon_shader_binary *binary,
+			   struct si_shader_config *conf)
 {
 	si_shader_binary_read_config(binary, conf, 0);
-	si_shader_dump(sscreen, binary, conf, debug, processor);
 }
 
 int si_compile_llvm(struct si_screen *sscreen,
@@ -3922,7 +3918,8 @@ int si_compile_llvm(struct si_screen *sscreen,
 			return r;
 	}
 
-	si_shader_binary_read(sscreen, binary, conf, debug, processor);
+	si_shader_binary_read(binary, conf);
+	si_shader_dump(sscreen, binary, conf, debug, processor);
 
 	FREE(binary->config);
 	FREE(binary->global_symbol_offsets);
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 780383c..51dfcd0 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -344,11 +344,13 @@ void si_shader_destroy(struct si_shader *shader);
 void si_shader_destroy_binary(struct radeon_shader_binary *binary);
 unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index);
 int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader);
-void si_shader_binary_read(struct si_screen *sscreen,
-			   struct radeon_shader_binary *binary,
-			   struct si_shader_config *conf,
-			   struct pipe_debug_callback *debug,
-			   unsigned processor);
+void si_shader_binary_read(struct radeon_shader_binary *binary,
+			   struct si_shader_config *conf);
+void si_shader_dump(struct si_screen *sscreen,
+		    struct radeon_shader_binary *binary,
+		    struct si_shader_config *conf,
+		    struct pipe_debug_callback *debug,
+		    unsigned processor);
 void si_shader_apply_scratch_relocs(struct si_context *sctx,
 			struct si_shader *shader,
 			uint64_t scratch_va);
-- 
2.1.4