[llvm] [InstrProf] Remove unused argv in llvm-profdata.cpp (PR #92435)
via llvm-commits
llvm-commits at lists.llvm.org
Thu May 16 10:49:50 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-pgo
Author: Ellis Hoag (ellishg)
<details>
<summary>Changes</summary>
https://github.com/llvm/llvm-project/pull/71328 refactored `llvm-profdata.cpp` to use subcommands (which is super nice 😄), but left many unused `argv` variables. This opts to use `ProgName` where necessary, and removes `argv` otherwise.
---
Full diff: https://github.com/llvm/llvm-project/pull/92435.diff
1 Files Affected:
- (modified) llvm/tools/llvm-profdata/llvm-profdata.cpp (+12-12)
``````````diff
diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp
index ec046ebfab130..4126b55576ddc 100644
--- a/llvm/tools/llvm-profdata/llvm-profdata.cpp
+++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp
@@ -1654,7 +1654,7 @@ static void parseInputFilenamesFile(MemoryBuffer *Buffer,
}
}
-static int merge_main(int argc, const char *argv[]) {
+static int merge_main(StringRef ProgName) {
WeightedFileVector WeightedInputs;
for (StringRef Filename : InputFilenames)
addWeightedInput(WeightedInputs, {std::string(Filename), 1});
@@ -1667,8 +1667,7 @@ static int merge_main(int argc, const char *argv[]) {
parseInputFilenamesFile(Buffer.get(), WeightedInputs);
if (WeightedInputs.empty())
- exitWithError("no input files specified. See " +
- sys::path::filename(argv[0]) + " " + argv[1] + " -help");
+ exitWithError("no input files specified. See " + ProgName + " merge -help");
if (DumpInputFileList) {
for (auto &WF : WeightedInputs)
@@ -2654,7 +2653,7 @@ void overlapSampleProfile(const std::string &BaseFilename,
OverlapAggr.dumpFuncSimilarity(OS);
}
-static int overlap_main(int argc, const char *argv[]) {
+static int overlap_main() {
std::error_code EC;
raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_TextWithCRLF);
if (EC)
@@ -3231,15 +3230,16 @@ static int showDebugInfoCorrelation(const std::string &Filename,
return 0;
}
-static int show_main(int argc, const char *argv[]) {
+static int show_main(StringRef ProgName) {
if (Filename.empty() && DebugInfoFilename.empty())
exitWithError(
"the positional argument '<profdata-file>' is required unless '--" +
DebugInfoFilename.ArgStr + "' is provided");
if (Filename == OutputFilename) {
- errs() << sys::path::filename(argv[0]) << " " << argv[1]
- << ": Input file name cannot be the same as the output file name!\n";
+ errs() << ProgName
+ << " show: Input file name cannot be the same as the output file "
+ "name!\n";
return 1;
}
if (JsonFormat)
@@ -3263,7 +3263,7 @@ static int show_main(int argc, const char *argv[]) {
return showMemProfProfile(SFormat, OS);
}
-static int order_main(int argc, const char *argv[]) {
+static int order_main() {
std::error_code EC;
raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_TextWithCRLF);
if (EC)
@@ -3314,16 +3314,16 @@ int llvm_profdata_main(int argc, char **argvNonConst,
cl::ParseCommandLineOptions(argc, argv, "LLVM profile data\n");
if (ShowSubcommand)
- return show_main(argc, argv);
+ return show_main(ProgName);
if (OrderSubcommand)
- return order_main(argc, argv);
+ return order_main();
if (OverlapSubcommand)
- return overlap_main(argc, argv);
+ return overlap_main();
if (MergeSubcommand)
- return merge_main(argc, argv);
+ return merge_main(ProgName);
errs() << ProgName
<< ": Unknown command. Run llvm-profdata --help for usage.\n";
``````````
</details>
https://github.com/llvm/llvm-project/pull/92435
More information about the llvm-commits
mailing list