tgsi: Provide alternate instruction mnemonics in tgsi info.

2 files changed, 31 insertions, 29 deletions

diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index 2b8a6f0fb19..22034c7a0ba 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -33,42 +33,42 @@ 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, "RCP", "RECIP" },
+   { 1, 1, 0, 0, "RSQ", "RECIPSQRT" },
+   { 1, 1, 0, 0, "EXP", "EXPP" },
    { 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, "DP3", "DOT3" },
+   { 1, 2, 0, 0, "DP4", "DOT4" },
    { 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, "SLT", "SETLT" },
+   { 1, 2, 0, 0, "SGE", "SETGE" },
+   { 1, 3, 0, 0, "MAD", "MADD" },
    { 1, 2, 0, 0, "SUB" },
-   { 1, 3, 0, 0, "LERP" },
+   { 1, 3, 0, 0, "LRP", "LERP" },
    { 1, 3, 0, 0, "CND" },
    { 1, 3, 0, 0, "CND0" },
-   { 1, 3, 0, 0, "DOT2ADD" },
+   { 1, 3, 0, 0, "DP2A", "DP2ADD", "DOT2ADD" },
    { 1, 2, 0, 0, "INDEX" },
    { 1, 1, 0, 0, "NEGATE" },
-   { 1, 1, 0, 0, "FRAC" },
+   { 1, 1, 0, 0, "FRC", "FRAC" },
    { 1, 3, 0, 0, "CLAMP" },
-   { 1, 1, 0, 0, "FLOOR" },
+   { 1, 1, 0, 0, "FLR", "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, "EX2", "EXPBASE2" },
+   { 1, 1, 0, 0, "LG2", "LOGBASE2", "LOGP" },
+   { 1, 2, 0, 0, "POW", "POWER" },
+   { 1, 2, 0, 0, "XPD", "CRS", "CROSSPRODUCT" },
+   { 1, 2, 0, 0, "M4X4", "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" },
+   { 1, 1, 0, 0, "DDX", "DSX" },
+   { 1, 1, 0, 0, "DDY", "DSY" },
    { 0, 0, 0, 0, "KILP" },
    { 1, 1, 0, 0, "PK2H" },
    { 1, 1, 0, 0, "PK2US" },
@@ -82,8 +82,8 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 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, "TEX", "TEXLD" },
+   { 1, 4, 1, 0, "TXD", "TEXLDD" },
    { 1, 2, 1, 0, "TXP" },
    { 1, 1, 0, 0, "UP2H" },
    { 1, 1, 0, 0, "UP2US" },
@@ -91,19 +91,19 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 1, 0, 0, "UP4UB" },
    { 1, 3, 0, 0, "X2D" },
    { 1, 1, 0, 0, "ARA" },
-   { 1, 1, 0, 0, "ARR" },
+   { 1, 1, 0, 0, "ARR", "MOVA" },
    { 0, 1, 0, 0, "BRA" },
-   { 0, 0, 0, 1, "CAL" },
+   { 0, 0, 0, 1, "CAL", "CALL" },
    { 0, 0, 0, 0, "RET" },
-   { 1, 1, 0, 0, "SSG" },
+   { 1, 1, 0, 0, "SGN", "SSG" },
    { 1, 3, 0, 0, "CMP" },
-   { 1, 1, 0, 0, "SCS" },
-   { 1, 2, 1, 0, "TXB" },
+   { 1, 1, 0, 0, "SCS", "SINCOS" },
+   { 1, 2, 1, 0, "TXB", "TEXLDB" },
    { 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, 0, 0, 0, "BRK", "BREAK" },
    { 0, 1, 0, 1, "IF" },
    { 0, 0, 0, 0, "LOOP" },
    { 0, 1, 0, 0, "REP" },
@@ -116,7 +116,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 1, 0, 0, "CEIL" },
    { 1, 1, 0, 0, "I2F" },
    { 1, 1, 0, 0, "NOT" },
-   { 1, 1, 0, 0, "TRUNC" },
+   { 1, 1, 0, 0, "INT", "TRUNC" },
    { 1, 2, 0, 0, "SHL" },
    { 1, 2, 0, 0, "SHR" },
    { 1, 2, 0, 0, "AND" },
@@ -146,7 +146,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 0, 1, 0, 0, "CALLNZ" },
    { 0, 1, 0, 0, "IFC" },
    { 0, 1, 0, 0, "BREAKC" },
-   { 0, 1, 0, 0, "KIL" },
+   { 0, 1, 0, 0, "KIL", "TEXKILL" },
    { 0, 0, 0, 0, "END" },
    { 1, 1, 0, 0, "SWZ" }
 };
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h b/src/gallium/auxiliary/tgsi/tgsi_info.h
index 7230bdaae33..077e25acd7f 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.h
@@ -41,6 +41,8 @@ struct tgsi_opcode_info
    boolean is_tex;
    boolean is_branch;
    const char *mnemonic;
+   const char *alt_mnemonic1;
+   const char *alt_mnemonic2;
 };
 
 const struct tgsi_opcode_info *