This is an archive of the discontinued LLVM Phabricator instance.

Differential D65259

fix typedef issue for offset relocation
ClosedPublic

Authored by yonghong-song on Jul 24 2019, 7:35 PM.

Details

Reviewers
ast
Commits
rGccddca30dd82: Merging r367062: --------------------------------------------------------------…
rL367211: Merging r367062:
rG329abf293998: [BPF] fix typedef issue for offset relocation
rL367062: [BPF] fix typedef issue for offset relocation
Summary

Currently, the CO-RE offset relocation does not work
if any struct/union member or array element is a typedef.
For example,

typedef const int arr_t[7];
struct input {
    arr_t a;
};
func(...) {
     struct input *in = ...;
     ... __builtin_preserve_access_index(&in->a[1]) ...
}

The BPF backend calculated default offset is 0 while
4 is the correct answer. Similar issues exist for struct/union
typedef's.

When getting struct/union member or array element type,
we should trace down to the type by skipping typedef
and qualifiers const/volatile as this is what clang did
to generate getelementptr instructions.
(const/volatile member type qualifiers are already
ignored by clang.)

This patch fixed this issue, for each access index,
skipping typedef and const/volatile/restrict BTF types.

Diff Detail

Repository
rL LLVM

Event Timeline

yonghong-song created this revision.Jul 24 2019, 7:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2019, 7:35 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
ast accepted this revision.Jul 24 2019, 9:13 PM
ast added inline comments.
lib/Target/BPF/BTFDebug.cpp
55

unnecessary empty line

This revision is now accepted and ready to land.Jul 24 2019, 9:13 PM
Herald added a subscriber: ormris. · View Herald TranscriptJul 24 2019, 9:13 PM
yonghong-song marked an inline comment as done.Jul 24 2019, 9:58 PM
yonghong-song added inline comments.
lib/Target/BPF/BTFDebug.cpp
55

thanks for spotting this. will fix.

Closed by commit rL367062: [BPF] fix typedef issue for offset relocation (authored by yhs). · Explain WhyJul 25 2019, 2:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
BPF/
6 lines
42 lines
test/
CodeGen/
BPF/
CORE/
97 lines
90 lines
90 lines
111 lines

Diff 211660

