From 0eca4b87f06e5fe6139f4d8881307684e0fdfd6d Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Thu, 30 Jan 2025 11:56:14 +0000 Subject: [PATCH] panfrost: Rename CSF MOVE into MOVE48 We name it move48 on our helpers and new generations renamed it too. Signed-off-by: Mary Guillemard Reviewed-by: Boris Brezillon Reviewed-by: Benjamin Lee Part-of: --- src/panfrost/lib/genxml/cs_builder.h | 4 ++-- src/panfrost/lib/genxml/decode_csf.c | 18 +++++++++--------- src/panfrost/lib/genxml/v10.xml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h index 62309790fd3..03d9924b6fa 100644 --- a/src/panfrost/lib/genxml/cs_builder.h +++ b/src/panfrost/lib/genxml/cs_builder.h @@ -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; } diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/lib/genxml/decode_csf.c index f465e3cf23e..92d1dcdea03 100644 --- a/src/panfrost/lib/genxml/decode_csf.c +++ b/src/panfrost/lib/genxml/decode_csf.c @@ -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; diff --git a/src/panfrost/lib/genxml/v10.xml b/src/panfrost/lib/genxml/v10.xml index 1d9abdda7e7..8b49c74e5ec 100644 --- a/src/panfrost/lib/genxml/v10.xml +++ b/src/panfrost/lib/genxml/v10.xml @@ -496,7 +496,7 @@ - + @@ -546,10 +546,10 @@ - + - +