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

panfrost: Rename CSF MOVE into MOVE48

Browse source 
We name it move48 on our helpers and new generations renamed it too.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Benjamin Lee <benjamin.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33736>
This commit is contained in:
Mary Guillemard 2025-01-30 11:56:14 +00:00 • committed by Marge Bot
parent 6603e519c9
commit 0eca4b87f0
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/panfrost/lib/genxml/cs_builder.h
View file

@ -515,7 +515,7 @@ cs_reserve_instrs(struct cs_builder *b, uint32_t num_instrs)
uint64_t *ptr = b->cur_chunk.buffer.cpu + (b->cur_chunk.pos++);
pan_cast_and_pack(ptr, CS_MOVE, I) {
pan_cast_and_pack(ptr, CS_MOVE48, I) {
I.destination = cs_overflow_address_reg(b);
I.immediate = newbuf.gpu;
}
@ -791,7 +791,7 @@ cs_move32_to(struct cs_builder *b, struct cs_index dest, unsigned imm)
static inline void
cs_move48_to(struct cs_builder *b, struct cs_index dest, uint64_t imm)
{
cs_emit(b, MOVE, I) {
cs_emit(b, MOVE48, I) {
I.destination = cs_dst64(b, dest);
I.immediate = imm;
}

18
src/panfrost/lib/genxml/decode_csf.c
View file

@ -108,9 +108,9 @@ print_cs_instr(FILE *fp, const uint64_t *instr)
break;
}
case MALI_CS_OPCODE_MOVE: {
cs_unpack(instr, CS_MOVE, I);
fprintf(fp, "MOVE d%u, #0x%" PRIX64, I.destination, I.immediate);
case MALI_CS_OPCODE_MOVE48: {
cs_unpack(instr, CS_MOVE48, I);
fprintf(fp, "MOVE48 d%u, #0x%" PRIX64, I.destination, I.immediate);
break;
}
@ -933,8 +933,8 @@ interpret_cs_instr(struct pandecode_context *ctx, struct queue_ctx *qctx)
break;
}
case MALI_CS_OPCODE_MOVE: {
cs_unpack(bytes, CS_MOVE, I);
case MALI_CS_OPCODE_MOVE48: {
cs_unpack(bytes, CS_MOVE48, I);
qctx->regs[I.destination + 0] = (uint32_t)I.immediate;
qctx->regs[I.destination + 1] = (uint32_t)(I.immediate >> 32);
@ -1177,8 +1177,8 @@ record_indirect_branch_target(struct cs_code_cfg *cfg,
const uint64_t *instr = &cfg->instrs[blk->start + blk_offs];
cs_unpack(instr, CS_BASE, base);
switch (base.opcode) {
case MALI_CS_OPCODE_MOVE: {
cs_unpack(instr, CS_MOVE, I);
case MALI_CS_OPCODE_MOVE48: {
cs_unpack(instr, CS_MOVE48, I);
assert(I.destination % 2 == 0 &&
"Destination register should be aligned to 2");
@ -1254,8 +1254,8 @@ collect_indirect_branch_targets_recurse(struct cs_code_cfg *cfg,
const uint64_t *instr = &cfg->instrs[instr_ptr];
cs_unpack(instr, CS_BASE, base);
switch (base.opcode) {
case MALI_CS_OPCODE_MOVE: {
cs_unpack(instr, CS_MOVE, I);
case MALI_CS_OPCODE_MOVE48: {
cs_unpack(instr, CS_MOVE48, I);
BITSET_CLEAR(track_map, I.destination);
BITSET_CLEAR(track_map, I.destination + 1);
break;

6
src/panfrost/lib/genxml/v10.xml
View file

@ -496,7 +496,7 @@
<enum name="CS Opcode">
<value name="NOP" value="0"/>
<value name="MOVE" value="1"/>
<value name="MOVE48" value="1"/>
<value name="MOVE32" value="2"/>
<value name="WAIT" value="3"/>
<value name="RUN_COMPUTE" value="4"/>
@ -546,10 +546,10 @@
<field name="Opcode" size="8" start="56" type="CS Opcode" default="NOP"/>
</struct>
<struct name="CS MOVE" size="2">
<struct name="CS MOVE48" size="2">
<field name="Immediate" size="48" start="0" type="hex"/>
<field name="Destination" size="8" start="48" type="uint"/>
<field name="Opcode" size="8" start="56" type="CS Opcode" default="MOVE"/>
<field name="Opcode" size="8" start="56" type="CS Opcode" default="MOVE48"/>
</struct>
<struct name="CS MOVE32" size="2">