lib/Target/BPF/BTFDebug.h

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Lines uint32_t getSize() {
return BTFTypeBase::getSize() + EnumValues.size() * BTF::BTFEnumSize; return BTFTypeBase::getSize() + EnumValues.size() * BTF::BTFEnumSize;
} }
void completeType(BTFDebug &BDebug); void completeType(BTFDebug &BDebug);
void emitType(MCStreamer &OS); void emitType(MCStreamer &OS);
}; };
/// Handle array type. /// Handle array type.
class BTFTypeArray : public BTFTypeBase { class BTFTypeArray : public BTFTypeBase {
const DIType *ElemTyNoQual;
uint32_t ElemSize; uint32_t ElemSize;
struct BTF::BTFArray ArrayInfo; struct BTF::BTFArray ArrayInfo;
uint32_t ElemTypeNoQual;
public: public:
BTFTypeArray(uint32_t ElemTypeId, uint32_t ElemSize, uint32_t NumElems); BTFTypeArray(const DIType *Ty, uint32_t ElemTypeId,
uint32_t ElemSize, uint32_t NumElems);
uint32_t getSize() { return BTFTypeBase::getSize() + BTF::BTFArraySize; } uint32_t getSize() { return BTFTypeBase::getSize() + BTF::BTFArraySize; }
void completeType(BTFDebug &BDebug); void completeType(BTFDebug &BDebug);
void emitType(MCStreamer &OS); void emitType(MCStreamer &OS);
void getLocInfo(uint32_t Loc, uint32_t &LocOffset, uint32_t &ElementTypeId); void getLocInfo(uint32_t Loc, uint32_t &LocOffset, uint32_t &ElementTypeId);
}; };
/// Handle struct/union type. /// Handle struct/union type.
class BTFTypeStruct : public BTFTypeBase { class BTFTypeStruct : public BTFTypeBase {
const DICompositeType *STy; const DICompositeType *STy;
bool HasBitField; bool HasBitField;
std::vector<struct BTF::BTFMember> Members; std::vector<struct BTF::BTFMember> Members;
std::vector<uint32_t> MemberTypeNoQual;
public: public:
BTFTypeStruct(const DICompositeType *STy, bool IsStruct, bool HasBitField, BTFTypeStruct(const DICompositeType *STy, bool IsStruct, bool HasBitField,
uint32_t NumMembers); uint32_t NumMembers);
uint32_t getSize() { uint32_t getSize() {
return BTFTypeBase::getSize() + Members.size() * BTF::BTFMemberSize; return BTFTypeBase::getSize() + Members.size() * BTF::BTFMemberSize;
} }
void completeType(BTFDebug &BDebug); void completeType(BTFDebug &BDebug);
▲ Show 20 Lines • Show All 241 Lines • Show Last 20 Lines

lib/Target/BPF/BTFDebug.cpp

Show All 24 Lines
using namespace llvm; using namespace llvm;
static const char *BTFKindStr[] = { static const char *BTFKindStr[] = {
#define HANDLE_BTF_KIND(ID, NAME) "BTF_KIND_" #NAME, #define HANDLE_BTF_KIND(ID, NAME) "BTF_KIND_" #NAME,
#include "BTF.def" #include "BTF.def"
}; };
static const DIType * stripQualifiers(const DIType *Ty) {
while (const auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
unsigned Tag = DTy->getTag();
if (Tag != dwarf::DW_TAG_typedef && Tag != dwarf::DW_TAG_const_type &&
Tag != dwarf::DW_TAG_volatile_type && Tag == dwarf::DW_TAG_restrict_type)
break;
Ty = DTy->getBaseType();
}
return Ty;
}
/// Emit a BTF common type. /// Emit a BTF common type.
void BTFTypeBase::emitType(MCStreamer &OS) { void BTFTypeBase::emitType(MCStreamer &OS) {
OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id) + OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id) +
")"); ")");
OS.EmitIntValue(BTFType.NameOff, 4); OS.EmitIntValue(BTFType.NameOff, 4);
OS.AddComment("0x" + Twine::utohexstr(BTFType.Info)); OS.AddComment("0x" + Twine::utohexstr(BTFType.Info));
OS.EmitIntValue(BTFType.Info, 4); OS.EmitIntValue(BTFType.Info, 4);
OS.EmitIntValue(BTFType.Size, 4); OS.EmitIntValue(BTFType.Size, 4);
} }
astUnsubmitted
Not Done
ReplyInline Actions

unnecessary empty line

ast: unnecessary empty line
yonghong-songAuthorUnsubmitted
Done
ReplyInline Actions

thanks for spotting this. will fix.

