This is an archive of the discontinued LLVM Phabricator instance.

Differential D69229

[BPF] fix indirect call assembly code
ClosedPublic

Authored by yonghong-song on Oct 20 2019, 4:34 PM.

Details

Reviewers
ast
Commits
rGee881197b001: [BPF] fix indirect call assembly code
rL375386: [BPF] fix indirect call assembly code
Summary

Currently, for indirect call, the assembly code printed out as

callx <imm>

This is not right, it should be

callx <reg>

Fixed the issue with proper format.

Diff Detail

Event Timeline

yonghong-song created this revision.Oct 20 2019, 4:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 20 2019, 4:34 PM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
ast accepted this revision.Oct 20 2019, 6:19 PM
This revision is now accepted and ready to land.Oct 20 2019, 6:19 PM
Closed by commit rGee881197b001: [BPF] fix indirect call assembly code (authored by yonghong-song). · Explain WhyOct 20 2019, 8:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Target/
BPF/
2 lines
test/
CodeGen/
BPF/
20 lines

Diff 225816

llvm/lib/Target/BPF/BPFInstrInfo.td

Show First 20 Lines • Show All 467 Lines • ▼ Show 20 Linesclass CALL<string OpcodeStr>
let Inst{31-0} = BrDst; let Inst{31-0} = BrDst;
let BPFClass = BPF_JMP; let BPFClass = BPF_JMP;
} }
class CALLX<string OpcodeStr> class CALLX<string OpcodeStr>
: TYPE_ALU_JMP<BPF_CALL.Value, BPF_X.Value, : TYPE_ALU_JMP<BPF_CALL.Value, BPF_X.Value,
(outs), (outs),
(ins calltarget:$BrDst), (ins GPR:$BrDst),
!strconcat(OpcodeStr, " $BrDst"), !strconcat(OpcodeStr, " $BrDst"),
[]> { []> {
bits<32> BrDst; bits<32> BrDst;
let Inst{31-0} = BrDst; let Inst{31-0} = BrDst;
let BPFClass = BPF_JMP; let BPFClass = BPF_JMP;
} }
▲ Show 20 Lines • Show All 320 Lines • Show Last 20 Lines

llvm/test/CodeGen/BPF/callx.ll

  • This file was added.
; RUN: llc < %s -march=bpfel | FileCheck %s
; source:
; int test(int (*f)(void)) { return f(); }
; Function Attrs: nounwind
define dso_local i32 @test(i32 ()* nocapture %f) local_unnamed_addr #0 {
entry:
%call = tail call i32 %f() #1
; CHECK: callx r{{[0-9]+}}
ret i32 %call
}
attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { nounwind }
!llvm.module.flags = !{!0}
!llvm.ident = !{!1}
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 7015a5c54b53d8d2297a3aa38bc32aab167bdcfc)"}