[llvm-lto2] Added version command for llvm-lto2 #148866
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
Ping! Thank you! |
|
Ping, thanks! |
|
Ping, thank you! |
|
Ping, thanks! |
|
@llvm/pr-subscribers-lto Author: Faith Rivera (fnriv) ChangesPreviously, the only way to check version for llvm-lto2 was to add version as a subcommand: You can now check version with the command Full diff: https://github.com/llvm/llvm-project/pull/148866.diff 2 Files Affected:
diff --git a/llvm/test/tools/llvm-lto2/version.test b/llvm/test/tools/llvm-lto2/version.test
new file mode 100644
index 0000000000000..16c728553b896
--- /dev/null
+++ b/llvm/test/tools/llvm-lto2/version.test
@@ -0,0 +1,7 @@
+## Show that you can run version as a main command for llvm-lto2
+## or a subcommand of llvm-lto2 run.
+
+RUN: llvm-lto2 --version | Filecheck %s
+RUN: llvm-lto2 run --version | FileCheck %s
+
+CHECK: version
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index fbde66666a596..d27a2199d75d8 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -616,5 +616,9 @@ int main(int argc, char **argv) {
outs() << GlobalValue::getGUIDAssumingExternalLinkage(argv[2]) << '\n';
return 0;
}
+ if (Subcommand == "--version") {
+ cl::PrintVersionMessage();
+ return 0;
+ }
return usage();
}
|
| ## or a subcommand of llvm-lto2 run. | ||
|
|
||
| RUN: llvm-lto2 --version | Filecheck %s | ||
| RUN: llvm-lto2 run --version | FileCheck %s |
There was a problem hiding this comment.
I was going to suggest removing the support for emitting the version under the run subcommand, but I don't see it in llvm-lto2.cpp. Is that coming from somewhere in cl::ParseCommandLineOptions?
There was a problem hiding this comment.
Hi Teresa,
It seems that llvm-lto2 run uses cl::ParseCommandLineOptions. This calls initCommonOptions() in CommandLine.cpp instantiates a CommandLineCommonOptions struct, where there is a VersionPrinter option and function. So taking it out or changing that workflow would impact other uses of cl::ParseCommandLineOptions.
|
|
|
NB: the CI tests have picked out that one of your "FileCheck" commands has a lower-case 'c', which leads to an unexpected test failure (simple to fix). |
|
Just fixed the syntax error and pushed @jmorse. Thanks! |
|
@fnriv Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
Previously, the only way to check version for llvm-lto2 was to add version as a subcommand:
llvm-lto2 run --version. This adds version as a main command for llvm-lto2 for more intuitive access.You can now check version with the command
llvm-lto2 --version.