Skip to content

Commit d3b825f

Browse files
authored
[AMDGPU] Use consistent DecoderNamespace for wave64 instructions. NFC. (llvm#81863)
For wave64 WMMA instructions, putting W64 in the DecoderNamespace is more descriptive than WMMA, and matches other uses for GFX12 GLOBAL_LOAD_TR instructions.
1 parent 7677453 commit d3b825f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,11 +662,11 @@ DecodeStatus AMDGPUDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
662662
if (Res)
663663
break;
664664

665-
Res = tryDecodeInst(DecoderTableWMMAGFX1164, MI, QW, Address, CS);
665+
Res = tryDecodeInst(DecoderTableGFX11W6464, MI, QW, Address, CS);
666666
if (Res)
667667
break;
668668

669-
Res = tryDecodeInst(DecoderTableWMMAGFX1264, MI, QW, Address, CS);
669+
Res = tryDecodeInst(DecoderTableGFX12W6464, MI, QW, Address, CS);
670670
} while (false);
671671

672672
if (Res && AMDGPU::isMAC(MI.getOpcode())) {

llvm/lib/Target/AMDGPU/VOP3PInstructions.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ multiclass VOP3P_Real_WMMA_gfx12 <bits<7> op, VOP3PWMMA_Profile WMMAP> {
14141414
}
14151415

14161416
multiclass VOP3P_Real_WMMA_gfx12w64 <bits<7> op, VOP3PWMMA_Profile WMMAP> {
1417-
let WaveSizePredicate = isWave64, DecoderNamespace = "WMMAGFX12" in {
1417+
let WaveSizePredicate = isWave64, DecoderNamespace = "GFX12W64" in {
14181418
defm _twoaddr : VOP3P_WMMA_Real_Base <GFX12Gen, op, WMMAP>;
14191419
}
14201420
}
@@ -1544,7 +1544,7 @@ multiclass VOP3P_Real_WMMA <bits<7> op> {
15441544
let WaveSizePredicate = isWave32, DecoderNamespace = "GFX11" in {
15451545
defm _twoaddr_w32 : VOP3P_Real_Base <GFX11Gen, op>;
15461546
}
1547-
let WaveSizePredicate = isWave64, DecoderNamespace = "WMMAGFX11" in {
1547+
let WaveSizePredicate = isWave64, DecoderNamespace = "GFX11W64" in {
15481548
defm _twoaddr_w64 : VOP3P_Real_Base <GFX11Gen, op>;
15491549
}
15501550
}

0 commit comments

Comments
 (0)