diff --git a/llvm/test/tools/llvm-cxxdump/help.test b/llvm/test/tools/llvm-cxxdump/help.test new file mode 100644 index 00000000000000..2b8fcecbd835be --- /dev/null +++ b/llvm/test/tools/llvm-cxxdump/help.test @@ -0,0 +1,6 @@ +# RUN: llvm-cxxdump --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: OVERVIEW: LLVM C++ ABI Data Dumper +# HELP: USAGE +# HELP: Color Options +# HELP: Generic Options diff --git a/llvm/test/tools/llvm-cxxmap/help.test b/llvm/test/tools/llvm-cxxmap/help.test new file mode 100644 index 00000000000000..5e8dd83484c670 --- /dev/null +++ b/llvm/test/tools/llvm-cxxmap/help.test @@ -0,0 +1,7 @@ +# RUN: llvm-cxxmap --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: OVERVIEW: LLVM C++ mangled name remapper +# HELP: USAGE +# HELP: CXX Map Options +# HELP: Color Options +# HELP: Generic Options diff --git a/llvm/test/tools/llvm-diff/help.test b/llvm/test/tools/llvm-diff/help.test new file mode 100644 index 00000000000000..0440fa8c124ebe --- /dev/null +++ b/llvm/test/tools/llvm-diff/help.test @@ -0,0 +1,5 @@ +# RUN: llvm-diff --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: USAGE +# HELP: Color Options +# HELP: Generic Options diff --git a/llvm/test/tools/llvm-dis/help.test b/llvm/test/tools/llvm-dis/help.test new file mode 100644 index 00000000000000..d5e9aa5783556b --- /dev/null +++ b/llvm/test/tools/llvm-dis/help.test @@ -0,0 +1,7 @@ +# RUN: llvm-dis --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: OVERVIEW +# HELP: USAGE +# HELP: Color Options +# HELP: Disassembler Options +# HELP: Generic Options diff --git a/llvm/test/tools/llvm-dwp/help.test b/llvm/test/tools/llvm-dwp/help.test new file mode 100644 index 00000000000000..f00cf68158d284 --- /dev/null +++ b/llvm/test/tools/llvm-dwp/help.test @@ -0,0 +1,7 @@ +# RUN: llvm-dwp --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: OVERVIEW +# HELP: USAGE +# HELP: Color Options +# HELP: Generic Options +# HELP: Specific Options diff --git a/llvm/test/tools/llvm-ifs/help.test b/llvm/test/tools/llvm-ifs/help.test new file mode 100644 index 00000000000000..1cfdbd25cca438 --- /dev/null +++ b/llvm/test/tools/llvm-ifs/help.test @@ -0,0 +1,6 @@ +# RUN: llvm-ifs --help | FileCheck %s --check-prefix HELP --implicit-check-not='{{[Oo]}}ptions:' + +# HELP: USAGE +# HELP: Color Options +# HELP: Generic Options +# HELP: Ifs Options diff --git a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp index 03e1bab9417e1d..f214288e951bc8 100644 --- a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -33,9 +33,10 @@ using namespace llvm::object; using namespace llvm::support; namespace opts { +cl::OptionCategory CXXDumpCategory("CXX Dump Options"); cl::list InputFilenames(cl::Positional, cl::desc(""), - cl::ZeroOrMore); + cl::ZeroOrMore, cl::cat(CXXDumpCategory)); } // namespace opts namespace llvm { @@ -549,6 +550,7 @@ int main(int argc, const char *argv[]) { // Register the target printer for --version. cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion); + cl::HideUnrelatedOptions({&opts::CXXDumpCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv, "LLVM C++ ABI Data Dumper\n"); // Default to stdin if no filename is specified. diff --git a/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp b/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp index ee3c627772485e..1e18e379f23cf1 100644 --- a/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp +++ b/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp @@ -25,23 +25,33 @@ using namespace llvm; +cl::OptionCategory CXXMapCategory("CXX Map Options"); + cl::opt OldSymbolFile(cl::Positional, cl::Required, - cl::desc("")); + cl::desc(""), + cl::cat(CXXMapCategory)); cl::opt NewSymbolFile(cl::Positional, cl::Required, - cl::desc("")); + cl::desc(""), + cl::cat(CXXMapCategory)); cl::opt RemappingFile("remapping-file", cl::Required, - cl::desc("Remapping file")); -cl::alias RemappingFileA("r", cl::aliasopt(RemappingFile)); + cl::desc("Remapping file"), + cl::cat(CXXMapCategory)); +cl::alias RemappingFileA("r", cl::aliasopt(RemappingFile), + cl::cat(CXXMapCategory)); cl::opt OutputFilename("output", cl::value_desc("output"), - cl::init("-"), cl::desc("Output file")); -cl::alias OutputFilenameA("o", cl::aliasopt(OutputFilename)); + cl::init("-"), cl::desc("Output file"), + cl::cat(CXXMapCategory)); +cl::alias OutputFilenameA("o", cl::aliasopt(OutputFilename), + cl::cat(CXXMapCategory)); cl::opt WarnAmbiguous( "Wambiguous", - cl::desc("Warn on equivalent symbols in the output symbol list")); + cl::desc("Warn on equivalent symbols in the output symbol list"), + cl::cat(CXXMapCategory)); cl::opt WarnIncomplete( "Wincomplete", - cl::desc("Warn on input symbols missing from output symbol list")); + cl::desc("Warn on input symbols missing from output symbol list"), + cl::cat(CXXMapCategory)); static void warn(Twine Message, Twine Whence = "", std::string Hint = "") { @@ -131,6 +141,7 @@ static void remapSymbols(MemoryBuffer &OldSymbolFile, int main(int argc, const char *argv[]) { InitLLVM X(argc, argv); + cl::HideUnrelatedOptions({&CXXMapCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv, "LLVM C++ mangled name remapper\n"); auto OldSymbolBufOrError = MemoryBuffer::getFileOrSTDIN(OldSymbolFile); diff --git a/llvm/tools/llvm-diff/llvm-diff.cpp b/llvm/tools/llvm-diff/llvm-diff.cpp index aaf7989e2e3d1d..8a11179e741ec5 100644 --- a/llvm/tools/llvm-diff/llvm-diff.cpp +++ b/llvm/tools/llvm-diff/llvm-diff.cpp @@ -55,16 +55,20 @@ static void diffGlobal(DifferenceEngine &Engine, Module &L, Module &R, errs() << "No function named @" << Name << " in right module\n"; } +cl::OptionCategory DiffCategory("Diff Options"); + static cl::opt LeftFilename(cl::Positional, - cl::desc(""), - cl::Required); + cl::desc(""), cl::Required, + cl::cat(DiffCategory)); static cl::opt RightFilename(cl::Positional, cl::desc(""), - cl::Required); + cl::Required, cl::cat(DiffCategory)); static cl::list GlobalsToCompare(cl::Positional, - cl::desc("")); + cl::desc(""), + cl::cat(DiffCategory)); int main(int argc, char **argv) { + cl::HideUnrelatedOptions({&DiffCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv); LLVMContext Context; diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp index b0103f75bb69e7..62d165fb84135a 100644 --- a/llvm/tools/llvm-dis/llvm-dis.cpp +++ b/llvm/tools/llvm-dis/llvm-dis.cpp @@ -35,37 +35,44 @@ #include using namespace llvm; +static cl::OptionCategory DisCategory("Disassembler Options"); + static cl::list InputFilenames(cl::Positional, cl::ZeroOrMore, - cl::desc("[input bitcode]...")); + cl::desc("[input bitcode]..."), + cl::cat(DisCategory)); -static cl::opt -OutputFilename("o", cl::desc("Override output filename"), - cl::value_desc("filename")); +static cl::opt OutputFilename("o", + cl::desc("Override output filename"), + cl::value_desc("filename"), + cl::cat(DisCategory)); -static cl::opt -Force("f", cl::desc("Enable binary output on terminals")); +static cl::opt Force("f", cl::desc("Enable binary output on terminals"), + cl::cat(DisCategory)); -static cl::opt -DontPrint("disable-output", cl::desc("Don't output the .ll file"), cl::Hidden); +static cl::opt DontPrint("disable-output", + cl::desc("Don't output the .ll file"), + cl::Hidden, cl::cat(DisCategory)); static cl::opt SetImporting("set-importing", cl::desc("Set lazy loading to pretend to import a module"), - cl::Hidden); + cl::Hidden, cl::cat(DisCategory)); static cl::opt ShowAnnotations("show-annotations", - cl::desc("Add informational comments to the .ll file")); + cl::desc("Add informational comments to the .ll file"), + cl::cat(DisCategory)); static cl::opt PreserveAssemblyUseListOrder( "preserve-ll-uselistorder", cl::desc("Preserve use-list order when writing LLVM assembly."), - cl::init(false), cl::Hidden); + cl::init(false), cl::Hidden, cl::cat(DisCategory)); static cl::opt MaterializeMetadata("materialize-metadata", cl::desc("Load module without materializing metadata, " - "then materialize only the metadata")); + "then materialize only the metadata"), + cl::cat(DisCategory)); namespace { @@ -151,6 +158,7 @@ int main(int argc, char **argv) { ExitOnErr.setBanner(std::string(argv[0]) + ": error: "); + cl::HideUnrelatedOptions({&DisCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .ll disassembler\n"); LLVMContext Context; diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp index b0b674a3e077b2..c5e54f25872891 100644 --- a/llvm/tools/llvm-dwp/llvm-dwp.cpp +++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp @@ -942,6 +942,7 @@ static Expected readTargetTriple(StringRef FileName) { int main(int argc, char **argv) { InitLLVM X(argc, argv); + cl::HideUnrelatedOptions({&DwpCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv, "merge split dwarf (.dwo) files\n"); llvm::InitializeAllTargetInfos(); diff --git a/llvm/tools/llvm-ifs/llvm-ifs.cpp b/llvm/tools/llvm-ifs/llvm-ifs.cpp index 324dd3931265f9..77269967a29887 100644 --- a/llvm/tools/llvm-ifs/llvm-ifs.cpp +++ b/llvm/tools/llvm-ifs/llvm-ifs.cpp @@ -45,58 +45,72 @@ const VersionTuple IfsVersionCurrent(3, 0); enum class FileFormat { IFS, ELF, TBD }; } // end anonymous namespace +cl::OptionCategory IfsCategory("Ifs Options"); + // TODO: Use OptTable for option parsing in the future. // Command line flags: cl::list InputFilePaths(cl::Positional, cl::desc("input"), - cl::ZeroOrMore); + cl::ZeroOrMore, cl::cat(IfsCategory)); cl::opt InputFormat( "input-format", cl::desc("Specify the input file format"), cl::values(clEnumValN(FileFormat::IFS, "IFS", "Text based ELF stub file"), - clEnumValN(FileFormat::ELF, "ELF", "ELF object file"))); + clEnumValN(FileFormat::ELF, "ELF", "ELF object file")), + cl::cat(IfsCategory)); cl::opt OutputFormat( "output-format", cl::desc("Specify the output file format"), cl::values(clEnumValN(FileFormat::IFS, "IFS", "Text based ELF stub file"), clEnumValN(FileFormat::ELF, "ELF", "ELF stub file"), clEnumValN(FileFormat::TBD, "TBD", "Apple TBD text stub file")), - cl::Required); + cl::Required, cl::cat(IfsCategory)); cl::opt OptArch("arch", - cl::desc("Specify the architecture, e.g. x86_64")); -cl::opt OptBitWidth( - "bitwidth", cl::desc("Specify the bit width"), - cl::values(clEnumValN(IFSBitWidthType::IFS32, "32", "32 bits"), - clEnumValN(IFSBitWidthType::IFS64, "64", "64 bits"))); + cl::desc("Specify the architecture, e.g. x86_64"), + cl::cat(IfsCategory)); +cl::opt + OptBitWidth("bitwidth", cl::desc("Specify the bit width"), + cl::values(clEnumValN(IFSBitWidthType::IFS32, "32", "32 bits"), + clEnumValN(IFSBitWidthType::IFS64, "64", "64 bits")), + cl::cat(IfsCategory)); cl::opt OptEndianness( "endianness", cl::desc("Specify the endianness"), cl::values(clEnumValN(IFSEndiannessType::Little, "little", "Little Endian"), - clEnumValN(IFSEndiannessType::Big, "big", "Big Endian"))); + clEnumValN(IFSEndiannessType::Big, "big", "Big Endian")), + cl::cat(IfsCategory)); cl::opt OptTargetTriple( - "target", cl::desc("Specify the target triple, e.g. x86_64-linux-gnu")); + "target", cl::desc("Specify the target triple, e.g. x86_64-linux-gnu"), + cl::cat(IfsCategory)); cl::opt OptTargetTripleHint( "hint-ifs-target", cl::desc("When --output-format is 'IFS', this flag will hint the expected " - "target triple for IFS output")); + "target triple for IFS output"), + cl::cat(IfsCategory)); cl::opt StripIFSArch( "strip-ifs-arch", - cl::desc("Strip target architecture information away from IFS output")); + cl::desc("Strip target architecture information away from IFS output"), + cl::cat(IfsCategory)); cl::opt StripIFSBitWidth( "strip-ifs-bitwidth", - cl::desc("Strip target bit width information away from IFS output")); + cl::desc("Strip target bit width information away from IFS output"), + cl::cat(IfsCategory)); cl::opt StripIFSEndiannessWidth( "strip-ifs-endianness", - cl::desc("Strip target endianness information away from IFS output")); + cl::desc("Strip target endianness information away from IFS output"), + cl::cat(IfsCategory)); cl::opt StripIFSTarget( "strip-ifs-target", - cl::desc("Strip all target information away from IFS output")); + cl::desc("Strip all target information away from IFS output"), + cl::cat(IfsCategory)); cl::opt SoName("soname", cl::desc("Manually set the DT_SONAME entry of any emitted files"), - cl::value_desc("name")); -cl::opt OutputFilePath("output", cl::desc("Output file")); + cl::value_desc("name"), cl::cat(IfsCategory)); +cl::opt OutputFilePath("output", cl::desc("Output file"), + cl::cat(IfsCategory)); cl::alias OutputFilePathA("o", cl::desc("Alias for --output"), - cl::aliasopt(OutputFilePath)); + cl::aliasopt(OutputFilePath), cl::cat(IfsCategory)); cl::opt WriteIfChanged( "write-if-changed", - cl::desc("Write the output file only if it is new or has changed.")); + cl::desc("Write the output file only if it is new or has changed."), + cl::cat(IfsCategory)); static std::string getTypeName(IFSSymbolType Type) { switch (Type) { @@ -259,6 +273,7 @@ static Error writeIFS(StringRef FilePath, IFSStub &Stub) { int main(int argc, char *argv[]) { // Parse arguments. + cl::HideUnrelatedOptions({&IfsCategory, &getColorCategory()}); cl::ParseCommandLineOptions(argc, argv); if (InputFilePaths.empty())