Skip to content

Commit 9fb01fc

Browse files
authored
[AMDGPU][MC][True16] Support VOP2 instructions with true16 format (#115233)
Support true16 format for VOP2 instructions in MC This patch updates the true16 and fake16 vop_profile for the following instructions and update the asm/dasm tests: v_fmac_f16 v_fmamk_f16 v_fmaak_f16 It seems vop2_t16_promote.s files are not yet updated with true16 flag in the previous batch update. It will be updated seperately
1 parent 934140a commit 9fb01fc

17 files changed

+794
-340
lines changed

llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,25 @@ static DecodeStatus decodeOperand_VSrcT16_Lo128(MCInst &Inst, unsigned Imm,
345345
(AMDGPU::OperandSemantics)OperandSemantics));
346346
}
347347

348+
template <AMDGPUDisassembler::OpWidthTy OpWidth, unsigned ImmWidth,
349+
unsigned OperandSemantics>
350+
static DecodeStatus
351+
decodeOperand_VSrcT16_Lo128_Deferred(MCInst &Inst, unsigned Imm,
352+
uint64_t /*Addr*/,
353+
const MCDisassembler *Decoder) {
354+
const auto *DAsm = static_cast<const AMDGPUDisassembler *>(Decoder);
355+
assert(isUInt<9>(Imm) && "9-bit encoding expected");
356+
357+
if (Imm & AMDGPU::EncValues::IS_VGPR) {
358+
bool IsHi = Imm & (1 << 7);
359+
unsigned RegIdx = Imm & 0x7f;
360+
return addOperand(Inst, DAsm->createVGPR16Operand(RegIdx, IsHi));
361+
}
362+
return addOperand(Inst, DAsm->decodeNonVGPRSrcOp(
363+
OpWidth, Imm & 0xFF, true, ImmWidth,
364+
(AMDGPU::OperandSemantics)OperandSemantics));
365+
}
366+
348367
template <AMDGPUDisassembler::OpWidthTy OpWidth, unsigned ImmWidth,
349368
unsigned OperandSemantics>
350369
static DecodeStatus decodeOperand_VSrcT16(MCInst &Inst, unsigned Imm,

llvm/lib/Target/AMDGPU/SIRegisterInfo.td

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,8 @@ def SSrcOrLds_b32 : SrcRegOrImm9 <SRegOrLds_32, "OPW32", "OPERAND_REG_IMM_INT32"
11611161
class SrcRegOrImmDeferred9<RegisterClass regClass, string opWidth,
11621162
string operandType, int immWidth, int OperandSemantics>
11631163
: RegOrImmOperand<regClass, operandType> {
1164-
let DecoderMethod = "decodeSrcRegOrImmDeferred9<AMDGPUDisassembler::" #
1164+
string DecoderMethodName = "decodeSrcRegOrImmDeferred9";
1165+
let DecoderMethod = DecoderMethodName # "<AMDGPUDisassembler::" #
11651166
opWidth # ", " # immWidth # ", " # OperandSemantics # ">";
11661167
}
11671168

@@ -1222,6 +1223,13 @@ def VSrc_bf16_Deferred : SrcRegOrImmDeferred9<VS_32, "OPW16", "OPERAND_REG_IMM_B
12221223
def VSrc_f16_Deferred : SrcRegOrImmDeferred9<VS_32, "OPW16", "OPERAND_REG_IMM_FP16_DEFERRED", 16, OperandSemantics.FP16>;
12231224
def VSrc_f32_Deferred : SrcRegOrImmDeferred9<VS_32, "OPW32", "OPERAND_REG_IMM_FP32_DEFERRED", 32, OperandSemantics.FP32>;
12241225

1226+
// True 16 Operands
1227+
def VSrcT_f16_Lo128_Deferred : SrcRegOrImmDeferred9<VS_16_Lo128, "OPW16",
1228+
"OPERAND_REG_IMM_FP16_DEFERRED", 16, OperandSemantics.FP16> {
1229+
let DecoderMethodName = "decodeOperand_VSrcT16_Lo128_Deferred";
1230+
let EncoderMethod = "getMachineOpValueT16Lo128";
1231+
}
1232+
12251233
def VSrcFake16_bf16_Lo128_Deferred
12261234
: SrcRegOrImmDeferred9<VS_32_Lo128, "OPW16", "OPERAND_REG_IMM_BF16_DEFERRED", 16, OperandSemantics.BF16>;
12271235
def VSrcFake16_f16_Lo128_Deferred

llvm/lib/Target/AMDGPU/VOP2Instructions.td

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,12 @@ class VOP_MADAK <ValueType vt> : VOP_MADK_Base<vt> {
374374
}
375375

376376
def VOP_MADAK_F16 : VOP_MADAK <f16>;
377+
def VOP_MADAK_F16_t16 : VOP_MADAK <f16> {
378+
let IsTrue16 = 1;
379+
let IsRealTrue16 = 1;
380+
let DstRC = getVALUDstForVT<DstVT, 1/*IsTrue16*/, 0/*IsVOP3Encoding*/>.ret;
381+
let Ins32 = (ins VSrcT_f16_Lo128_Deferred:$src0, VGPRSrc_16_Lo128:$src1, ImmOpType:$imm);
382+
}
377383
def VOP_MADAK_F16_fake16 : VOP_MADAK <f16> {
378384
let IsTrue16 = 1;
379385
let DstRC = getVALUDstForVT_fake16<DstVT>.ret;
@@ -399,6 +405,12 @@ class VOP_MADMK <ValueType vt> : VOP_MADK_Base<vt> {
399405
}
400406

401407
def VOP_MADMK_F16 : VOP_MADMK <f16>;
408+
def VOP_MADMK_F16_t16 : VOP_MADMK <f16> {
409+
let IsTrue16 = 1;
410+
let IsRealTrue16 = 1;
411+
let DstRC = getVALUDstForVT<DstVT, 1/*IsTrue16*/, 0/*IsVOP3Encoding*/>.ret;
412+
let Ins32 = (ins VSrcT_f16_Lo128_Deferred:$src0, ImmOpType:$imm, VGPRSrc_16_Lo128:$src1);
413+
}
402414
def VOP_MADMK_F16_fake16 : VOP_MADMK <f16> {
403415
let IsTrue16 = 1;
404416
let DstRC = getVALUDstForVT_fake16<DstVT>.ret;
@@ -467,6 +479,42 @@ class VOP_MAC <ValueType vt0, ValueType vt1=vt0> : VOPProfile <[vt0, vt1, vt1, v
467479
}
468480

469481
def VOP_MAC_F16 : VOP_MAC <f16>;
482+
def VOP_MAC_F16_t16 : VOP_MAC <f16> {
483+
let IsTrue16 = 1;
484+
let IsRealTrue16 = 1;
485+
let HasOpSel = 1;
486+
let DstRC = VOPDstOperand_t16Lo128;
487+
let Src0RC32 = getVOPSrc0ForVT<Src0VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
488+
let Src1RC32 = getVregSrcForVT<Src1VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
489+
let Ins32 = (ins Src0RC32:$src0, Src1RC32:$src1, getVregSrcForVT<Src2VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret:$src2);
490+
let Src0DPP = getVregSrcForVT<Src0VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
491+
let Src1DPP = getVregSrcForVT<Src1VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
492+
let Src2DPP = getVregSrcForVT<Src2VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
493+
let Src0ModDPP = getSrcModDPP_t16<Src0VT, 0/*IsFake16*/>.ret;
494+
let Src1ModDPP = getSrcModDPP_t16<Src1VT, 0/*IsFake16*/>.ret;
495+
let Src2ModDPP = getSrcModDPP_t16<Src2VT, 0/*IsFake16*/>.ret;
496+
let InsDPP = (ins Src0ModDPP:$src0_modifiers, Src0DPP:$src0,
497+
Src1ModDPP:$src1_modifiers, Src1DPP:$src1,
498+
getVregSrcForVT<Src2VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret:$src2, // stub argument
499+
dpp_ctrl:$dpp_ctrl, DppRowMask:$row_mask,
500+
DppBankMask:$bank_mask, DppBoundCtrl:$bound_ctrl);
501+
let InsDPP8 = (ins Src0ModDPP:$src0_modifiers, Src0DPP:$src0,
502+
Src1ModDPP:$src1_modifiers, Src1DPP:$src1,
503+
getVregSrcForVT<Src2VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret:$src2, // stub argument
504+
dpp8:$dpp8, Dpp8FI:$fi);
505+
let DstRC64 = getVALUDstForVT<DstVT, 1/*IsTrue*/, 1/*IsVOP3Encoding*/>.ret;
506+
let Src0RC64 = getVOP3SrcForVT<Src0VT, 1/*IsTrue16*/>.ret;
507+
let Src1RC64 = getVOP3SrcForVT<Src1VT, 1/*IsTrue16*/>.ret;
508+
let Src0VOP3DPP = VGPRSrc_16;
509+
let Src1VOP3DPP = getVOP3DPPSrcForVT<Src1VT, 0/*IsFake16*/>.ret;
510+
let Src2VOP3DPP = getVOP3DPPSrcForVT<Src2VT, 0/*IsFake16*/>.ret;
511+
let Src0ModVOP3DPP = getSrc0ModVOP3DPP<Src0VT, DstVT, 0/*IsFake16*/>.ret;
512+
let Src1ModVOP3DPP = getSrcModVOP3DPP<Src1VT, 0/*IsFake16*/>.ret;
513+
let Src2ModVOP3DPP = getSrcModVOP3DPP<Src2VT, 0/*IsFake16*/>.ret;
514+
let Src0Mod = getSrc0Mod<Src0VT, DstVT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
515+
let Src1Mod = getSrcMod<Src1VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
516+
let Src2Mod = getSrcMod<Src2VT, 1/*IsTrue16*/, 0/*IsFake16*/>.ret;
517+
}
470518
def VOP_MAC_F16_fake16 : VOP_MAC <f16> {
471519
let IsTrue16 = 1;
472520
let DstRC = getVALUDstForVT_fake16<DstVT>.ret;
@@ -998,6 +1046,9 @@ let FPDPRounding = 1, isReMaterializable = 1, FixedSize = 1 in {
9981046
let SubtargetPredicate = isGFX10Plus, True16Predicate = NotHasTrue16BitInsts in {
9991047
def V_FMAMK_F16 : VOP2_Pseudo <"v_fmamk_f16", VOP_MADMK_F16, [], "">;
10001048
}
1049+
let True16Predicate = UseRealTrue16Insts in {
1050+
def V_FMAMK_F16_t16 : VOP2_Pseudo <"v_fmamk_f16_t16", VOP_MADMK_F16_t16, [], "">;
1051+
}
10011052
let True16Predicate = UseFakeTrue16Insts in {
10021053
def V_FMAMK_F16_fake16 : VOP2_Pseudo <"v_fmamk_f16_fake16", VOP_MADMK_F16_fake16, [], "">;
10031054
}
@@ -1006,6 +1057,9 @@ let isCommutable = 1 in {
10061057
let SubtargetPredicate = isGFX10Plus, True16Predicate = NotHasTrue16BitInsts in {
10071058
def V_FMAAK_F16 : VOP2_Pseudo <"v_fmaak_f16", VOP_MADAK_F16, [], "">;
10081059
}
1060+
let True16Predicate = UseRealTrue16Insts in {
1061+
def V_FMAAK_F16_t16 : VOP2_Pseudo <"v_fmaak_f16_t16", VOP_MADAK_F16_t16, [], "">;
1062+
}
10091063
let True16Predicate = UseFakeTrue16Insts in {
10101064
def V_FMAAK_F16_fake16 : VOP2_Pseudo <"v_fmaak_f16_fake16", VOP_MADAK_F16_fake16, [], "">;
10111065
}
@@ -1020,6 +1074,9 @@ let SubtargetPredicate = isGFX10Plus in {
10201074
let True16Predicate = NotHasTrue16BitInsts in {
10211075
defm V_FMAC_F16 : VOP2Inst <"v_fmac_f16", VOP_MAC_F16>;
10221076
}
1077+
let True16Predicate = UseRealTrue16Insts in {
1078+
defm V_FMAC_F16_t16 : VOP2Inst <"v_fmac_f16_t16", VOP_MAC_F16_t16>;
1079+
}
10231080
let True16Predicate = UseFakeTrue16Insts in {
10241081
defm V_FMAC_F16_fake16 : VOP2Inst <"v_fmac_f16_fake16", VOP_MAC_F16_fake16>;
10251082
}
@@ -1692,8 +1749,8 @@ multiclass VOP3Only_Realtriple_t16_gfx11_gfx12<bits<10> op, string asmName, stri
16921749
VOP3_Realtriple_t16_gfx12<op, asmName, OpName, "", /*IsSingle*/1>;
16931750

16941751
multiclass VOP3Only_Realtriple_t16_and_fake16_gfx11_gfx12<bits<10> op, string asmName, string OpName = NAME> {
1695-
defm OpName#"_t16": VOP3Only_Realtriple_t16_gfx11_gfx12<op, asmName, OpName#"_t16">;
1696-
defm OpName#"_fake16": VOP3Only_Realtriple_t16_gfx11_gfx12<op, asmName, OpName#"_fake16">;
1752+
defm _t16: VOP3Only_Realtriple_t16_gfx11_gfx12<op, asmName, OpName#"_t16">;
1753+
defm _fake16: VOP3Only_Realtriple_t16_gfx11_gfx12<op, asmName, OpName#"_fake16">;
16971754
}
16981755

16991756
multiclass VOP3beOnly_Realtriple_gfx11_gfx12<bits<10> op> :
@@ -1712,7 +1769,14 @@ multiclass VOP2Only_Real_MADK_t16_and_fake16_gfx11_gfx12<bits<6> op, string asmN
17121769

17131770
multiclass VOP2_Real_FULL_t16_gfx11_gfx12<bits<6> op, string asmName,
17141771
string opName = NAME> :
1715-
VOP2_Real_FULL_with_name_gfx11_gfx12<op, opName, asmName>;
1772+
VOP2_Real_FULL_with_name<GFX11Gen, op, opName, asmName>,
1773+
VOP2_Real_FULL_with_name<GFX12Gen, op, opName, asmName>;
1774+
1775+
multiclass VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<bits<6> op, string asmName,
1776+
string opName = NAME> {
1777+
defm _t16: VOP2_Real_FULL_t16_gfx11_gfx12<op, asmName, opName#"_t16">;
1778+
defm _fake16: VOP2_Real_FULL_t16_gfx11_gfx12<op, asmName, opName#"_fake16">;
1779+
}
17161780

17171781
multiclass VOP2_Real_FULL_gfx11<bits<6> op> :
17181782
VOP2_Real_FULL<GFX11Gen, op>;
@@ -1747,15 +1811,15 @@ defm V_SUBREV_F16_t16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x034, "v_subrev_f16
17471811
defm V_SUBREV_F16_fake16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x034, "v_subrev_f16">;
17481812
defm V_MUL_F16_t16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x035, "v_mul_f16">;
17491813
defm V_MUL_F16_fake16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x035, "v_mul_f16">;
1750-
defm V_FMAC_F16_fake16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x036, "v_fmac_f16">;
1814+
defm V_FMAC_F16 : VOP2_Real_FULL_t16_and_fake16_gfx11_gfx12<0x036, "v_fmac_f16">;
17511815
defm V_LDEXP_F16_t16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x03b, "v_ldexp_f16">;
17521816
defm V_LDEXP_F16_fake16 : VOP2_Real_FULL_t16_gfx11_gfx12<0x03b, "v_ldexp_f16">;
17531817
defm V_MAX_F16_t16 : VOP2_Real_FULL_t16_gfx11<0x039, "v_max_f16">;
17541818
defm V_MAX_F16_fake16 : VOP2_Real_FULL_t16_gfx11<0x039, "v_max_f16">;
17551819
defm V_MIN_F16_t16 : VOP2_Real_FULL_t16_gfx11<0x03a, "v_min_f16">;
17561820
defm V_MIN_F16_fake16 : VOP2_Real_FULL_t16_gfx11<0x03a, "v_min_f16">;
1757-
defm V_FMAMK_F16_fake16 : VOP2Only_Real_MADK_t16_gfx11_gfx12<0x037, "v_fmamk_f16">;
1758-
defm V_FMAAK_F16_fake16 : VOP2Only_Real_MADK_t16_gfx11_gfx12<0x038, "v_fmaak_f16">;
1821+
defm V_FMAMK_F16 : VOP2Only_Real_MADK_t16_and_fake16_gfx11_gfx12<0x037, "v_fmamk_f16">;
1822+
defm V_FMAAK_F16 : VOP2Only_Real_MADK_t16_and_fake16_gfx11_gfx12<0x038, "v_fmaak_f16">;
17591823

17601824
// VOP3 only.
17611825
defm V_CNDMASK_B16 : VOP3Only_Realtriple_gfx11_gfx12<0x25d>;

0 commit comments

Comments
 (0)