Skip to content

Commit 0472e83

Browse files
yonghong-songyonghong-song
committed
BPF: emit BTF_KIND_DECL_TAG for typedef types
If a typedef type has __attribute__((btf_decl_tag("str"))) with bpf target, emit BTF_KIND_DECL_TAG for that type in the BTF. Differential Revision: https://reviews.llvm.org/D112259
1 parent d9eca33 commit 0472e83

File tree

2 files changed

+89
-0
lines changed

2 files changed

+89
-0
lines changed

‎llvm/lib/Target/BPF/BTFDebug.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,8 @@ void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
663663
Tag == dwarf::DW_TAG_restrict_type) {
664664
auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, false);
665665
TypeId = addType(std::move(TypeEntry), DTy);
666+
if (Tag == dwarf::DW_TAG_typedef)
667+
processDeclAnnotations(DTy->getAnnotations(), TypeId, -1);
666668
} else if (Tag != dwarf::DW_TAG_member) {
667669
return;
668670
}

‎llvm/test/CodeGen/BPF/BTF/tag-typedef.ll

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
2+
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
3+
4+
; Source code:
5+
; #define __tag1 __attribute__((btf_decl_tag("tag1")))
6+
; typedef struct { int a; } __s __tag1;
7+
; typedef unsigned * __u __tag1;
8+
; __s a;
9+
; __u u;
10+
; Compilation flag:
11+
; clang -target bpf -O2 -g -S -emit-llvm t.c
12+
13+
%struct.__s = type { i32 }
14+
15+
@a = dso_local local_unnamed_addr global %struct.__s zeroinitializer, align 4, !dbg !0
16+
@u = dso_local local_unnamed_addr global i32* null, align 8, !dbg !5
17+
18+
!llvm.dbg.cu = !{!2}
19+
!llvm.module.flags = !{!17, !18, !19, !20}
20+
!llvm.ident = !{!21}
21+
22+
!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
23+
!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 4, type: !12, isLocal: false, isDefinition: true)
24+
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 14.0.0 (https://github.com/llvm/llvm-project.git 219b26fbcd70273ddfd4ead9387f7c69b7eb4570)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
25+
!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag")
26+
!4 = !{!0, !5}
27+
!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
28+
!6 = distinct !DIGlobalVariable(name: "u", scope: !2, file: !3, line: 5, type: !7, isLocal: false, isDefinition: true)
29+
!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__u", file: !3, line: 3, baseType: !8, annotations: !10)
30+
!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64)
31+
!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
32+
!10 = !{!11}
33+
!11 = !{!"btf_decl_tag", !"tag1"}
34+
!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s", file: !3, line: 2, baseType: !13, annotations: !10)
35+
!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !3, line: 2, size: 32, elements: !14)
36+
!14 = !{!15}
37+
!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !3, line: 2, baseType: !16, size: 32)
38+
!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
39+
!17 = !{i32 7, !"Dwarf Version", i32 4}
40+
!18 = !{i32 2, !"Debug Info Version", i32 3}
41+
!19 = !{i32 1, !"wchar_size", i32 4}
42+
!20 = !{i32 7, !"frame-pointer", i32 2}
43+
!21 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 219b26fbcd70273ddfd4ead9387f7c69b7eb4570)"}
44+
45+
; CHECK: .long 1 # BTF_KIND_TYPEDEF(id = 1)
46+
; CHECK-NEXT: .long 134217728 # 0x8000000
47+
; CHECK-NEXT: .long 3
48+
; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(id = 2)
49+
; CHECK-NEXT: .long 285212672 # 0x11000000
50+
; CHECK-NEXT: .long 1
51+
; CHECK-NEXT: .long 4294967295
52+
; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 3)
53+
; CHECK-NEXT: .long 67108865 # 0x4000001
54+
; CHECK-NEXT: .long 4
55+
; CHECK-NEXT: .long 10
56+
; CHECK-NEXT: .long 4
57+
; CHECK-NEXT: .long 0 # 0x0
58+
; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 4)
59+
; CHECK-NEXT: .long 16777216 # 0x1000000
60+
; CHECK-NEXT: .long 4
61+
; CHECK-NEXT: .long 16777248 # 0x1000020
62+
; CHECK-NEXT: .long 10 # BTF_KIND_VAR(id = 5)
63+
; CHECK-NEXT: .long 234881024 # 0xe000000
64+
; CHECK-NEXT: .long 1
65+
; CHECK-NEXT: .long 1
66+
; CHECK-NEXT: .long 16 # BTF_KIND_TYPEDEF(id = 6)
67+
; CHECK-NEXT: .long 134217728 # 0x8000000
68+
; CHECK-NEXT: .long 8
69+
; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(id = 7)
70+
; CHECK-NEXT: .long 285212672 # 0x11000000
71+
; CHECK-NEXT: .long 6
72+
; CHECK-NEXT: .long 4294967295
73+
; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 8)
74+
; CHECK-NEXT: .long 33554432 # 0x2000000
75+
; CHECK-NEXT: .long 9
76+
; CHECK-NEXT: .long 20 # BTF_KIND_INT(id = 9)
77+
; CHECK-NEXT: .long 16777216 # 0x1000000
78+
; CHECK-NEXT: .long 4
79+
; CHECK-NEXT: .long 32 # 0x20
80+
81+
; CHECK: .ascii "__s" # string offset=1
82+
; CHECK: .ascii "tag1" # string offset=5
83+
; CHECK: .byte 97 # string offset=10
84+
; CHECK: .ascii "int" # string offset=12
85+
; CHECK: .ascii "__u" # string offset=16
86+
; CHECK: .ascii "unsigned int" # string offset=20
87+

0 commit comments

Comments
 (0)