Skip to content

[BPF] Use ".L" local prefix label for basic blocks #95103

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions llvm/include/llvm/IR/DataLayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class DataLayout {

enum ManglingModeT {
MM_None,
MM_BPF,
MM_ELF,
MM_MachO,
MM_WinCOFF,
Expand Down Expand Up @@ -316,6 +317,7 @@ class DataLayout {
char getGlobalPrefix() const {
switch (ManglingMode) {
case MM_None:
case MM_BPF:
case MM_ELF:
case MM_GOFF:
case MM_Mips:
Expand All @@ -340,6 +342,7 @@ class DataLayout {
return "L#";
case MM_Mips:
return "$";
case MM_BPF:
case MM_MachO:
case MM_WinCOFFX86:
return "L";
Expand Down
3 changes: 3 additions & 0 deletions llvm/lib/IR/DataLayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,9 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
switch(Rest[0]) {
default:
return reportError("Unknown mangling in datalayout string");
case 'b':
ManglingMode = MM_BPF;
break;
case 'e':
ManglingMode = MM_ELF;
break;
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/BPF/BPFTargetMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeBPFTarget() {
// DataLayout: little or big endian
static std::string computeDataLayout(const Triple &TT) {
if (TT.getArch() == Triple::bpfeb)
return "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
return "E-m:b-p:64:64-i64:64-i128:128-n32:64-S128";
else
return "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
return "e-m:b-p:64:64-i64:64-i128:128-n32:64-S128";
}

static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {
Expand Down
1 change: 0 additions & 1 deletion llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class BPFMCAsmInfo : public MCAsmInfo {
if (TT.getArch() == Triple::bpfeb)
IsLittleEndian = false;

PrivateGlobalPrefix = ".L";
WeakRefDirective = "\t.weak\t";

UsesELFSectionDirectiveForBSS = true;
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 10 # Field reloc section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 20
; CHECK-NEXT: .long 7
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-local.ll
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 10 # Field reloc section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 20
; CHECK-NEXT: .long 7
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 7 # Field reloc section string offset=7
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 7
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/BTF/filename.ll
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 10 # FuncInfo section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin{{[0-9]+}}
; CHECK-NEXT: .long Lfunc_begin{{[0-9]+}}
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 10 # LineInfo section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1038 # Line 1 Col 14
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ entry:
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 11 # FuncInfo section string offset=11
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 11 # LineInfo section string offset=11
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 17
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3091 # Line 3 Col 19
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/BPF/BTF/func-non-void.ll
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ define dso_local i32 @f1(i32 returned) local_unnamed_addr #0 !dbg !7 {
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 11 # FuncInfo section string offset=11
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 11 # LineInfo section string offset=11
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 17
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1024 # Line 1 Col 0
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 17
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1042 # Line 1 Col 18
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/BTF/func-source.ll
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ entry:
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 3 # FuncInfo section string offset=3
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 3 # LineInfo section string offset=3
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 9
; CHECK-NEXT: .long 18
; CHECK-NEXT: .long 1040 # Line 1 Col 16
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/BPF/BTF/func-typedef.ll
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ entry:
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 20 # FuncInfo section string offset=20
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 20 # LineInfo section string offset=20
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 26
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3072 # Line 3 Col 0
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 26
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3092 # Line 3 Col 20
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ define dso_local i32 @f1(i32) local_unnamed_addr #0 !dbg !7 {
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 11 # FuncInfo section string offset=11
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 11 # LineInfo section string offset=11
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 17
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1042 # Line 1 Col 18
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/BTF/func-void.ll
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ define dso_local void @f1() local_unnamed_addr #0 !dbg !7 {
; CHECK-NEXT: .long 8 # FuncInfo
; CHECK-NEXT: .long 4 # FuncInfo section string offset=4
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Lfunc_begin0
; CHECK-NEXT: .long Lfunc_begin0
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16 # LineInfo
; CHECK-NEXT: .long 4 # LineInfo section string offset=4
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1040 # Line 1 Col 16
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 59 # Field reloc section string offset=59
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp[[#]]
; CHECK-NEXT: .long Ltmp[[#]]
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 65
; CHECK-NEXT: .long 0
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 10 # Field reloc section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp[[#]]
; CHECK-NEXT: .long Ltmp[[#]]
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 101
; CHECK-NEXT: .long 1
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 10 # Field reloc section string offset=10
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp[[#]]
; CHECK-NEXT: .long Ltmp[[#]]
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 101
; CHECK-NEXT: .long 1
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 20 # Field reloc section string offset=20
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 26
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 26
; CHECK-NEXT: .long 6
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 7 # Field reloc section string offset=7
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 19
; CHECK-NEXT: .long 0
Expand Down
66 changes: 33 additions & 33 deletions llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
Original file line number Diff line number Diff line change
Expand Up @@ -27,67 +27,67 @@ target triple = "bpfeb"
; Function Attrs: nounwind readnone
define dso_local i32 @test(ptr %arg) local_unnamed_addr #0 !dbg !13 {
; CHECK-ALU64-LABEL: test:
; CHECK-ALU64: .Ltest$local:
; CHECK-ALU64-NEXT: .type .Ltest$local,@function
; CHECK-ALU64-NEXT: .Lfunc_begin0:
; CHECK-ALU64: Ltest$local:
; CHECK-ALU64-NEXT: .type Ltest$local,@function
; CHECK-ALU64-NEXT: Lfunc_begin0:
; CHECK-ALU64-NEXT: .loc 1 11 0 # test.c:11:0
; CHECK-ALU64-NEXT: .cfi_sections .debug_frame
; CHECK-ALU64-NEXT: .cfi_startproc
; CHECK-ALU64-NEXT: # %bb.0: # %entry
; CHECK-ALU64-NEXT: #DEBUG_VALUE: test:arg <- $r1
; CHECK-ALU64-NEXT: .Ltmp0:
; CHECK-ALU64-NEXT: Ltmp0:
; CHECK-ALU64-NEXT: r1 = 16
; CHECK-ALU64-NEXT: .Ltmp1:
; CHECK-ALU64-NEXT: .Ltmp2:
; CHECK-ALU64-NEXT: .Ltmp3:
; CHECK-ALU64-NEXT: Ltmp1:
; CHECK-ALU64-NEXT: Ltmp2:
; CHECK-ALU64-NEXT: Ltmp3:
; CHECK-ALU64-NEXT: r0 = 8
; CHECK-ALU64-NEXT: .Ltmp4:
; CHECK-ALU64-NEXT: Ltmp4:
; CHECK-ALU64-NEXT: .loc 1 12 69 prologue_end # test.c:12:69
; CHECK-ALU64-NEXT: .Ltmp5:
; CHECK-ALU64-NEXT: .Ltmp6:
; CHECK-ALU64-NEXT: Ltmp5:
; CHECK-ALU64-NEXT: Ltmp6:
; CHECK-ALU64-NEXT: r0 += r1
; CHECK-ALU64-NEXT: .Ltmp7:
; CHECK-ALU64-NEXT: Ltmp7:
; CHECK-ALU64-NEXT: r1 = 45
; CHECK-ALU64-NEXT: .loc 1 13 67 # test.c:13:67
; CHECK-ALU64-NEXT: .Ltmp8:
; CHECK-ALU64-NEXT: Ltmp8:
; CHECK-ALU64-NEXT: r0 += r1
; CHECK-ALU64-NEXT: .loc 1 12 3 # test.c:12:3
; CHECK-ALU64-NEXT: .Ltmp9:
; CHECK-ALU64-NEXT: Ltmp9:
; CHECK-ALU64-NEXT: exit
; CHECK-ALU64-NEXT: .Ltmp10:
; CHECK-ALU64-NEXT: .Ltmp11:
; CHECK-ALU64-NEXT: Ltmp10:
; CHECK-ALU64-NEXT: Ltmp11:
;
; CHECK-ALU32-LABEL: test:
; CHECK-ALU32: .Ltest$local:
; CHECK-ALU32-NEXT: .type .Ltest$local,@function
; CHECK-ALU32-NEXT: .Lfunc_begin0:
; CHECK-ALU32: Ltest$local:
; CHECK-ALU32-NEXT: .type Ltest$local,@function
; CHECK-ALU32-NEXT: Lfunc_begin0:
; CHECK-ALU32-NEXT: .loc 1 11 0 # test.c:11:0
; CHECK-ALU32-NEXT: .cfi_sections .debug_frame
; CHECK-ALU32-NEXT: .cfi_startproc
; CHECK-ALU32-NEXT: # %bb.0: # %entry
; CHECK-ALU32-NEXT: #DEBUG_VALUE: test:arg <- $r1
; CHECK-ALU32-NEXT: .Ltmp0:
; CHECK-ALU32-NEXT: Ltmp0:
; CHECK-ALU32-NEXT: r1 = 16
; CHECK-ALU32-NEXT: .Ltmp1:
; CHECK-ALU32-NEXT: .Ltmp2:
; CHECK-ALU32-NEXT: .Ltmp3:
; CHECK-ALU32-NEXT: Ltmp1:
; CHECK-ALU32-NEXT: Ltmp2:
; CHECK-ALU32-NEXT: Ltmp3:
; CHECK-ALU32-NEXT: r0 = 8
; CHECK-ALU32-NEXT: .Ltmp4:
; CHECK-ALU32-NEXT: Ltmp4:
; CHECK-ALU32-NEXT: .loc 1 12 69 prologue_end # test.c:12:69
; CHECK-ALU32-NEXT: .Ltmp5:
; CHECK-ALU32-NEXT: .Ltmp6:
; CHECK-ALU32-NEXT: Ltmp5:
; CHECK-ALU32-NEXT: Ltmp6:
; CHECK-ALU32-NEXT: w0 += w1
; CHECK-ALU32-NEXT: .Ltmp7:
; CHECK-ALU32-NEXT: Ltmp7:
; CHECK-ALU32-NEXT: r1 = 45
; CHECK-ALU32-NEXT: .loc 1 13 67 # test.c:13:67
; CHECK-ALU32-NEXT: .Ltmp8:
; CHECK-ALU32-NEXT: Ltmp8:
; CHECK-ALU32-NEXT: w0 += w1
; CHECK-ALU32-NEXT: # kill: def $w0 killed $w0 killed $r0
; CHECK-ALU32-NEXT: .loc 1 12 3 # test.c:12:3
; CHECK-ALU32-NEXT: .Ltmp9:
; CHECK-ALU32-NEXT: Ltmp9:
; CHECK-ALU32-NEXT: exit
; CHECK-ALU32-NEXT: .Ltmp10:
; CHECK-ALU32-NEXT: .Ltmp11:
; CHECK-ALU32-NEXT: Ltmp10:
; CHECK-ALU32-NEXT: Ltmp11:
entry:
call void @llvm.dbg.value(metadata ptr %arg, metadata !30, metadata !DIExpression()), !dbg !31
%0 = tail call ptr @llvm.preserve.struct.access.index.p0.p0.ss(ptr elementtype(%struct.s) %arg, i32 5, i32 6), !dbg !32, !llvm.preserve.access.index !18
Expand All @@ -108,15 +108,15 @@ entry:
; CHECK: .long 16 # FieldReloc
; CHECK-NEXT: .long 89 # Field reloc section string offset=89
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 95
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 95
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long .Ltmp{{[0-9]+}}
; CHECK-NEXT: .long Ltmp{{[0-9]+}}
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 95
; CHECK-NEXT: .long 4
Expand Down
Loading
Loading