yonghong-song: thanks for spotting this. will fix.
BTFTypeDerived::BTFTypeDerived(const DIDerivedType *DTy, unsigned Tag, BTFTypeDerived::BTFTypeDerived(const DIDerivedType *DTy, unsigned Tag,
bool NeedsFixup) bool NeedsFixup)
: DTy(DTy), NeedsFixup(NeedsFixup) { : DTy(DTy), NeedsFixup(NeedsFixup) {
switch (Tag) { switch (Tag) {
case dwarf::DW_TAG_pointer_type: case dwarf::DW_TAG_pointer_type:
Kind = BTF::BTF_KIND_PTR; Kind = BTF::BTF_KIND_PTR;
break; break;
case dwarf::DW_TAG_const_type: case dwarf::DW_TAG_const_type:
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines
void BTFTypeEnum::emitType(MCStreamer &OS) { void BTFTypeEnum::emitType(MCStreamer &OS) {
BTFTypeBase::emitType(OS); BTFTypeBase::emitType(OS);
for (const auto &Enum : EnumValues) { for (const auto &Enum : EnumValues) {
OS.EmitIntValue(Enum.NameOff, 4); OS.EmitIntValue(Enum.NameOff, 4);
OS.EmitIntValue(Enum.Val, 4); OS.EmitIntValue(Enum.Val, 4);
} }
} }
BTFTypeArray::BTFTypeArray(uint32_t ElemTypeId, uint32_t ElemSize, BTFTypeArray::BTFTypeArray(const DIType *Ty, uint32_t ElemTypeId,
uint32_t NumElems) uint32_t ElemSize, uint32_t NumElems)
: ElemSize(ElemSize) { : ElemTyNoQual(Ty), ElemSize(ElemSize) {
Kind = BTF::BTF_KIND_ARRAY; Kind = BTF::BTF_KIND_ARRAY;
BTFType.NameOff = 0; BTFType.NameOff = 0;
BTFType.Info = Kind << 24; BTFType.Info = Kind << 24;
BTFType.Size = 0; BTFType.Size = 0;
ArrayInfo.ElemType = ElemTypeId; ArrayInfo.ElemType = ElemTypeId;
ArrayInfo.Nelems = NumElems; ArrayInfo.Nelems = NumElems;
} }
/// Represent a BTF array. /// Represent a BTF array.
void BTFTypeArray::completeType(BTFDebug &BDebug) { void BTFTypeArray::completeType(BTFDebug &BDebug) {
if (IsCompleted) if (IsCompleted)
return; return;
IsCompleted = true; IsCompleted = true;
// The IR does not really have a type for the index. // The IR does not really have a type for the index.
// A special type for array index should have been // A special type for array index should have been
// created during initial type traversal. Just // created during initial type traversal. Just
// retrieve that type id. // retrieve that type id.
ArrayInfo.IndexType = BDebug.getArrayIndexTypeId(); ArrayInfo.IndexType = BDebug.getArrayIndexTypeId();
ElemTypeNoQual = ElemTyNoQual ? BDebug.getTypeId(ElemTyNoQual)
: ArrayInfo.ElemType;
} }
void BTFTypeArray::emitType(MCStreamer &OS) { void BTFTypeArray::emitType(MCStreamer &OS) {
BTFTypeBase::emitType(OS); BTFTypeBase::emitType(OS);
OS.EmitIntValue(ArrayInfo.ElemType, 4); OS.EmitIntValue(ArrayInfo.ElemType, 4);
OS.EmitIntValue(ArrayInfo.IndexType, 4); OS.EmitIntValue(ArrayInfo.IndexType, 4);
OS.EmitIntValue(ArrayInfo.Nelems, 4); OS.EmitIntValue(ArrayInfo.Nelems, 4);
} }
void BTFTypeArray::getLocInfo(uint32_t Loc, uint32_t &LocOffset, void BTFTypeArray::getLocInfo(uint32_t Loc, uint32_t &LocOffset,
uint32_t &ElementTypeId) { uint32_t &ElementTypeId) {
ElementTypeId = ArrayInfo.ElemType; ElementTypeId = ElemTypeNoQual;
LocOffset = Loc * ElemSize; LocOffset = Loc * ElemSize;
} }
/// Represent either a struct or a union. /// Represent either a struct or a union.
BTFTypeStruct::BTFTypeStruct(const DICompositeType *STy, bool IsStruct, BTFTypeStruct::BTFTypeStruct(const DICompositeType *STy, bool IsStruct,
bool HasBitField, uint32_t Vlen) bool HasBitField, uint32_t Vlen)
: STy(STy), HasBitField(HasBitField) { : STy(STy), HasBitField(HasBitField) {
Kind = IsStruct ? BTF::BTF_KIND_STRUCT : BTF::BTF_KIND_UNION; Kind = IsStruct ? BTF::BTF_KIND_STRUCT : BTF::BTF_KIND_UNION;
Show All 16 Lines for (const auto *Element : Elements) {
BTFMember.NameOff = BDebug.addString(DDTy->getName()); BTFMember.NameOff = BDebug.addString(DDTy->getName());
if (HasBitField) { if (HasBitField) {
uint8_t BitFieldSize = DDTy->isBitField() ? DDTy->getSizeInBits() : 0; uint8_t BitFieldSize = DDTy->isBitField() ? DDTy->getSizeInBits() : 0;
BTFMember.Offset = BitFieldSize << 24 | DDTy->getOffsetInBits(); BTFMember.Offset = BitFieldSize << 24 | DDTy->getOffsetInBits();
} else { } else {
BTFMember.Offset = DDTy->getOffsetInBits(); BTFMember.Offset = DDTy->getOffsetInBits();
} }
BTFMember.Type = BDebug.getTypeId(DDTy->getBaseType()); const auto *BaseTy = DDTy->getBaseType();
BTFMember.Type = BDebug.getTypeId(BaseTy);
MemberTypeNoQual.push_back(BDebug.getTypeId(stripQualifiers(BaseTy)));
Members.push_back(BTFMember); Members.push_back(BTFMember);
} }
} }
void BTFTypeStruct::emitType(MCStreamer &OS) { void BTFTypeStruct::emitType(MCStreamer &OS) {
BTFTypeBase::emitType(OS); BTFTypeBase::emitType(OS);
for (const auto &Member : Members) { for (const auto &Member : Members) {
OS.EmitIntValue(Member.NameOff, 4); OS.EmitIntValue(Member.NameOff, 4);
OS.EmitIntValue(Member.Type, 4); OS.EmitIntValue(Member.Type, 4);
OS.AddComment("0x" + Twine::utohexstr(Member.Offset)); OS.AddComment("0x" + Twine::utohexstr(Member.Offset));
OS.EmitIntValue(Member.Offset, 4); OS.EmitIntValue(Member.Offset, 4);
} }
} }
std::string BTFTypeStruct::getName() { return STy->getName(); } std::string BTFTypeStruct::getName() { return STy->getName(); }
void BTFTypeStruct::getMemberInfo(uint32_t Loc, uint32_t &MemberOffset, void BTFTypeStruct::getMemberInfo(uint32_t Loc, uint32_t &MemberOffset,
uint32_t &MemberType) { uint32_t &MemberType) {
MemberType = Members[Loc].Type; MemberType = MemberTypeNoQual[Loc];
MemberOffset = MemberOffset =
HasBitField ? Members[Loc].Offset & 0xffffff : Members[Loc].Offset; HasBitField ? Members[Loc].Offset & 0xffffff : Members[Loc].Offset;
} }
uint32_t BTFTypeStruct::getStructSize() { return STy->getSizeInBits() >> 3; } uint32_t BTFTypeStruct::getStructSize() { return STy->getSizeInBits() >> 3; }
/// The Func kind represents both subprogram and pointee of function /// The Func kind represents both subprogram and pointee of function
/// pointers. If the FuncName is empty, it represents a pointee of function /// pointers. If the FuncName is empty, it represents a pointee of function
▲ Show 20 Lines • Show All 205 Lines • ▼ Show 20 Lines for (const auto *Element : Elements)
visitTypeEntry(cast<DIDerivedType>(Element)); visitTypeEntry(cast<DIDerivedType>(Element));
} }
void BTFDebug::visitArrayType(const DICompositeType *CTy, uint32_t &TypeId) { void BTFDebug::visitArrayType(const DICompositeType *CTy, uint32_t &TypeId) {
// Visit array element type. // Visit array element type.
uint32_t ElemTypeId, ElemSize; uint32_t ElemTypeId, ElemSize;
const DIType *ElemType = CTy->getBaseType(); const DIType *ElemType = CTy->getBaseType();
visitTypeEntry(ElemType, ElemTypeId, false, false); visitTypeEntry(ElemType, ElemTypeId, false, false);
// Strip qualifiers from element type to get accurate element size.
ElemType = stripQualifiers(ElemType);
ElemSize = ElemType->getSizeInBits() >> 3; ElemSize = ElemType->getSizeInBits() >> 3;
if (!CTy->getSizeInBits()) { if (!CTy->getSizeInBits()) {
auto TypeEntry = llvm::make_unique<BTFTypeArray>(ElemTypeId, 0, 0); auto TypeEntry = llvm::make_unique<BTFTypeArray>(ElemType, ElemTypeId, 0, 0);
ArrayTypes.push_back(TypeEntry.get()); ArrayTypes.push_back(TypeEntry.get());
ElemTypeId = addType(std::move(TypeEntry), CTy); ElemTypeId = addType(std::move(TypeEntry), CTy);
} else { } else {
// Visit array dimensions. // Visit array dimensions.
DINodeArray Elements = CTy->getElements(); DINodeArray Elements = CTy->getElements();
for (int I = Elements.size() - 1; I >= 0; --I) { for (int I = Elements.size() - 1; I >= 0; --I) {
if (auto *Element = dyn_cast_or_null<DINode>(Elements[I])) if (auto *Element = dyn_cast_or_null<DINode>(Elements[I]))
if (Element->getTag() == dwarf::DW_TAG_subrange_type) { if (Element->getTag() == dwarf::DW_TAG_subrange_type) {
const DISubrange *SR = cast<DISubrange>(Element); const DISubrange *SR = cast<DISubrange>(Element);
auto *CI = SR->getCount().dyn_cast<ConstantInt *>(); auto *CI = SR->getCount().dyn_cast<ConstantInt *>();
int64_t Count = CI->getSExtValue(); int64_t Count = CI->getSExtValue();
const DIType *ArrayElemTy = (I == 0) ? ElemType : nullptr;
auto TypeEntry = auto TypeEntry =
llvm::make_unique<BTFTypeArray>(ElemTypeId, ElemSize, Count); llvm::make_unique<BTFTypeArray>(ArrayElemTy, ElemTypeId,
ElemSize, Count);
ArrayTypes.push_back(TypeEntry.get()); ArrayTypes.push_back(TypeEntry.get());
if (I == 0) if (I == 0)
ElemTypeId = addType(std::move(TypeEntry), CTy); ElemTypeId = addType(std::move(TypeEntry), CTy);
else else
ElemTypeId = addType(std::move(TypeEntry)); ElemTypeId = addType(std::move(TypeEntry));
ElemSize = ElemSize * Count; ElemSize = ElemSize * Count;
} }
} }
▲ Show 20 Lines • Show All 513 Lines • ▼ Show 20 Lines if (C != ':') {
setTypeFromId(MemberTypeId, &PrevStructType, &PrevArrayType); setTypeFromId(MemberTypeId, &PrevStructType, &PrevArrayType);
} else if (PrevArrayType) { } else if (PrevArrayType) {
uint32_t LocOffset, ElementTypeId; uint32_t LocOffset, ElementTypeId;
PrevArrayType->getLocInfo(Loc, LocOffset, ElementTypeId); PrevArrayType->getLocInfo(Loc, LocOffset, ElementTypeId);
Offset += LocOffset; Offset += LocOffset;
PrevArrayType = nullptr; PrevArrayType = nullptr;
setTypeFromId(ElementTypeId, &PrevStructType, &PrevArrayType); setTypeFromId(ElementTypeId, &PrevStructType, &PrevArrayType);
} else {
llvm_unreachable("Internal Error: BTF offset relocation type traversal error");
} }
Start = End + 1; Start = End + 1;
End = Start; End = Start;
} }
} }
AccessOffsets[AccessPattern.str()] = Offset; AccessOffsets[AccessPattern.str()] = Offset;
OffsetRelocTable[SecNameOff].push_back(OffsetReloc); OffsetRelocTable[SecNameOff].push_back(OffsetReloc);
} }
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines

