From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 3 Jan 2016 16:18:04 +0000 (+0100)
Subject: radeonsi: move si_shader_dump call out of si_compile_llvm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a51b010e5a250bd533c95447f6f2d8132345e67;p=mesa.git

radeonsi: move si_shader_dump call out of si_compile_llvm

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 2380242a7fa..ffac6560527 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -125,6 +125,9 @@ static void *si_create_compute_state(
 			si_compile_llvm(sctx->screen, &program->kernels[i].binary,
 					&program->kernels[i].config, sctx->tm,
 					mod, &sctx->b.debug, TGSI_PROCESSOR_COMPUTE);
+			si_shader_dump(sctx->screen, &program->kernels[i].binary,
+				       &program->kernels[i].config,
+				       &sctx->b.debug, TGSI_PROCESSOR_COMPUTE);
 			si_shader_binary_upload(sctx->screen, &program->kernels[i]);
 			LLVMDisposeModule(mod);
 		}
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 36b0364a204..500dd2b60c5 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3912,7 +3912,6 @@ int si_compile_llvm(struct si_screen *sscreen,
 	}
 
 	si_shader_binary_read_config(binary, conf, 0);
-	si_shader_dump(sscreen, binary, conf, debug, processor);
 
 	FREE(binary->config);
 	FREE(binary->global_symbol_offsets);
@@ -3995,8 +3994,12 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
 			    &si_shader_ctx->shader->config, si_shader_ctx->tm,
 			    bld_base->base.gallivm->module,
 			    debug, TGSI_PROCESSOR_GEOMETRY);
-	if (!r)
+	if (!r) {
+		si_shader_dump(sscreen, &si_shader_ctx->shader->binary,
+			       &si_shader_ctx->shader->config, debug,
+			       TGSI_PROCESSOR_GEOMETRY);
 		r = si_shader_binary_upload(sscreen, si_shader_ctx->shader);
+	}
 
 	radeon_llvm_dispose(&si_shader_ctx->radeon_bld);
 
@@ -4198,6 +4201,9 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
 		goto out;
 	}
 
+	si_shader_dump(sscreen, &shader->binary, &shader->config,
+		       debug, si_shader_ctx.type);
+
 	r = si_shader_binary_upload(sscreen, shader);
 	if (r) {
 		fprintf(stderr, "LLVM failed to upload shader\n");