aco: correctly validate v_fma_mixhi_f16 register assignment
authorDaniel Schürmann <daniel@schuermann.dev>
Wed, 1 Jun 2022 15:16:55 +0000 (17:16 +0200)
committerMarge Bot <emma+marge@anholt.net>
Mon, 27 Jun 2022 15:07:27 +0000 (15:07 +0000)
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

src/amd/compiler/aco_ir.cpp
src/amd/compiler/aco_validate.cpp

index 88b028d..45ae5be 100644 (file)
@@ -446,6 +446,7 @@ instr_is_16bit(amd_gfx_level gfx_level, aco_opcode op)
    case aco_opcode::v_div_fixup_f16:
    case aco_opcode::v_interp_p2_f16:
    case aco_opcode::v_fma_mixlo_f16:
+   case aco_opcode::v_fma_mixhi_f16:
    /* VOP2 */
    case aco_opcode::v_mac_f16:
    case aco_opcode::v_madak_f16:
index dd474ef..87b5bee 100644 (file)
@@ -841,6 +841,7 @@ validate_subdword_definition(amd_gfx_level gfx_level, const aco_ptr<Instruction>
       return true;
 
    switch (instr->opcode) {
+   case aco_opcode::v_fma_mixhi_f16:
    case aco_opcode::buffer_load_ubyte_d16_hi:
    case aco_opcode::buffer_load_sbyte_d16_hi:
    case aco_opcode::buffer_load_short_d16_hi: