OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600: Fix SCRATCH OP de-assembly

Browse Source 
1d871aa626
   r600g: Implement spilling of temp arrays (v2)

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18130>
This commit is contained in:
Gert Wollny
2022-08-16 10:39:02 +02:00
committed by Marge Bot
parent ebcd8c51dc
commit f0f22d850c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/r600/r600_asm.c
View File

@@ -2274,8 +2274,14 @@ void r600_bytecode_disasm(struct r600_bytecode *bc)
fprintf(stderr, "\n");
} else if (r600_isa_cf(cf->op)->flags & CF_MEM) {
int o = 0;
const char *exp_type[] = {"WRITE", "WRITE_IND", "WRITE_ACK",
"WRITE_IND_ACK"};
const char *exp_type_r600[] = {"WRITE", "WRITE_IND", "READ",
"READ_IND"};
const char *exp_type_r700[] = {"WRITE", "WRITE_IND", "WRITE_ACK",
"WRITE_IND_ACK"};
const char **exp_type = bc->gfx_level >= R700 ?
exp_type_r700 : exp_type_r600;
o += fprintf(stderr, "%04d %08X %08X %s ", id,
bc->bytecode[id], bc->bytecode[id + 1], cfop->name);
o += print_indent(o, 43);

8
src/gallium/drivers/r600/sb/sb_bc_dump.cpp
View File

@@ -141,8 +141,14 @@ void bc_dump::dump(cf_node& n) {
} else if (n.bc.op_ptr->flags & CF_MEM) {
static const char *exp_type[] = {"WRITE", "WRITE_IND", "WRITE_ACK",
"WRITE_IND_ACK"};
static const char *exp_type_r600[] = {"WRITE", "WRITE_IND",
"READ", "READ_IND"};
fill_to(s, 18);
s << " " << exp_type[n.bc.type] << " ";
if (ctx.hw_class == HW_CLASS_R600 && n.bc.op == CF_OP_MEM_SCRATCH)
s << " " << exp_type_r600[n.bc.type] << " ";
else
s << " " << exp_type[n.bc.type] << " ";
s.print_wl(n.bc.array_base, 5);
s << " R" << n.bc.rw_gpr << ".";
for (int k = 0; k < 4; ++k)