fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Track M values of disassembled constants

Browse source 
We'll want to route these values from the clause itself to the source
dump in order to disassemble modified embedded constants.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6793>
This commit is contained in:
Alyssa Rosenzweig 2020-09-19 15:20:42 -04:00 • committed by Marge Bot
parent 43c6623c9e
commit 9de34e16e0
3 changed files with 48 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/panfrost/bifrost/disassemble.c
View file

@ -280,42 +280,29 @@ static void dump_const_imm(FILE *fp, uint32_t imm)
fprintf(fp, "0x%08x /* %f */", imm, fi.f);
}
static uint64_t get_const(uint64_t *consts, struct bifrost_regs srcs)
/* Convert an index to an embedded constant in FAU-RAM to the index of the
* embedded constant. No, it's not in order. Yes, really. */
static unsigned
const_fau_to_idx(unsigned fau_value)
{
unsigned low_bits = srcs.uniform_const & 0xf;
uint64_t imm;
switch (srcs.uniform_const >> 4) {
case 4:
imm = consts[0];
break;
case 5:
imm = consts[1];
break;
case 6:
imm = consts[2];
break;
case 7:
imm = consts[3];
break;
case 2:
imm = consts[4];
break;
case 3:
imm = consts[5];
break;
default:
unreachable("bad imm");
}
return imm | low_bits;
unsigned map[8] = {
~0, ~0, 4, 5, 0, 1, 2, 3
};
assert(map[fau_value] < 6);
return map[fau_value];
}
static void dump_uniform_const_src(FILE *fp, struct bifrost_regs srcs, uint64_t *consts, bool high32)
static void dump_uniform_const_src(FILE *fp, struct bifrost_regs srcs, struct bi_constants *consts, bool high32)
{
if (srcs.uniform_const & 0x80) {
unsigned uniform = (srcs.uniform_const & 0x7f);
fprintf(fp, "u%d.w%d", uniform, high32);
} else if (srcs.uniform_const >= 0x20) {
uint64_t imm = get_const(consts, srcs);
uint64_t imm = consts->raw[const_fau_to_idx(srcs.uniform_const >> 4)];
imm |= (srcs.uniform_const & 0xf);
if (high32)
dump_const_imm(fp, imm >> 32);
else
@ -366,7 +353,7 @@ static void dump_uniform_const_src(FILE *fp, struct bifrost_regs srcs, uint64_t
}
void
dump_src(FILE *fp, unsigned src, struct bifrost_regs srcs, uint64_t *consts, bool isFMA)
dump_src(FILE *fp, unsigned src, struct bifrost_regs srcs, struct bi_constants *consts, bool isFMA)
{
switch (src) {
case 0:
@ -403,7 +390,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
{
// State for a decoded clause
struct bifrost_alu_inst instrs[8] = {};
uint64_t consts[6] = {};
struct bi_constants consts = {};
unsigned num_instrs = 0;
unsigned num_consts = 0;
uint64_t header_bits = 0;
@ -444,7 +431,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
instrs[idx + 1] = main_instr;
instrs[idx].add_bits = bits(words[3], 0, 17) | ((tag & 0x7) << 17);
instrs[idx].fma_bits |= bits(words[2], 19, 32) << 10;
consts[0] = bits(words[3], 17, 32) << 4;
consts.raw[0] = bits(words[3], 17, 32) << 4;
} else {
bool done = false;
switch ((tag >> 3) & 0x7) {
@ -461,7 +448,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
/* Format 3 */
instrs[2].add_bits = bits(words[3], 0, 17) | bits(words[3], 29, 32) << 17;
instrs[2].fma_bits |= bits(words[2], 19, 32) << 10;
consts[0] = const0;
consts.raw[0] = const0;
num_instrs = 3;
num_consts = 1;
done = stop;
@ -482,7 +469,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
/* Format 8 */
instrs[5].add_bits = bits(words[3], 0, 17) | bits(words[3], 29, 32) << 17;
instrs[5].fma_bits |= bits(words[2], 19, 32) << 10;
consts[0] = const0;
consts.raw[0] = const0;
num_instrs = 6;
num_consts = 1;
done = stop;
@ -506,7 +493,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
unsigned idx = ((tag >> 3) & 0x7) == 2 ? 4 : 7;
main_instr.add_bits |= (tag & 0x7) << 17;
instrs[idx] = main_instr;
consts[0] |= (bits(words[2], 19, 32) | ((uint64_t) words[3] << 13)) << 19;
consts.raw[0] |= (bits(words[2], 19, 32) | ((uint64_t) words[3] << 13)) << 19;
num_consts = 1;
num_instrs = idx + 1;
done = stop;
@ -579,8 +566,8 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
if (num_consts < const_idx + 2)
num_consts = const_idx + 2;
consts[const_idx] = const0;
consts[const_idx + 1] = const1;
consts.raw[const_idx] = const0;
consts.raw[const_idx + 1] = const1;
done = stop;
break;
}
@ -623,15 +610,15 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
dump_regs(fp, regs);
}
bi_disasm_fma(fp, instrs[i].fma_bits, &regs, &next_regs, header.datareg, offset, consts);
bi_disasm_add(fp, instrs[i].add_bits, &regs, &next_regs, header.datareg, offset, consts);
bi_disasm_fma(fp, instrs[i].fma_bits, &regs, &next_regs, header.datareg, offset, &consts);
bi_disasm_add(fp, instrs[i].add_bits, &regs, &next_regs, header.datareg, offset, &consts);
}
fprintf(fp, "}\n");
if (verbose) {
for (unsigned i = 0; i < num_consts; i++) {
fprintf(fp, "# const%d: %08" PRIx64 "\n", 2 * i, consts[i] & 0xffffffff);
fprintf(fp, "# const%d: %08" PRIx64 "\n", 2 * i + 1, consts[i] >> 32);
fprintf(fp, "# const%d: %08" PRIx64 "\n", 2 * i, consts.raw[i] & 0xffffffff);
fprintf(fp, "# const%d: %08" PRIx64 "\n", 2 * i + 1, consts.raw[i] >> 32);
}
}
return stopbit;

23
src/panfrost/bifrost/disassemble.h
View file

@ -34,14 +34,29 @@
void disassemble_bifrost(FILE *fp, uint8_t *code, size_t size, bool verbose);
void
bi_disasm_fma(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, uint64_t *consts);
enum bi_constmod {
BI_CONSTMOD_NONE,
BI_CONSTMOD_PC_LO,
BI_CONSTMOD_PC_HI,
BI_CONSTMOD_PC_LO_HI
};
void bi_disasm_add(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, uint64_t *consts);
struct bi_constants {
/* Raw constant values */
uint64_t raw[6];
/* Associated modifier derived from M values */
enum bi_constmod mods[6];
};
void
bi_disasm_fma(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts);
void bi_disasm_add(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts);
void bi_disasm_dest_fma(FILE *fp, struct bifrost_regs *next_regs);
void bi_disasm_dest_add(FILE *fp, struct bifrost_regs *next_regs);
void dump_src(FILE *fp, unsigned src, struct bifrost_regs srcs, uint64_t *consts, bool isFMA);
void dump_src(FILE *fp, unsigned src, struct bifrost_regs srcs, struct bi_constants *consts, bool isFMA);
#endif

4
src/panfrost/bifrost/gen_disasm.py
View file

@ -64,7 +64,7 @@ def decode_op(instructions, is_fma):
# Generate checks in order
template = """void
bi_disasm_${unit}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, uint64_t *consts)
bi_disasm_${unit}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts)
{
% for (i, (name, (emask, ebits), derived)) in enumerate(options):
% if len(derived) > 0:
@ -89,7 +89,7 @@ bi_disasm_${unit}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bif
# state. Sync prototypes to avoid moves when calling.
disasm_op_template = Template("""static void
bi_disasm_${c_name}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, uint64_t *consts)
bi_disasm_${c_name}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts)
{
${body.strip()}
}