[BOLT] Add dump-dot-func option for selective function CFG dumping (#153007)
## Change: * Added `--dump-dot-func` command-line option that allows users to dump CFGs only for specific functions instead of dumping all functions (the current only available option being `--dump-dot-all`) ## Usage: * Users can now specify function names or regex patterns (e.g., `--dump-dot-func=main,helper` or `--dump-dot-func="init.*`") to generate .dot files only for functions of interest * Aims to save time when analysing specific functions in large binaries (e.g., only dumping graphs for performance-critical functions identified through profiling) and we can now avoid reduce output clutter from generating thousands of unnecessary .dot files when analysing large binaries ## Testing The introduced test `dump-dot-func.test` confirms the new option does the following: - [x] 1. `dump-dot-func` can correctly filter a specified functions - [x] 2. Can achieve the above with regexes - [x] 3. Can do 1. with a list of functions - [x] No option specified creates no dot files - [x] Passing in a non-existent function generates no dumping messages - [x] `dump-dot-all` continues to work as expected
This commit is contained in:
parent
7594b4b8d1
commit
fda24dbc16
@ -138,6 +138,12 @@
|
|||||||
Dump function CFGs to graphviz format after each stage;enable '-print-loops'
|
Dump function CFGs to graphviz format after each stage;enable '-print-loops'
|
||||||
for color-coded blocks
|
for color-coded blocks
|
||||||
|
|
||||||
|
- `--dump-dot-func=<func1,func2,func3...>`
|
||||||
|
|
||||||
|
Dump function CFGs to graphviz format for specified functions only;
|
||||||
|
takes function name patterns (regex supported). Note: C++ function names
|
||||||
|
must be passed using their mangled names
|
||||||
|
|
||||||
- `--dump-linux-exceptions`
|
- `--dump-linux-exceptions`
|
||||||
|
|
||||||
Dump Linux kernel exception table
|
Dump Linux kernel exception table
|
||||||
|
@ -15,6 +15,12 @@
|
|||||||
|
|
||||||
#include "llvm/Support/CommandLine.h"
|
#include "llvm/Support/CommandLine.h"
|
||||||
|
|
||||||
|
namespace llvm {
|
||||||
|
namespace bolt {
|
||||||
|
class BinaryFunction;
|
||||||
|
}
|
||||||
|
} // namespace llvm
|
||||||
|
|
||||||
namespace opts {
|
namespace opts {
|
||||||
|
|
||||||
enum HeatmapModeKind {
|
enum HeatmapModeKind {
|
||||||
@ -100,6 +106,9 @@ extern llvm::cl::opt<unsigned> Verbosity;
|
|||||||
/// Return true if we should process all functions in the binary.
|
/// Return true if we should process all functions in the binary.
|
||||||
bool processAllFunctions();
|
bool processAllFunctions();
|
||||||
|
|
||||||
|
/// Return true if we should dump dot graphs for the given function.
|
||||||
|
bool shouldDumpDot(const llvm::bolt::BinaryFunction &Function);
|
||||||
|
|
||||||
enum GadgetScannerKind { GS_PACRET, GS_PAUTH, GS_ALL };
|
enum GadgetScannerKind { GS_PACRET, GS_PAUTH, GS_ALL };
|
||||||
|
|
||||||
extern llvm::cl::bits<GadgetScannerKind> GadgetScannersToRun;
|
extern llvm::cl::bits<GadgetScannerKind> GadgetScannersToRun;
|
||||||
|
@ -52,6 +52,7 @@ namespace opts {
|
|||||||
extern cl::opt<bool> PrintAll;
|
extern cl::opt<bool> PrintAll;
|
||||||
extern cl::opt<bool> PrintDynoStats;
|
extern cl::opt<bool> PrintDynoStats;
|
||||||
extern cl::opt<bool> DumpDotAll;
|
extern cl::opt<bool> DumpDotAll;
|
||||||
|
extern bool shouldDumpDot(const bolt::BinaryFunction &Function);
|
||||||
extern cl::opt<std::string> AsmDump;
|
extern cl::opt<std::string> AsmDump;
|
||||||
extern cl::opt<bolt::PLTCall::OptType> PLT;
|
extern cl::opt<bolt::PLTCall::OptType> PLT;
|
||||||
extern cl::opt<bolt::IdenticalCodeFolding::ICFLevel, false,
|
extern cl::opt<bolt::IdenticalCodeFolding::ICFLevel, false,
|
||||||
@ -340,7 +341,7 @@ Error BinaryFunctionPassManager::runPasses() {
|
|||||||
|
|
||||||
Function.print(BC.outs(), Message);
|
Function.print(BC.outs(), Message);
|
||||||
|
|
||||||
if (opts::DumpDotAll)
|
if (opts::shouldDumpDot(Function))
|
||||||
Function.dumpGraphForPass(PassIdName);
|
Function.dumpGraphForPass(PassIdName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -115,6 +115,35 @@ cl::opt<bool> DumpDotAll(
|
|||||||
"enable '-print-loops' for color-coded blocks"),
|
"enable '-print-loops' for color-coded blocks"),
|
||||||
cl::Hidden, cl::cat(BoltCategory));
|
cl::Hidden, cl::cat(BoltCategory));
|
||||||
|
|
||||||
|
cl::list<std::string> DumpDotFunc(
|
||||||
|
"dump-dot-func", cl::CommaSeparated,
|
||||||
|
cl::desc(
|
||||||
|
"dump function CFGs to graphviz format for specified functions only;"
|
||||||
|
"takes function name patterns (regex supported)"),
|
||||||
|
cl::value_desc("func1,func2,func3,..."), cl::Hidden, cl::cat(BoltCategory));
|
||||||
|
|
||||||
|
bool shouldDumpDot(const bolt::BinaryFunction &Function) {
|
||||||
|
// If dump-dot-all is enabled, dump all functions
|
||||||
|
if (DumpDotAll)
|
||||||
|
return !Function.isIgnored();
|
||||||
|
|
||||||
|
// If no specific functions specified in dump-dot-func, don't dump any
|
||||||
|
if (DumpDotFunc.empty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (Function.isIgnored())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Check if function matches any of the specified patterns
|
||||||
|
for (const std::string &Name : DumpDotFunc) {
|
||||||
|
if (Function.hasNameRegex(Name)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static cl::list<std::string>
|
static cl::list<std::string>
|
||||||
ForceFunctionNames("funcs",
|
ForceFunctionNames("funcs",
|
||||||
cl::CommaSeparated,
|
cl::CommaSeparated,
|
||||||
@ -3569,7 +3598,7 @@ void RewriteInstance::postProcessFunctions() {
|
|||||||
if (opts::PrintAll || opts::PrintCFG)
|
if (opts::PrintAll || opts::PrintCFG)
|
||||||
Function.print(BC->outs(), "after building cfg");
|
Function.print(BC->outs(), "after building cfg");
|
||||||
|
|
||||||
if (opts::DumpDotAll)
|
if (opts::shouldDumpDot(Function))
|
||||||
Function.dumpGraphForPass("00_build-cfg");
|
Function.dumpGraphForPass("00_build-cfg");
|
||||||
|
|
||||||
if (opts::PrintLoopInfo) {
|
if (opts::PrintLoopInfo) {
|
||||||
|
24
bolt/test/Inputs/multi-func.cpp
Normal file
24
bolt/test/Inputs/multi-func.cpp
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
// Multiple functions to test selective dumping
|
||||||
|
int add(int a, int b) { return a + b; }
|
||||||
|
|
||||||
|
int multiply(int a, int b) { return a * b; }
|
||||||
|
|
||||||
|
int main_helper() {
|
||||||
|
std::cout << "Helper function" << std::endl;
|
||||||
|
return 42;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main_secondary() { return add(5, 3); }
|
||||||
|
|
||||||
|
void other_function() { std::cout << "Other function" << std::endl; }
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
int result = add(10, 20);
|
||||||
|
result = multiply(result, 2);
|
||||||
|
main_helper();
|
||||||
|
main_secondary();
|
||||||
|
other_function();
|
||||||
|
return result;
|
||||||
|
}
|
52
bolt/test/dump-dot-func.test
Normal file
52
bolt/test/dump-dot-func.test
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
# Test the --dump-dot-func option with multiple functions
|
||||||
|
# (includes tests for both mangled/unmangled names)
|
||||||
|
|
||||||
|
RUN: %clang++ %p/Inputs/multi-func.cpp -o %t.exe -Wl,-q
|
||||||
|
|
||||||
|
# Test 1: --dump-dot-func with specific function name (mangled)
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt1 --dump-dot-func=_Z3addii -v=1 2>&1 | FileCheck %s --check-prefix=ADD
|
||||||
|
|
||||||
|
# Test 2: --dump-dot-func with regex pattern (main.*)
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt2 --dump-dot-func="main.*" -v=1 2>&1 | FileCheck %s --check-prefix=MAIN-REGEX
|
||||||
|
|
||||||
|
# Test 3: --dump-dot-func with multiple specific functions (mangled names)
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt3 --dump-dot-func=_Z3addii,_Z8multiplyii -v=1 2>&1 | FileCheck %s --check-prefix=MULTI
|
||||||
|
|
||||||
|
# Test 4: No option specified should create no dot files
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt4 2>&1 | FileCheck %s --check-prefix=NONE
|
||||||
|
|
||||||
|
# Test 5: --dump-dot-func with non-existent function
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt5 --dump-dot-func=nonexistent -v=1 2>&1 | FileCheck %s --check-prefix=NONEXISTENT
|
||||||
|
|
||||||
|
# Test 6: Backward compatibility - --dump-dot-all should still work
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt6 --dump-dot-all -v=1 2>&1 | FileCheck %s --check-prefix=ALL
|
||||||
|
|
||||||
|
# Test 7: Test with unmangled function name (main function)
|
||||||
|
RUN: llvm-bolt %t.exe -o %t.bolt7 --dump-dot-func=main -v=1 2>&1 | FileCheck %s --check-prefix=MAIN-UNMANGLED
|
||||||
|
|
||||||
|
# Check that specific functions are dumped
|
||||||
|
ADD: BOLT-INFO: dumping CFG to _Z3addii-00_build-cfg.dot
|
||||||
|
ADD-NOT: BOLT-INFO: dumping CFG to main-00_build-cfg.dot
|
||||||
|
ADD-NOT: BOLT-INFO: dumping CFG to _Z8multiplyii-00_build-cfg.dot
|
||||||
|
ADD-NOT: BOLT-INFO: dumping CFG to _Z11main_helperv-00_build-cfg.dot
|
||||||
|
|
||||||
|
MAIN-REGEX-DAG: BOLT-INFO: dumping CFG to main-00_build-cfg.dot
|
||||||
|
MAIN-REGEX-NOT: BOLT-INFO: dumping CFG to _Z3addii-00_build-cfg.dot
|
||||||
|
MAIN-REGEX-NOT: BOLT-INFO: dumping CFG to _Z8multiplyii-00_build-cfg.dot
|
||||||
|
|
||||||
|
MULTI-DAG: BOLT-INFO: dumping CFG to _Z3addii-00_build-cfg.dot
|
||||||
|
MULTI-DAG: BOLT-INFO: dumping CFG to _Z8multiplyii-00_build-cfg.dot
|
||||||
|
MULTI-NOT: BOLT-INFO: dumping CFG to main-00_build-cfg.dot
|
||||||
|
MULTI-NOT: BOLT-INFO: dumping CFG to _Z11main_helperv-00_build-cfg.dot
|
||||||
|
|
||||||
|
# Should be no dumping messages when no option is specified
|
||||||
|
NONE-NOT: BOLT-INFO: dumping CFG
|
||||||
|
|
||||||
|
# Should be no dumping messages for non-existent function
|
||||||
|
NONEXISTENT-NOT: BOLT-INFO: dumping CFG
|
||||||
|
|
||||||
|
ALL: BOLT-INFO: dumping CFG to main-00_build-cfg.dot
|
||||||
|
|
||||||
|
MAIN-UNMANGLED: BOLT-INFO: dumping CFG to main-00_build-cfg.dot
|
||||||
|
MAIN-UNMANGLED-NOT: BOLT-INFO: dumping CFG to _Z3addii-00_build-cfg.dot
|
||||||
|
MAIN-UNMANGLED-NOT: BOLT-INFO: dumping CFG to _Z8multiplyii-00_build-cfg.dot
|
Loading…
x
Reference in New Issue
Block a user