Skip to content

Commit 429098c

Browse files
authored
[AMDGPU] Fix subtarget predicates for some V_MAD, V_FMA and V_DOT instructions. (#71194)
Resolves AsmParser ambiguities, e.g., between V_FMA_MIXLO_F16_vi and V_FMA_MIXLO_F16_gfx11. Part of <#69256>.
1 parent 2e79133 commit 429098c

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

llvm/lib/Target/AMDGPU/VOP3PInstructions.td

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ class UDot2Pat<Instruction Inst> : GCNPat <
360360
(and i32:$src1, (i32 65535)))
361361
),
362362
(Inst (i32 8), $src0, (i32 8), $src1, (i32 8), $src2, (i1 0))> {
363-
let SubtargetPredicate = !cast<VOP_Pseudo>(Inst).SubtargetPredicate;
363+
let Predicates = !cast<VOP_Pseudo>(Inst).Predicates;
364364
}
365365

366366
class SDot2Pat<Instruction Inst> : GCNPat <
@@ -369,40 +369,35 @@ class SDot2Pat<Instruction Inst> : GCNPat <
369369
(AMDGPUmul_i24_oneuse (sext_inreg i32:$src0, i16),
370370
(sext_inreg i32:$src1, i16))),
371371
(Inst (i32 8), $src0, (i32 8), $src1, (i32 8), $src2, (i1 0))> {
372-
let SubtargetPredicate = !cast<VOP_Pseudo>(Inst).SubtargetPredicate;
372+
let Predicates = !cast<VOP_Pseudo>(Inst).Predicates;
373373
}
374374

