From e5cbaf140b2e927d0c7b70052de58d7ea4456a8d Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 29 Jul 2010 17:55:00 +0000 Subject: [PATCH] Switch to using the LLVM CommandLine library so that our help message is properly contaminated with nonsense about timing passes that doesn't apply at all to this utility. :) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@109769 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-diff/llvm-diff.cpp | 70 ++++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/tools/llvm-diff/llvm-diff.cpp b/tools/llvm-diff/llvm-diff.cpp index e5bcb12aecf..1a3e1aeef8a 100644 --- a/tools/llvm-diff/llvm-diff.cpp +++ b/tools/llvm-diff/llvm-diff.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -52,14 +53,6 @@ static Module *ReadModule(LLVMContext &Context, StringRef Name) { return 0; } -static int usage() { - errs() << "expected usage:\n"; - errs() << " llvm-diff oldmodule.ll newmodule.ll [function list]\n"; - errs() << "Assembly or bitcode modules may be used interchangeably.\n"; - errs() << "If no functions are provided, all functions will be compared.\n"; - return 1; -} - namespace { struct DiffContext { DiffContext(Value *L, Value *R) @@ -270,48 +263,47 @@ public: }; } -int main(int argc, const char **argv) { - if (argc < 3) return usage(); +static void diffGlobal(DifferenceEngine &Engine, Module *L, Module *R, + StringRef Name) { + // Drop leading sigils from the global name. + if (Name.startswith("@")) Name = Name.substr(1); + + Function *LFn = L->getFunction(Name); + Function *RFn = R->getFunction(Name); + if (LFn && RFn) + Engine.diff(LFn, RFn); + else if (!LFn && !RFn) + errs() << "No function named @" << Name << " in either module\n"; + else if (!LFn) + errs() << "No function named @" << Name << " in left module\n"; + else + errs() << "No function named @" << Name << " in right module\n"; +} + +cl::opt LeftFilename(cl::Positional, cl::desc(""), cl::Required); +cl::opt RightFilename(cl::Positional, cl::desc(""), cl::Required); +cl::list GlobalsToCompare(cl::Positional, cl::desc("")); - // Don't make StringRef locals like this at home. - StringRef LModuleFile = argv[1]; - StringRef RModuleFile = argv[2]; +int main(int argc, char **argv) { + cl::ParseCommandLineOptions(argc, argv); LLVMContext Context; // Load both modules. Die if that fails. - Module *LModule = ReadModule(Context, LModuleFile); - Module *RModule = ReadModule(Context, RModuleFile); + Module *LModule = ReadModule(Context, LeftFilename); + Module *RModule = ReadModule(Context, RightFilename); if (!LModule || !RModule) return 1; DiffConsumer Consumer(LModule, RModule); DifferenceEngine Engine(Context, Consumer); - // If any function names were given, just diff those. - const char **FnNames = argv + 3; - unsigned NumFnNames = argc - 3; - if (NumFnNames) { - for (unsigned I = 0; I != NumFnNames; ++I) { - StringRef FnName = FnNames[I]; - - // Drop leading sigils from the function name. - if (FnName.startswith("@")) FnName = FnName.substr(1); - - Function *LFn = LModule->getFunction(FnName); - Function *RFn = RModule->getFunction(FnName); - if (LFn && RFn) - Engine.diff(LFn, RFn); - else { - if (!LFn && !RFn) - errs() << "No function named @" << FnName << " in either module\n"; - else if (!LFn) - errs() << "No function named @" << FnName << " in left module\n"; - else - errs() << "No function named @" << FnName << " in right module\n"; - } - } + // If any global names were given, just diff those. + if (!GlobalsToCompare.empty()) { + for (unsigned I = 0, E = GlobalsToCompare.size(); I != E; ++I) + diffGlobal(Engine, LModule, RModule, GlobalsToCompare[I]); + + // Otherwise, diff everything in the module. } else { - // Otherwise, diff all functions in the modules. Engine.diff(LModule, RModule); } -- 2.34.1