Index: llvm/lib/Target/BPF/BTFDebug.h
===================================================================
--- llvm/lib/Target/BPF/BTFDebug.h
+++ llvm/lib/Target/BPF/BTFDebug.h
@@ -57,6 +57,7 @@
virtual void completeType(BTFDebug &BDebug) {}
/// Emit types for this BTF type entry.
virtual void emitType(MCStreamer &OS);
+ void emitType(MCStreamer &OS, StringRef Name);
};
/// Handle several derived types include pointer, const,
Index: llvm/lib/Target/BPF/BTFDebug.cpp
===================================================================
--- llvm/lib/Target/BPF/BTFDebug.cpp
+++ llvm/lib/Target/BPF/BTFDebug.cpp
@@ -35,8 +35,17 @@
/// Emit a BTF common type.
void BTFTypeBase::emitType(MCStreamer &OS) {
- OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id) +
- ")");
+ emitType(OS, StringRef());
+}
+
+void BTFTypeBase::emitType(MCStreamer &OS, StringRef Name) {
+ if (Name.empty())
+ OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id)
+ + ", name_off = " + std::to_string(BTFType.NameOff) + ")");
+ else
+ OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id)
+ + ", name = " + Name.str() + ")");
+
OS.emitInt32(BTFType.NameOff);
OS.AddComment("0x" + Twine::utohexstr(BTFType.Info));
OS.emitInt32(BTFType.Info);
@@ -99,7 +108,7 @@
}
}
-void BTFTypeDerived::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+void BTFTypeDerived::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS, Name); }
void BTFTypeDerived::setPointeeType(uint32_t PointeeType) {
BTFType.Type = PointeeType;
@@ -120,7 +129,7 @@
BTFType.NameOff = BDebug.addString(Name);
}
-void BTFTypeFwd::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+void BTFTypeFwd::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS, Name); }
BTFTypeInt::BTFTypeInt(uint32_t Encoding, uint32_t SizeInBits,
uint32_t OffsetInBits, StringRef TypeName)
@@ -158,7 +167,7 @@
}
void BTFTypeInt::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, Name);
OS.AddComment("0x" + Twine::utohexstr(IntVal));
OS.emitInt32(IntVal);
}
@@ -195,7 +204,7 @@
}
void BTFTypeEnum::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, ETy->getName());
for (const auto &Enum : EnumValues) {
OS.emitInt32(Enum.NameOff);
OS.emitInt32(Enum.Val);
@@ -234,7 +243,7 @@
}
void BTFTypeEnum64::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, ETy->getName());
for (const auto &Enum : EnumValues) {
OS.emitInt32(Enum.NameOff);
OS.AddComment("0x" + Twine::utohexstr(Enum.Val_Lo32));
@@ -310,7 +319,7 @@
}
void BTFTypeStruct::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, STy->getName());
for (const auto &Member : Members) {
OS.emitInt32(Member.NameOff);
OS.emitInt32(Member.Type);
@@ -384,7 +393,7 @@
BTFType.NameOff = BDebug.addString(Name);
}
-void BTFTypeFunc::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+void BTFTypeFunc::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS, Name); }
BTFKindVar::BTFKindVar(StringRef VarName, uint32_t TypeId, uint32_t VarInfo)
: Name(VarName) {
@@ -399,7 +408,7 @@
}
void BTFKindVar::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, Name);
OS.emitInt32(Info);
}
@@ -416,7 +425,7 @@
}
void BTFKindDataSec::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, Name);
for (const auto &V : Vars) {
OS.emitInt32(std::get<0>(V));
@@ -458,7 +467,7 @@
}
void BTFTypeDeclTag::emitType(MCStreamer &OS) {
- BTFTypeBase::emitType(OS);
+ BTFTypeBase::emitType(OS, Tag);
OS.emitInt32(Info);
}
Index: llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
+++ llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
@@ -21,17 +21,20 @@
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 26
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 6 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 6 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
+++ llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
@@ -21,17 +21,20 @@
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 25
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 5 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
+++ llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
@@ -21,23 +21,27 @@
; CHECK-NEXT: .long 80
; CHECK-NEXT: .long 80
; CHECK-NEXT: .long 25
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 5 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 5 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/array-size-0.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/array-size-0.ll
+++ llvm/test/CodeGen/BPF/BTF/array-size-0.ll
@@ -24,16 +24,19 @@
; CHECK-NEXT: .long 52
; CHECK-NEXT: .long 52
; CHECK-NEXT: .long 23
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108864 # 0x4000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 3 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 3 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/array-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/array-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/array-typedef.ll
@@ -23,23 +23,28 @@
; CHECK-NEXT: .long 80
; CHECK-NEXT: .long 80
; CHECK-NEXT: .long 45
-; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 7 # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT: .long 7 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 12 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 25 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 25 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
+++ llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
@@ -19,12 +19,14 @@
ret i32 %conv, !dbg !16
}
-; CHECK: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK: .long 16 # BTF_KIND_STRUCT(id = 4)
+; CHECK: .long 16 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 18
Index: llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
+++ llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
@@ -60,7 +60,8 @@
; CHECK-LABEL: prog3
; CHECK: r1 = 4 ll
-; CHECK: .long 0 # BTF_KIND_STRUCT(id = 3)
+; CHECK: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 104
; CHECK-NEXT: .long 13
@@ -69,8 +70,10 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 800 # 0x320
-; CHECK: .long 19 # BTF_KIND_INT(id = 4)
-; CHECK: .long 0 # BTF_KIND_PTR(id = 10)
+; CHECK: .long 19 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
+; CHECK: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 3
Index: llvm/test/CodeGen/BPF/BTF/char.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/char.ll
+++ llvm/test/CodeGen/BPF/BTF/char.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
Index: llvm/test/CodeGen/BPF/BTF/double.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/double.ll
+++ llvm/test/CodeGen/BPF/BTF/double.ll
@@ -22,16 +22,19 @@
; CHECK-NEXT: .long 52
; CHECK-NEXT: .long 15
; [1] double, size=8 bytes (64 bits)
-; CHECK-NEXT: .long 1 # BTF_KIND_FLOAT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_FLOAT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 268435456 # 0x10000000
; CHECK-NEXT: .long 8
; [2] a, type=double (1), global
-; CHECK-NEXT: .long 8 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT: .long 8 # BTF_KIND_VAR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
; [3] .bss, 1 var, {a, offset=&a, size=8 bytes}
-; CHECK-NEXT: .long 10 # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT: .long 10 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/enum-basic.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/enum-basic.ll
+++ llvm/test/CodeGen/BPF/BTF/enum-basic.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 28
; CHECK-NEXT: .long 28
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_ENUM(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 2248146946 # 0x86000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
Index: llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
@@ -26,19 +26,23 @@
; CHECK-NEXT: .long 60
; CHECK-NEXT: .long 60
; CHECK-NEXT: .long 78
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 5 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 64 # 0x40
-; CHECK-NEXT: .long 28 # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT: .long 28 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
@@ -22,26 +22,32 @@
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 72
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
; CHECK: .ascii "int" # string offset=1
Index: llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
@@ -17,20 +17,22 @@
ret i64 %call, !dbg !12
}
-; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 51 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 51 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 55 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 55 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
-; CHECK: .long 74 # BTF_KIND_DATASEC(id = 10)
+; CHECK: .long 74 # BTF_KIND_DATASEC(id = 10
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
@@ -25,14 +25,17 @@
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 52
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
@@ -26,29 +26,36 @@
; CHECK-NEXT: .long 112
; CHECK-NEXT: .long 112
; CHECK-NEXT: .long 76
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 72 # BTF_KIND_DATASEC(id = 7)
+; CHECK-NEXT: .long 72 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
@@ -26,26 +26,32 @@
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 72
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
@@ -25,26 +25,32 @@
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 72
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
@@ -31,33 +31,41 @@
; CHECK-NEXT: .long 140
; CHECK-NEXT: .long 140
; CHECK-NEXT: .long 79
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 72 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 72 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 75 # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT: .long 75 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
@@ -27,26 +27,32 @@
; CHECK-NEXT: .long 92
; CHECK-NEXT: .long 92
; CHECK-NEXT: .long 73
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 55 # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT: .long 55 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 60 # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT: .long 60 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 63
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 66 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 66 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
@@ -28,26 +28,32 @@
; CHECK-NEXT: .long 92
; CHECK-NEXT: .long 92
; CHECK-NEXT: .long 73
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 55 # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT: .long 55 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 60 # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT: .long 60 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 63
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 66 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 66 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
+++ llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
@@ -31,33 +31,41 @@
; CHECK-NEXT: .long 140
; CHECK-NEXT: .long 140
; CHECK-NEXT: .long 79
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 55 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 72 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 72 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 75 # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT: .long 75 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/filename.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/filename.ll
+++ llvm/test/CodeGen/BPF/BTF/filename.ll
@@ -20,14 +20,17 @@
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 35
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/float.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/float.ll
+++ llvm/test/CodeGen/BPF/BTF/float.ll
@@ -22,16 +22,19 @@
; CHECK-NEXT: .long 52
; CHECK-NEXT: .long 14
; [1] float, size=4 bytes (32 bits)
-; CHECK-NEXT: .long 1 # BTF_KIND_FLOAT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_FLOAT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 268435456 # 0x10000000
; CHECK-NEXT: .long 4
; [2] a, type=float (1), global
-; CHECK-NEXT: .long 7 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT: .long 7 # BTF_KIND_VAR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
; [3] .bss, 1 var, {a, offset=&a, size=4 bytes}
-; CHECK-NEXT: .long 9 # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT: .long 9 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
+++ llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
@@ -29,27 +29,33 @@
; CHECK-NEXT: .long 104
; CHECK-NEXT: .long 104
; CHECK-NEXT: .long 32
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 26 # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT: .long 26 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 29
Index: llvm/test/CodeGen/BPF/BTF/func-non-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-non-void.ll
+++ llvm/test/CodeGen/BPF/BTF/func-non-void.ll
@@ -21,16 +21,19 @@
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 26
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/func-source.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-source.ll
+++ llvm/test/CodeGen/BPF/BTF/func-source.ll
@@ -24,10 +24,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 35
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/func-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/func-typedef.ll
@@ -24,22 +24,27 @@
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 35
-; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 7 # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT: .long 7 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 12 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 18 # BTF_KIND_FUNC(id = 5)
+; CHECK-NEXT: .long 18 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
+++ llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
@@ -21,16 +21,19 @@
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 26
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 8 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/func-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/func-void.ll
+++ llvm/test/CodeGen/BPF/BTF/func-void.ll
@@ -20,10 +20,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 19
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
+++ llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
@@ -25,16 +25,19 @@
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 48
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 6 # BTF_KIND_FWD(id = 3)
+; CHECK-NEXT: .long 6 # BTF_KIND_FWD(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 117440512 # 0x7000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
+++ llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
@@ -24,13 +24,15 @@
; CHECK-NEXT: .long 36
; CHECK-NEXT: .long 36
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
+++ llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
@@ -47,29 +47,35 @@
; CHECK-NEXT: .long 148
; CHECK-NEXT: .long 148
; CHECK-NEXT: .long 26
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 5 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 5 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 9 # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT: .long 9 # BTF_KIND_VAR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 11 # BTF_KIND_VAR(id = 4)
+; CHECK-NEXT: .long 11 # BTF_KIND_VAR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 13 # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT: .long 13 # BTF_KIND_VAR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 15 # BTF_KIND_DATASEC(id = 6)
+; CHECK-NEXT: .long 15 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
@@ -78,7 +84,8 @@
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long b
; CHECK-NEXT: .long 16
-; CHECK-NEXT: .long 20 # BTF_KIND_DATASEC(id = 7)
+; CHECK-NEXT: .long 20 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
Index: llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
+++ llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
@@ -17,15 +17,18 @@
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 56
; CHECK-NEXT: .long 13
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT: .long 5 # BTF_KIND_VAR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 7 # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT: .long 7 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
+++ llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
@@ -19,22 +19,27 @@
; CHECK-NEXT: .long 96
; CHECK-NEXT: .long 96
; CHECK-NEXT: .long 18
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_VAR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 9 # BTF_KIND_VAR(id = 4)
+; CHECK-NEXT: .long 9 # BTF_KIND_VAR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 13 # BTF_KIND_DATASEC(id = 5)
+; CHECK-NEXT: .long 13 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
Index: llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
+++ llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
@@ -19,19 +19,23 @@
; CHECK-NEXT: .long 84
; CHECK-NEXT: .long 84
; CHECK-NEXT: .long 18
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT: .long 5 # BTF_KIND_VAR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 9 # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT: .long 9 # BTF_KIND_VAR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 13 # BTF_KIND_DATASEC(id = 4)
+; CHECK-NEXT: .long 13 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
Index: llvm/test/CodeGen/BPF/BTF/int.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/int.ll
+++ llvm/test/CodeGen/BPF/BTF/int.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/local-var.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/local-var.ll
+++ llvm/test/CodeGen/BPF/BTF/local-var.ll
@@ -28,20 +28,24 @@
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 59
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 8 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 8 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 12 # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT: .long 12 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 2
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/longlong.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/longlong.ll
+++ llvm/test/CodeGen/BPF/BTF/longlong.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 15
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 16777280 # 0x1000040
Index: llvm/test/CodeGen/BPF/BTF/map-def-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/map-def-2.ll
+++ llvm/test/CodeGen/BPF/BTF/map-def-2.ll
@@ -18,36 +18,44 @@
@hash_map = dso_local local_unnamed_addr global %struct.map_type zeroinitializer, section ".maps", align 8, !dbg !0
-; CHECK: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 13 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 13 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 17 # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT: .long 17 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 28 # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT: .long 28 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 38 # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT: .long 38 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 47
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 51 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 51 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 60 # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT: .long 60 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
Index: llvm/test/CodeGen/BPF/BTF/map-def-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/map-def-3.ll
+++ llvm/test/CodeGen/BPF/BTF/map-def-3.ll
@@ -13,24 +13,29 @@
@hash_map = dso_local local_unnamed_addr constant %struct.key_type zeroinitializer, section ".maps", align 4, !dbg !0
-; CHECK: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 5 # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 14
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 17 # BTF_KIND_VAR(id = 4)
+; CHECK-NEXT: .long 17 # BTF_KIND_VAR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 26 # BTF_KIND_DATASEC(id = 5)
+; CHECK-NEXT: .long 26 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
Index: llvm/test/CodeGen/BPF/BTF/map-def.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/map-def.ll
+++ llvm/test/CodeGen/BPF/BTF/map-def.ll
@@ -28,10 +28,12 @@
; CHECK-NEXT: .long 168
; CHECK-NEXT: .long 168
; CHECK-NEXT: .long 65
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 10
@@ -40,18 +42,22 @@
; CHECK-NEXT: .long 12
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 14 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 14 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 18 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 18 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 31 # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT: .long 31 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 40
@@ -60,11 +66,13 @@
; CHECK-NEXT: .long 44
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 64 # 0x40
-; CHECK-NEXT: .long 50 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 50 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 59 # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT: .long 59 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
Index: llvm/test/CodeGen/BPF/BTF/pruning-const.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/pruning-const.ll
+++ llvm/test/CodeGen/BPF/BTF/pruning-const.ll
@@ -36,18 +36,21 @@
ret i32 %0, !dbg !42
}
-; CHECK: .long 0 # BTF_KIND_CONST(id = 4)
+; CHECK: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 10
-; CHECK: .long 60 # BTF_KIND_STRUCT(id = 9)
+; CHECK: .long 60 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 63
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0 # 0x0
-; CHECK: .long 66 # BTF_KIND_STRUCT(id = 10)
+; CHECK: .long 66 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 69
Index: llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
+++ llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
@@ -26,10 +26,12 @@
ret i32 %0, !dbg !31
}
-; CHECK: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108867 # 0x4000003
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 4
@@ -41,22 +43,27 @@
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 128 # 0x80
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 12 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 20 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 20 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 60 # BTF_KIND_FWD(id = 7)
+; CHECK-NEXT: .long 60 # BTF_KIND_FWD(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 117440512 # 0x7000000
; CHECK-NEXT: .long 0
Index: llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
+++ llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
@@ -29,12 +29,14 @@
ret i32 0, !dbg !31
}
-; CHECK: .long 10 # BTF_KIND_INT(id = 7)
+; CHECK: .long 10 # BTF_KIND_INT(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK: .long 69 # BTF_KIND_STRUCT(id = 9)
+; CHECK: .long 69 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 4
Index: llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
@@ -38,21 +38,25 @@
ret i32 %0, !dbg !43
}
-; CHECK: .long 7 # BTF_KIND_TYPEDEF(id = 4)
+; CHECK: .long 7 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 12 # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT: .long 12 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 11
-; CHECK: .long 69 # BTF_KIND_STRUCT(id = 10)
+; CHECK: .long 69 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0 # 0x0
-; CHECK: .long 75 # BTF_KIND_STRUCT(id = 11)
+; CHECK: .long 75 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 11
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 78
Index: llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
@@ -21,10 +21,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
@@ -21,10 +21,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
@@ -21,21 +21,25 @@
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 5 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
Index: llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
@@ -22,20 +22,24 @@
; CHECK-NEXT: .long 68
; CHECK-NEXT: .long 68
; CHECK-NEXT: .long 11
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(id = 3)
+; CHECK-NEXT: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 7 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 7 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/ptr-int.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-int.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-int.ll
@@ -21,10 +21,12 @@
; CHECK-NEXT: .long 28
; CHECK-NEXT: .long 28
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
@@ -26,26 +26,31 @@
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 23
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 7 # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT: .long 7 # BTF_KIND_VAR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 9 # BTF_KIND_DATASEC(id = 4)
+; CHECK-NEXT: .long 9 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long g
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 21 # BTF_KIND_FWD(id = 5)
+; CHECK-NEXT: .long 21 # BTF_KIND_FWD(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 117440512 # 0x7000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/ptr-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-void.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-void.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 12
; CHECK-NEXT: .long 12
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
@@ -21,13 +21,16 @@
; CHECK-NEXT: .long 36
; CHECK-NEXT: .long 36
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
+++ llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
@@ -21,10 +21,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
+++ llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
@@ -21,13 +21,16 @@
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_RESTRICT(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_RESTRICT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 184549376 # 0xb000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/short.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/short.ll
+++ llvm/test/CodeGen/BPF/BTF/short.ll
@@ -22,7 +22,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
Index: llvm/test/CodeGen/BPF/BTF/static-func.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-func.ll
+++ llvm/test/CodeGen/BPF/BTF/static-func.ll
@@ -31,26 +31,33 @@
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 88
; CHECK-NEXT: .long 64
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 54 # BTF_KIND_FUNC(id = 5)
+; CHECK-NEXT: .long 54 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 201326592 # 0xc000000
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT: .long 60 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 6
; CHECK-NEXT: .byte 0
Index: llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
@@ -43,61 +43,78 @@
; CHECK-NEXT: .long 288
; CHECK-NEXT: .long 288
; CHECK-NEXT: .long 95
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 16777280 # 0x1000040
-; CHECK-NEXT: .long 10 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 10 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 58 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 58 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 62 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 62 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 9)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 10)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 65 # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT: .long 65 # BTF_KIND_VAR(
+; CHECK-SAME: id = 11
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 12)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 12
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 13
-; CHECK-NEXT: .long 68 # BTF_KIND_TYPEDEF(id = 13)
+; CHECK-NEXT: .long 68 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 13
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 76 # BTF_KIND_VAR(id = 14)
+; CHECK-NEXT: .long 76 # BTF_KIND_VAR(
+; CHECK-SAME: id = 14
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 12
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 15)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 15
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 12
-; CHECK-NEXT: .long 79 # BTF_KIND_VAR(id = 16)
+; CHECK-NEXT: .long 79 # BTF_KIND_VAR(
+; CHECK-SAME: id = 16
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 15
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 82 # BTF_KIND_DATASEC(id = 17)
+; CHECK-NEXT: .long 82 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 17
; CHECK-NEXT: .long 251658243 # 0xf000003
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
@@ -109,7 +126,8 @@
; CHECK-NEXT: .long 14
; CHECK-NEXT: .long v3
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 87 # BTF_KIND_DATASEC(id = 18)
+; CHECK-NEXT: .long 87 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 18
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 16
Index: llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
@@ -32,39 +32,49 @@
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 76
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 8)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
@@ -32,39 +32,49 @@
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 77
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 8)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
@@ -32,45 +32,57 @@
; CHECK-NEXT: .long 188
; CHECK-NEXT: .long 188
; CHECK-NEXT: .long 76
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 9)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 10)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 11
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 12)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 12
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
Index: llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
@@ -32,45 +32,57 @@
; CHECK-NEXT: .long 188
; CHECK-NEXT: .long 188
; CHECK-NEXT: .long 79
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 9)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 10)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 11
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 12)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 12
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
Index: llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
@@ -32,39 +32,49 @@
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 76
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 8)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
@@ -29,20 +29,25 @@
; CHECK-NEXT: .long 196
; CHECK-NEXT: .long 196
; CHECK-NEXT: .long 95
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 53 # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT: .long 53 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 67108867 # 0x4000003
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 55
@@ -54,25 +59,30 @@
; CHECK-NEXT: .long 59
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 64 # 0x40
-; CHECK-NEXT: .long 61 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 61 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 66 # BTF_KIND_INT(id = 8)
+; CHECK-NEXT: .long 66 # BTF_KIND_INT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 86 # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT: .long 86 # BTF_KIND_VAR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 89 # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT: .long 89 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 9
Index: llvm/test/CodeGen/BPF/BTF/static-var.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/static-var.ll
+++ llvm/test/CodeGen/BPF/BTF/static-var.ll
@@ -32,39 +32,49 @@
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 164
; CHECK-NEXT: .long 76
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 52 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 52 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16777232 # 0x1000010
-; CHECK-NEXT: .long 58 # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT: .long 58 # BTF_KIND_VAR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 64 # BTF_KIND_INT(id = 8)
+; CHECK-NEXT: .long 64 # BTF_KIND_INT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 69 # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT: .long 69 # BTF_KIND_VAR(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT: .long 71 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 251658242 # 0xf000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 6
Index: llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
+++ llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
@@ -21,10 +21,12 @@
ret i32 0, !dbg !27
}
-; CHECK: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 4
@@ -33,26 +35,31 @@
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 64 # 0x40
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 13 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 13 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 17
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 20 # BTF_KIND_INT(id = 7)
+; CHECK-NEXT: .long 20 # BTF_KIND_INT(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 16777280 # 0x1000040
Index: llvm/test/CodeGen/BPF/BTF/struct-anon.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/struct-anon.ll
+++ llvm/test/CodeGen/BPF/BTF/struct-anon.ll
@@ -24,19 +24,22 @@
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 3 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 3 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/struct-basic.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/struct-basic.ll
+++ llvm/test/CodeGen/BPF/BTF/struct-basic.ll
@@ -23,7 +23,8 @@
; CHECK-NEXT: .long 68
; CHECK-NEXT: .long 68
; CHECK-NEXT: .long 19
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
@@ -32,11 +33,13 @@
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 32
-; CHECK-NEXT: .long 10 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 10 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 15 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
@@ -25,7 +25,8 @@
; CHECK-NEXT: .long 104
; CHECK-NEXT: .long 104
; CHECK-NEXT: .long 27
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 2214592515 # 0x84000003
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
@@ -37,17 +38,21 @@
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 8 # 0x8
-; CHECK-NEXT: .long 7 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 7 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 12 # BTF_KIND_TYPEDEF(id = 3)
+; CHECK-NEXT: .long 12 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 18 # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT: .long 18 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 23 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 23 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/struct-enum.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/struct-enum.ll
+++ llvm/test/CodeGen/BPF/BTF/struct-enum.ll
@@ -24,7 +24,8 @@
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 15
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 2214592514 # 0x84000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
@@ -33,7 +34,8 @@
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 8 # BTF_KIND_ENUM(id = 2)
+; CHECK-NEXT: .long 8 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 100663298 # 0x6000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 11
Index: llvm/test/CodeGen/BPF/BTF/tag-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/tag-1.ll
+++ llvm/test/CodeGen/BPF/BTF/tag-1.ll
@@ -40,7 +40,8 @@
!17 = !{i32 7, !"frame-pointer", i32 2}
!18 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 825661b8e31d0b29d78178df1e518949dfec9f9a)"}
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 1)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4
@@ -49,35 +50,43 @@
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 2)
+; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 20 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 20 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 5)
+; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 6)
+; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 24 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 24 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(id = 8)
+; CHECK-NEXT: .long 10 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(id = 9)
+; CHECK-NEXT: .long 15 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 7
; CHECK-NEXT: .long 4294967295
Index: llvm/test/CodeGen/BPF/BTF/tag-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/tag-2.ll
+++ llvm/test/CodeGen/BPF/BTF/tag-2.ll
@@ -73,46 +73,56 @@
!32 = !{!17, !33}
!33 = !{!"btf_decl_tag", !"tag2"}
-; CHECK: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 15 # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT: .long 15 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 5)
+; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 6)
+; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 72 # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT: .long 72 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(id = 9)
+; CHECK-NEXT: .long 19 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 76 # BTF_KIND_DECL_TAG(id = 10)
+; CHECK-NEXT: .long 76 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 4294967295
Index: llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
+++ llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
@@ -58,35 +58,43 @@
!25 = !{!26}
!26 = !{!"btf_decl_tag", !"foo_tag"}
-; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 44 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 44 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 48 # BTF_KIND_FUNC(id = 5)
+; CHECK-NEXT: .long 48 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 52 # BTF_KIND_DECL_TAG(id = 6)
+; CHECK-NEXT: .long 52 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 58 # BTF_KIND_DECL_TAG(id = 7)
+; CHECK-NEXT: .long 58 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 64 # BTF_KIND_DECL_TAG(id = 8)
+; CHECK-NEXT: .long 64 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 4294967295
Index: llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
@@ -42,38 +42,47 @@
!20 = !{i32 7, !"frame-pointer", i32 2}
!21 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 219b26fbcd70273ddfd4ead9387f7c69b7eb4570)"}
-; CHECK: .long 1 # BTF_KIND_TYPEDEF(id = 1)
+; CHECK: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(id = 2)
+; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 10
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 12 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 10 # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT: .long 10 # BTF_KIND_VAR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 16 # BTF_KIND_TYPEDEF(id = 6)
+; CHECK-NEXT: .long 16 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(id = 7)
+; CHECK-NEXT: .long 5 # BTF_KIND_DECL_TAG(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 285212672 # 0x11000000
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 4294967295
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 20 # BTF_KIND_INT(id = 9)
+; CHECK-NEXT: .long 20 # BTF_KIND_INT(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
+++ llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
@@ -35,39 +35,49 @@
ret void, !dbg !23
}
-; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 62 # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT: .long 62 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 72
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 76 # BTF_KIND_TYPE_TAG(id = 6)
+; CHECK-NEXT: .long 76 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 9
-; CHECK-NEXT: .long 81 # BTF_KIND_TYPE_TAG(id = 7)
+; CHECK-NEXT: .long 81 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 86 # BTF_KIND_FWD(id = 9)
+; CHECK-NEXT: .long 86 # BTF_KIND_FWD(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 117440512 # 0x7000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 90 # BTF_KIND_FUNC(id = 10)
+; CHECK-NEXT: .long 90 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 3
Index: llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
+++ llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
@@ -37,51 +37,63 @@
ret void, !dbg !26
}
-; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 218103810 # 0xd000002
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 63 # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT: .long 63 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 73
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 12
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 77 # BTF_KIND_STRUCT(id = 8)
+; CHECK-NEXT: .long 77 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 81
; CHECK-NEXT: .long 9
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 83 # BTF_KIND_INT(id = 9)
+; CHECK-NEXT: .long 83 # BTF_KIND_INT(
+; CHECK-SAME: id = 9
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 87 # BTF_KIND_FUNC(id = 10)
+; CHECK-NEXT: .long 87 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 10
; CHECK-NEXT: .long 201326594 # 0xc000002
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 92 # BTF_KIND_TYPE_TAG(id = 11)
+; CHECK-NEXT: .long 92 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 11
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 97 # BTF_KIND_TYPE_TAG(id = 12)
+; CHECK-NEXT: .long 97 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 12
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 11
Index: llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
+++ llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
@@ -27,26 +27,33 @@
!10 = !{!9, !11}
!11 = !{!"btf_type_tag", !"tag2"}
-; CHECK: .long 1 # BTF_KIND_TYPE_TAG(id = 1)
+; CHECK: .long 1 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 6 # BTF_KIND_TYPE_TAG(id = 2)
+; CHECK-NEXT: .long 6 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_TYPE_TAG(id = 4)
+; CHECK-NEXT: .long 1 # BTF_KIND_TYPE_TAG(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 301989888 # 0x12000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 11 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 11 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 15 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 15 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 1
Index: llvm/test/CodeGen/BPF/BTF/uchar.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/uchar.ll
+++ llvm/test/CodeGen/BPF/BTF/uchar.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 15
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 8 # 0x8
Index: llvm/test/CodeGen/BPF/BTF/uint.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/uint.ll
+++ llvm/test/CodeGen/BPF/BTF/uint.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 14
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
Index: llvm/test/CodeGen/BPF/BTF/ulonglong.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ulonglong.ll
+++ llvm/test/CodeGen/BPF/BTF/ulonglong.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 24
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 64 # 0x40
Index: llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
+++ llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
@@ -24,7 +24,8 @@
; CHECK-NEXT: .long 120
; CHECK-NEXT: .long 120
; CHECK-NEXT: .long 41
-; CHECK-NEXT: .long 1 # BTF_KIND_UNION(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 83886082 # 0x5000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 3
@@ -33,24 +34,29 @@
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 7 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 7 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long 12 # BTF_KIND_INT(id = 4)
+; CHECK-NEXT: .long 12 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 32 # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT: .long 32 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 37 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 37 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/BTF/ushort.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/ushort.ll
+++ llvm/test/CodeGen/BPF/BTF/ushort.ll
@@ -21,7 +21,8 @@
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 16
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 1)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 16 # 0x10
Index: llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
+++ llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
@@ -18,15 +18,18 @@
ret i32 %conv, !dbg !19
}
-; CHECK: .long 55 # BTF_KIND_INT(id = 4)
+; CHECK: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT: .long 60 # BTF_KIND_VAR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 62 # BTF_KIND_DATASEC(id = 6)
+; CHECK-NEXT: .long 62 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
Index: llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
+++ llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
@@ -19,31 +19,39 @@
ret i32 %conv, !dbg !21
}
-; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 218103808 # 0xd000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_INT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_INT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT: .long 5 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 0 # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_CONST(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 167772160 # 0xa000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_VOLATILE(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 150994944 # 0x9000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 47 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 47 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 52 # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT: .long 52 # BTF_KIND_VAR(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 54 # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT: .long 54 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 7
Index: llvm/test/CodeGen/BPF/BTF/weak-global.ll
===================================================================
--- llvm/test/CodeGen/BPF/BTF/weak-global.ll
+++ llvm/test/CodeGen/BPF/BTF/weak-global.ll
@@ -18,15 +18,18 @@
ret i32 %conv, !dbg !19
}
-; CHECK: .long 55 # BTF_KIND_INT(id = 4)
+; CHECK: .long 55 # BTF_KIND_INT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 16777224 # 0x1000008
-; CHECK-NEXT: .long 60 # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT: .long 60 # BTF_KIND_VAR(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 234881024 # 0xe000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 62 # BTF_KIND_DATASEC(id = 6)
+; CHECK-NEXT: .long 62 # BTF_KIND_DATASEC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 251658241 # 0xf000001
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 5
Index: llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
+++ llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
@@ -34,10 +34,12 @@
ret i32 %bf.cast, !dbg !32
}
-; CHECK: .long 1 # BTF_KIND_TYPEDEF(id = 2)
+; CHECK: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK: .ascii "sockptr_t" # string offset=1
; CHECK: .ascii ".text" # string offset=59
Index: llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
+++ llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
@@ -35,10 +35,12 @@
ret i32 %2, !dbg !36
}
-; CHECK: .long 56 # BTF_KIND_TYPEDEF(id = 7)
+; CHECK: .long 56 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 0 # BTF_KIND_UNION(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_UNION(
+; CHECK-SAME: id = 8
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "sockptr_t" # string offset=56
Index: llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
+++ llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
@@ -37,10 +37,12 @@
ret i32 %2, !dbg !36
}
-; CHECK: .long 56 # BTF_KIND_TYPEDEF(id = 7)
+; CHECK: .long 56 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 8
-; CHECK-NEXT: .long 0 # BTF_KIND_UNION(id = 8)
+; CHECK-NEXT: .long 0 # BTF_KIND_UNION(
+; CHECK-SAME: id = 8
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "sockptr_t" # string offset=56
Index: llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
+++ llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
@@ -40,7 +40,8 @@
ret i32 %conv, !dbg !30
}
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .ascii "s1" # string offset=1
; CHECK: .ascii ".text" # string offset=20
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
@@ -25,7 +25,8 @@
; CHECK: r0 = 4
; CHECK: exit
-; CHECK: .long 13 # BTF_KIND_STRUCT(id = 4)
+; CHECK: .long 13 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK: .ascii ".text" # string offset=7
; CHECK: .byte 98 # string offset=13
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
@@ -46,7 +46,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=89
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
@@ -46,7 +46,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=89
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
@@ -47,7 +47,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=40
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
@@ -47,7 +47,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=40
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
@@ -51,7 +51,8 @@
ret i32 %bf.cast, !dbg !27
}
-; CHECK: .long 68 # BTF_KIND_STRUCT(id = 4)
+; CHECK: .long 68 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK: .ascii ".text" # string offset=9
; CHECK: .ascii "t1" # string offset=68
Index: llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
+++ llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
@@ -42,7 +42,8 @@
ret i32 %2, !dbg !35
}
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .ascii "s1" # string offset=1
; CHECK: .ascii ".text" # string offset=20
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
@@ -25,7 +25,8 @@
ret i32 %1, !dbg !25
}
-; CHECK: .long 16 # BTF_KIND_STRUCT(id = 4)
+; CHECK: .long 16 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "s1" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
@@ -56,7 +56,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=43
; CHECK: .ascii "0:1:0" # string offset=49
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
@@ -47,7 +47,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=42
; CHECK: .ascii "0:1" # string offset=48
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
@@ -41,7 +41,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=54
; CHECK: .ascii "0:1:0:5" # string offset=60
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
@@ -26,7 +26,8 @@
; CHECK: r0 = 4
; CHECK: exit
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = 3)
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK: .ascii "s1" # string offset=6
; CHECK: .ascii ".text" # string offset=31
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
@@ -56,8 +56,10 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
-; CHECK: .long 37 # BTF_KIND_UNION(id = 7)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
+; CHECK: .long 37 # BTF_KIND_UNION(
+; CHECK-SAME: id = 7
; CHECK: .ascii "s1" # string offset=1
; CHECK: .ascii "u1" # string offset=37
; CHECK: .ascii ".text" # string offset=64
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
@@ -40,7 +40,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=55
; CHECK: .ascii "0:1:0" # string offset=61
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
@@ -40,7 +40,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=54
; CHECK: .ascii "0:1:0:5" # string offset=60
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
@@ -29,13 +29,15 @@
; CHECK: r0 = 1
; CHECK-NEXT: exit
-; CHECK: .long 26 # BTF_KIND_STRUCT(id = 4)
+; CHECK: .long 26 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 28
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 32 # BTF_KIND_INT(id = 5)
+; CHECK-NEXT: .long 32 # BTF_KIND_INT(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
@@ -57,7 +57,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=43
; CHECK: .ascii "0:1:0" # string offset=49
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
@@ -57,7 +57,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=43
; CHECK: .ascii "0:1:0" # string offset=49
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
@@ -41,7 +41,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=43
; CHECK: .ascii "0:1:0" # string offset=49
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
@@ -56,7 +56,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=43
; CHECK: .ascii "0:1:0" # string offset=49
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
@@ -40,7 +40,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=42
; CHECK: .ascii "0:1:0" # string offset=48
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
@@ -41,7 +41,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=59
; CHECK: .ascii "0:1:0:3" # string offset=65
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
@@ -56,8 +56,10 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
-; CHECK: .long 37 # BTF_KIND_UNION(id = 7)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
+; CHECK: .long 37 # BTF_KIND_UNION(
+; CHECK-SAME: id = 7
; CHECK: .ascii "s1" # string offset=1
; CHECK: .ascii "u1" # string offset=37
; CHECK: .ascii ".text" # string offset=64
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
@@ -52,7 +52,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=65
; CHECK: .ascii "0:1:0" # string offset=71
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
@@ -47,7 +47,8 @@
; CHECK-ALU32: w0 += w1
; CHECK: exit
-; CHECK: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK: .ascii "u1" # string offset=1
; CHECK: .ascii ".text" # string offset=81
; CHECK: .ascii "0:1:0:5" # string offset=87
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
@@ -36,8 +36,10 @@
; CHECK: r{{[0-9]+}} = -2147483648 ll
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_ENUM64(id = 4)
-; CHECK: .long 57 # BTF_KIND_TYPEDEF(id = 5)
+; CHECK: .long 16 # BTF_KIND_ENUM64(
+; CHECK-SAME: id = 4
+; CHECK: .long 57 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 5
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "AA" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
@@ -36,7 +36,8 @@
; CHECK: r{{[0-9]+}} = -2147483648 ll
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_ENUM64(id = 4)
+; CHECK: .long 16 # BTF_KIND_ENUM64(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 2466250754 # 0x93000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 19
@@ -45,10 +46,12 @@
; CHECK-NEXT: .long 24
; CHECK-NEXT: .long 4294934528 # 0xffff8000
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 57 # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT: .long 57 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 6
-; CHECK-NEXT: .long 0 # BTF_KIND_ENUM64(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_ENUM64(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 318767105 # 0x13000001
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 62
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
@@ -32,9 +32,12 @@
; CHECK: r{{[0-9]+}} = 1
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_TYPEDEF(id = 4)
-; CHECK: .long 49 # BTF_KIND_STRUCT(id = 7)
-; CHECK: .long 74 # BTF_KIND_ENUM(id = 10)
+; CHECK: .long 16 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
+; CHECK: .long 49 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 7
+; CHECK: .long 74 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 10
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "func_t" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
@@ -33,9 +33,12 @@
; CHECK: r{{[0-9]+}} = 1
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_TYPEDEF(id = 4)
-; CHECK: .long 40 # BTF_KIND_STRUCT(id = 7)
-; CHECK: .long 65 # BTF_KIND_ENUM(id = 10)
+; CHECK: .long 16 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
+; CHECK: .long 40 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 7
+; CHECK: .long 65 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 10
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "func_t" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
@@ -32,9 +32,12 @@
; CHECK: r{{[0-9]+}} = 4
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_TYPEDEF(id = 4)
-; CHECK: .long 49 # BTF_KIND_STRUCT(id = 7)
-; CHECK: .long 74 # BTF_KIND_ENUM(id = 10)
+; CHECK: .long 16 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
+; CHECK: .long 49 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 7
+; CHECK: .long 74 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 10
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "func_t" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
+++ llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
@@ -38,9 +38,12 @@
; CHECK: r{{[0-9]+}} = 4
; CHECK: exit
-; CHECK: .long 16 # BTF_KIND_TYPEDEF(id = 4)
-; CHECK: .long 49 # BTF_KIND_STRUCT(id = 7)
-; CHECK: .long 74 # BTF_KIND_ENUM(id = 10)
+; CHECK: .long 16 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 4
+; CHECK: .long 49 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 7
+; CHECK: .long 74 # BTF_KIND_ENUM(
+; CHECK-SAME: id = 10
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "func_t" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
@@ -49,10 +49,12 @@
; CHECK-NEXT: .long 120
; CHECK-NEXT: .long 120
; CHECK-NEXT: .long 90
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 16
; CHECK-NEXT: .long 9
@@ -61,22 +63,27 @@
; CHECK-NEXT: .long 11
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 64 # 0x40
-; CHECK-NEXT: .long 15 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 5
-; CHECK-NEXT: .long 19 # BTF_KIND_FWD(id = 5)
+; CHECK-NEXT: .long 19 # BTF_KIND_FWD(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 117440512 # 0x7000000
; CHECK-NEXT: .long 0
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 30
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 34 # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT: .long 34 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 6
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
@@ -40,8 +40,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
-; CHECK: .long 100 # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 100 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=1
; CHECK: .ascii ".text" # string offset=46
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
@@ -41,8 +41,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
-; CHECK: .long 100 # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 100 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=1
; CHECK: .ascii ".text" # string offset=46
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
@@ -36,8 +36,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = [[V3_TID:[0-9]+]])
-; CHECK: .long 81 # BTF_KIND_STRUCT(id = [[V1_TID:[0-9]+]])
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[V3_TID:[0-9]+]]
+; CHECK: .long 81 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[V1_TID:[0-9]+]]
; CHECK: .ascii "v3" # string offset=1
; CHECK-NEXT: .byte 0
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
@@ -39,8 +39,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
-; CHECK: .long 91 # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 91 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=39
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
@@ -39,8 +39,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
-; CHECK: .long 111 # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 111 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=57
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
@@ -41,8 +41,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_UNION(id = [[TID1:[0-9]+]])
-; CHECK: .long 91 # BTF_KIND_UNION(id = [[TID2:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 91 # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=39
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
@@ -41,8 +41,10 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_UNION(id = [[TID1:[0-9]+]])
-; CHECK: .long 111 # BTF_KIND_UNION(id = [[TID2:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
+; CHECK: .long 111 # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TID2:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=57
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
@@ -27,7 +27,8 @@
; CHECK-ALU32: w0 = *(u32 *)(r1 + 4)
; CHECK: exit
;
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
;
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=20
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
@@ -27,7 +27,8 @@
; CHECK: r0 += r1
; CHECK: exit
;
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
;
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=20
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
@@ -115,7 +115,8 @@
; CHECK32: r{{[0-9]+}} s>>= 60
; CHECK: r{{[0-9]+}} = 1
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=30
; CHECK: .ascii "0:2" # string offset=36
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
@@ -115,7 +115,8 @@
; CHECK32: r{{[0-9]+}} s>>= 60
; CHECK: r{{[0-9]+}} = 1
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .byte 115 # string offset=1
; CHECK: .ascii ".text" # string offset=30
; CHECK: .ascii "0:2" # string offset=36
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
@@ -31,7 +31,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 16 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 16 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "v3" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
@@ -33,7 +33,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 16 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 16 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "v3" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
@@ -31,7 +31,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 16 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 16 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii ".text" # string offset=10
; CHECK: .ascii "v3" # string offset=16
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
@@ -42,7 +42,8 @@
ret void, !dbg !37
}
-; CHECK: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK: .ascii "r1" # string offset=1
; CHECK: .ascii ".text" # string offset=29
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
@@ -32,7 +32,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=52
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
@@ -33,7 +33,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=52
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
@@ -50,10 +50,12 @@
; CHECK-NEXT: .long 132
; CHECK-NEXT: .long 132
; CHECK-NEXT: .long 106
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 12
; CHECK-NEXT: .long 9
@@ -62,11 +64,13 @@
; CHECK-NEXT: .long 11
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 15 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 19 # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT: .long 19 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 30
@@ -75,12 +79,14 @@
; CHECK-NEXT: .long 37
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 44
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 48 # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT: .long 48 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 5
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
@@ -28,7 +28,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=26
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
@@ -29,7 +29,8 @@
; CHECK-NEXT: r1 += r2
; CHECK: call get_value
-; CHECK: .long 6 # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK: .long 6 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TID1:[0-9]+]]
; CHECK: .ascii "v3" # string offset=6
; CHECK: .ascii ".text" # string offset=26
; CHECK: .ascii "1:1" # string offset=32
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
@@ -50,10 +50,12 @@
; CHECK-NEXT: .long 172
; CHECK-NEXT: .long 172
; CHECK-NEXT: .long 117
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 84
; CHECK-NEXT: .long 9
@@ -62,11 +64,13 @@
; CHECK-NEXT: .long 11
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 15 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 19
@@ -75,22 +79,26 @@
; CHECK-NEXT: .long 26
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 33 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 33 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 53
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 57 # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT: .long 57 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 7
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
@@ -51,10 +51,12 @@
; CHECK-NEXT: .long 172
; CHECK-NEXT: .long 172
; CHECK-NEXT: .long 128
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 84
; CHECK-NEXT: .long 9
@@ -63,11 +65,13 @@
; CHECK-NEXT: .long 11
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 15 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 15 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 19 # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT: .long 19 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 30
@@ -76,22 +80,26 @@
; CHECK-NEXT: .long 37
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_ARRAY(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 50331648 # 0x3000000
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 6
; CHECK-NEXT: .long 10
-; CHECK-NEXT: .long 44 # BTF_KIND_INT(id = 6)
+; CHECK-NEXT: .long 44 # BTF_KIND_INT(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 64
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 68 # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT: .long 68 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 8
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 7
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
@@ -35,7 +35,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(id = [[TYPE_ID:[0-9]+]])
+; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TYPE_ID:[0-9]+]]
; CHECK: .ascii ".text" # string offset=[[SEC_INDEX:[0-9]+]]
; CHECK-NEXT: .byte 0
; CHECK: .ascii "0:0:1" # string offset=[[ACCESS_STR:[0-9]+]]
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
@@ -26,10 +26,12 @@
ret i32 %1, !dbg !26
}
-; CHECK: .long 1 # BTF_KIND_TYPEDEF(id = 2)
+; CHECK: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 67108865 # 0x4000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 5
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
@@ -34,7 +34,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(id = [[TYPE_ID:[0-9]+]])
+; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(
+; CHECK-SAME: id = [[TYPE_ID:[0-9]+]]
; CHECK: .ascii ".text" # string offset=[[SEC_STR:[0-9]+]]
; CHECK-NEXT: .byte 0
; CHECK: .ascii "0:1" # string offset=[[ACCESS_STR:[0-9]+]]
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
@@ -26,10 +26,12 @@
ret i32 %1, !dbg !24
}
-; CHECK: .long 1 # BTF_KIND_TYPEDEF(id = 2)
+; CHECK: .long 1 # BTF_KIND_TYPEDEF(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 134217728 # 0x8000000
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long 0 # BTF_KIND_UNION(id = 3)
+; CHECK-NEXT: .long 0 # BTF_KIND_UNION(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 83886081 # 0x5000001
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 5
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
@@ -34,7 +34,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(id = [[TYPE_ID:[0-9]+]])
+; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TYPE_ID:[0-9]+]]
; CHECK: .ascii ".text" # string offset=[[SEC_INDEX:[0-9]+]]
; CHECK-NEXT: .byte 0
; CHECK: .ascii "0:1" # string offset=[[ACCESS_STR:[0-9]+]]
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
@@ -40,7 +40,8 @@
; CHECK: r1 += r2
; CHECK: call get_value
-; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(id = [[TYPE_ID:[0-9]+]])
+; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(
+; CHECK-SAME: id = [[TYPE_ID:[0-9]+]]
; CHECK: .ascii ".text" # string offset=[[SEC_STR:[0-9]+]]
; CHECK-NEXT: .byte 0
; CHECK: .ascii "1:1:1" # string offset=[[ACCESS_STR:[0-9]+]]
Index: llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
===================================================================
--- llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
+++ llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
@@ -54,10 +54,12 @@
; CHECK-NEXT: .long 168
; CHECK-NEXT: .long 168
; CHECK-NEXT: .long 105
-; CHECK-NEXT: .long 0 # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT: .long 0 # BTF_KIND_PTR(
+; CHECK-SAME: id = 1
; CHECK-NEXT: .long 33554432 # 0x2000000
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long 1 # BTF_KIND_UNION(id = 2)
+; CHECK-NEXT: .long 1 # BTF_KIND_UNION(
+; CHECK-SAME: id = 2
; CHECK-NEXT: .long 83886082 # 0x5000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 9
@@ -66,11 +68,13 @@
; CHECK-NEXT: .long 11
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 13 # BTF_KIND_INT(id = 3)
+; CHECK-NEXT: .long 13 # BTF_KIND_INT(
+; CHECK-SAME: id = 3
; CHECK-NEXT: .long 16777216 # 0x1000000
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 16777248 # 0x1000020
-; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT: .long 0 # BTF_KIND_STRUCT(
+; CHECK-SAME: id = 4
; CHECK-NEXT: .long 67108866 # 0x4000002
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 17
@@ -79,7 +83,8 @@
; CHECK-NEXT: .long 23
; CHECK-NEXT: .long 5
; CHECK-NEXT: .long 32 # 0x20
-; CHECK-NEXT: .long 0 # BTF_KIND_UNION(id = 5)
+; CHECK-NEXT: .long 0 # BTF_KIND_UNION(
+; CHECK-SAME: id = 5
; CHECK-NEXT: .long 83886082 # 0x5000002
; CHECK-NEXT: .long 4
; CHECK-NEXT: .long 27
@@ -88,12 +93,14 @@
; CHECK-NEXT: .long 34
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 0 # 0x0
-; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT: .long 0 # BTF_KIND_FUNC_PROTO(
+; CHECK-SAME: id = 6
; CHECK-NEXT: .long 218103809 # 0xd000001
; CHECK-NEXT: .long 3
; CHECK-NEXT: .long 41
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long 45 # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT: .long 45 # BTF_KIND_FUNC(
+; CHECK-SAME: id = 7
; CHECK-NEXT: .long 201326593 # 0xc000001
; CHECK-NEXT: .long 6
; CHECK-NEXT: .byte 0 # string offset=0
Index: llvm/test/ExecutionEngine/RuntimeDyld/BPF/nodyld32-64-relocations.s
===================================================================
--- llvm/test/ExecutionEngine/RuntimeDyld/BPF/nodyld32-64-relocations.s
+++ llvm/test/ExecutionEngine/RuntimeDyld/BPF/nodyld32-64-relocations.s
@@ -36,21 +36,21 @@
.long 80
.long 80
.long 87
- .long 0 # BTF_KIND_FUNC_PROTO(id = 1)
+ .long 0 # BTF_KIND_FUNC_PROTO(id = 1
.long 218103808 # 0xd000000
.long 2
- .long 1 # BTF_KIND_INT(id = 2)
+ .long 1 # BTF_KIND_INT(id = 2
.long 16777216 # 0x1000000
.long 4
.long 16777248 # 0x1000020
- .long 5 # BTF_KIND_FUNC(id = 3)
+ .long 5 # BTF_KIND_FUNC(id = 3
.long 201326593 # 0xc000001
.long 1
- .long 80 # BTF_KIND_VAR(id = 4)
+ .long 80 # BTF_KIND_VAR(id = 4
.long 234881024 # 0xe000000
.long 2
.long 1
- .long 82 # BTF_KIND_DATASEC(id = 5)
+ .long 82 # BTF_KIND_DATASEC(id = 5
.long 251658241 # 0xf000001
.long 0
.long 4