shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[XRay] Make xray_fn_idx entries PC-relative

Browse Source 
As mentioned by commit c5d38924dc6688c15b3fa133abeb3626e8f0767c (Apr 2020),
PC-relative entries avoid dynamic relocations and can therefore make the
section read-only.

This is similar to D78082 and D78590. We cannot commit to support
compiler/runtime built at different versions, so just don't play with versions.

For Mach-O support (incomplete yet), we use non-temporary `lxray_fn_idx[0-9]+`
symbols. Label differences are represented as a pair of UNSIGNED and SUBTRACTOR
relocations. The SUBTRACTOR external relocation requires r_extern==1 (needs to
reference a symbol table entry) which can be satisfied by `lxray_fn_idx[0-9]+`.
A `lxray_fn_idx[0-9]+` symbol also serves as the atom for this dead-strippable
section (follow-up to commit b9a134aa629de23a1dcf4be32e946e4e308fc64d).

Differential Revision: https://reviews.llvm.org/D152661
This commit is contained in:
Fangrui Song 2023-06-20 22:40:56 -07:00
parent 75d70b7306
commit e0a6561ec9
16 changed files with 133 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/test/CodeGen/xray-function-index.c
View File

@ -2,7 +2,7 @@
// RUN: %clang_cc1 -S -triple x86_64 -fxray-instrument -fxray-instruction-threshold=1 %s -o - | FileCheck %s
// RUN: %clang_cc1 -S -triple x86_64 -fxray-instrument -fxray-instruction-threshold=1 -fno-xray-function-index %s -o - | FileCheck %s --check-prefix=NO
// CHECK: .section xray_fn_idx,"awo",@progbits,foo
// CHECK: .section xray_fn_idx,"ao",@progbits,foo
// NO-NOT: .section xray_fn_idx
void foo(void) {}

39
compiler-rt/lib/xray/xray_interface.cpp
View File

