From 0e7ac7d65f1139c5b9635848053e1e84ca85a283 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Thu, 30 Jan 2025 11:56:12 +0000 Subject: [PATCH] panfrost: Properly name CSF instruction UMIN32 source 0 Was named source 2, but it's actually source 0. Signed-off-by: Mary Guillemard Reviewed-by: Lars-Ivar Hesselberg Simonsen Reviewed-by: Boris Brezillon Reviewed-by: Erik Faye-Lund Part-of: --- src/panfrost/lib/genxml/cs_builder.h | 2 +- src/panfrost/lib/genxml/decode_csf.c | 6 +++--- src/panfrost/lib/genxml/v10.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h index 889d667d2b7..51238dc43de 100644 --- a/src/panfrost/lib/genxml/cs_builder.h +++ b/src/panfrost/lib/genxml/cs_builder.h @@ -1258,7 +1258,7 @@ cs_umin32(struct cs_builder *b, struct cs_index dest, struct cs_index src1, cs_emit(b, UMIN32, I) { I.destination = cs_dst32(b, dest); I.source_1 = cs_src32(b, src1); - I.source_2 = cs_src32(b, src2); + I.source_0 = cs_src32(b, src2); } } diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/lib/genxml/decode_csf.c index eba79839b49..dd90bcf2ca6 100644 --- a/src/panfrost/lib/genxml/decode_csf.c +++ b/src/panfrost/lib/genxml/decode_csf.c @@ -223,7 +223,7 @@ print_cs_instr(FILE *fp, const uint64_t *instr) cs_unpack(instr, CS_UMIN32, I); fprintf(fp, "UMIN32 r%u, r%u, r%u", I.destination, I.source_1, - I.source_2); + I.source_0); break; } @@ -1195,7 +1195,7 @@ record_indirect_branch_target(struct cs_code_cfg *cfg, case MALI_CS_OPCODE_UMIN32: { cs_unpack(instr, CS_UMIN32, I); reg_file.u32[I.destination] = - MIN2(reg_file.u32[I.source_1], reg_file.u32[I.source_2]); + MIN2(reg_file.u32[I.source_1], reg_file.u32[I.source_0]); break; } @@ -1273,7 +1273,7 @@ collect_indirect_branch_targets_recurse(struct cs_code_cfg *cfg, cs_unpack(instr, CS_UMIN32, I); if (BITSET_TEST(track_map, I.destination)) { BITSET_SET(track_map, I.source_1); - BITSET_SET(track_map, I.source_2); + BITSET_SET(track_map, I.source_0); BITSET_CLEAR(track_map, I.destination); } break; diff --git a/src/panfrost/lib/genxml/v10.xml b/src/panfrost/lib/genxml/v10.xml index 1b53bb0e34f..4838e0a2032 100644 --- a/src/panfrost/lib/genxml/v10.xml +++ b/src/panfrost/lib/genxml/v10.xml @@ -643,7 +643,7 @@ - +