test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll

  • This file was added.
; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck %s
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck %s
;
; Source code:
; typedef const int arr_t[7];
; typedef arr_t __arr;
; typedef __arr _arr;
; struct __s { _arr a; };
; typedef struct __s s;
; #define _(x) (__builtin_preserve_access_index(x))
; int get_value(const void *addr);
; int test(s *arg) {
; return get_value(_(&arg->a[1]));
; }
; clang -target bpf -S -O2 -g -emit-llvm test.c
%struct.__s = type { [7 x i32] }
; Function Attrs: nounwind
define dso_local i32 @test(%struct.__s* %arg) local_unnamed_addr #0 !dbg !7 {
entry:
call void @llvm.dbg.value(metadata %struct.__s* %arg, metadata !24, metadata !DIExpression()), !dbg !25
%0 = tail call [7 x i32]* @llvm.preserve.struct.access.index.p0a7i32.p0s_struct.__ss(%struct.__s* %arg, i32 0, i32 0), !dbg !26, !llvm.preserve.access.index !13
%1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a7i32([7 x i32]* %0, i32 1, i32 1), !dbg !26
%2 = bitcast i32* %1 to i8*, !dbg !26
%call = tail call i32 @get_value(i8* %2) #4, !dbg !27
ret i32 %call, !dbg !28
}
; CHECK: .cfi_startproc
; CHECK: [[RELOC:.Ltmp[0-9]+]]:
; CHECK: r2 = 4
; CHECK: r1 += r2
; CHECK: call get_value
; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(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]+]]
; CHECK-NEXT: .byte 0
; CHECK: .long 12 # OffsetReloc
; CHECK-NEXT: .long [[SEC_INDEX]] # Offset reloc section string offset=[[SEC_INDEX]]
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long [[RELOC]]
; CHECK-NEXT: .long [[TYPE_ID]]
; CHECK-NEXT: .long [[ACCESS_STR]]
declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
; Function Attrs: nounwind readnone
declare [7 x i32]* @llvm.preserve.struct.access.index.p0a7i32.p0s_struct.__ss(%struct.__s*, i32 immarg, i32 immarg) #2
; Function Attrs: nounwind readnone
declare i32* @llvm.preserve.array.access.index.p0i32.p0a7i32([7 x i32]*, i32 immarg, i32 immarg) #2
; Function Attrs: nounwind readnone speculatable
declare void @llvm.dbg.value(metadata, metadata, metadata) #3
attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #2 = { nounwind readnone }
attributes #3 = { nounwind readnone speculatable }
attributes #4 = { nounwind }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5}
!llvm.ident = !{!6}
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 4}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 4}
!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !23)
!8 = !DISubroutineType(types: !9)
!9 = !{!10, !11}
!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "__s", file: !1, line: 4, size: 224, elements: !14)
!14 = !{!15}
!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !1, line: 4, baseType: !16, size: 224)
!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "_arr", file: !1, line: 3, baseType: !17)
!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__arr", file: !1, line: 2, baseType: !18)
!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr_t", file: !1, line: 1, baseType: !19)
!19 = !DICompositeType(tag: DW_TAG_array_type, baseType: !20, size: 224, elements: !21)
!20 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !10)
!21 = !{!22}
!22 = !DISubrange(count: 7)
!23 = !{!24}
!24 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
!25 = !DILocation(line: 0, scope: !7)
!26 = !DILocation(line: 9, column: 20, scope: !7)
!27 = !DILocation(line: 9, column: 10, scope: !7)
!28 = !DILocation(line: 9, column: 3, scope: !7)