@ -183,7 +183,7 @@ findFunctionSleds(int32_t FuncId,
const XRaySledMap &InstrMap) XRAY_NEVER_INSTRUMENT {
int32_t CurFn = 0;
uint64_t LastFnAddr = 0;
XRayFunctionSledIndex Index = {nullptr, nullptr};
XRayFunctionSledIndex Index = {nullptr, 0};
for (std::size_t I = 0; I < InstrMap.Entries && CurFn <= FuncId; I++) {
const auto &Sled = InstrMap.Sleds[I];
@ -196,12 +196,10 @@ findFunctionSleds(int32_t FuncId,
if (CurFn == FuncId) {
if (Index.Begin == nullptr)
Index.Begin = &Sled;
Index.End = &Sled;
Index.Size = &Sled - Index.Begin + 1;
}
}
Index.End += 1;
return Index;
}
@ -235,13 +233,17 @@ XRayPatchingStatus patchFunction(int32_t FuncId,
}
// Now we patch ths sleds for this specific function.
auto SledRange = InstrMap.SledsIndex ? InstrMap.SledsIndex[FuncId - 1]
: findFunctionSleds(FuncId, InstrMap);
XRayFunctionSledIndex SledRange;
if (InstrMap.SledsIndex) {
SledRange = {InstrMap.SledsIndex[FuncId - 1].fromPCRelative(),
InstrMap.SledsIndex[FuncId - 1].Size};
} else {
SledRange = findFunctionSleds(FuncId, InstrMap);
}
auto *f = SledRange.Begin;
auto *e = SledRange.End;
bool SucceedOnce = false;
while (f != e)
SucceedOnce |= patchSled(*f++, Enable, FuncId);
for (size_t i = 0; i != SledRange.Size; ++i)
SucceedOnce |= patchSled(f[i], Enable, FuncId);
atomic_store(&XRayPatching, false,
memory_order_release);
@ -365,12 +367,17 @@ XRayPatchingStatus mprotectAndPatchFunction(int32_t FuncId,
// Here we compute the minimum sled and maximum sled associated with a
// particular function ID.
auto SledRange = InstrMap.SledsIndex ? InstrMap.SledsIndex[FuncId - 1]
: findFunctionSleds(FuncId, InstrMap);
XRayFunctionSledIndex SledRange;
if (InstrMap.SledsIndex) {
SledRange = {InstrMap.SledsIndex[FuncId - 1].fromPCRelative(),
InstrMap.SledsIndex[FuncId - 1].Size};
} else {
SledRange = findFunctionSleds(FuncId, InstrMap);
}
auto *f = SledRange.Begin;
auto *e = SledRange.End;
auto *e = SledRange.Begin + SledRange.Size;
auto *MinSled = f;
auto *MaxSled = (SledRange.End - 1);
auto *MaxSled = e - 1;
while (f != e) {
if (f->address() < MinSled->address())
MinSled = f;
@ -502,9 +509,9 @@ uintptr_t __xray_function_address(int32_t FuncId) XRAY_NEVER_INSTRUMENT {
if (FuncId <= 0 || static_cast<size_t>(FuncId) > InstrMap.Functions)
return 0;
const XRaySledEntry *Sled = InstrMap.SledsIndex
? InstrMap.SledsIndex[FuncId - 1].Begin
: findFunctionSleds(FuncId, InstrMap).Begin;
const XRaySledEntry *Sled =
InstrMap.SledsIndex ? InstrMap.SledsIndex[FuncId - 1].fromPCRelative()
: findFunctionSleds(FuncId, InstrMap).Begin;
return Sled->function()
// On PPC, function entries are always aligned to 16 bytes. The beginning of a
// sled might be a local entry, which is always +8 based on the global entry.

8
compiler-rt/lib/xray/xray_interface_internal.h
View File

@ -59,7 +59,13 @@ struct XRaySledEntry {
struct XRayFunctionSledIndex {
const XRaySledEntry *Begin;
const XRaySledEntry *End;
size_t Size;
// For an entry in the xray_fn_idx section, the address is relative to the
// location of the Begin variable.
const XRaySledEntry *fromPCRelative() const {
return reinterpret_cast<const XRaySledEntry *>(uintptr_t(&Begin) +
uintptr_t(Begin));
}
};
}

6
llvm/include/llvm/MC/MCContext.h
View File

@ -473,9 +473,11 @@ public:
/// \name Symbol Management
/// @{
/// Create and return a new linker temporary symbol with a unique but
/// unspecified name.
/// Create a new linker temporary symbol with the specified prefix (Name) or
/// "tmp". This creates a "l"-prefixed symbol for Mach-O and is identical to
/// createNamedTempSymbol for other object file formats.
MCSymbol *createLinkerPrivateTempSymbol();
MCSymbol *createLinkerPrivateSymbol(const Twine &Name);
/// Create a temporary symbol with a unique name. The name will be omitted
/// in the symbol table if UseNamesOnTempLabels is false (default except

23
llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -4013,16 +4013,16 @@ void AsmPrinter::emitXRayTable() {
if (TM.Options.XRayFunctionIndex)
FnSledIndex = OutContext.getELFSection(
"xray_fn_idx", ELF::SHT_PROGBITS, Flags | ELF::SHF_WRITE, 0,
GroupName, F.hasComdat(), MCSection::NonUniqueID, LinkedToSym);
"xray_fn_idx", ELF::SHT_PROGBITS, Flags, 0, GroupName, F.hasComdat(),
MCSection::NonUniqueID, LinkedToSym);
} else if (MF->getSubtarget().getTargetTriple().isOSBinFormatMachO()) {
InstMap = OutContext.getMachOSection("__DATA", "xray_instr_map",
MachO::S_ATTR_LIVE_SUPPORT,
SectionKind::getReadOnlyWithRel());
if (TM.Options.XRayFunctionIndex)
FnSledIndex = OutContext.getMachOSection(
"__DATA", "xray_fn_idx", MachO::S_ATTR_LIVE_SUPPORT,
SectionKind::getReadOnlyWithRel());
FnSledIndex = OutContext.getMachOSection("__DATA", "xray_fn_idx",
MachO::S_ATTR_LIVE_SUPPORT,
SectionKind::getReadOnly());
} else {
llvm_unreachable("Unsupported target");
}
@ -4064,8 +4064,17 @@ void AsmPrinter::emitXRayTable() {
OutStreamer->switchSection(FnSledIndex);
OutStreamer->emitCodeAlignment(Align(2 * WordSizeBytes),
&getSubtargetInfo());
OutStreamer->emitSymbolValue(SledsStart, WordSizeBytes, false);
OutStreamer->emitSymbolValue(SledsEnd, WordSizeBytes, false);
// For Mach-O, use an "l" symbol as the atom of this subsection. The label
// difference uses a SUBTRACTOR external relocation which references the
// symbol.
MCSymbol *Dot = Ctx.createLinkerPrivateSymbol("xray_fn_idx");
OutStreamer->emitLabel(Dot);
OutStreamer->emitValueImpl(
MCBinaryExpr::createSub(MCSymbolRefExpr::create(SledsStart, Ctx),
MCSymbolRefExpr::create(Dot, Ctx), Ctx),
WordSizeBytes);
OutStreamer->emitValueImpl(MCConstantExpr::create(Sleds.size(), Ctx),
WordSizeBytes);
OutStreamer->switchSection(PrevSection);
}
Sleds.clear();

6
llvm/lib/MC/MCContext.cpp
View File

@ -310,8 +310,12 @@ MCSymbol *MCContext::createNamedTempSymbol(const Twine &Name) {
}
MCSymbol *MCContext::createLinkerPrivateTempSymbol() {
return createLinkerPrivateSymbol("tmp");
}
MCSymbol *MCContext::createLinkerPrivateSymbol(const Twine &Name) {
SmallString<128> NameSV;
raw_svector_ostream(NameSV) << MAI->getLinkerPrivateGlobalPrefix() << "tmp";
raw_svector_ostream(NameSV) << MAI->getLinkerPrivateGlobalPrefix() << Name;
return createSymbol(NameSV, true, false);
}

21
llvm/test/CodeGen/AArch64/xray-tail-call-sled.ll
View File

@ -24,9 +24,9 @@ define i32 @callee() nounwind noinline uwtable "function-instrument"="xray-alway
; CHECK-LINUX: [[TMP:.Ltmp[0-9]+]]:
; CHECK-LINUX-NEXT: .xword .Lxray_sled_1-[[TMP]]
; CHECK-LINUX-LABEL: Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,callee{{$}}
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,callee{{$}}
; CHECK-LINUX: .xword .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .xword .Lxray_sleds_end0
; CHECK-LINUX-NEXT: .xword 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start0:
@ -36,8 +36,9 @@ define i32 @callee() nounwind noinline uwtable "function-instrument"="xray-alway
; CHECK-MACOS-NEXT: .quad Lxray_sled_1-[[TMP]]
; CHECK-MACOS-LABEL: Lxray_sleds_end0:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start0
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end0
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start0-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2
define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-always" {
; CHECK: .p2align 2
@ -61,9 +62,10 @@ define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-alway
; CHECK-LINUX: .xword .Lxray_sled_2
; CHECK-LINUX: .xword .Lxray_sled_3
; CHECK-LINUX-LABEL: Lxray_sleds_end1:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,caller{{$}}
; CHECK-LINUX: .xword .Lxray_sleds_start1
; CHECK-LINUX-NEXT: .xword .Lxray_sleds_end1
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,caller{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .xword .Lxray_sleds_start1-[[IDX]]
; CHECK-LINUX-NEXT: .xword 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start1:
@ -71,5 +73,6 @@ define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-alway
; CHECK-MACOS: .quad Lxray_sled_3
; CHECK-MACOS-LABEL: Lxray_sleds_end1:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start1
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end1
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start1-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2

10
llvm/test/CodeGen/ARM/xray-armv6-attribute-instrumentation.ll
View File

@ -29,9 +29,9 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-LINUX: .long .Lxray_sled_0
; CHECK-LINUX: .long .Lxray_sled_1
; CHECK-LINUX-LABEL: .Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",%progbits,foo{{$}}
; CHECK-LINUX: .long .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .long .Lxray_sleds_end0
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",%progbits,foo{{$}}
; CHECK-LINUX: .long .Lxray_sleds_start0-.Lxray_fn_idx0
; CHECK-LINUX-NEXT: .long 2
; CHECK-IOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-IOS-LABEL: Lxray_sleds_start0:
@ -39,5 +39,5 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-IOS: .long Lxray_sled_1
; CHECK-IOS-LABEL: Lxray_sleds_end0:
; CHECK-IOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-IOS: .long Lxray_sleds_start0
; CHECK-IOS-NEXT: .long Lxray_sleds_end0
; CHECK-IOS: .long Lxray_sleds_start0-lxray_fn_idx0
; CHECK-IOS-NEXT: .long 2

12
llvm/test/CodeGen/ARM/xray-armv7-attribute-instrumentation.ll
View File

@ -19,9 +19,10 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-LINUX: .long .Lxray_sled_0
; CHECK-LINUX: .long .Lxray_sled_1
; CHECK-LINUX-LABEL: .Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",%progbits,foo{{$}}
; CHECK-LINUX: .long .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .long .Lxray_sleds_end0
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",%progbits,foo{{$}}
; CHECK-LINUX: .Lxray_fn_idx0:
; CHECK-LINUX-NEXT: .long .Lxray_sleds_start0-.Lxray_fn_idx0
; CHECK-LINUX-NEXT: .long 2
; CHECK-IOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-IOS-LABEL: Lxray_sleds_start0:
@ -29,5 +30,6 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-IOS: .long Lxray_sled_1
; CHECK-IOS-LABEL: Lxray_sleds_end0:
; CHECK-IOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-IOS: .long Lxray_sleds_start0
; CHECK-IOS-NEXT: .long Lxray_sleds_end0
; CHECK-IOS: lxray_fn_idx0:
; CHECK-IOS: .long Lxray_sleds_start0-lxray_fn_idx0
; CHECK-IOS-NEXT: .long 2

4
llvm/test/CodeGen/Hexagon/xray.ll
View File

@ -32,5 +32,5 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-NEXT: .space 5
; CHECK-LABEL: .Lxray_sleds_end0:
; CHECK-LABEL: xray_fn_idx
; CHECK: .word .Lxray_sleds_start0{{$}}
; CHECK-NEXT: .word .Lxray_sleds_end0{{$}}
; CHECK: .word .Lxray_sleds_start0-.Lxray_fn_idx[[#]]
; CHECK-NEXT: .word 2

7
llvm/test/CodeGen/PowerPC/xray-attribute-instrumentation.ll
View File

@ -40,8 +40,9 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-NEXT: .byte 0x02
; CHECK-NEXT: .space 13
; CHECK-NEXT: .Lxray_sleds_end0:
; CHECK-LABEL: xray_fn_idx,"awo",@progbits,foo{{$}}
; CHECK-LABEL: xray_fn_idx,"ao",@progbits,foo{{$}}
; CHECK: .p2align 4
; CHECK-NEXT: .quad .Lxray_sleds_start0
; CHECK-NEXT: .quad .Lxray_sleds_end0
; CHECK-NEXT: [[IDX:.Lxray_fn_idx[0-9]+]]:
; CHECK-NEXT: .quad .Lxray_sleds_start0-[[IDX]]
; CHECK-NEXT: .quad 2
; CHECK-NEXT: .text

24
llvm/test/CodeGen/X86/xray-attribute-instrumentation.ll
View File

@ -19,9 +19,10 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-LINUX: .quad .Lxray_sled_0
; CHECK-LINUX: .quad .Lxray_sled_1
; CHECK-LINUX-LABEL: .Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,foo{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end0
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,foo{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start0-[[IDX]]
; CHECK-LINUX-NEXT: .quad 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start0:
@ -29,8 +30,9 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-MACOS: .quad Lxray_sled_1
; CHECK-MACOS-LABEL: Lxray_sleds_end0:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start0
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end0
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start0-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2
; We test multiple returns in a single function to make sure we're getting all
@ -66,9 +68,10 @@ NotEqual:
; CHECK-LINUX: [[TMP:.Ltmp[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sled_4-[[TMP]]
; CHECK-LINUX-LABEL: .Lxray_sleds_end1:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,bar{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start1
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end1
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,bar{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start1-[[IDX]]
; CHECK-LINUX-NEXT: .quad 3
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start1:
@ -80,5 +83,6 @@ NotEqual:
; CHECK-MACOS-NEXT: .quad Lxray_sled_4-[[TMP]]
; CHECK-MACOS-LABEL: Lxray_sleds_end1:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start1
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end1
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start1-[[IDX]]
; CHECK-MACOS-NEXT: .quad 3

24
llvm/test/CodeGen/X86/xray-partial-instrumentation-skip-entry.ll
View File

@ -15,17 +15,19 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-LINUX-LABEL: .Lxray_sleds_start0:
; CHECK-LINUX: .quad .Lxray_sled_0
; CHECK-LINUX-LABEL: .Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,foo{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end0
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,foo{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start0-[[IDX]]
; CHECK-LINUX-NEXT: .quad 1
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start0:
; CHECK-MACOS: .quad Lxray_sled_0
; CHECK-MACOS-LABEL: Lxray_sleds_end0:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start0
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end0
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start0-[[IDX]]
; CHECK-MACOS-NEXT: .quad 1
; We test multiple returns in a single function to make sure we're getting all
@ -54,9 +56,10 @@ NotEqual:
; CHECK-LINUX: .quad .Lxray_sled_1
; CHECK-LINUX: .quad .Lxray_sled_2
; CHECK-LINUX-LABEL: .Lxray_sleds_end1:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,bar{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start1
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end1
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,bar{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start1-[[IDX]]
; CHECK-LINUX-NEXT: .quad 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start1:
@ -64,5 +67,6 @@ NotEqual:
; CHECK-MACOS: .quad Lxray_sled_2
; CHECK-MACOS-LABEL: Lxray_sleds_end1:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start1
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end1
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start1-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2

6
llvm/test/CodeGen/X86/xray-partial-instrumentation-skip-exit.ll
View File

@ -55,7 +55,8 @@ NotEqual:
; CHECK-LINUX: .quad .Lxray_sled_1
; CHECK-LINUX-LABEL: .Lxray_sleds_end1:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,bar{[$}}
; CHECK-LINUX: .quad .Lxray_sleds_start1
; CHECK-LINUX: .Lxray_fn_idx0:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start1-.Lxray_fn_idx0
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end1
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
@ -63,5 +64,6 @@ NotEqual:
; CHECK-MACOS: .quad Lxray_sled_1
; CHECK-MACOS-LABEL: Lxray_sleds_end1:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start1
; CHECK-MACOS: Lxray_fn_idx0:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start1-Lxray_fn_idx0
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end1

24
llvm/test/CodeGen/X86/xray-tail-call-sled.ll
View File

@ -18,9 +18,10 @@ define dso_local i32 @callee() nounwind noinline uwtable "function-instrument"="
; CHECK-LINUX: .quad .Lxray_sled_0
; CHECK-LINUX: .quad .Lxray_sled_1
; CHECK-LINUX-LABEL: .Lxray_sleds_end0:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,callee{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start0
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_end0
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,callee{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start0-[[IDX]]
; CHECK-LINUX-NEXT: .quad 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start0:
@ -28,8 +29,9 @@ define dso_local i32 @callee() nounwind noinline uwtable "function-instrument"="
; CHECK-MACOS: .quad Lxray_sled_1
; CHECK-MACOS-LABEL: Lxray_sleds_end0:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start0
; CHECK-MACOS-NEXT: .quad Lxray_sleds_end0
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start0-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2
define dso_local i32 @caller() nounwind noinline uwtable "function-instrument"="xray-always" {
; CHECK: .p2align 1, 0x90
@ -50,9 +52,10 @@ define dso_local i32 @caller() nounwind noinline uwtable "function-instrument"="
; CHECK-LINUX: .quad .Lxray_sled_2
; CHECK-LINUX: .quad .Lxray_sled_3
; CHECK-LINUX-LABEL: .Lxray_sleds_end1:
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,caller{{$}}
; CHECK-LINUX: .quad .Lxray_sleds_start1
; CHECK-LINUX: .quad .Lxray_sleds_end1
; CHECK-LINUX-LABEL: .section xray_fn_idx,"ao",@progbits,caller{{$}}
; CHECK-LINUX: [[IDX:\.Lxray_fn_idx[0-9]+]]:
; CHECK-LINUX-NEXT: .quad .Lxray_sleds_start1-[[IDX]]
; CHECK-LINUX-NEXT: .quad 2
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map,regular,live_support{{$}}
; CHECK-MACOS-LABEL: Lxray_sleds_start1:
@ -60,5 +63,6 @@ define dso_local i32 @caller() nounwind noinline uwtable "function-instrument"="
; CHECK-MACOS: .quad Lxray_sled_3
; CHECK-MACOS-LABEL: Lxray_sleds_end1:
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx,regular,live_support{{$}}
; CHECK-MACOS: .quad Lxray_sleds_start1
; CHECK-MACOS: .quad Lxray_sleds_end1
; CHECK-MACOS: [[IDX:lxray_fn_idx[0-9]+]]:
; CHECK-MACOS-NEXT: .quad Lxray_sleds_start1-[[IDX]]
; CHECK-MACOS-NEXT: .quad 2

2
llvm/test/DebugInfo/X86/xray-split-dwarf-interaction.ll
View File

@ -25,7 +25,7 @@
; `a::b()` is actually associated with the function's symbol instead of the
; .debug_types.dwo section.
;
; CHECK-ASM: xray_fn_idx,"awo",@progbits,_ZN1a1bEv{{$}}
; CHECK-ASM: xray_fn_idx,"ao",@progbits,_ZN1a1bEv{{$}}
;
; CHECK-ELF-DAG: [[FSECT:[0-9]+]]] .text._ZN1a1bEv PROGBITS
; CHECK-ELF-DAG: [{{.*}}] .debug_types.dwo PROGBITS