Skip to content

[BPF] fix sub-register handling for bpf_fastcall #110618

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.

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

Merged
merged 4 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/BPF/BPFMIPeephole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,9 @@ static void collectBPFFastCalls(const TargetRegisterInfo *TRI,
if (MI.isCall()) {
unsigned LiveCallerSavedRegs = 0;
for (MCRegister R : CallerSavedRegs) {
bool DoSpillFill = !MI.definesRegister(R, TRI) && LiveRegs.contains(R);
bool DoSpillFill = false;
for (MCPhysReg SR : TRI->subregs(R))
DoSpillFill |= !MI.definesRegister(SR, TRI) && LiveRegs.contains(SR);
if (!DoSpillFill)
continue;
LiveCallerSavedRegs |= 1 << R;
Expand Down
35 changes: 35 additions & 0 deletions llvm/test/CodeGen/BPF/bpf-fastcall-4.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s

; Generated from the following C code:
;
; extern int foo(void) __attribute__((bpf_fastcall));
;
; int bar(int a) {
; foo();
; return a;
; }
;
; Using the following command:
;
; clang --target=bpf -emit-llvm -O2 -S -o - t.c
;
; (unnecessary attrs removed maually)

; Check that function marked with bpf_fastcall does not clobber W1-W5.

define dso_local i32 @bar(i32 %a) {
entry:
%call = tail call i32 @foo() #0
ret i32 %a
}

; CHECK: # %bb.0:
; CHECK-NEXT: *(u64 *)(r10 - 8) = r1
; CHECK-NEXT: call foo
; CHECK-NEXT: r1 = *(u64 *)(r10 - 8)
; CHECK-NEXT: w0 = w1
; CHECK-NEXT: exit

declare dso_local i32 @foo() #0

attributes #0 = { "bpf_fastcall" }
35 changes: 35 additions & 0 deletions llvm/test/CodeGen/BPF/bpf-fastcall-5.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s

; Generated from the following C code:
;
; extern int foo(void) __attribute__((bpf_fastcall));
;
; int bar(int a, int b, int c, int d, int e) {
; foo();
; return e;
; }
;
; Using the following command:
;
; clang --target=bpf -emit-llvm -O2 -S -o - t.c
;
; (unnecessary attrs removed maually)

; Check that function marked with bpf_fastcall does not clobber W1-W5.

define dso_local i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
entry:
%call = tail call i32 @foo() #0
ret i32 %e
}

; CHECK: # %bb.0:
; CHECK-NEXT: *(u64 *)(r10 - 8) = r5
; CHECK-NEXT: call foo
; CHECK-NEXT: r5 = *(u64 *)(r10 - 8)
; CHECK-NEXT: w0 = w5
; CHECK-NEXT: exit

declare dso_local i32 @foo() #0

attributes #0 = { "bpf_fastcall" }
Loading