Skip to content

[llvm-profgen] Remove temporary perf script files #86668

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

Merged
merged 4 commits into from
Apr 11, 2024
Merged

[llvm-profgen] Remove temporary perf script files #86668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94b08ce
[llvm-profgen] Remove temporary perf script files
HaohaiWen Mar 26, 2024
969af1e
[Support] Make CleanupInstaller public
HaohaiWen Mar 27, 2024
e456fa6
Use CleanupInstaller to make code cleaner
HaohaiWen Mar 27, 2024
496134b
Merge branch 'main' into profgen
HaohaiWen Apr 9, 2024
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
6 changes: 6 additions & 0 deletions llvm/tools/llvm-profgen/PerfReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "llvm/DebugInfo/Symbolize/SymbolizableModule.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/ToolOutputFile.h"

#define DEBUG_TYPE "perf-reader"

Expand Down Expand Up @@ -375,6 +376,9 @@ PerfScriptReader::convertPerfDataToTrace(ProfiledBinary *Binary,
StringRef(ErrorFile)}; // Stderr
sys::ExecuteAndWait(PerfPath, ScriptMMapArgs, std::nullopt, Redirects);

PerfScriptReader::TempFileCleanups.emplace_back(PerfTraceFile);
PerfScriptReader::TempFileCleanups.emplace_back(ErrorFile);

// Collect the PIDs
TraceStream TraceIt(PerfTraceFile);
std::string PIDs;
Expand Down Expand Up @@ -1220,5 +1224,7 @@ void PerfScriptReader::parsePerfTraces() {
writeUnsymbolizedProfile(OutputFilename);
}

SmallVector<CleanupInstaller, 2> PerfScriptReader::TempFileCleanups;

} // end namespace sampleprof
} // end namespace llvm
8 changes: 8 additions & 0 deletions llvm/tools/llvm-profgen/PerfReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ using namespace llvm;
using namespace sampleprof;

namespace llvm {

class CleanupInstaller;

namespace sampleprof {

// Stream based trace line iterator
Expand Down Expand Up @@ -604,6 +607,11 @@ class PerfScriptReader : public PerfReaderBase {
// Extract perf script type by peaking at the input
static PerfContent checkPerfScriptType(StringRef FileName);

// Cleanup installers for temporary files created by perf script command.
// Those files will be automatically removed when running destructor or
// receiving signals.
static SmallVector<CleanupInstaller, 2> TempFileCleanups;

protected:
// The parsed MMap event
struct MMapEvent {
Expand Down