test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll

  • This file was added.
; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck %s
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck %s
;
; Source code:
; typedef int _int;
; typedef _int __int;
; struct __s { __int a; __int b; };
; typedef struct __s _s;
; typedef _s s;
; #define _(x) (__builtin_preserve_access_index(x))
; int get_value(const void *addr);
; int test(s *arg) {
; return get_value(_(&arg->b));
; }
; clang -target bpf -S -O2 -g -emit-llvm test.c
%struct.__s = type { i32, i32 }
; Function Attrs: nounwind
define dso_local i32 @test(%struct.__s* %arg) local_unnamed_addr #0 !dbg !7 {
entry:
call void @llvm.dbg.value(metadata %struct.__s* %arg, metadata !21, metadata !DIExpression()), !dbg !22
%0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ss(%struct.__s* %arg, i32 1, i32 1), !dbg !23, !llvm.preserve.access.index !14
%1 = bitcast i32* %0 to i8*, !dbg !23
%call = tail call i32 @get_value(i8* %1) #4, !dbg !24
ret i32 %call, !dbg !25
}
; CHECK: .cfi_startproc
; CHECK: [[RELOC:.Ltmp[0-9]+]]:
; CHECK: r2 = 4
; CHECK: r1 += r2
; CHECK: call get_value
; CHECK: .long {{[0-9]+}} # BTF_KIND_STRUCT(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]+]]
; CHECK-NEXT: .byte 0
; CHECK: .long 12 # OffsetReloc
; CHECK-NEXT: .long [[SEC_STR]] # Offset reloc section string offset={{[0-9]+}}
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long [[RELOC]]
; CHECK-NEXT: .long [[TYPE_ID]]
; CHECK-NEXT: .long [[ACCESS_STR]]
declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
; Function Attrs: nounwind readnone
declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ss(%struct.__s*, i32 immarg, i32 immarg) #2
; Function Attrs: nounwind readnone speculatable
declare void @llvm.dbg.value(metadata, metadata, metadata) #3
attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #2 = { nounwind readnone }
attributes #3 = { nounwind readnone speculatable }
attributes #4 = { nounwind }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5}
!llvm.ident = !{!6}
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 4}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 4}
!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !20)
!8 = !DISubroutineType(types: !9)
!9 = !{!10, !11}
!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "_s", file: !1, line: 4, baseType: !14)
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "__s", file: !1, line: 3, size: 64, elements: !15)
!15 = !{!16, !19}
!16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 2, baseType: !18)
!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !1, line: 1, baseType: !10)
!19 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 3, baseType: !17, size: 32, offset: 32)
!20 = !{!21}
!21 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
!22 = !DILocation(line: 0, scope: !7)
!23 = !DILocation(line: 9, column: 20, scope: !7)
!24 = !DILocation(line: 9, column: 10, scope: !7)
!25 = !DILocation(line: 9, column: 3, scope: !7)

