From 2c513e86894ff92cb5be9d41a4cf5e4e1aab879b Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 13 Oct 2024 22:36:19 -0400 Subject: [PATCH] agx: consistent ffma name Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/compiler/agx_compile.c | 2 +- src/asahi/compiler/agx_opcodes.py | 2 +- src/asahi/compiler/agx_performance.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c index e63ddafee2e..a3d53736a00 100644 --- a/src/asahi/compiler/agx_compile.c +++ b/src/asahi/compiler/agx_compile.c @@ -1842,7 +1842,7 @@ agx_emit_alu(agx_builder *b, nir_alu_instr *instr) if (instr->def.bit_size == 16) return agx_hfma_to(b, dst, s0, s1, s2); else - return agx_fma_to(b, dst, s0, s1, s2); + return agx_ffma_to(b, dst, s0, s1, s2); case nir_op_fsat: { agx_instr *I = agx_fadd_to(b, dst, s0, agx_negzero()); diff --git a/src/asahi/compiler/agx_opcodes.py b/src/asahi/compiler/agx_opcodes.py index 481e578d0d3..b8fb6997a88 100644 --- a/src/asahi/compiler/agx_opcodes.py +++ b/src/asahi/compiler/agx_opcodes.py @@ -222,7 +222,7 @@ op("fadd", encoding = (0x2A, 0x3F, 4, 6), srcs = 2, is_float = True) -op("fma", +op("ffma", encoding = (0x3A, 0x3F, 6, 8), srcs = 3, is_float = True) diff --git a/src/asahi/compiler/agx_performance.c b/src/asahi/compiler/agx_performance.c index 358a25d070b..20cc0f3aab3 100644 --- a/src/asahi/compiler/agx_performance.c +++ b/src/asahi/compiler/agx_performance.c @@ -65,7 +65,7 @@ struct alu_timing { /* clang-format off */ struct alu_timing op_timings[] = { - [AGX_OPCODE_FMA] = { F32, 2, 1 }, + [AGX_OPCODE_FFMA] = { F32, 2, 1 }, [AGX_OPCODE_FADD] = { F32, 2, 1 }, [AGX_OPCODE_FMUL] = { F32, 2, 1 },