diff options
| author | Fangrui Song <i@maskray.me> | 2021-06-21 12:01:57 -0700 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2021-06-21 12:01:57 -0700 |
| commit | ea23c38d0605514f68e33d319a6bdd858381257a (patch) | |
| tree | 328375b603acd752cabece4f6f9da43901d716d8 /llvm/tools/llvm-profdata/llvm-profdata.cpp | |
| parent | b2cd98d5fe7ab71415f2a87c741ebf62a7e3ba54 (diff) | |
| download | llvm-ea23c38d0605514f68e33d319a6bdd858381257a.zip llvm-ea23c38d0605514f68e33d319a6bdd858381257a.tar.gz llvm-ea23c38d0605514f68e33d319a6bdd858381257a.tar.bz2 | |
[llvm-profdata] Allow omission of -o for --text output
This makes it more convenient to get a text format profile.
Add an error for printing non-text format output to a terminal for instrumentation profile.
(It cannot be portably tested. For sample profile, raw_fd_ostream is hidden deeply so it's inconvenient to add a diagnostic.)
Reviewed By: davidxl
Differential Revision: https://reviews.llvm.org/D104600
Diffstat (limited to 'llvm/tools/llvm-profdata/llvm-profdata.cpp')
| -rw-r--r-- | llvm/tools/llvm-profdata/llvm-profdata.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index 58d3b41..b61df6e 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -316,6 +316,8 @@ static void writeInstrProfile(StringRef OutputFilename, if (Error E = Writer.writeText(Output)) warn(std::move(E)); } else { + if (Output.is_displayed()) + exitWithError("cannot write a non-text format profile to the terminal"); if (Error E = Writer.write(Output)) warn(std::move(E)); } @@ -326,9 +328,6 @@ static void mergeInstrProfile(const WeightedFileVector &Inputs, StringRef OutputFilename, ProfileFormat OutputFormat, bool OutputSparse, unsigned NumThreads, FailureMode FailMode) { - if (OutputFilename.compare("-") == 0) - exitWithError("cannot write indexed profdata format to stdout"); - if (OutputFormat != PF_Binary && OutputFormat != PF_Compact_Binary && OutputFormat != PF_Ext_Binary && OutputFormat != PF_Text) exitWithError("unknown format is specified"); @@ -863,8 +862,7 @@ static int merge_main(int argc, const char *argv[]) { cl::alias RemappingFileA("r", cl::desc("Alias for --remapping-file"), cl::aliasopt(RemappingFile)); cl::opt<std::string> OutputFilename("output", cl::value_desc("output"), - cl::init("-"), cl::Required, - cl::desc("Output file")); + cl::init("-"), cl::desc("Output file")); cl::alias OutputFilenameA("o", cl::desc("Alias for --output"), cl::aliasopt(OutputFilename)); cl::opt<ProfileKinds> ProfileKind( |