Mesa (master): radeonsi: Add additional information to shader dumps

[Tom Stellard]

Module: Mesa
Branch: master
Commit: 51b43c559f40eed2d02a35014c86b6a3e232c6fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51b43c559f40eed2d02a35014c86b6a3e232c6fa

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Thu Feb 26 21:27:27 2015 -0500

radeonsi: Add additional information to shader dumps

This adds SGPR count, VGPR count, shader size, LDS size, and scratch
usage to shader dumps.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 87aef4d..0ef58a7 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2605,17 +2605,23 @@ int si_shader_binary_read(struct si_screen *sscreen,
 	bool dump  = r600_can_dump_shader(&sscreen->b,
 		shader->selector ? shader->selector->tokens : NULL);
 
-	if (dump && !binary->disassembled) {
-		fprintf(stderr, "SI CODE:\n");
-		for (i = 0; i < binary->code_size; i+=4 ) {
-			fprintf(stderr, "@0x%x: %02x%02x%02x%02x\n", i, binary->code[i + 3],
+	si_shader_binary_read_config(sscreen, shader, 0);
+
+	if (dump) {
+		if (!binary->disassembled) {
+			fprintf(stderr, "SI CODE:\n");
+			for (i = 0; i < binary->code_size; i+=4 ) {
+				fprintf(stderr, "@0x%x: %02x%02x%02x%02x\n", i, binary->code[i + 3],
 				binary->code[i + 2], binary->code[i + 1],
 				binary->code[i]);
+			}
 		}
+		fprintf(stderr, "SGPRS: %d\nVGPRS: %d\nCode Size: %d bytes\nLDS: %d blocks\n"
+				"Scratch: %d bytes per wave\n",
+			shader->num_sgprs, shader->num_vgprs, binary->code_size,
+			shader->lds_size, shader->scratch_bytes_per_wave);
 	}
 
-	si_shader_binary_read_config(sscreen, shader, 0);
-
 	/* copy new shader */
 	code_size = binary->code_size + binary->rodata_size;
 	r600_resource_reference(&shader->bo, NULL);