Skip to content

[AMDGPU] Enable aliases in InstPrinter #171265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
arichardson wants to merge 1 commit into
base: users/arichardson/spr/main.amdgpu-enable-aliases-in-instprinter
Choose a base branch
from
Draft

[AMDGPU] Enable aliases in InstPrinter #171265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ void AMDGPUInstPrinter::printRegName(raw_ostream &OS, MCRegister Reg) {
void AMDGPUInstPrinter::printInst(const MCInst *MI, uint64_t Address,
StringRef Annot, const MCSubtargetInfo &STI,
raw_ostream &OS) {
printInstruction(MI, Address, STI, OS);
if (!PrintAliases || !printAliasInstr(MI, Address, STI, OS))
printInstruction(MI, Address, STI, OS);
printAnnotation(OS, Annot);
}

Expand Down Expand Up @@ -1944,4 +1945,5 @@ void AMDGPUInstPrinter::printScaleSel(const MCInst *MI, unsigned OpNo,
O << " scale_sel:" << formatDec(Imm);
}

#define PRINT_ALIAS_INSTR
#include "AMDGPUGenAsmWriter.inc"
5 changes: 5 additions & 0 deletions llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ class AMDGPUInstPrinter : public MCInstPrinter {
raw_ostream &O, const MCRegisterInfo &MRI);

private:
bool printAliasInstr(const MCInst *MI, uint64_t Address,
const MCSubtargetInfo &STI, raw_ostream &OS);
void printCustomAliasOperand(const MCInst *MI, uint64_t Address,
unsigned OpIdx, unsigned PrintMethodIdx,
const MCSubtargetInfo &STI, raw_ostream &OS);
void printU16ImmOperand(const MCInst *MI, unsigned OpNo,
const MCSubtargetInfo &STI, raw_ostream &O);
void printU16ImmDecOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
Expand Down
8 changes: 4 additions & 4 deletions llvm/test/CodeGen/AMDGPU/max.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ define amdgpu_kernel void @test_umax_ugt_i64(ptr addrspace(1) %out, i64 %a, i64
; SI-NEXT: s_mov_b32 s4, s0
; SI-NEXT: v_mov_b32_e32 v0, s8
; SI-NEXT: v_mov_b32_e32 v1, s9
; SI-NEXT: v_cmp_gt_u64_e32 vcc, s[2:3], v[0:1]
; SI-NEXT: V_CMP_GT_U64 vcc, s[2:3], v[0:1]
Copy link
Contributor

@arsenm arsenm Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We definitely don't want to switch to all caps instruction names

Copy link
Member Author

@arichardson arichardson Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I have no idea why it's suddenly using these aliases. Haven't had a chance to look into it. Maybe there are some InstAlias instantiations with Emit=1 that were being ignored previously

; SI-NEXT: s_mov_b32 s5, s1
; SI-NEXT: s_and_b64 s[0:1], vcc, exec
; SI-NEXT: s_cselect_b32 s0, s3, s9
Expand Down Expand Up @@ -1174,7 +1174,7 @@ define amdgpu_kernel void @test_umax_uge_i64(ptr addrspace(1) %out, i64 %a, i64
; SI-NEXT: s_mov_b32 s4, s0
; SI-NEXT: v_mov_b32_e32 v0, s8
; SI-NEXT: v_mov_b32_e32 v1, s9
; SI-NEXT: v_cmp_ge_u64_e32 vcc, s[2:3], v[0:1]
; SI-NEXT: V_CMP_GE_U64 vcc, s[2:3], v[0:1]
; SI-NEXT: s_mov_b32 s5, s1
; SI-NEXT: s_and_b64 s[0:1], vcc, exec
; SI-NEXT: s_cselect_b32 s0, s3, s9
Expand Down Expand Up @@ -1228,7 +1228,7 @@ define amdgpu_kernel void @test_imax_sgt_i64(ptr addrspace(1) %out, i64 %a, i64
; SI-NEXT: s_mov_b32 s4, s0
; SI-NEXT: v_mov_b32_e32 v0, s8
; SI-NEXT: v_mov_b32_e32 v1, s9
; SI-NEXT: v_cmp_gt_i64_e32 vcc, s[2:3], v[0:1]
; SI-NEXT: V_CMP_GT_I64 vcc, s[2:3], v[0:1]
; SI-NEXT: s_mov_b32 s5, s1
; SI-NEXT: s_and_b64 s[0:1], vcc, exec
; SI-NEXT: s_cselect_b32 s0, s3, s9
Expand Down Expand Up @@ -1282,7 +1282,7 @@ define amdgpu_kernel void @test_imax_sge_i64(ptr addrspace(1) %out, i64 %a, i64
; SI-NEXT: s_mov_b32 s4, s0
; SI-NEXT: v_mov_b32_e32 v0, s8
; SI-NEXT: v_mov_b32_e32 v1, s9
; SI-NEXT: v_cmp_ge_i64_e32 vcc, s[2:3], v[0:1]
; SI-NEXT: V_CMP_GE_I64 vcc, s[2:3], v[0:1]
; SI-NEXT: s_mov_b32 s5, s1
; SI-NEXT: s_and_b64 s[0:1], vcc, exec
; SI-NEXT: s_cselect_b32 s0, s3, s9
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.