From 4e0a55d0d129bc56c4b961288d4f63538b3ef824 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Fri, 16 Sep 2011 21:09:17 +0000 Subject: [PATCH] Add -rfunc and -rglob options to llvm-extract to support regular expression matching. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139945 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/CommandGuide/llvm-extract.pod | 12 +++++ tools/llvm-extract/llvm-extract.cpp | 77 ++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/docs/CommandGuide/llvm-extract.pod b/docs/CommandGuide/llvm-extract.pod index 797e79d128d..67f00f0b861 100644 --- a/docs/CommandGuide/llvm-extract.pod +++ b/docs/CommandGuide/llvm-extract.pod @@ -37,11 +37,23 @@ B will write raw bitcode regardless of the output device. Extract the function named I from the LLVM bitcode. May be specified multiple times to extract multiple functions at once. +=item B<--rfunc> I + +Extract the function(s) matching I from the LLVM bitcode. +All functions matching the regular expression will be extracted. May be +specified multiple times. + =item B<--glob> I Extract the global variable named I from the LLVM bitcode. May be specified multiple times to extract multiple global variables at once. +=item B<--rglob> I + +Extract the global variable(s) matching I from the LLVM +bitcode. All global variables matching the regular expression will be extracted. +May be specified multiple times. + =item B<-help> Print a summary of command line options. diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp index a6c229fc979..f6227ee2555 100644 --- a/tools/llvm-extract/llvm-extract.cpp +++ b/tools/llvm-extract/llvm-extract.cpp @@ -26,7 +26,9 @@ #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/SystemUtils.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/Regex.h" #include "llvm/ADT/SmallPtrSet.h" +#include "llvm/ADT/SetVector.h" #include using namespace llvm; @@ -45,16 +47,30 @@ Force("f", cl::desc("Enable binary output on terminals")); static cl::opt DeleteFn("delete", cl::desc("Delete specified Globals from Module")); -// ExtractFuncs - The functions to extract from the module... +// ExtractFuncs - The functions to extract from the module. static cl::list ExtractFuncs("func", cl::desc("Specify function to extract"), cl::ZeroOrMore, cl::value_desc("function")); -// ExtractGlobals - The globals to extract from the module... +// ExtractRegExpFuncs - The functions, matched via regular expression, to +// extract from the module. +static cl::list +ExtractRegExpFuncs("rfunc", cl::desc("Specify function(s) to extract using a " + "regular expression"), + cl::ZeroOrMore, cl::value_desc("rfunction")); + +// ExtractGlobals - The globals to extract from the module. static cl::list ExtractGlobals("glob", cl::desc("Specify global to extract"), cl::ZeroOrMore, cl::value_desc("global")); +// ExtractRegExpGlobals - The globals, matched via regular expression, to +// extract from the module... +static cl::list +ExtractRegExpGlobals("rglob", cl::desc("Specify global(s) to extract using a " + "regular expression"), + cl::ZeroOrMore, cl::value_desc("rglobal")); + static cl::opt OutputAssembly("S", cl::desc("Write output as LLVM assembly"), cl::Hidden); @@ -78,7 +94,8 @@ int main(int argc, char **argv) { return 1; } - std::vector GVs; + // Use SetVector to avoid duplicates. + SetVector GVs; // Figure out which globals we should extract. for (size_t i = 0, e = ExtractGlobals.size(); i != e; ++i) { @@ -88,7 +105,30 @@ int main(int argc, char **argv) { << ExtractGlobals[i] << "'!\n"; return 1; } - GVs.push_back(GV); + GVs.insert(GV); + } + + // Extract globals via regular expression matching. + for (size_t i = 0, e = ExtractRegExpGlobals.size(); i != e; ++i) { + std::string Error; + Regex RegEx(ExtractRegExpGlobals[i]); + if (!RegEx.isValid(Error)) { + errs() << argv[0] << ": '" << ExtractRegExpGlobals[i] << "' " + "invalid regex: " << Error; + } + bool match = false; + for (Module::global_iterator GV = M.get()->global_begin(), + E = M.get()->global_end(); GV != E; GV++) { + if (RegEx.match(GV->getName())) { + GVs.insert(&*GV); + match = true; + } + } + if (!match) { + errs() << argv[0] << ": program doesn't contain global named '" + << ExtractRegExpGlobals[i] << "'!\n"; + return 1; + } } // Figure out which functions we should extract. @@ -99,7 +139,30 @@ int main(int argc, char **argv) { << ExtractFuncs[i] << "'!\n"; return 1; } - GVs.push_back(GV); + GVs.insert(GV); + } + // Extract functions via regular expression matching. + for (size_t i = 0, e = ExtractRegExpFuncs.size(); i != e; ++i) { + std::string Error; + StringRef RegExStr = ExtractRegExpFuncs[i]; + Regex RegEx(RegExStr); + if (!RegEx.isValid(Error)) { + errs() << argv[0] << ": '" << ExtractRegExpFuncs[i] << "' " + "invalid regex: " << Error; + } + bool match = false; + for (Module::iterator F = M.get()->begin(), E = M.get()->end(); F != E; + F++) { + if (RegEx.match(F->getName())) { + GVs.insert(&*F); + match = true; + } + } + if (!match) { + errs() << argv[0] << ": program doesn't contain global named '" + << ExtractRegExpFuncs[i] << "'!\n"; + return 1; + } } // Materialize requisite global values. @@ -145,7 +208,9 @@ int main(int argc, char **argv) { PassManager Passes; Passes.add(new TargetData(M.get())); // Use correct TargetData - Passes.add(createGVExtractionPass(GVs, DeleteFn)); + std::vector Gvs(GVs.begin(), GVs.end()); + + Passes.add(createGVExtractionPass(Gvs, DeleteFn)); if (!DeleteFn) Passes.add(createGlobalDCEPass()); // Delete unreachable globals Passes.add(createStripDeadDebugInfoPass()); // Remove dead debug info -- 2.34.1