-
Notifications
You must be signed in to change notification settings - Fork 10.8k
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.
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
llvm-profgen: Fix race condition #83489
Conversation
@llvm/pr-subscribers-pgo Author: Matthias Braun (MatzeB) ChangesFix race condition when multiple instances of Full diff: https://github.com/llvm/llvm-project/pull/83489.diff 1 Files Affected:
diff --git a/llvm/tools/llvm-profgen/PerfReader.cpp b/llvm/tools/llvm-profgen/PerfReader.cpp
index 313d40483a2591..df952734fbf939 100644
--- a/llvm/tools/llvm-profgen/PerfReader.cpp
+++ b/llvm/tools/llvm-profgen/PerfReader.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PerfReader.h"
#include "ProfileGenerator.h"
+#include "llvm/ADT/SmallString.h"
#include "llvm/DebugInfo/Symbolize/SymbolizableModule.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h"
@@ -361,8 +362,11 @@ PerfScriptReader::convertPerfDataToTrace(ProfiledBinary *Binary,
exitWithError("Perf not found.");
}
std::string PerfPath = *PerfExecutable;
- std::string PerfTraceFile = PerfData.str() + ".script.tmp";
- std::string ErrorFile = PerfData.str() + ".script.err.tmp";
+
+ SmallString<128> PerfTraceFile;
+ sys::fs::createUniquePath("perf-script-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.tmp",
+ PerfTraceFile, /*MakeAbsolute=*/true);
+ std::string ErrorFile = std::string(PerfTraceFile) + ".script.err.tmp";
StringRef ScriptMMapArgs[] = {PerfPath, "script", "--show-mmap-events",
"-F", "comm,pid", "-i",
PerfData};
@@ -400,7 +404,8 @@ PerfScriptReader::convertPerfDataToTrace(ProfiledBinary *Binary,
PIDs, "-i", PerfData};
sys::ExecuteAndWait(PerfPath, ScriptSampleArgs, std::nullopt, Redirects);
- return {PerfTraceFile, PerfFormat::PerfScript, PerfContent::UnknownContent};
+ return {std::string(PerfTraceFile), PerfFormat::PerfScript,
+ PerfContent::UnknownContent};
}
void PerfScriptReader::updateBinaryAddress(const MMapEvent &Event) {
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
test failure on windows bot seems unrelated, merging |
@MatzeB , why do we need to create a uniq temp perf-script for each llvm-profgen read? |
Without this change, when you have two |
Are you having trouble with temporary files accumulating and you running out of disk space? You could probably submit a patch then that the temporary file is deleted after it was read... |
Yeah, I run out of disk for large project. |
Fix race condition when multiple instances of
llvm-progen
read from the sameinputs.