test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll

  • This file was added.
; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck %s
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck %s
;
; Source code:
; typedef int _int;
; typedef _int __int;
; union __s { __int a; __int b; };
; typedef union __s _s;
; typedef _s s;
; #define _(x) (__builtin_preserve_access_index(x))
; int get_value(const void *addr);
; int test(s *arg) {
; return get_value(_(&arg->b));
; }
; clang -target bpf -S -O2 -g -emit-llvm test.c
%union.__s = type { i32 }
; Function Attrs: nounwind
define dso_local i32 @test(%union.__s* %arg) local_unnamed_addr #0 !dbg !7 {
entry:
call void @llvm.dbg.value(metadata %union.__s* %arg, metadata !21, metadata !DIExpression()), !dbg !22
%0 = tail call %union.__s* @llvm.preserve.union.access.index.p0s_union.__ss.p0s_union.__ss(%union.__s* %arg, i32 1), !dbg !23, !llvm.preserve.access.index !14
%1 = bitcast %union.__s* %0 to i8*, !dbg !23
%call = tail call i32 @get_value(i8* %1) #4, !dbg !24
ret i32 %call, !dbg !25
}
; CHECK: .cfi_startproc
; CHECK: [[RELOC:.Ltmp[0-9]+]]:
; CHECK: r2 = 0
; CHECK: r1 += r2
; CHECK: call get_value
; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(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]+]]
; CHECK-NEXT: .byte 0
; CHECK: .long 12 # OffsetReloc
; CHECK-NEXT: .long [[SEC_INDEX]] # Offset reloc section string offset=[[SEC_INDEX]]
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long [[RELOC]]
; CHECK-NEXT: .long [[TYPE_ID]]
; CHECK-NEXT: .long [[ACCESS_STR]]
declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
; Function Attrs: nounwind readnone
declare %union.__s* @llvm.preserve.union.access.index.p0s_union.__ss.p0s_union.__ss(%union.__s*, i32 immarg) #2
; Function Attrs: nounwind readnone speculatable
declare void @llvm.dbg.value(metadata, metadata, metadata) #3
attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #2 = { nounwind readnone }
attributes #3 = { nounwind readnone speculatable }
attributes #4 = { nounwind }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5}
!llvm.ident = !{!6}
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 4}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 4}
!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !20)
!8 = !DISubroutineType(types: !9)
!9 = !{!10, !11}
!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "_s", file: !1, line: 4, baseType: !14)
!14 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "__s", file: !1, line: 3, size: 32, elements: !15)
!15 = !{!16, !19}
!16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 2, baseType: !18)
!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !1, line: 1, baseType: !10)
!19 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
!20 = !{!21}
!21 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
!22 = !DILocation(line: 0, scope: !7)
!23 = !DILocation(line: 9, column: 20, scope: !7)
!24 = !DILocation(line: 9, column: 10, scope: !7)
!25 = !DILocation(line: 9, column: 3, scope: !7)