375375
let IsDOT = 1 in {
376-
let SubtargetPredicate = HasDot2Insts in {
377-
376+
let OtherPredicates = [HasDot2Insts] in {
378377
defm V_DOT2_I32_I16 : VOP3PInst<"v_dot2_i32_i16",
379378
VOP3P_Profile<VOP_I32_V2I16_V2I16_I32>, int_amdgcn_sdot2, 1>;
380379
defm V_DOT2_U32_U16 : VOP3PInst<"v_dot2_u32_u16",
381380
VOP3P_Profile<VOP_I32_V2I16_V2I16_I32>, int_amdgcn_udot2, 1>;
381+
} // End OtherPredicates = [HasDot2Insts]
382382

383-
} // End SubtargetPredicate = HasDot2Insts
384-
385-
let SubtargetPredicate = HasDot10Insts in
383+
let OtherPredicates = [HasDot10Insts] in
386384
defm V_DOT2_F32_F16 : VOP3PInst<"v_dot2_f32_f16",
387385
VOP3P_Profile<VOP_F32_V2F16_V2F16_F32, VOP3_REGULAR, /*HasDPP*/ 1>,
388386
AMDGPUfdot2, 1/*ExplicitClamp*/>;
389387

390-
let SubtargetPredicate = HasDot7Insts in {
388+
let OtherPredicates = [HasDot7Insts] in {
391389
defm V_DOT4_U32_U8 : VOP3PInst<"v_dot4_u32_u8",
392390
VOP3P_Profile<VOP_I32_I32_I32_I32, VOP3_PACKED>, int_amdgcn_udot4, 1>;
393391
defm V_DOT8_U32_U4 : VOP3PInst<"v_dot8_u32_u4",
394392
VOP3P_Profile<VOP_I32_I32_I32_I32, VOP3_PACKED>, int_amdgcn_udot8, 1>;
393+
} // End OtherPredicates = [HasDot7Insts]
395394

396-
} // End SubtargetPredicate = HasDot7Insts
397-
398-
let SubtargetPredicate = HasDot1Insts in {
399-
395+
let OtherPredicates = [HasDot1Insts] in {
400396
defm V_DOT4_I32_I8 : VOP3PInst<"v_dot4_i32_i8",
401397
VOP3P_Profile<VOP_I32_I32_I32_I32, VOP3_PACKED>, int_amdgcn_sdot4, 1>;
402398
defm V_DOT8_I32_I4 : VOP3PInst<"v_dot8_i32_i4",
403399
VOP3P_Profile<VOP_I32_I32_I32_I32, VOP3_PACKED>, int_amdgcn_sdot8, 1>;
404-
405-
} // End SubtargetPredicate = HasDot1Insts
400+
} // End OtherPredicates = [HasDot1Insts]
406401

407402
def DOT2_BF16_Profile
408403
: VOP3P_Profile<VOP_F32_V2I16_V2I16_F32, VOP3_REGULAR, /*HasDPP*/ 1> {
@@ -456,14 +451,14 @@ def : UDot2Pat<V_DOT2_U32_U16>;
456451
def : SDot2Pat<V_DOT2_I32_I16>;
457452

458453
foreach Type = ["U", "I"] in
459-
let SubtargetPredicate = !cast<VOP_Pseudo>("V_DOT4_"#Type#"32_"#Type#8).SubtargetPredicate in
454+
let Predicates = !cast<VOP_Pseudo>("V_DOT4_"#Type#"32_"#Type#8).Predicates in
460455
def : GCNPat <
461456
!cast<dag>(!foldl((i32 i32:$src2), [0, 1, 2, 3], lhs, y,
462457
(add_oneuse lhs, (!cast<PatFrag>("Mul"#Type#"_Elt"#y) i32:$src0, i32:$src1)))),
463458
(!cast<VOP3P_Pseudo>("V_DOT4_"#Type#"32_"#Type#8) (i32 8), $src0, (i32 8), $src1, (i32 8), $src2, (i1 0))>;
464459

465460
foreach Type = ["U", "I"] in
466-
let SubtargetPredicate = !cast<VOP_Pseudo>("V_DOT8_"#Type#"32_"#Type#4).SubtargetPredicate in
461+
let Predicates = !cast<VOP_Pseudo>("V_DOT8_"#Type#"32_"#Type#4).Predicates in
467462
def : GCNPat <
468463
!cast<dag>(!foldl((add_oneuse i32:$src2, (!cast<PatFrag>("Mul"#Type#"0_4bit") i32:$src0, i32:$src1)),
469464
[1, 2, 3, 4, 5, 6, 7], lhs, y,
@@ -473,7 +468,7 @@ foreach Type = ["U", "I"] in
473468
// Different variants of dot8 code-gen dag patterns are not generated through table-gen due to a huge increase
474469
// in the compile time. Directly handle the pattern generated by the FE here.
475470
foreach Type = ["U", "I"] in
476-
let SubtargetPredicate = !cast<VOP_Pseudo>("V_DOT8_"#Type#"32_"#Type#4).SubtargetPredicate in
471+
let Predicates = !cast<VOP_Pseudo>("V_DOT8_"#Type#"32_"#Type#4).Predicates in
477472
def : GCNPat <
478473
!cast<dag>(!foldl((add_oneuse i32:$src2, (!cast<PatFrag>("Mul"#Type#"0_4bit") i32:$src0, i32:$src1)),
479474
[7, 1, 2, 3, 4, 5, 6], lhs, y,
@@ -1128,25 +1123,22 @@ defm V_PK_ADD_F16 : VOP3P_Real_vi <0x0f>;
11281123
defm V_PK_MUL_F16 : VOP3P_Real_vi <0x10>;
11291124
defm V_PK_MIN_F16 : VOP3P_Real_vi <0x11>;
11301125
defm V_PK_MAX_F16 : VOP3P_Real_vi <0x12>;
1131-
} // End SubtargetPredicate = isGFX8GFX9
11321126

1133-
let SubtargetPredicate = HasMadMixInsts in {
1127+
let OtherPredicates = [HasMadMixInsts] in {
11341128
defm V_MAD_MIX_F32 : VOP3P_Real_vi <0x20>;
11351129
defm V_MAD_MIXLO_F16 : VOP3P_Real_vi <0x21>;
11361130
defm V_MAD_MIXHI_F16 : VOP3P_Real_vi <0x22>;
11371131
}
11381132

1139-
let SubtargetPredicate = HasFmaMixInsts in {
1140-
let DecoderNamespace = "GFX9_DL" in {
1133+
let OtherPredicates = [HasFmaMixInsts],
1134+
DecoderNamespace = "GFX9_DL" in {
11411135
// The mad_mix instructions were renamed and their behaviors changed,
11421136
// but the opcode stayed the same so we need to put these in a
11431137
// different DecoderNamespace to avoid the ambiguity.
11441138
defm V_FMA_MIX_F32 : VOP3P_Real_vi <0x20>;
11451139
defm V_FMA_MIXLO_F16 : VOP3P_Real_vi <0x21>;
11461140
defm V_FMA_MIXHI_F16 : VOP3P_Real_vi <0x22>;
11471141
}
1148-
}
1149-
11501142

11511143
defm V_DOT2_I32_I16 : VOP3P_Real_vi <0x26>;
11521144
defm V_DOT2_U32_U16 : VOP3P_Real_vi <0x27>;
@@ -1157,6 +1149,7 @@ defm V_DOT8_U32_U4 : VOP3P_Real_vi <0x2b>;
11571149

11581150
defm V_DOT4_I32_I8 : VOP3P_Real_vi <0x28>;
11591151
defm V_DOT8_I32_I4 : VOP3P_Real_vi <0x2a>;
1152+
} // End SubtargetPredicate = isGFX8GFX9
11601153

11611154
let OtherPredicates = [HasMAIInsts] in {
11621155

0 commit comments

Comments
 (0)