diff --git a/clang/tools/clang-scan-deps/CMakeLists.txt b/clang/tools/clang-scan-deps/CMakeLists.txt --- a/clang/tools/clang-scan-deps/CMakeLists.txt +++ b/clang/tools/clang-scan-deps/CMakeLists.txt @@ -3,8 +3,15 @@ Support ) +set(LLVM_TARGET_DEFINITIONS Opts.td) +tablegen(LLVM Opts.inc -gen-opt-parser-defs) +add_public_tablegen_target(ScanDepsOptsTableGen) + add_clang_tool(clang-scan-deps ClangScanDeps.cpp + + DEPENDS + ScanDepsOptsTableGen ) set(CLANG_SCAN_DEPS_LIB_DEPS diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -26,11 +26,163 @@ #include #include +#include "Opts.inc" + using namespace clang; using namespace tooling::dependencies; namespace { +using namespace llvm::opt; +enum ID { + OPT_INVALID = 0, // This is not an option ID. +#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ + HELPTEXT, METAVAR, VALUES) \ + OPT_##ID, +#include "Opts.inc" +#undef OPTION +}; + +#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; +#include "Opts.inc" +#undef PREFIX + +const llvm::opt::OptTable::Info InfoTable[] = { +#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ + HELPTEXT, METAVAR, VALUES) \ + {PREFIX, NAME, HELPTEXT, \ + METAVAR, OPT_##ID, llvm::opt::Option::KIND##Class, \ + PARAM, FLAGS, OPT_##GROUP, \ + OPT_##ALIAS, ALIASARGS, VALUES}, +#include "Opts.inc" +#undef OPTION +}; + +class ScanDepsOptTable : public llvm::opt::OptTable { +public: + ScanDepsOptTable() : OptTable(InfoTable) { setGroupedShortOptions(true); } +}; + +enum ResourceDirRecipeKind { + RDRK_ModifyCompilerPath, + RDRK_InvokeCompiler, +}; + +static ScanningMode ScanMode = ScanningMode::DependencyDirectivesScan; +static ScanningOutputFormat Format = ScanningOutputFormat::Make; +static std::string ModuleFilesDir; +static bool OptimizeArgs; +static bool EagerLoadModules; +static unsigned NumThreads = 0; +static std::string CompilationDB; +static std::string ModuleName; +static std::vector ModuleDepTargets; +static bool DeprecatedDriverCommand; +static ResourceDirRecipeKind ResourceDirRecipe; +static bool Verbose; + +static void ParseArgs(int argc, char **argv) { + ScanDepsOptTable Tbl; + llvm::StringRef ToolName = argv[0]; + llvm::BumpPtrAllocator A; + llvm::StringSaver Saver{A}; + llvm::opt::InputArgList Args = + Tbl.parseArgs(argc, argv, OPT_UNKNOWN, Saver, [&](StringRef Msg) { + llvm::errs() << Msg << '\n'; + std::exit(1); + }); + + if (Args.hasArg(OPT_help)) { + Tbl.printHelp(llvm::outs(), "clang-scan-deps [options]", "clang-scan-deps"); + std::exit(0); + } + if (Args.hasArg(OPT_version)) { + llvm::outs() << ToolName << '\n'; + llvm::cl::PrintVersionMessage(); + std::exit(0); + } + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_mode_EQ)) { + auto ModeType = + llvm::StringSwitch>(A->getValue()) + .Case("preprocess-dependency-directives", + ScanningMode::DependencyDirectivesScan) + .Case("preprocess", ScanningMode::CanonicalPreprocessing) + .Default(std::nullopt); + if (!ModeType) { + llvm::errs() << ToolName + << ": for the --mode option: Cannot find option named '" + << A->getValue() << "'\n"; + std::exit(1); + } + ScanMode = *ModeType; + } + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_format_EQ)) { + auto FormatType = + llvm::StringSwitch>(A->getValue()) + .Case("make", ScanningOutputFormat::Make) + .Case("experimental-full", ScanningOutputFormat::Full) + .Default(std::nullopt); + if (!FormatType) { + llvm::errs() << ToolName + << ": for the --format option: Cannot find option named '" + << A->getValue() << "'\n"; + std::exit(1); + } + Format = *FormatType; + } + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_module_files_dir_EQ)) + ModuleFilesDir = A->getValue(); + + OptimizeArgs = Args.hasArg(OPT_optimize_args); + EagerLoadModules = Args.hasArg(OPT_eager_load_pcm); + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_j)) { + StringRef S{A->getValue()}; + if (!llvm::to_integer(S, NumThreads, 0)) { + llvm::errs() << ToolName << ": for the -j option: '" << S + << "' value invalid for uint argument!\n"; + std::exit(1); + } + } + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_compilation_database_EQ)) { + CompilationDB = A->getValue(); + } else { + llvm::errs() << ToolName + << ": for the --compiilation-database option: must be " + "specified at least once!"; + std::exit(1); + } + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_module_name_EQ)) + ModuleName = A->getValue(); + + for (const llvm::opt::Arg *A : Args.filtered(OPT_dependency_target_EQ)) + ModuleDepTargets.emplace_back(A->getValue()); + + DeprecatedDriverCommand = Args.hasArg(OPT_deprecated_driver_command); + + if (const llvm::opt::Arg *A = Args.getLastArg(OPT_resource_dir_recipe_EQ)) { + auto Kind = + llvm::StringSwitch>(A->getValue()) + .Case("modify-compiler-path", RDRK_ModifyCompilerPath) + .Case("invoke-compiler", RDRK_InvokeCompiler) + .Default(std::nullopt); + if (!Kind) { + llvm::errs() << ToolName + << ": for the --resource-dir-recipe option: Cannot find " + "option named '" + << A->getValue() << "'\n"; + std::exit(1); + } + ResourceDirRecipe = *Kind; + } + + Verbose = Args.hasArg(OPT_verbose); +} + class SharedStream { public: SharedStream(raw_ostream &OS) : OS(OS) {} @@ -108,104 +260,6 @@ std::mutex CacheLock; }; -llvm::cl::opt Help("h", llvm::cl::desc("Alias for -help"), - llvm::cl::Hidden); - -llvm::cl::OptionCategory DependencyScannerCategory("Tool options"); - -static llvm::cl::opt ScanMode( - "mode", - llvm::cl::desc("The preprocessing mode used to compute the dependencies"), - llvm::cl::values( - clEnumValN(ScanningMode::DependencyDirectivesScan, - "preprocess-dependency-directives", - "The set of dependencies is computed by preprocessing with " - "special lexing after scanning the source files to get the " - "directives that might affect the dependencies"), - clEnumValN(ScanningMode::CanonicalPreprocessing, "preprocess", - "The set of dependencies is computed by preprocessing the " - "source files")), - llvm::cl::init(ScanningMode::DependencyDirectivesScan), - llvm::cl::cat(DependencyScannerCategory)); - -static llvm::cl::opt Format( - "format", llvm::cl::desc("The output format for the dependencies"), - llvm::cl::values(clEnumValN(ScanningOutputFormat::Make, "make", - "Makefile compatible dep file"), - clEnumValN(ScanningOutputFormat::Full, "experimental-full", - "Full dependency graph suitable" - " for explicitly building modules. This format " - "is experimental and will change.")), - llvm::cl::init(ScanningOutputFormat::Make), - llvm::cl::cat(DependencyScannerCategory)); - -static llvm::cl::opt ModuleFilesDir( - "module-files-dir", - llvm::cl::desc( - "The build directory for modules. Defaults to the value of " - "'-fmodules-cache-path=' from command lines for implicit modules."), - llvm::cl::cat(DependencyScannerCategory)); - -static llvm::cl::opt OptimizeArgs( - "optimize-args", - llvm::cl::desc("Whether to optimize command-line arguments of modules."), - llvm::cl::init(false), llvm::cl::cat(DependencyScannerCategory)); - -static llvm::cl::opt EagerLoadModules( - "eager-load-pcm", - llvm::cl::desc("Load PCM files eagerly (instead of lazily on import)."), - llvm::cl::init(false), llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::opt - NumThreads("j", llvm::cl::Optional, - llvm::cl::desc("Number of worker threads to use (default: use " - "all concurrent threads)"), - llvm::cl::init(0), llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::opt - CompilationDB("compilation-database", - llvm::cl::desc("Compilation database"), llvm::cl::Required, - llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::opt ModuleName( - "module-name", llvm::cl::Optional, - llvm::cl::desc("the module of which the dependencies are to be computed"), - llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::list ModuleDepTargets( - "dependency-target", - llvm::cl::desc("The names of dependency targets for the dependency file"), - llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::opt DeprecatedDriverCommand( - "deprecated-driver-command", llvm::cl::Optional, - llvm::cl::desc("use a single driver command to build the tu (deprecated)"), - llvm::cl::cat(DependencyScannerCategory)); - -enum ResourceDirRecipeKind { - RDRK_ModifyCompilerPath, - RDRK_InvokeCompiler, -}; - -static llvm::cl::opt ResourceDirRecipe( - "resource-dir-recipe", - llvm::cl::desc("How to produce missing '-resource-dir' argument"), - llvm::cl::values( - clEnumValN(RDRK_ModifyCompilerPath, "modify-compiler-path", - "Construct the resource directory from the compiler path in " - "the compilation database. This assumes it's part of the " - "same toolchain as this clang-scan-deps. (default)"), - clEnumValN(RDRK_InvokeCompiler, "invoke-compiler", - "Invoke the compiler with '-print-resource-dir' and use the " - "reported path as the resource directory. (deprecated)")), - llvm::cl::init(RDRK_ModifyCompilerPath), - llvm::cl::cat(DependencyScannerCategory)); - -llvm::cl::opt Verbose("v", llvm::cl::Optional, - llvm::cl::desc("Use verbose output."), - llvm::cl::init(false), - llvm::cl::cat(DependencyScannerCategory)); - } // end anonymous namespace /// Takes the result of a dependency scan and prints error / dependency files @@ -439,9 +493,7 @@ int main(int argc, const char **argv) { llvm::InitLLVM X(argc, argv); - llvm::cl::HideUnrelatedOptions(DependencyScannerCategory); - if (!llvm::cl::ParseCommandLineOptions(argc, argv)) - return 1; + ParseArgs(argc, const_cast(argv)); std::string ErrorMessage; std::unique_ptr Compilations = diff --git a/clang/tools/clang-scan-deps/Opts.td b/clang/tools/clang-scan-deps/Opts.td new file mode 100644 --- /dev/null +++ b/clang/tools/clang-scan-deps/Opts.td @@ -0,0 +1,34 @@ +include "llvm/Option/OptParser.td" + +class F : Flag<["-"], name>, HelpText; +class Arg : Separate<["-"], name>, HelpText; + +multiclass Eq { + def NAME #_EQ : Joined<["-", "--"], name #"=">, HelpText; + def : Separate<["-", "--"], name>, Alias(NAME #_EQ)>; +} + +def help : Flag<["--"], "help">, HelpText<"Display this help">; +def version : Flag<["--"], "version">, HelpText<"Display the version">; + +defm mode : Eq<"mode", "The preprocessing mode used to compute the dependencies">; + +defm format : Eq<"format", "The output format for the dependencies">; + +defm module_files_dir : Eq<"module-files-dir", + "The build directory for modules. Defaults to the value of '-fmodules-cache-path=' from command lines for implicit modules">; + +def optimize_args : F<"optimize-args", "Whether to optimize command-line arguments of modules">; +def eager_load_pcm : F<"eager-load-pcm", "Load PCM files eagerly (instead of lazily on import)">; + +def j : Arg<"j", "Number of worker threads to use (default: use all concurrent threads)">; + +defm compilation_database : Eq<"compilation-database", "Compilation database">; +defm module_name : Eq<"module-name", "the module of which the dependencies are to be computed">; +defm dependency_target : Eq<"dependency-target", "The names of dependency targets for the dependency file">; + +def deprecated_driver_command : F<"deprecated-driver-command", "use a single driver command to build the tu (deprecated)">; + +defm resource_dir_recipe : Eq<"resource-dir-recipe", "How to produce missing '-resource-dir' argument">; + +def verbose : F<"v", "Use verbose output">; diff --git a/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn --- a/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn @@ -1,6 +1,14 @@ +import("//llvm/utils/TableGen/tablegen.gni") + +tablegen("Opts") { + visibility = [ ":clang-scan-deps" ] + args = [ "-gen-opt-parser-defs" ] +} + executable("clang-scan-deps") { configs += [ "//llvm/utils/gn/build:clang_code" ] deps = [ + ":Opts", "//clang/lib/AST", "//clang/lib/Basic", "//clang/lib/CodeGen", diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel --- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel @@ -2197,11 +2197,24 @@ ], ) +gentbl( + name = "ScanDepsTableGen", + strip_include_prefix = "include/clang/tools/clang-scan-deps", + tbl_outs = [( + "-gen-opt-parser-defs", + "include/clang/tools/clang-scan-deps/Opts.inc", + )], + tblgen = "//llvm:llvm-tblgen", + td_file = "tools/clang-scan-deps/Opts.td", + td_srcs = [ "//llvm:include/llvm/Option/OptParser.td" ], +) + cc_binary( name = "clang-scan-deps", srcs = glob(["tools/clang-scan-deps/*.cpp"]), stamp = 0, deps = [ + ":ScanDepsTableGen", ":driver", ":frontend", ":tooling",