Skip to content

Commit 2f210fc

Browse files
committed
[AMDGPU] Fix wrong MSB encoding for V_FMAMK instructions
These instructions use `src0`, `imm`, `src1` as operand. Fixes SWDEV-566579.
1 parent 3a08e42 commit 2f210fc

File tree

2 files changed

+33
-8
lines changed

2 files changed

+33
-8
lines changed

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3439,17 +3439,42 @@ getVGPRLoweringOperandTables(const MCInstrDesc &Desc) {
34393439
AMDGPU::OpName::src0Y, AMDGPU::OpName::vsrc1Y, AMDGPU::OpName::vsrc2Y,
34403440
AMDGPU::OpName::vdstY};
34413441

3442+
// VOP2 MADMK instructions use src0, imm, src1 scheme.
3443+
static const AMDGPU::OpName VOP2MADMKOps[4] = {
3444+
AMDGPU::OpName::src0, AMDGPU::OpName::imm, AMDGPU::OpName::src1,
3445+
AMDGPU::OpName::vdst};
3446+
34423447
unsigned TSFlags = Desc.TSFlags;
34433448

34443449
if (TSFlags &
34453450
(SIInstrFlags::VOP1 | SIInstrFlags::VOP2 | SIInstrFlags::VOP3 |
34463451
SIInstrFlags::VOP3P | SIInstrFlags::VOPC | SIInstrFlags::DPP)) {
3452+
switch (Desc.getOpcode()) {
34473453
// LD_SCALE operands ignore MSB.
3448-
if (Desc.getOpcode() == AMDGPU::V_WMMA_LD_SCALE_PAIRED_B32 ||
3449-
Desc.getOpcode() == AMDGPU::V_WMMA_LD_SCALE_PAIRED_B32_gfx1250 ||
3450-
Desc.getOpcode() == AMDGPU::V_WMMA_LD_SCALE16_PAIRED_B64 ||
3451-
Desc.getOpcode() == AMDGPU::V_WMMA_LD_SCALE16_PAIRED_B64_gfx1250)
3454+
case AMDGPU::V_WMMA_LD_SCALE_PAIRED_B32:
3455+
case AMDGPU::V_WMMA_LD_SCALE_PAIRED_B32_gfx1250:
3456+
case AMDGPU::V_WMMA_LD_SCALE16_PAIRED_B64:
3457+
case AMDGPU::V_WMMA_LD_SCALE16_PAIRED_B64_gfx1250:
34523458
return {};
3459+
case AMDGPU::V_FMAMK_F16_fake16_gfx11:
3460+
case AMDGPU::V_FMAMK_F16_fake16_gfx12:
3461+
case AMDGPU::V_FMAMK_F16_gfx10:
3462+
case AMDGPU::V_FMAMK_F16_t16_gfx11:
3463+
case AMDGPU::V_FMAMK_F16_t16_gfx12:
3464+
case AMDGPU::V_FMAMK_F32_gfx10:
3465+
case AMDGPU::V_FMAMK_F32_gfx11:
3466+
case AMDGPU::V_FMAMK_F32_gfx12:
3467+
case AMDGPU::V_FMAMK_F32_gfx940:
3468+
case AMDGPU::V_FMAMK_F64_gfx1250:
3469+
case AMDGPU::V_FMAMK_F16:
3470+
case AMDGPU::V_FMAMK_F16_t16:
3471+
case AMDGPU::V_FMAMK_F16_fake16:
3472+
case AMDGPU::V_FMAMK_F32:
3473+
case AMDGPU::V_FMAMK_F64:
3474+
return {VOP2MADMKOps, nullptr};
3475+
default:
3476+
break;
3477+
}
34533478
return {VOPOps, nullptr};
34543479
}
34553480

llvm/test/CodeGen/AMDGPU/vgpr-lowering-gfx1250.mir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,19 +332,19 @@ body: |
332332
; GCN-NEXT: v_fmaak_f32 v0 /*v256*/, v1, v2 /*v258*/, 0x1
333333
$vgpr256 = V_FMAAK_F32 undef $vgpr1, undef $vgpr258, 1, implicit $exec, implicit $mode
334334
335-
; GCN-NEXT: s_set_vgpr_msb 0x4445
335+
; GCN-NEXT: s_set_vgpr_msb 0x4451
336336
; GCN-NEXT: v_fmamk_f32 v0 /*v256*/, v1 /*v257*/, 0x1, v2 /*v258*/
337337
$vgpr256 = V_FMAMK_F32 undef $vgpr257, 1, undef $vgpr258, implicit $exec, implicit $mode
338338
339-
; GCN-NEXT: s_set_vgpr_msb 0x4505
339+
; GCN-NEXT: s_set_vgpr_msb 0x5111
340340
; GCN-NEXT: v_fmamk_f32 v0, v1 /*v257*/, 0x1, v2 /*v258*/
341341
$vgpr0 = V_FMAMK_F32 undef $vgpr257, 1, undef $vgpr258, implicit $exec, implicit $mode
342342
343-
; GCN-NEXT: s_set_vgpr_msb 0x541
343+
; GCN-NEXT: s_set_vgpr_msb 0x1141
344344
; GCN-NEXT: v_fmamk_f32 v0 /*v256*/, v1 /*v257*/, 0x1, v2
345345
$vgpr256 = V_FMAMK_F32 undef $vgpr257, 1, undef $vgpr2, implicit $exec, implicit $mode
346346
347-
; GCN-NEXT: s_set_vgpr_msb 0x4144
347+
; GCN-NEXT: s_set_vgpr_msb 0x4150
348348
; GCN-NEXT: v_fmamk_f32 v0 /*v256*/, v1, 0x1, v2 /*v258*/
349349
$vgpr256 = V_FMAMK_F32 undef $vgpr1, 1, undef $vgpr258, implicit $exec, implicit $mode
350350

0 commit comments

Comments
 (0)