Skip to content

Commit 1321e47

Browse files
yonghong-songyonghong-song
committed
BPF: rename BTF_KIND_TAG to BTF_KIND_DECL_TAG
Per discussion in https://reviews.llvm.org/D111199, the existing btf_tag attribute will be renamed to btf_decl_tag. This patch updated BTF backend to use btf_decl_tag attribute name and also renamed BTF_KIND_TAG to BTF_KIND_DECL_TAG. Differential Revision: https://reviews.llvm.org/D111592
1 parent f7de696 commit 1321e47

File tree

6 files changed

+31
-30
lines changed

6 files changed

+31
-30
lines changed

‎llvm/lib/Target/BPF/BTF.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ HANDLE_BTF_KIND(13, FUNC_PROTO)
3131
HANDLE_BTF_KIND(14, VAR)
3232
HANDLE_BTF_KIND(15, DATASEC)
3333
HANDLE_BTF_KIND(16, FLOAT)
34-
HANDLE_BTF_KIND(17, TAG)
34+
HANDLE_BTF_KIND(17, DECL_TAG)
3535

3636
#undef HANDLE_BTF_KIND

‎llvm/lib/Target/BPF/BTF.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ struct CommonType {
106106
/// Bits 24-27: kind (e.g. int, ptr, array...etc)
107107
/// Bits 28-30: unused
108108
/// Bit 31: kind_flag, currently used by
109-
/// struct, union, fwd and tag
109+
/// struct, union, fwd and decl_tag
110110
uint32_t Info;
111111

112112
/// "Size" is used by INT, ENUM, STRUCT and UNION.
113113
/// "Size" tells the size of the type it is describing.
114114
///
115115
/// "Type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
116-
/// FUNC, FUNC_PROTO, VAR and TAG.
116+
/// FUNC, FUNC_PROTO, VAR and DECL_TAG.
117117
/// "Type" is a type_id referring to another type.
118118
union {
119119
uint32_t Size;

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,23 +386,24 @@ void BTFTypeFloat::completeType(BTFDebug &BDebug) {
386386
BTFType.NameOff = BDebug.addString(Name);
387387
}
388388

389-
BTFTypeTag::BTFTypeTag(uint32_t BaseTypeId, int ComponentIdx, StringRef Tag)
389+
BTFTypeDeclTag::BTFTypeDeclTag(uint32_t BaseTypeId, int ComponentIdx,
390+
StringRef Tag)
390391
: Tag(Tag) {
391-
Kind = BTF::BTF_KIND_TAG;
392+
Kind = BTF::BTF_KIND_DECL_TAG;
392393
BTFType.Info = Kind << 24;
393394
BTFType.Type = BaseTypeId;
394395
Info = ComponentIdx;
395396
}
396397

397-
void BTFTypeTag::completeType(BTFDebug &BDebug) {
398+
void BTFTypeDeclTag::completeType(BTFDebug &BDebug) {
398399
if (IsCompleted)
399400
return;
400401
IsCompleted = true;
401402

402403
BTFType.NameOff = BDebug.addString(Tag);
403404
}
404405

405-
void BTFTypeTag::emitType(MCStreamer &OS) {
406+
void BTFTypeDeclTag::emitType(MCStreamer &OS) {
406407
BTFTypeBase::emitType(OS);
407408
OS.emitInt32(Info);
408409
}
@@ -504,12 +505,12 @@ void BTFDebug::processAnnotations(DINodeArray Annotations, uint32_t BaseTypeId,
504505
for (const Metadata *Annotation : Annotations->operands()) {
505506
const MDNode *MD = cast<MDNode>(Annotation);
506507
const MDString *Name = cast<MDString>(MD->getOperand(0));
507-
if (!Name->getString().equals("btf_tag"))
508+
if (!Name->getString().equals("btf_decl_tag"))
508509
continue;
509510

510511
const MDString *Value = cast<MDString>(MD->getOperand(1));
511-
auto TypeEntry = std::make_unique<BTFTypeTag>(BaseTypeId, ComponentIdx,
512-
Value->getString());
512+
auto TypeEntry = std::make_unique<BTFTypeDeclTag>(BaseTypeId, ComponentIdx,
513+
Value->getString());
513514
addType(std::move(TypeEntry));
514515
}
515516
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ class BTFTypeFloat : public BTFTypeBase {
205205
};
206206

207207
/// Handle tags.
208-
class BTFTypeTag : public BTFTypeBase {
208+
class BTFTypeDeclTag : public BTFTypeBase {
209209
uint32_t Info;
210210
StringRef Tag;
211211

212212
public:
213-
BTFTypeTag(uint32_t BaseTypeId, int ComponentId, StringRef Tag);
213+
BTFTypeDeclTag(uint32_t BaseTypeId, int ComponentId, StringRef Tag);
214214
uint32_t getSize() override { return BTFTypeBase::getSize() + 4; }
215215
void completeType(BTFDebug &BDebug) override;
216216
void emitType(MCStreamer &OS) override;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
33

44
; Source code:
5-
; #define __tag1 __attribute__((btf_tag("tag1")))
6-
; #define __tag2 __attribute__((btf_tag("tag2")))
5+
; #define __tag1 __attribute__((btf_decl_tag("tag1")))
6+
; #define __tag2 __attribute__((btf_decl_tag("tag2")))
77
; struct t1 {
88
; int a1;
99
; int a2 __tag1 __tag2;
@@ -32,8 +32,8 @@
3232
!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
3333
!10 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !6, file: !3, line: 5, baseType: !9, size: 32, offset: 32, annotations: !11)
3434
!11 = !{!12, !13}
35-
!12 = !{!"btf_tag", !"tag1"}
36-
!13 = !{!"btf_tag", !"tag2"}
35+
!12 = !{!"btf_decl_tag", !"tag1"}
36+
!13 = !{!"btf_decl_tag", !"tag2"}
3737
!14 = !{i32 7, !"Dwarf Version", i32 4}
3838
!15 = !{i32 2, !"Debug Info Version", i32 3}
3939
!16 = !{i32 1, !"wchar_size", i32 4}
@@ -49,35 +49,35 @@
4949
; CHECK-NEXT: .long 7
5050
; CHECK-NEXT: .long 4
5151
; CHECK-NEXT: .long 32 # 0x20
52-
; CHECK-NEXT: .long 10 # BTF_KIND_TAG(id = 2)
52+
; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 2)
5353
; CHECK-NEXT: .long 285212672 # 0x11000000
5454
; CHECK-NEXT: .long 1
5555
; CHECK-NEXT: .long 4294967295
56-
; CHECK-NEXT: .long 15 # BTF_KIND_TAG(id = 3)
56+
; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 3)
5757
; CHECK-NEXT: .long 285212672 # 0x11000000
5858
; CHECK-NEXT: .long 1
5959
; CHECK-NEXT: .long 4294967295
6060
; CHECK-NEXT: .long 20 # BTF_KIND_INT(id = 4)
6161
; CHECK-NEXT: .long 16777216 # 0x1000000
6262
; CHECK-NEXT: .long 4
6363
; CHECK-NEXT: .long 16777248 # 0x1000020
64-
; CHECK-NEXT: .long 10 # BTF_KIND_TAG(id = 5)
64+
; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 5)
6565
; CHECK-NEXT: .long 285212672 # 0x11000000
6666
; CHECK-NEXT: .long 1
6767
; CHECK-NEXT: .long 1
68-
; CHECK-NEXT: .long 15 # BTF_KIND_TAG(id = 6)
68+
; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 6)
6969
; CHECK-NEXT: .long 285212672 # 0x11000000
7070
; CHECK-NEXT: .long 1
7171
; CHECK-NEXT: .long 1
7272
; CHECK-NEXT: .long 24 # BTF_KIND_VAR(id = 7)
7373
; CHECK-NEXT: .long 234881024 # 0xe000000
7474
; CHECK-NEXT: .long 1
7575
; CHECK-NEXT: .long 1
76-
; CHECK-NEXT: .long 10 # BTF_KIND_TAG(id = 8)
76+
; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 8)
7777
; CHECK-NEXT: .long 285212672 # 0x11000000
7878
; CHECK-NEXT: .long 7
7979
; CHECK-NEXT: .long 4294967295
80-
; CHECK-NEXT: .long 15 # BTF_KIND_TAG(id = 9)
80+
; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 9)
8181
; CHECK-NEXT: .long 285212672 # 0x11000000
8282
; CHECK-NEXT: .long 7
8383
; CHECK-NEXT: .long 4294967295

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
33

44
; Source code:
5-
; #define __tag1 __attribute__((btf_tag("tag1")))
6-
; #define __tag2 __attribute__((btf_tag("tag2")))
5+
; #define __tag1 __attribute__((btf_decl_tag("tag1")))
6+
; #define __tag2 __attribute__((btf_decl_tag("tag2")))
77
; extern int bar(int a1, int a2) __tag1 __tag2;
88
; int __tag1 foo(int arg1, int *arg2 __tag1) {
99
; ; return arg1 + *arg2 + bar(arg1, arg1 + 1);
@@ -55,7 +55,7 @@ attributes #3 = { nounwind }
5555
!14 = !DILocalVariable(name: "arg1", arg: 1, scope: !8, file: !1, line: 4, type: !11)
5656
!15 = !DILocalVariable(name: "arg2", arg: 2, scope: !8, file: !1, line: 4, type: !12, annotations: !16)
5757
!16 = !{!17}
58-
!17 = !{!"btf_tag", !"tag1"}
58+
!17 = !{!"btf_decl_tag", !"tag1"}
5959
!18 = !DILocation(line: 0, scope: !8)
6060
!19 = !DILocation(line: 5, column: 17, scope: !8)
6161
!20 = !{!21, !21, i64 0}
@@ -71,7 +71,7 @@ attributes #3 = { nounwind }
7171
!30 = !DISubroutineType(types: !31)
7272
!31 = !{!11, !11, !11}
7373
!32 = !{!17, !33}
74-
!33 = !{!"btf_tag", !"tag2"}
74+
!33 = !{!"btf_decl_tag", !"tag2"}
7575

7676
; CHECK: .long 1 # BTF_KIND_INT(id = 1)
7777
; CHECK-NEXT: .long 16777216 # 0x1000000
@@ -90,11 +90,11 @@ attributes #3 = { nounwind }
9090
; CHECK-NEXT: .long 15 # BTF_KIND_FUNC(id = 4)
9191
; CHECK-NEXT: .long 201326593 # 0xc000001
9292
; CHECK-NEXT: .long 3
93-
; CHECK-NEXT: .long 19 # BTF_KIND_TAG(id = 5)
93+
; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 5)
9494
; CHECK-NEXT: .long 285212672 # 0x11000000
9595
; CHECK-NEXT: .long 4
9696
; CHECK-NEXT: .long 1
97-
; CHECK-NEXT: .long 19 # BTF_KIND_TAG(id = 6)
97+
; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 6)
9898
; CHECK-NEXT: .long 285212672 # 0x11000000
9999
; CHECK-NEXT: .long 4
100100
; CHECK-NEXT: .long 4294967295
@@ -108,11 +108,11 @@ attributes #3 = { nounwind }
108108
; CHECK-NEXT: .long 72 # BTF_KIND_FUNC(id = 8)
109109
; CHECK-NEXT: .long 201326594 # 0xc000002
110110
; CHECK-NEXT: .long 7
111-
; CHECK-NEXT: .long 19 # BTF_KIND_TAG(id = 9)
111+
; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 9)
112112
; CHECK-NEXT: .long 285212672 # 0x11000000
113113
; CHECK-NEXT: .long 8
114114
; CHECK-NEXT: .long 4294967295
115-
; CHECK-NEXT: .long 76 # BTF_KIND_TAG(id = 10)
115+
; CHECK-NEXT: .long 76 # BTF_KIND_DECL_TAG(id = 10)
116116
; CHECK-NEXT: .long 285212672 # 0x11000000
117117
; CHECK-NEXT: .long 8
118118
; CHECK-NEXT: .long 4294967295

0 commit comments

Comments
 (0)