Mesa (gallium-0.1): tgsi: Indent dumped instructions in respect to grammatical opcodes (e.g. LOOP).
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Sep 2 10:29:04 UTC 2009
Module: Mesa
Branch: gallium-0.1
Commit: e86604da896c8b2084543ac0872c05ce9d1450a2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e86604da896c8b2084543ac0872c05ce9d1450a2
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Sep 2 11:10:49 2009 +0100
tgsi: Indent dumped instructions in respect to grammatical opcodes (e.g. LOOP).
---
src/gallium/auxiliary/tgsi/tgsi_dump.c | 14 ++-
src/gallium/auxiliary/tgsi/tgsi_info.c | 238 ++++++++++++++++----------------
src/gallium/auxiliary/tgsi/tgsi_info.h | 10 +-
3 files changed, 137 insertions(+), 125 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index 0e77906..f216aed 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -37,6 +37,7 @@ struct dump_ctx
struct tgsi_iterate_context iter;
uint instno;
+ int indent;
void (*printf)(struct dump_ctx *ctx, const char *format, ...);
};
@@ -328,13 +329,19 @@ iter_instruction(
{
struct dump_ctx *ctx = (struct dump_ctx *) iter;
uint instno = ctx->instno++;
-
+ const struct tgsi_opcode_info *info = tgsi_get_opcode_info( inst->Instruction.Opcode );
uint i;
boolean first_reg = TRUE;
INSTID( instno );
TXT( ": " );
- TXT( tgsi_get_opcode_info( inst->Instruction.Opcode )->mnemonic );
+
+ ctx->indent -= info->pre_dedent;
+ for(i = 0; i < ctx->indent; ++i)
+ TXT( " " );
+ ctx->indent += info->post_indent;
+
+ TXT( info->mnemonic );
switch (inst->Instruction.Saturate) {
case TGSI_SAT_NONE:
@@ -476,6 +483,7 @@ tgsi_dump_instruction(
struct dump_ctx ctx;
ctx.instno = instno;
+ ctx.indent = 0;
ctx.printf = dump_ctx_printf;
iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst );
@@ -508,6 +516,7 @@ tgsi_dump(
ctx.iter.epilog = NULL;
ctx.instno = 0;
+ ctx.indent = 0;
ctx.printf = dump_ctx_printf;
tgsi_iterate_shader( tokens, &ctx.iter );
@@ -560,6 +569,7 @@ tgsi_dump_str(
ctx.base.iter.epilog = NULL;
ctx.base.instno = 0;
+ ctx.base.indent = 0;
ctx.base.printf = &str_dump_ctx_printf;
ctx.str = str;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index 5700a34..5adcbfc 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -30,125 +30,125 @@
static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{
- { 1, 1, 0, 0, "ARL" },
- { 1, 1, 0, 0, "MOV" },
- { 1, 1, 0, 0, "LIT" },
- { 1, 1, 0, 0, "RCP" },
- { 1, 1, 0, 0, "RSQ" },
- { 1, 1, 0, 0, "EXP" },
- { 1, 1, 0, 0, "LOG" },
- { 1, 2, 0, 0, "MUL" },
- { 1, 2, 0, 0, "ADD" },
- { 1, 2, 0, 0, "DP3" },
- { 1, 2, 0, 0, "DP4" },
- { 1, 2, 0, 0, "DST" },
- { 1, 2, 0, 0, "MIN" },
- { 1, 2, 0, 0, "MAX" },
- { 1, 2, 0, 0, "SLT" },
- { 1, 2, 0, 0, "SGE" },
- { 1, 3, 0, 0, "MAD" },
- { 1, 2, 0, 0, "SUB" },
- { 1, 3, 0, 0, "LERP" },
- { 1, 3, 0, 0, "CND" },
- { 1, 3, 0, 0, "CND0" },
- { 1, 3, 0, 0, "DOT2ADD" },
- { 1, 2, 0, 0, "INDEX" },
- { 1, 1, 0, 0, "NEGATE" },
- { 1, 1, 0, 0, "FRAC" },
- { 1, 3, 0, 0, "CLAMP" },
- { 1, 1, 0, 0, "FLOOR" },
- { 1, 1, 0, 0, "ROUND" },
- { 1, 1, 0, 0, "EXPBASE2" },
- { 1, 1, 0, 0, "LOGBASE2" },
- { 1, 2, 0, 0, "POWER" },
- { 1, 2, 0, 0, "CROSSPRODUCT" },
- { 1, 2, 0, 0, "MULTIPLYMATRIX" },
- { 1, 1, 0, 0, "ABS" },
- { 1, 1, 0, 0, "RCC" },
- { 1, 2, 0, 0, "DPH" },
- { 1, 1, 0, 0, "COS" },
- { 1, 1, 0, 0, "DDX" },
- { 1, 1, 0, 0, "DDY" },
- { 0, 0, 0, 0, "KILP" },
- { 1, 1, 0, 0, "PK2H" },
- { 1, 1, 0, 0, "PK2US" },
- { 1, 1, 0, 0, "PK4B" },
- { 1, 1, 0, 0, "PK4UB" },
- { 1, 2, 0, 0, "RFL" },
- { 1, 2, 0, 0, "SEQ" },
- { 1, 2, 0, 0, "SFL" },
- { 1, 2, 0, 0, "SGT" },
- { 1, 1, 0, 0, "SIN" },
- { 1, 2, 0, 0, "SLE" },
- { 1, 2, 0, 0, "SNE" },
- { 1, 2, 0, 0, "STR" },
- { 1, 2, 1, 0, "TEX" },
- { 1, 4, 1, 0, "TXD" },
- { 1, 2, 1, 0, "TXP" },
- { 1, 1, 0, 0, "UP2H" },
- { 1, 1, 0, 0, "UP2US" },
- { 1, 1, 0, 0, "UP4B" },
- { 1, 1, 0, 0, "UP4UB" },
- { 1, 3, 0, 0, "X2D" },
- { 1, 1, 0, 0, "ARA" },
- { 1, 1, 0, 0, "ARR" },
- { 0, 1, 0, 0, "BRA" },
- { 0, 0, 0, 1, "CAL" },
- { 0, 0, 0, 0, "RET" },
- { 1, 1, 0, 0, "SSG" },
- { 1, 3, 0, 0, "CMP" },
- { 1, 1, 0, 0, "SCS" },
- { 1, 2, 1, 0, "TXB" },
- { 1, 1, 0, 0, "NRM" },
- { 1, 2, 0, 0, "DIV" },
- { 1, 2, 0, 0, "DP2" },
- { 1, 2, 1, 0, "TXL" },
- { 0, 0, 0, 0, "BRK" },
- { 0, 1, 0, 1, "IF" },
- { 1, 1, 0, 0, "LOOP" },
- { 0, 1, 0, 0, "REP" },
- { 0, 0, 0, 1, "ELSE" },
- { 0, 0, 0, 0, "ENDIF" },
- { 0, 0, 0, 0, "ENDLOOP" },
- { 0, 0, 0, 0, "ENDREP" },
- { 0, 1, 0, 0, "PUSHA" },
- { 1, 0, 0, 0, "POPA" },
- { 1, 1, 0, 0, "CEIL" },
- { 1, 1, 0, 0, "I2F" },
- { 1, 1, 0, 0, "NOT" },
- { 1, 1, 0, 0, "TRUNC" },
- { 1, 2, 0, 0, "SHL" },
- { 1, 2, 0, 0, "SHR" },
- { 1, 2, 0, 0, "AND" },
- { 1, 2, 0, 0, "OR" },
- { 1, 2, 0, 0, "MOD" },
- { 1, 2, 0, 0, "XOR" },
- { 1, 3, 0, 0, "SAD" },
- { 1, 2, 1, 0, "TXF" },
- { 1, 2, 1, 0, "TXQ" },
- { 0, 0, 0, 0, "CONT" },
- { 0, 0, 0, 0, "EMIT" },
- { 0, 0, 0, 0, "ENDPRIM" },
- { 0, 0, 0, 1, "BGNLOOP2" },
- { 0, 0, 0, 0, "BGNSUB" },
- { 0, 0, 0, 1, "ENDLOOP2" },
- { 0, 0, 0, 0, "ENDSUB" },
- { 1, 1, 0, 0, "NOISE1" },
- { 1, 1, 0, 0, "NOISE2" },
- { 1, 1, 0, 0, "NOISE3" },
- { 1, 1, 0, 0, "NOISE4" },
- { 0, 0, 0, 0, "NOP" },
- { 1, 2, 0, 0, "M4X3" },
- { 1, 2, 0, 0, "M3X4" },
- { 1, 2, 0, 0, "M3X3" },
- { 1, 2, 0, 0, "M3X2" },
- { 1, 1, 0, 0, "NRM4" },
- { 0, 1, 0, 0, "CALLNZ" },
- { 0, 1, 0, 0, "IFC" },
- { 0, 1, 0, 0, "BREAKC" },
- { 0, 1, 0, 0, "KIL" },
- { 0, 0, 0, 0, "END" },
- { 1, 1, 0, 0, "SWZ" }
+ { 1, 1, 0, 0, 0, 0, "ARL" },
+ { 1, 1, 0, 0, 0, 0, "MOV" },
+ { 1, 1, 0, 0, 0, 0, "LIT" },
+ { 1, 1, 0, 0, 0, 0, "RCP" },
+ { 1, 1, 0, 0, 0, 0, "RSQ" },
+ { 1, 1, 0, 0, 0, 0, "EXP" },
+ { 1, 1, 0, 0, 0, 0, "LOG" },
+ { 1, 2, 0, 0, 0, 0, "MUL" },
+ { 1, 2, 0, 0, 0, 0, "ADD" },
+ { 1, 2, 0, 0, 0, 0, "DP3" },
+ { 1, 2, 0, 0, 0, 0, "DP4" },
+ { 1, 2, 0, 0, 0, 0, "DST" },
+ { 1, 2, 0, 0, 0, 0, "MIN" },
+ { 1, 2, 0, 0, 0, 0, "MAX" },
+ { 1, 2, 0, 0, 0, 0, "SLT" },
+ { 1, 2, 0, 0, 0, 0, "SGE" },
+ { 1, 3, 0, 0, 0, 0, "MAD" },
+ { 1, 2, 0, 0, 0, 0, "SUB" },
+ { 1, 3, 0, 0, 0, 0, "LERP" },
+ { 1, 3, 0, 0, 0, 0, "CND" },
+ { 1, 3, 0, 0, 0, 0, "CND0" },
+ { 1, 3, 0, 0, 0, 0, "DOT2ADD" },
+ { 1, 2, 0, 0, 0, 0, "INDEX" },
+ { 1, 1, 0, 0, 0, 0, "NEGATE" },
+ { 1, 1, 0, 0, 0, 0, "FRAC" },
+ { 1, 3, 0, 0, 0, 0, "CLAMP" },
+ { 1, 1, 0, 0, 0, 0, "FLOOR" },
+ { 1, 1, 0, 0, 0, 0, "ROUND" },
+ { 1, 1, 0, 0, 0, 0, "EXPBASE2" },
+ { 1, 1, 0, 0, 0, 0, "LOGBASE2" },
+ { 1, 2, 0, 0, 0, 0, "POWER" },
+ { 1, 2, 0, 0, 0, 0, "CROSSPRODUCT" },
+ { 1, 2, 0, 0, 0, 0, "MULTIPLYMATRIX" },
+ { 1, 1, 0, 0, 0, 0, "ABS" },
+ { 1, 1, 0, 0, 0, 0, "RCC" },
+ { 1, 2, 0, 0, 0, 0, "DPH" },
+ { 1, 1, 0, 0, 0, 0, "COS" },
+ { 1, 1, 0, 0, 0, 0, "DDX" },
+ { 1, 1, 0, 0, 0, 0, "DDY" },
+ { 0, 0, 0, 0, 0, 0, "KILP" },
+ { 1, 1, 0, 0, 0, 0, "PK2H" },
+ { 1, 1, 0, 0, 0, 0, "PK2US" },
+ { 1, 1, 0, 0, 0, 0, "PK4B" },
+ { 1, 1, 0, 0, 0, 0, "PK4UB" },
+ { 1, 2, 0, 0, 0, 0, "RFL" },
+ { 1, 2, 0, 0, 0, 0, "SEQ" },
+ { 1, 2, 0, 0, 0, 0, "SFL" },
+ { 1, 2, 0, 0, 0, 0, "SGT" },
+ { 1, 1, 0, 0, 0, 0, "SIN" },
+ { 1, 2, 0, 0, 0, 0, "SLE" },
+ { 1, 2, 0, 0, 0, 0, "SNE" },
+ { 1, 2, 0, 0, 0, 0, "STR" },
+ { 1, 2, 1, 0, 0, 0, "TEX" },
+ { 1, 4, 1, 0, 0, 0, "TXD" },
+ { 1, 2, 1, 0, 0, 0, "TXP" },
+ { 1, 1, 0, 0, 0, 0, "UP2H" },
+ { 1, 1, 0, 0, 0, 0, "UP2US" },
+ { 1, 1, 0, 0, 0, 0, "UP4B" },
+ { 1, 1, 0, 0, 0, 0, "UP4UB" },
+ { 1, 3, 0, 0, 0, 0, "X2D" },
+ { 1, 1, 0, 0, 0, 0, "ARA" },
+ { 1, 1, 0, 0, 0, 0, "ARR" },
+ { 0, 1, 0, 0, 0, 0, "BRA" },
+ { 0, 0, 0, 1, 0, 0, "CAL" },
+ { 0, 0, 0, 0, 0, 0, "RET" },
+ { 1, 1, 0, 0, 0, 0, "SSG" },
+ { 1, 3, 0, 0, 0, 0, "CMP" },
+ { 1, 1, 0, 0, 0, 0, "SCS" },
+ { 1, 2, 1, 0, 0, 0, "TXB" },
+ { 1, 1, 0, 0, 0, 0, "NRM" },
+ { 1, 2, 0, 0, 0, 0, "DIV" },
+ { 1, 2, 0, 0, 0, 0, "DP2" },
+ { 1, 2, 1, 0, 0, 0, "TXL" },
+ { 0, 0, 0, 0, 0, 0, "BRK" },
+ { 0, 1, 0, 1, 0, 1, "IF" },
+ { 1, 1, 0, 0, 0, 1, "LOOP" },
+ { 0, 1, 0, 0, 0, 0, "REP" },
+ { 0, 0, 0, 1, 1, 1, "ELSE" },
+ { 0, 0, 0, 0, 1, 0, "ENDIF" },
+ { 0, 0, 0, 0, 1, 0, "ENDLOOP" },
+ { 0, 0, 0, 0, 1, 0, "ENDREP" },
+ { 0, 1, 0, 0, 0, 0, "PUSHA" },
+ { 1, 0, 0, 0, 0, 0, "POPA" },
+ { 1, 1, 0, 0, 0, 0, "CEIL" },
+ { 1, 1, 0, 0, 0, 0, "I2F" },
+ { 1, 1, 0, 0, 0, 0, "NOT" },
+ { 1, 1, 0, 0, 0, 0, "TRUNC" },
+ { 1, 2, 0, 0, 0, 0, "SHL" },
+ { 1, 2, 0, 0, 0, 0, "SHR" },
+ { 1, 2, 0, 0, 0, 0, "AND" },
+ { 1, 2, 0, 0, 0, 0, "OR" },
+ { 1, 2, 0, 0, 0, 0, "MOD" },
+ { 1, 2, 0, 0, 0, 0, "XOR" },
+ { 1, 3, 0, 0, 0, 0, "SAD" },
+ { 1, 2, 1, 0, 0, 0, "TXF" },
+ { 1, 2, 1, 0, 0, 0, "TXQ" },
+ { 0, 0, 0, 0, 0, 0, "CONT" },
+ { 0, 0, 0, 0, 0, 0, "EMIT" },
+ { 0, 0, 0, 0, 0, 0, "ENDPRIM" },
+ { 0, 0, 0, 1, 0, 1, "BGNLOOP2" },
+ { 0, 0, 0, 0, 0, 1, "BGNSUB" },
+ { 0, 0, 0, 1, 1, 0, "ENDLOOP2" },
+ { 0, 0, 0, 0, 1, 0, "ENDSUB" },
+ { 1, 1, 0, 0, 0, 0, "NOISE1" },
+ { 1, 1, 0, 0, 0, 0, "NOISE2" },
+ { 1, 1, 0, 0, 0, 0, "NOISE3" },
+ { 1, 1, 0, 0, 0, 0, "NOISE4" },
+ { 0, 0, 0, 0, 0, 0, "NOP" },
+ { 1, 2, 0, 0, 0, 0, "M4X3" },
+ { 1, 2, 0, 0, 0, 0, "M3X4" },
+ { 1, 2, 0, 0, 0, 0, "M3X3" },
+ { 1, 2, 0, 0, 0, 0, "M3X2" },
+ { 1, 1, 0, 0, 0, 0, "NRM4" },
+ { 0, 1, 0, 0, 0, 0, "CALLNZ" },
+ { 0, 1, 0, 0, 0, 0, "IFC" },
+ { 0, 1, 0, 0, 0, 0, "BREAKC" },
+ { 0, 1, 0, 0, 0, 0, "KIL" },
+ { 0, 0, 0, 0, 0, 0, "END" },
+ { 1, 1, 0, 0, 0, 0, "SWZ" }
};
const struct tgsi_opcode_info *
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h b/src/gallium/auxiliary/tgsi/tgsi_info.h
index 7230bda..c041c78 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.h
@@ -36,10 +36,12 @@ extern "C" {
struct tgsi_opcode_info
{
- uint num_dst;
- uint num_src;
- boolean is_tex;
- boolean is_branch;
+ unsigned num_dst:3;
+ unsigned num_src:3;
+ unsigned is_tex:1;
+ unsigned is_branch:1;
+ int pre_dedent:2;
+ int post_indent:2;
const char *mnemonic;
};
More information about the mesa-commit
mailing list