[llvm] [AMDGPU] Add VOP2 to gfx13 (PR #182812)

via llvm-commits llvm-commits at lists.llvm.org
Sun Feb 22 22:59:01 PST 2026


llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-amdgpu

Author: Mariusz Sikora (mariusz-sikora-at-amd)

<details>
<summary>Changes</summary>



---

Patch is 1.13 MiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/182812.diff


19 Files Affected:

- (modified) llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp (+21) 
- (modified) llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp (+4) 
- (modified) llvm/lib/Target/AMDGPU/VOP2Instructions.td (+157-118) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2.s (+2807) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_aliases.s (+20) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_dpp16.s (+2007) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_dpp8.s (+434) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_err.s (+68) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_t16_err.s (+227) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop2_t16_promote.s (+191) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop3_from_vop2.s (+2269) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop3_from_vop2_dpp16.s (+1903) 
- (added) llvm/test/MC/AMDGPU/gfx13_asm_vop3_from_vop2_dpp8.s (+527) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop2.txt (+2642) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop2_dpp16.txt (+1835) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop2_dpp8.txt (+288) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop3_from_vop2.txt (+2091) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop3_from_vop2_dpp16.txt (+1709) 
- (added) llvm/test/MC/Disassembler/AMDGPU/gfx13_dasm_vop3_from_vop2_dpp8.txt (+397) 


``````````diff
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
index 4aa4083b6c2ab..66792a67503d8 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
@@ -476,6 +476,15 @@ void AMDGPUInstPrinter::printVOPDst(const MCInst *MI, unsigned OpNo,
   case AMDGPU::V_ADD_CO_CI_U32_dpp8_gfx12:
   case AMDGPU::V_SUB_CO_CI_U32_dpp8_gfx12:
   case AMDGPU::V_SUBREV_CO_CI_U32_dpp8_gfx12:
+  case AMDGPU::V_ADD_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_ADD_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_ADD_CO_CI_U32_dpp8_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_dpp8_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_dpp8_gfx13:
     printDefaultVccOperand(false, STI, O);
     break;
   }
@@ -953,6 +962,18 @@ void AMDGPUInstPrinter::printRegularOperand(const MCInst *MI, unsigned OpNo,
   case AMDGPU::V_ADD_CO_CI_U32_dpp8_gfx12:
   case AMDGPU::V_SUB_CO_CI_U32_dpp8_gfx12:
   case AMDGPU::V_SUBREV_CO_CI_U32_dpp8_gfx12:
+  case AMDGPU::V_CNDMASK_B32_e32_gfx13:
+  case AMDGPU::V_ADD_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_e32_gfx13:
+  case AMDGPU::V_CNDMASK_B32_dpp_gfx13:
+  case AMDGPU::V_ADD_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_dpp_gfx13:
+  case AMDGPU::V_CNDMASK_B32_dpp8_gfx13:
+  case AMDGPU::V_ADD_CO_CI_U32_dpp8_gfx13:
+  case AMDGPU::V_SUB_CO_CI_U32_dpp8_gfx13:
+  case AMDGPU::V_SUBREV_CO_CI_U32_dpp8_gfx13:
 
   case AMDGPU::V_CNDMASK_B32_e32_gfx6_gfx7:
   case AMDGPU::V_CNDMASK_B32_e32_vi:
diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
index 8ad424a255fc1..98c60da49faca 100644
--- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
@@ -682,9 +682,11 @@ bool isMAC(unsigned Opc) {
          Opc == AMDGPU::V_MAC_F16_e64_vi ||
          Opc == AMDGPU::V_FMAC_F64_e64_gfx90a ||
          Opc == AMDGPU::V_FMAC_F64_e64_gfx12 ||
+         Opc == AMDGPU::V_FMAC_F64_e64_gfx13 ||
          Opc == AMDGPU::V_FMAC_F32_e64_gfx10 ||
          Opc == AMDGPU::V_FMAC_F32_e64_gfx11 ||
          Opc == AMDGPU::V_FMAC_F32_e64_gfx12 ||
+         Opc == AMDGPU::V_FMAC_F32_e64_gfx13 ||
          Opc == AMDGPU::V_FMAC_F32_e64_vi ||
          Opc == AMDGPU::V_FMAC_LEGACY_F32_e64_gfx10 ||
          Opc == AMDGPU::V_FMAC_DX9_ZERO_F32_e64_gfx11 ||
@@ -693,6 +695,8 @@ bool isMAC(unsigned Opc) {
          Opc == AMDGPU::V_FMAC_F16_fake16_e64_gfx11 ||
          Opc == AMDGPU::V_FMAC_F16_t16_e64_gfx12 ||
          Opc == AMDGPU::V_FMAC_F16_fake16_e64_gfx12 ||
+         Opc == AMDGPU::V_FMAC_F16_t16_e64_gfx13 ||
+         Opc == AMDGPU::V_FMAC_F16_fake16_e64_gfx13 ||
          Opc == AMDGPU::V_DOT2C_F32_F16_e64_vi ||
          Opc == AMDGPU::V_DOT2C_F32_BF16_e64_vi ||
          Opc == AMDGPU::V_DOT2C_I32_I16_e64_vi ||
diff --git a/llvm/lib/Target/AMDGPU/VOP2Instructions.td b/llvm/lib/Target/AMDGPU/VOP2Instructions.td
index 2ccf39224a278..5898762a1ab4d 100644
--- a/llvm/lib/Target/AMDGPU/VOP2Instructions.td
+++ b/llvm/lib/Target/AMDGPU/VOP2Instructions.td
@@ -1568,7 +1568,7 @@ class VOP2_DPP8_Gen<bits<6> op, VOP2_Pseudo ps, GFXGen Gen,
 }
 
 //===----------------------------------------------------------------------===//
-// GFX11, GFX12
+// GFX11, GFX12, GFX13
 //===----------------------------------------------------------------------===//
 
 //===------------------------------- VOP2 -------------------------------===//
@@ -1586,6 +1586,10 @@ multiclass VOP2Only_Real_MADK64<GFXGen Gen, bits<6> op> {
   }
 }
 
+multiclass VOP2Only_Real_MADK64_gfx1250_gfx13<bits<6> gfx1250Op, bits<6> op> :
+  VOP2Only_Real_MADK64<GFX1250Gen, gfx1250Op>,
+  VOP2Only_Real_MADK64<GFX13Gen, op>;
+
 multiclass VOP2Only_Real_MADK_with_name<GFXGen Gen, bits<6> op, string asmName,
                                         string opName = NAME> {
   def Gen.Suffix :
@@ -1761,6 +1765,10 @@ multiclass VOP2_Real_FULL<GFXGen Gen, bits<6> op> :
   VOP2_Real_dpp<Gen, op>,
   VOP2_Real_dpp8<Gen, op>;
 
+multiclass VOP2_Real_FULL_gfx1250_gfx13<bits<6> gfx1250Op, bits<6> op> :
+  VOP2_Real_FULL<GFX1250Gen, gfx1250Op>,
+  VOP2_Real_FULL<GFX13Gen, op>;
+
 multiclass VOP2_Real_NO_VOP3_with_name<GFXGen Gen, bits<6> op, string opName,
                                        string asmName, bit isSingle = 0> {
   defm NAME : VOP2_Real_e32_with_name<Gen, op, opName, asmName, isSingle>,
@@ -1780,6 +1788,10 @@ multiclass VOP2_Real_FULL_with_name<GFXGen Gen, bits<6> op, string opName,
 multiclass VOP2_Real_NO_DPP<GFXGen Gen, bits<6> op> :
   VOP2_Real_e32<Gen, op>, VOP2_Real_e64<Gen, op>;
 
+multiclass VOP2_Real_NO_DPP_gfx1250_gfx13<bits<6> gfx1250Op, bits<6> op> :
+  VOP2_Real_NO_DPP<GFX1250Gen, gfx1250Op>,
+  VOP2_Real_NO_DPP<GFX13Gen, op>;
+
 multiclass VOP2_Real_NO_DPP_with_name<GFXGen Gen, bits<6> op, string opName,
                                       string asmName> {
   defm NAME : VOP2_Real_e32_with_name<Gen, op, opName, asmName>,
@@ -1790,93 +1802,108 @@ multiclass VOP2_Real_NO_DPP_with_name<GFXGen Gen, bits<6> op, string opName,
   }
 }
 
-multiclass VOP2_Real_with_DPP16_with_alias<GFXGen Gen, bits<6> op, string alias> {
+multiclass VOP2_Real_with_NO_DPP_with_alias<GFXGen Gen, bits<6> op, string alias> {
   defm NAME : VOP2_Real_e32<Gen, op>,
-              VOP2_Real_dpp<Gen, op>,
-              VOP2_Real_e64<Gen, op>,
-              VOP3_Real_dpp_Base<Gen, {0, 1, 0, 0, op{5-0}}>;
+              VOP2_Real_e64<Gen, op>;
   def Gen.Suffix#"_alias" : AMDGPUMnemonicAlias<alias, NAME> {
     let AssemblerPredicate = Gen.AssemblerPredicate;
   }
 }
 
+multiclass VOP2_Real_with_DPP16_with_alias<GFXGen Gen, bits<6> op, string alias> :
+  VOP2_Real_with_NO_DPP_with_alias<Gen, op, alias>,
+  VOP2_Real_dpp<Gen, op>,
+  VOP3_Real_dpp_Base<Gen, {0, 1, 0, 0, op{5-0}}>;
+
 //===----------------------------------------------------------------------===//
-// GFX12.
+// GFX12, GFX13
 //===----------------------------------------------------------------------===//
 
-multiclass VOP2be_Real_gfx12<bits<6> op, string opName, string asmName> :
-  VOP2be_Real<GFX12Gen, op, opName, asmName>;
+multiclass VOP2be_Real_gfx12_gfx13<
+    bits<6> gfx12Op, bits<6> op, string opName, string asmName> :
+  VOP2be_Real<GFX12Gen, gfx12Op, opName, asmName>,
+  VOP2be_Real<GFX13Gen, op, opName, asmName>;
 
 // Only for CNDMASK
-multiclass VOP2e_Real_gfx12<bits<6> op, string opName, string asmName> :
-  VOP2e_Real<GFX12Gen, op, opName, asmName>;
-
-multiclass VOP2_Real_FULL_with_name_gfx12<bits<6> op, string opName,
-                                          string asmName> :
-  VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>;
-
-multiclass VOP2_Real_FULL_t16_gfx12<bits<6> op, string opName,
-                                    string asmName, string alias> {
-  defm NAME : VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>;
+multiclass VOP2e_Real_gfx12_gfx13<bits<6> op, string opName, string asmName> :
+  VOP2e_Real<GFX12Gen, op, opName, asmName>,
+  VOP2e_Real<GFX13Gen, op, opName, asmName>;
+
+multiclass VOP2_Real_FULL_gfx12_gfx13<bits<6> gfx12Op, bits<6> op> :
+  VOP2_Real_FULL<GFX12Gen, gfx12Op>,
+  VOP2_Real_FULL<GFX13Gen, op>;
+
+multiclass VOP2_Real_FULL_with_name_gfx12_gfx13<
+    bits<6> gfx12Op, bits<6> op, string opName, string asmName> :
+  VOP2_Real_FULL_with_name<GFX12Gen, gfx12Op, opName, asmName>,
+  VOP2_Real_FULL_with_name<GFX13Gen, op, opName, asmName>;
+
+multiclass VOP2_Real_FULL_t16_gfx12_gfx13<
+    bits<6> gfx12Op, bits<6> op, string opName, string asmName, string alias> {
+  defm NAME : VOP2_Real_FULL_with_name<GFX12Gen, gfx12Op, opName, asmName>;
+  defm NAME : VOP2_Real_FULL_with_name<GFX13Gen, op, opName, asmName>;
   def _gfx12_2nd_alias : AMDGPUMnemonicAlias<alias, asmName> {
-    let AssemblerPredicate = isGFX12Only;
+    let AssemblerPredicate = isGFX12Plus;
   }
 }
 
-multiclass VOP2_Real_with_DPP16_with_alias_gfx12<bits<6> op, string alias> :
-  VOP2_Real_with_DPP16_with_alias<GFX12Gen, op, alias>;
+multiclass VOP2_Real_with_NO_DPP_gfx13_DPP16_with_alias_gfx12<bits<6> op, string alias> :
+  VOP2_Real_with_DPP16_with_alias<GFX12Gen, op, alias>,
+  VOP2_Real_with_NO_DPP_with_alias<GFX13Gen, op, alias>;
 
-multiclass VOP2_Real_FULL_t16_and_fake16_gfx12<bits<6> op, string opName,
-                                               string asmName, string alias> {
-  defm _t16: VOP2_Real_FULL_t16_gfx12<op, opName#"_t16", asmName, alias>;
-  defm _fake16: VOP2_Real_FULL_t16_gfx12<op, opName#"_fake16", asmName, alias>;
+multiclass VOP2_Real_FULL_t16_and_fake16_gfx12_gfx13<bits<6> gfx12Op, bits<6> op, string opName,
+                                                     string asmName, string alias> {
+  defm _t16: VOP2_Real_FULL_t16_gfx12_gfx13<gfx12Op, op, opName#"_t16", asmName, alias>;
+  defm _fake16: VOP2_Real_FULL_t16_gfx12_gfx13<gfx12Op, op, opName#"_fake16", asmName, alias>;
 }
 
 multiclass VOP2_Real_NO_DPP_with_name_gfx12<bits<6> op, string opName,
                                             string asmName> :
   VOP2_Real_NO_DPP_with_name<GFX12Gen, op, opName, asmName>;
 
-defm V_ADD_F64     : VOP2_Real_FULL_with_name_gfx12<0x002, "V_ADD_F64_pseudo", "v_add_f64">;
-defm V_MUL_F64     : VOP2_Real_FULL_with_name_gfx12<0x006, "V_MUL_F64_pseudo", "v_mul_f64">;
-defm V_LSHLREV_B64 : VOP2_Real_FULL_with_name_gfx12<0x01f, "V_LSHLREV_B64_pseudo", "v_lshlrev_b64">;
-defm V_MIN_NUM_F64 : VOP2_Real_with_DPP16_with_alias_gfx12<0x00d, "v_min_f64">;
-defm V_MAX_NUM_F64 : VOP2_Real_with_DPP16_with_alias_gfx12<0x00e, "v_max_f64">;
+defm V_ADD_F64     : VOP2_Real_FULL_with_name_gfx12_gfx13<0x02, 0x02, "V_ADD_F64_pseudo", "v_add_f64">;
+defm V_MUL_F64     : VOP2_Real_FULL_with_name_gfx12_gfx13<0x06, 0x06, "V_MUL_F64_pseudo", "v_mul_f64">;
+defm V_LSHLREV_B64 : VOP2_Real_FULL_with_name_gfx12_gfx13<0x1f, 0x22, "V_LSHLREV_B64_pseudo", "v_lshlrev_b64">;
+defm V_MIN_NUM_F64 : VOP2_Real_with_NO_DPP_gfx13_DPP16_with_alias_gfx12<0x00d, "v_min_f64">;
+defm V_MAX_NUM_F64 : VOP2_Real_with_NO_DPP_gfx13_DPP16_with_alias_gfx12<0x00e, "v_max_f64">;
 
-defm V_CNDMASK_B32 : VOP2e_Real_gfx12<0x001, "V_CNDMASK_B32", "v_cndmask_b32">;
+defm V_CNDMASK_B32 : VOP2e_Real_gfx12_gfx13<0x001, "V_CNDMASK_B32", "v_cndmask_b32">;
 defm V_ADD_CO_CI_U32 :
-  VOP2be_Real_gfx12<0x020, "V_ADDC_U32", "v_add_co_ci_u32">;
+  VOP2be_Real_gfx12_gfx13<0x20, 0x28, "V_ADDC_U32", "v_add_co_ci_u32">;
 defm V_SUB_CO_CI_U32 :
-  VOP2be_Real_gfx12<0x021, "V_SUBB_U32", "v_sub_co_ci_u32">;
+  VOP2be_Real_gfx12_gfx13<0x21, 0x29, "V_SUBB_U32", "v_sub_co_ci_u32">;
 defm V_SUBREV_CO_CI_U32 :
-  VOP2be_Real_gfx12<0x022, "V_SUBBREV_U32", "v_subrev_co_ci_u32">;
+  VOP2be_Real_gfx12_gfx13<0x22, 0x2a, "V_SUBBREV_U32", "v_subrev_co_ci_u32">;
 
-defm V_MIN_NUM_F32 : VOP2_Real_FULL_with_name_gfx12<0x015, "V_MIN_F32", "v_min_num_f32">;
-defm V_MAX_NUM_F32 : VOP2_Real_FULL_with_name_gfx12<0x016, "V_MAX_F32", "v_max_num_f32">;
-defm V_MIN_NUM_F16 : VOP2_Real_FULL_t16_and_fake16_gfx12<0x030, "V_MIN_F16", "v_min_num_f16", "v_min_f16">;
-defm V_MAX_NUM_F16 : VOP2_Real_FULL_t16_and_fake16_gfx12<0x031, "V_MAX_F16", "v_max_num_f16", "v_max_f16">;
+defm V_MIN_NUM_F32 : VOP2_Real_FULL_with_name_gfx12_gfx13<0x015, 0x0f, "V_MIN_F32", "v_min_num_f32">;
+defm V_MAX_NUM_F32 : VOP2_Real_FULL_with_name_gfx12_gfx13<0x016, 0x10, "V_MAX_F32", "v_max_num_f32">;
+defm V_MIN_NUM_F16 : VOP2_Real_FULL_t16_and_fake16_gfx12_gfx13<0x030, 0x3a, "V_MIN_F16", "v_min_num_f16", "v_min_f16">;
+defm V_MAX_NUM_F16 : VOP2_Real_FULL_t16_and_fake16_gfx12_gfx13<0x031, 0x39, "V_MAX_F16", "v_max_num_f16", "v_max_f16">;
 
-let SubtargetPredicate = isGFX12Plus in {
-  defm : VOP2eInstAliases<V_CNDMASK_B32_e32, V_CNDMASK_B32_e32_gfx12>;
+foreach Gen = [GFX12Gen, GFX13Gen] in
+let SubtargetPredicate = Gen.AssemblerPredicate in {
+  defm : VOP2eInstAliases<
+    V_CNDMASK_B32_e32, !cast<VOP2_Real>("V_CNDMASK_B32_e32"#Gen.Suffix)>;
 
   defm : VOP2bInstAliases<
-    V_ADDC_U32_e32, V_ADD_CO_CI_U32_e32_gfx12, "v_add_co_ci_u32">;
+    V_ADDC_U32_e32, !cast<VOP2_Real>("V_ADD_CO_CI_U32_e32"#Gen.Suffix), "v_add_co_ci_u32">;
   defm : VOP2bInstAliases<
-    V_SUBB_U32_e32, V_SUB_CO_CI_U32_e32_gfx12, "v_sub_co_ci_u32">;
+    V_SUBB_U32_e32, !cast<VOP2_Real>("V_SUB_CO_CI_U32_e32"#Gen.Suffix), "v_sub_co_ci_u32">;
   defm : VOP2bInstAliases<
-    V_SUBBREV_U32_e32, V_SUBREV_CO_CI_U32_e32_gfx12, "v_subrev_co_ci_u32">;
-} // End SubtargetPredicate = isGFX12Plus
+    V_SUBBREV_U32_e32, !cast<VOP2_Real>("V_SUBREV_CO_CI_U32_e32"#Gen.Suffix), "v_subrev_co_ci_u32">;
+} // End SubtargetPredicate = Gen.AssemblerPredicate
 
 let SubtargetPredicate = HasFmacF64Inst in
-defm V_FMAC_F64 : VOP2_Real_FULL<GFX12Gen, 0x17>;
+defm V_FMAC_F64 : VOP2_Real_FULL_gfx12_gfx13<0x17, 0x1f>;
 
-defm V_FMAMK_F64 : VOP2Only_Real_MADK64<GFX1250Gen, 0x23>;
-defm V_FMAAK_F64 : VOP2Only_Real_MADK64<GFX1250Gen, 0x24>;
-defm V_ADD_U64 : VOP2_Real_FULL<GFX1250Gen, 0x28>;
-defm V_SUB_U64 : VOP2_Real_FULL<GFX1250Gen, 0x29>;
+defm V_FMAMK_F64 : VOP2Only_Real_MADK64_gfx1250_gfx13<0x23, 0x20>;
+defm V_FMAAK_F64 : VOP2Only_Real_MADK64_gfx1250_gfx13<0x24, 0x21>;
+defm V_ADD_U64 : VOP2_Real_FULL_gfx1250_gfx13<0x28, 0x23>;
+defm V_SUB_U64 : VOP2_Real_FULL_gfx1250_gfx13<0x29, 0x24>;
 defm V_MUL_U64 : VOP2_Real_NO_DPP<GFX1250Gen, 0x2a>;
 
 //===----------------------------------------------------------------------===//
-// GFX11.
+// GFX11, GFX12, GFX13.
 //===----------------------------------------------------------------------===//
 
 multiclass VOP2be_Real_gfx11<bits<6> op, string opName, string asmName> :
@@ -1909,13 +1936,19 @@ multiclass VOP2_Real_NO_DPP_with_name_gfx11<bits<6> op, string opName,
                                            string asmName> :
   VOP2_Real_NO_DPP_with_name<GFX11Gen, op, opName, asmName>;
 
-multiclass VOP2_Real_FULL_gfx11_gfx12<bits<6> op> :
-  VOP2_Real_FULL<GFX11Gen, op>, VOP2_Real_FULL<GFX12Gen, op>;
+multiclass VOP2_Real_FULL_gfx11_gfx12_gfx13<bits<6> preGFX13Op, bits<6> op> :
+  VOP2_Real_FULL<GFX11Gen, preGFX13Op>, VOP2_Real_FULL<GFX12Gen, preGFX13Op>,
+  VOP2_Real_FULL<GFX13Gen, op>;
 
-multiclass VOP2_Real_FULL_with_name_gfx11_gfx12<bits<6> op, string opName,
-                                                string asmName> :
+multiclass VOP2_Real_FULL_with_name_gfx11_gfx12_gfx13<
+    bits<6> op, string opName, string asmName> :
   VOP2_Real_FULL_with_name<GFX11Gen, op, opName, asmName>,
-  VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>;
+  VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>,
+  VOP2_Real_FULL_with_name<GFX13Gen, op, opName, asmName>;
+
+multiclass VOP2_Real_e32_gfx11_gfx12_gfx13<bits<6> op> :
+  VOP2Only_Real_e32<GFX11Gen, op>, VOP2Only_Real_e32<GFX12Gen, op>,
+  VOP2Only_Real_e32<GFX13Gen, op>;
 
 multiclass VOP2_Real_e32_gfx11_gfx12<bits<6> op> :
   VOP2Only_Real_e32<GFX11Gen, op>, VOP2Only_Real_e32<GFX12Gen, op>;
@@ -1935,26 +1968,28 @@ multiclass VOP3Only_Realtriple_t16_and_fake16_gfx11_gfx12<bits<10> op, string as
 multiclass VOP3beOnly_Realtriple_gfx11_gfx12<bits<10> op> :
   VOP3beOnly_Realtriple<GFX11Gen, op>, VOP3beOnly_Realtriple<GFX12Gen, op>;
 
-multiclass VOP2Only_Real_MADK_t16_gfx11_gfx12<bits<6> op, string asmName,
-                                              string opName = NAME> :
+multiclass VOP2Only_Real_MADK_t16_gfx11_gfx12_gfx13<
+    bits<6> op, string asmName, string opName = NAME> :
   VOP2Only_Real_MADK_with_name<GFX11Gen, op, asmName, opName>,
-  VOP2Only_Real_MADK_with_name<GFX12Gen, op, asmName, opName>;
+  VOP2Only_Real_MADK_with_name<GFX12Gen, op, asmName, opName>,
+  VOP2Only_Real_MADK_with_name<GFX13Gen, op, asmName, opName>;
 
-multiclass VOP2Only_Real_MADK_t16_and_fake16_gfx11_gfx12<bits<6> op, string asmName,
-                                                         string opName = NAME> {
-  defm _t16: VOP2Only_Real_MADK_t16_gfx11_gfx12<op, asmName, opName#"_t16">;
-  defm _fake16: VOP2Only_Real_MADK_t16_gfx11_gfx12<op, asmName, opName#"_fake16">;
+multiclass VOP2Only_Real_MADK_t16_and_fake16_gfx11_gfx12_gfx13<bits<6> op, string asmName,
+                                                               string opName = NAME> {
+  defm _t16: VOP2Only_Real_MADK_t16_gfx11_gfx12_gfx13<op, asmName, opName#"_t16">;
+  defm _fake16: VOP2Only_Real_MADK_t16_gfx11_gfx12_gfx13<op, asmName, opName#"_fake16">;
 }
 
-multiclass VOP2_Real_FULL_t16_gfx11_gfx12<bits<6> op, string asmName,
-                                          string opName = NAME> :
+multiclass VOP2_Real_FULL_t16_gfx11_gfx12_gfx13<
+    bits<6> op, string asmName, string opName = NAME> :
   VOP2_Real_FULL_with_name<GFX11Gen, op, opName, asmName>,
-  VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>;
+  VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>,
+  VOP2_Real_FULL_with_name<GFX13Gen, op, opName, asmName>;
 
-multiclass VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<bits<6> op, string asmName,
-                                          string opName = NAME> {
-  defm _t16:    VOP2_Real_FULL_t16_gfx11_gfx12<op, asmName, opName#"_t16">;
-  defm _fake16: VOP2_Real_FULL_t16_gfx11_gfx12<op, asmName, opName#"_fake16">;
+multiclass VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12_gfx13<bits<6> op, string asmName,
+                                                           string opName = NAME> {
+  defm _t16:    VOP2_Real_FULL_t16_gfx11_gfx12_gfx13<op, asmName, opName#"_t16">;
+  defm _fake16: VOP2_Real_FULL_t16_gfx11_gfx12_gfx13<op, asmName, opName#"_fake16">;
 }
 
 multiclass VOP2_Real_FULL_gfx11<bits<6> op> :
@@ -1966,32 +2001,32 @@ defm V_DOT2ACC_F32_F16 : VOP2_Real_NO_VOP3_with_name_gfx11<0x002,
   "V_DOT2C_F32_F16", "v_dot2acc_f32_f16", 1>;
 defm V_FMAC_DX9_ZERO_F32 : VOP2_Real_NO_DPP_with_name_gfx11<0x006,
   "V_FMAC_LEGACY_F32", "v_fmac_dx9_zero_f32">;
-defm V_MUL_DX9_ZERO_F32 : VOP2_Real_FULL_with_name_gfx11_gfx12<0x007,
+defm V_MUL_DX9_ZERO_F32 : VOP2_Real_FULL_with_name_gfx11_gfx12_gfx13<0x007,
   "V_MUL_LEGACY_F32", "v_mul_dx9_zero_f32">;
-defm V_LSHLREV_B32        : VOP2_Real_FULL_gfx11_gfx12<0x018>;
-defm V_LSHRREV_B32        : VOP2_Real_FULL_gfx11_gfx12<0x019>;
-defm V_ASHRREV_I32        : VOP2_Real_FULL_gfx11_gfx12<0x01a>;
+defm V_LSHLREV_B32        : VOP2_Real_FULL_gfx11_gfx12_gfx13<0x018, 0x1a>;
+defm V_LSHRREV_B32        : VOP2_Real_FULL_gfx11_gfx12_gfx13<0x019, 0x16>;
+defm V_ASHRREV_I32        : VOP2_Real_FULL_gfx11_gfx12_gfx13<0x01a, 0x18>;
 defm V_ADD_CO_CI_U32 :
-  VOP2be_Real_gfx11<0x020, "V_ADDC_U32", "v_add_co_ci_u32">;
+  VOP2be_Real_gfx11<0x20, "V_ADDC_U32", "v_add_co_ci_u32">;
 defm V_SUB_CO_CI_U32 :
-  VOP2be_Real_gfx11<0x021, "V_SUBB_U32", "v_sub_co_ci_u32">;
+  VOP2be_Real_gfx11<0x21, "V_SUBB_U32", "v_sub_co_ci_u32">;
 defm V_SUBREV_CO_CI_U32 :
-  VOP2be_Real_gfx11<0x022, "V_SUBBREV_U32", "v_subrev_co_ci_u32">;
+  VOP2be_Real_gfx11<0x22, "V_SUBBREV_U32", "v_subrev_co_ci_u32">;
 
-defm V_CVT_PK_RTZ_F16_F32  : VOP2_Real_FULL_with_name_gfx11_gfx12<0x02f,
+defm V_CVT_PK_RTZ_F16_F32  : VOP2_Real_FULL_with_name_gfx11_gfx12_gfx13<0x02f,
   "V_CVT_PKRTZ_F16_F32", "v_cvt_pk_rtz_f16_f32">;
-defm V_PK_FMAC_F16     : VOP2_Real_e32_gfx11_gfx12<0x03c>;
-
-defm V_ADD_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x032, "v_add_f16">;
-defm V_SUB_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x033, "v_sub_f16">;
-defm V_SUBREV_F16          : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x034, "v_subrev_f16">;
-defm V_MUL_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x035, "v_mul_f16">;
-defm V_FMAC_F16            : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x036, "v_fmac_f16">;
-defm V_LDEXP_F16           : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x03b, "v_ldexp_f16">;
+defm V_PK_FMAC_F16     : VOP2_Real_e32_gfx11_gfx12_gfx13<0x03c>;
+
+defm V_ADD_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12_gfx13<0x032, "v_add_f16">;
+defm V_SUB_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12_gfx13<0x033, "v_sub_f16">;
+defm V_SUBREV_F16          : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12_gfx13<0x034, "v_subrev_f16">;
+defm V_MUL_F16             : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12_gfx13<0x035, "v_mul_f16">;
+defm V_FMAC_F16            : VOP2_Real_FULL_t16_and_fake16_gfx...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/182812


More information about the llvm-commits mailing list