test/CodeGen/BPF/CORE/offset-reloc-typedef.ll

  • This file was added.
; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck %s
; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck %s
;
; Source code:
; struct s { int a; int b; };
; typedef struct s __s;
; union u { __s c; __s d; };
; typedef union u __u;
; typedef __u arr_t[7];
; typedef arr_t __arr;
;
; #define _(x) (__builtin_preserve_access_index(x))
; int get_value(const void *addr);
; int test(__arr *arg) {
; return get_value(_(&arg[1]->d.b));
; }
; clang -target bpf -S -O2 -g -emit-llvm test.c
; The offset reloc offset should be 12 from the base "arg".
%union.u = type { %struct.s }
%struct.s = type { i32, i32 }
; Function Attrs: nounwind
define dso_local i32 @test([7 x %union.u]* %arg) local_unnamed_addr #0 !dbg !7 {
entry:
call void @llvm.dbg.value(metadata [7 x %union.u]* %arg, metadata !28, metadata !DIExpression()), !dbg !29
%0 = tail call [7 x %union.u]* @llvm.preserve.array.access.index.p0a7s_union.us.p0a7s_union.us([7 x %union.u]* %arg, i32 0, i32 1), !dbg !30
%arraydecay = getelementptr inbounds [7 x %union.u], [7 x %union.u]* %0, i64 0, i64 0, !dbg !30
%1 = tail call %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u* %arraydecay, i32 1), !dbg !30, !llvm.preserve.access.index !16
%d = getelementptr inbounds %union.u, %union.u* %1, i64 0, i32 0, !dbg !30
%2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* %d, i32 1, i32 1), !dbg !30, !llvm.preserve.access.index !20
%3 = bitcast i32* %2 to i8*, !dbg !30
%call = tail call i32 @get_value(i8* %3) #4, !dbg !31
ret i32 %call, !dbg !32
}
; CHECK: .cfi_startproc
; CHECK: [[RELOC:.Ltmp[0-9]+]]:
; CHECK: r2 = 12
; CHECK: r1 += r2
; CHECK: call get_value
; CHECK: .long {{[0-9]+}} # BTF_KIND_UNION(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]+]]
; CHECK-NEXT: .byte 0
; CHECK: .long 12 # OffsetReloc
; CHECK-NEXT: .long [[SEC_STR:[0-9]+]] # Offset reloc section string offset=[[SEC_STR:[0-9]+]]
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long [[RELOC:.Ltmp[0-9]+]]
; CHECK-NEXT: .long [[TYPE_ID:[0-9]+]]
; CHECK-NEXT: .long [[ACCESS_STR:[0-9]+]]
declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
; Function Attrs: nounwind readnone
declare [7 x %union.u]* @llvm.preserve.array.access.index.p0a7s_union.us.p0a7s_union.us([7 x %union.u]*, i32 immarg, i32 immarg) #2
; Function Attrs: nounwind readnone
declare %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u*, i32 immarg) #2
; Function Attrs: nounwind readnone
declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
; Function Attrs: nounwind readnone speculatable
declare void @llvm.dbg.value(metadata, metadata, metadata) #3
attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #2 = { nounwind readnone }
attributes #3 = { nounwind readnone speculatable }
attributes #4 = { nounwind }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5}
!llvm.ident = !{!6}
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 4}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 4}
!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 10, type: !8, scopeLine: 10, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
!8 = !DISubroutineType(types: !9)
!9 = !{!10, !11}
!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__arr", file: !1, line: 6, baseType: !13)
!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr_t", file: !1, line: 5, baseType: !14)
!14 = !DICompositeType(tag: DW_TAG_array_type, baseType: !15, size: 448, elements: !25)
!15 = !DIDerivedType(tag: DW_TAG_typedef, name: "__u", file: !1, line: 4, baseType: !16)
!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u", file: !1, line: 3, size: 64, elements: !17)
!17 = !{!18, !24}
!18 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !16, file: !1, line: 3, baseType: !19, size: 64)
!19 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s", file: !1, line: 2, baseType: !20)
!20 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !21)
!21 = !{!22, !23}
!22 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !20, file: !1, line: 1, baseType: !10, size: 32)
!23 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !20, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
!24 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !16, file: !1, line: 3, baseType: !19, size: 64)
!25 = !{!26}
!26 = !DISubrange(count: 7)
!27 = !{!28}
!28 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 10, type: !11)
!29 = !DILocation(line: 0, scope: !7)
!30 = !DILocation(line: 11, column: 20, scope: !7)
!31 = !DILocation(line: 11, column: 10, scope: !7)
!32 = !DILocation(line: 11, column: 3, scope: !7)