Skip to content

[llvm-profgen][NFC] Detect pre-aggregated format #191593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aaupov wants to merge 1 commit into from
Closed

[llvm-profgen][NFC] Detect pre-aggregated format #191593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions llvm/tools/llvm-profgen/PerfReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,11 @@ PerfReaderBase::create(ProfiledBinary *Binary, PerfInputFile &PerfInput,

PerfInput.Content =
PerfScriptReader::checkPerfScriptType(PerfInput.InputFile);
if (PerfInput.Content == PerfContent::LBRStack) {
PerfReader.reset(
new HybridPerfReader(Binary, PerfInput.InputFile, PIDFilter));
if (PerfInput.Content == PerfContent::LBRStack ||
PerfInput.Content == PerfContent::AggLBRStack) {
auto *Reader = new HybridPerfReader(Binary, PerfInput.InputFile, PIDFilter);
Reader->setIsPreAggregated(PerfInput.Content == PerfContent::AggLBRStack);
PerfReader.reset(Reader);
} else if (PerfInput.Content == PerfContent::LBR) {
PerfReader.reset(new LBRPerfReader(Binary, PerfInput.InputFile, PIDFilter));
} else {
Expand Down Expand Up @@ -1191,8 +1193,9 @@ PerfContent PerfScriptReader::checkPerfScriptType(StringRef FileName) {
TraceStream TraceIt(FileName);
uint64_t FrameAddr = 0;
while (!TraceIt.isAtEoF()) {
// Skip the aggregated count
if (!TraceIt.getCurrentLine().getAsInteger(10, FrameAddr))
// Skip the aggregated count and detect pre-aggregated input.
bool HasAggCount = !TraceIt.getCurrentLine().getAsInteger(10, FrameAddr);
if (HasAggCount)
TraceIt.advance();

// Detect sample with call stack
Expand All @@ -1205,7 +1208,7 @@ PerfContent PerfScriptReader::checkPerfScriptType(StringRef FileName) {
if (!TraceIt.isAtEoF()) {
if (isLBRSample(TraceIt.getCurrentLine())) {
if (Count > 0)
return PerfContent::LBRStack;
return HasAggCount ? PerfContent::AggLBRStack : PerfContent::LBRStack;
else
return PerfContent::LBR;
}
Expand Down
9 changes: 7 additions & 2 deletions llvm/tools/llvm-profgen/PerfReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ enum PerfFormat {
// The type of perfscript content.
enum PerfContent {
UnknownContent = 0,
LBR = 1, // Only LBR sample.
LBRStack = 2, // Hybrid sample including call stack and LBR stack.
LBR = 1, // Only LBR sample.
LBRStack = 2, // Hybrid sample including call stack and LBR stack.
AggLBRStack = 3, // Pre-aggregated hybrid sample.
};

struct PerfInputFile {
Expand Down Expand Up @@ -631,6 +632,8 @@ class PerfScriptReader : public PerfReaderBase {
// receiving signals.
static SmallVector<CleanupInstaller, 2> TempFileCleanups;

void setIsPreAggregated(bool V) { IsPreAggregated = V; }

protected:
// Check whether a given line is LBR sample
static bool isLBRSample(StringRef Line);
Expand Down Expand Up @@ -676,6 +679,8 @@ class PerfScriptReader : public PerfReaderBase {
std::set<uint64_t> InvalidReturnAddresses;
// PID for the process of interest
std::optional<int32_t> PIDFilter;
// Whether the input is pre-aggregated
bool IsPreAggregated = false;
};

/*
Expand Down