https://github.com/kosarev updated https://github.com/llvm/llvm-project/pull/78198
>From 0dc06c5ab3b1ff5f2441ff0ee26f5a6dfbbb7753 Mon Sep 17 00:00:00 2001 From: Ivan Kosarev <ivan.kosa...@amd.com> Date: Mon, 15 Jan 2024 17:20:34 +0000 Subject: [PATCH] [AMDGPU] Fix predicates for V_DOT instructions. Resolves AsmParser ambiguities, e.g., between V_DOT4C_I32_I8_dpp_vi and V_DOT4C_I32_I8_dpp_gfx10. The latter is predicated with isGFX10Only while the first has no subtarget generation predicates. Part of <https://github.com/llvm/llvm-project/issues/69256>. --- llvm/lib/Target/AMDGPU/VOP2Instructions.td | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/VOP2Instructions.td b/llvm/lib/Target/AMDGPU/VOP2Instructions.td index 48d4e259bc1cec..bbb2ac0bdb861d 100644 --- a/llvm/lib/Target/AMDGPU/VOP2Instructions.td +++ b/llvm/lib/Target/AMDGPU/VOP2Instructions.td @@ -2512,6 +2512,7 @@ defm V_FMAAK_F32 : VOP2_Real_MADK_gfx940 <0x18>; } multiclass VOP2_Real_DOT_ACC_gfx9<bits<6> op> : Base_VOP2_Real_e32e64_vi<op> { + let SubtargetPredicate = isGFX9Only in def _dpp_vi : VOP2_DPP<op, !cast<VOP2_DPP_Pseudo>(NAME#"_dpp")>; } @@ -2520,22 +2521,22 @@ multiclass VOP2_Real_DOT_ACC_gfx10<bits<6> op> : VOP2_Real_dpp_gfx10<op>, VOP2_Real_dpp8_gfx10<op>; -let SubtargetPredicate = HasDot5Insts in { +let OtherPredicates = [HasDot5Insts] in { defm V_DOT2C_F32_F16 : VOP2_Real_DOT_ACC_gfx9<0x37>; // NB: Opcode conflicts with V_DOT8C_I32_I4 // This opcode exists in gfx 10.1* only defm V_DOT2C_F32_F16 : VOP2_Real_DOT_ACC_gfx10<0x02>; } -let SubtargetPredicate = HasDot6Insts in { +let OtherPredicates = [HasDot6Insts] in { defm V_DOT4C_I32_I8 : VOP2_Real_DOT_ACC_gfx9<0x39>; defm V_DOT4C_I32_I8 : VOP2_Real_DOT_ACC_gfx10<0x0d>; } -let SubtargetPredicate = HasDot4Insts in { +let OtherPredicates = [HasDot4Insts] in { defm V_DOT2C_I32_I16 : VOP2_Real_DOT_ACC_gfx9<0x38>; } -let SubtargetPredicate = HasDot3Insts in { +let OtherPredicates = [HasDot3Insts] in { defm V_DOT8C_I32_I4 : VOP2_Real_DOT_ACC_gfx9<0x3a>; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
