diff --git a/llvm/test/tools/llvm-profgen/pseudoprobe-decoding.test b/llvm/test/tools/llvm-profgen/pseudoprobe-decoding.test --- a/llvm/test/tools/llvm-profgen/pseudoprobe-decoding.test +++ b/llvm/test/tools/llvm-profgen/pseudoprobe-decoding.test @@ -1,4 +1,5 @@ ; RUN: llvm-profgen --format=text --perfscript=%s --binary=%S/Inputs/inline-cs-pseudoprobe.perfbin --output=%t --show-pseudo-probe --show-disassembly-only | FileCheck %s +; RUN: llvm-profgen --format=text --perfscript=%s --binary=%S/Inputs/inline-cs-pseudoprobe.perfbin --output=%t --show-pseudo-probe --show-disassembly-only --disassemble-functions=main,foo | FileCheck %s -check-prefix=SYM PERF_RECORD_MMAP2 2854748/2854748: [0x400000(0x1000) @ 0 00:1d 123291722 526021]: r-xp /home/inline-cs-pseudoprobe.perfbin @@ -79,6 +80,11 @@ ; CHECK: [Probe]: FUNC: foo Index: 9 Type: DirectCall Inlined: @ main:2 ; CHECK-NEXT: 865: callq 0x930 +; SYM-NOT: : +; SYM: : +; SYM:
: + + ; clang -O3 -fexperimental-new-pass-manager -fuse-ld=lld -fpseudo-probe-for-profiling ; -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -Xclang -mdisable-tail-calls diff --git a/llvm/tools/llvm-profgen/ProfiledBinary.h b/llvm/tools/llvm-profgen/ProfiledBinary.h --- a/llvm/tools/llvm-profgen/ProfiledBinary.h +++ b/llvm/tools/llvm-profgen/ProfiledBinary.h @@ -185,6 +185,9 @@ // String table owning function name strings created from the symbolizer. std::unordered_set NameStrings; + // A collection of functions to print disassembly for. + StringSet<> DisassembleFunctionSet; + // Pseudo probe decoder MCPseudoProbeDecoder ProbeDecoder; diff --git a/llvm/tools/llvm-profgen/ProfiledBinary.cpp b/llvm/tools/llvm-profgen/ProfiledBinary.cpp --- a/llvm/tools/llvm-profgen/ProfiledBinary.cpp +++ b/llvm/tools/llvm-profgen/ProfiledBinary.cpp @@ -38,6 +38,11 @@ "show-pseudo-probe", cl::ReallyHidden, cl::init(false), cl::ZeroOrMore, cl::desc("Print pseudo probe section and disassembled info.")); +static cl::list DisassembleFunctions( + "disassemble-functions", cl::CommaSeparated, + cl::desc("List of functions to print disassembly for. Accept demangled " + "names only. Only work with show-disassembly-only")); + namespace llvm { namespace sampleprof { @@ -298,7 +303,10 @@ ShowCanonicalFnName ? FunctionSamples::getCanonicalFnName(Symbols[SI].Name) : Symbols[SI].Name; - if (ShowDisassemblyOnly) + bool ShowDisassembly = + ShowDisassemblyOnly && (DisassembleFunctionSet.empty() || + DisassembleFunctionSet.count(SymbolName)); + if (ShowDisassembly) outs() << '<' << SymbolName << ">:\n"; auto WarnInvalidInsts = [](uint64_t Start, uint64_t End) { @@ -321,7 +329,7 @@ if (Size == 0) Size = 1; - if (ShowDisassemblyOnly) { + if (ShowDisassembly) { if (ShowPseudoProbe) { ProbeDecoder.printProbeForAddress(outs(), Offset + getPreferredBaseAddress()); @@ -385,7 +393,7 @@ if (InvalidInstLength) WarnInvalidInsts(Offset - InvalidInstLength, Offset - 1); - if (ShowDisassemblyOnly) + if (ShowDisassembly) outs() << "\n"; FuncStartAddrMap[StartOffset] = Symbols[SI].Name.str(); @@ -452,6 +460,12 @@ for (std::pair &SecSyms : AllSymbols) stable_sort(SecSyms.second); + DisassembleFunctionSet.insert(DisassembleFunctions.begin(), + DisassembleFunctions.end()); + assert((DisassembleFunctionSet.empty() || ShowDisassemblyOnly) && + "Functions to disassemble should be only specified together with " + "--show-disassembly-only"); + if (ShowDisassemblyOnly) outs() << "\nDisassembly of " << FileName << ":\n";