Skip to content
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

Jump to bottom

[PAC][CodeGen] Do not emit trivial 'mov xN, xN' on tail call #109100

Merged
merged 3 commits into from
Sep 19, 2024
Merged

[PAC][CodeGen] Do not emit trivial 'mov xN, xN' on tail call #109100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a7788b
[PAC][CodeGen] Do not emit trivial 'mov xN xN' on tail call
kovdan01 Sep 18, 2024
4d8a2a4
Merge branch 'main' into do-not-emit-trivial-mov
kovdan01 Sep 19, 2024
0cae7ea
Address review comments
kovdan01 Sep 19, 2024
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
11 changes: 6 additions & 5 deletions llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,11 +2510,12 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
unsigned DiscReg = AddrDisc;
if (Disc) {
if (AddrDisc != AArch64::NoRegister) {
EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::ORRXrs)
.addReg(ScratchReg)
.addReg(AArch64::XZR)
.addReg(AddrDisc)
.addImm(0));
if (ScratchReg != AddrDisc)
EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::ORRXrs)
.addReg(ScratchReg)
.addReg(AArch64::XZR)
.addReg(AddrDisc)
.addImm(0));
EmitToStreamer(*OutStreamer, MCInstBuilder(AArch64::MOVKXi)
.addReg(ScratchReg)
.addReg(ScratchReg)
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/AArch64/ptrauth-call.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,27 @@ define i32 @test_tailcall_ib_var(ptr %arg0, ptr %arg1) #0 {
ret i32 %tmp1
}

define void @test_tailcall_omit_mov_x16_x16(ptr %objptr) #0 {
; CHECK-LABEL: test_tailcall_omit_mov_x16_x16:
; CHECK: ldr x16, [x0]
; CHECK: mov x17, x0
; CHECK: movk x17, #6503, lsl #48
; CHECK: autda x16, x17
; CHECK: ldr x1, [x16]
; CHECK: movk x16, #54167, lsl #48
; CHECK: braa x1, x16
%vtable.signed = load ptr, ptr %objptr, align 8
%objptr.int = ptrtoint ptr %objptr to i64
%vtable.discr = tail call i64 @llvm.ptrauth.blend(i64 %objptr.int, i64 6503)
%vtable.signed.int = ptrtoint ptr %vtable.signed to i64
%vtable.unsigned.int = tail call i64 @llvm.ptrauth.auth(i64 %vtable.signed.int, i32 2, i64 %vtable.discr)
%vtable.unsigned = inttoptr i64 %vtable.unsigned.int to ptr
%virt.func.signed = load ptr, ptr %vtable.unsigned, align 8
%virt.func.discr = tail call i64 @llvm.ptrauth.blend(i64 %vtable.unsigned.int, i64 54167)
tail call void %virt.func.signed(ptr %objptr) [ "ptrauth"(i32 0, i64 %virt.func.discr) ]
ret void
}

define i32 @test_call_ia_arg(ptr %arg0, i64 %arg1) #0 {
; DARWIN-LABEL: test_call_ia_arg:
; DARWIN-NEXT: stp x29, x30, [sp, #-16]!
Expand Down
Loading