KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: use tgsi_get_opcode_name instead of tgsi_opcode_info::mnemonic 

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2017-08-02 12:05:34 +02:00
parent 2f7c55c23f
commit 438177aa19
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/gallivm/lp_bld_tgsi.c
View File

@ -531,7 +531,7 @@ lp_build_tgsi_llvm(
tgsi_get_opcode_info(instr->Instruction.Opcode);
if (!lp_build_tgsi_inst_llvm(bld_base, instr)) {
_debug_printf("warning: failed to translate tgsi opcode %s to LLVM\n",
opcode_info->mnemonic);
tgsi_get_opcode_name(instr->Instruction.Opcode));
return FALSE;
}
}

2
src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
View File

@ -956,7 +956,7 @@ lp_build_tgsi_aos(struct gallivm_state *gallivm,
tgsi_get_opcode_info(instr->Instruction.Opcode);
if (!lp_emit_instruction_aos(&bld, instr, opcode_info, &pc))
_debug_printf("warning: failed to translate tgsi opcode %s to LLVM\n",
opcode_info->mnemonic);
tgsi_get_opcode_name(instr->Instruction.Opcode));
}
if (0) {

2
src/gallium/auxiliary/tgsi/tgsi_dump.c
View File

@ -578,7 +578,7 @@ iter_instruction(
TXT( " " );
ctx->indent += info->post_indent;
TXT( info->mnemonic );
TXT( tgsi_get_opcode_name(inst->Instruction.Opcode) );
if (inst->Instruction.Saturate) {
TXT( "_SAT" );

6
src/gallium/auxiliary/tgsi/tgsi_sanity.c
View File

@ -326,10 +326,12 @@ iter_instruction(
}
if (info->num_dst != inst->Instruction.NumDstRegs) {
report_error( ctx, "%s: Invalid number of destination operands, should be %u", info->mnemonic, info->num_dst );
report_error( ctx, "%s: Invalid number of destination operands, should be %u",
tgsi_get_opcode_name(inst->Instruction.Opcode), info->num_dst );
}
if (info->num_src != inst->Instruction.NumSrcRegs) {
report_error( ctx, "%s: Invalid number of source operands, should be %u", info->mnemonic, info->num_src );
report_error( ctx, "%s: Invalid number of source operands, should be %u",
tgsi_get_opcode_name(inst->Instruction.Opcode), info->num_src );
}
/* Check destination and source registers' validity.

5
src/gallium/auxiliary/tgsi/tgsi_text.c
View File

@ -1003,16 +1003,17 @@ match_inst(const char **pcur,
const struct tgsi_opcode_info *info)
{
const char *cur = *pcur;
const char *mnemonic = tgsi_get_opcode_name(info->opcode);
/* simple case: the whole string matches the instruction name */
if (str_match_nocase_whole(&cur, info->mnemonic)) {
if (str_match_nocase_whole(&cur, mnemonic)) {
*pcur = cur;
*saturate = 0;
*precise = 0;
return TRUE;
}
if (str_match_no_case(&cur, info->mnemonic)) {
if (str_match_no_case(&cur, mnemonic)) {
/* the instruction has a suffix, figure it out */
if (str_match_no_case(&cur, "_SAT")) {
*pcur = cur;