fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 15:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/gfx11.7: fix v_pk_min_f16/v_pk_max_f16 opcode numbers

Browse source 
Apparently the opcode numbers in LLVM were wrong:
https://github.com/llvm/llvm-project/pull/195180

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: 58debf726c ("aco/gfx11.7: add opcode numbers")
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41311>
This commit is contained in:
Rhys Perry 2026-05-01 10:11:18 +01:00 • committed by Marge Bot
parent 8a146a1be9
commit 6f50dda648
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/compiler/aco_opcodes.py
View file

@ -1221,8 +1221,8 @@ VOPP = {
("v_pk_fma_f16", dst(PkF16), src(PkF16, PkF16, PkF16), op(gfx9=0x0e)),
("v_pk_add_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x0f)),
("v_pk_mul_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x10)),
("v_pk_min_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x11, gfx11_7=0x12, gfx12=0x1b)), # called v_pk_min_num_f16 in GFX12
("v_pk_max_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x12, gfx11_7=0x11, gfx12=0x1c)), # called v_pk_min_num_f16 in GFX12
("v_pk_min_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x11, gfx12=0x1b)), # called v_pk_min_num_f16 in GFX12
("v_pk_max_f16", dst(PkF16), src(PkF16, PkF16), op(gfx9=0x12, gfx12=0x1c)), # called v_pk_min_num_f16 in GFX12
("v_pk_minimum_f16", dst(PkF16), src(PkF16, PkF16), op(gfx11_7=0x1d)),
("v_pk_maximum_f16", dst(PkF16), src(PkF16, PkF16), op(gfx11_7=0x1e)),
("v_fma_mix_f32", dst(F32), src(F32, F32, F32), op(gfx9=0x20)), # v_mad_mix_f32 in VEGA ISA, v_fma_mix_f32 in RDNA ISA

4
src/amd/compiler/tests/test_assembler.cpp
View file

@ -1609,8 +1609,8 @@ BEGIN_TEST(assembler.gfx11_7)
bld.vop3p(aco_opcode::v_pk_minimum_f16, dst_v0, op_v1, op_v2, 0x0, 0x3);
bld.vop3p(aco_opcode::v_pk_maximum_f16, dst_v0, op_v1, op_v2, 0x0, 0x3);
//! v_pk_min_num_f16 v0, v1, v2 ; cc120000 18020501
//! v_pk_max_num_f16 v0, v1, v2 ; cc110000 18020501
//! v_pk_min_num_f16 v0, v1, v2 ; cc110000 18020501
//! v_pk_max_num_f16 v0, v1, v2 ; cc120000 18020501
bld.vop3p(aco_opcode::v_pk_min_f16, dst_v0, op_v1, op_v2, 0x0, 0x3);
bld.vop3p(aco_opcode::v_pk_max_f16, dst_v0, op_v1, op_v2, 0x0, 0x3);