[ELF] Dump symbols ordered by profiled guided section layout to file.

Patch by Tiancong Wang.

In D36351, Call-Chain Clustering (C3) heuristic is implemented with
option --call-graph-ordering-file <file>.
This patch adds a flag --print-symbol-order=<file> to LLD, and when
specified, it prints out the symbols ordered by the heuristics to the
file. The symbols printout is helpful to those who want to understand
the heuristics and want to reproduce the ordering with
--symbol-ordering-file in later pass.

Differential Revision: https://reviews.llvm.org/D59311

llvm-svn: 357133
This commit is contained in:
Rui Ueyama 2019-03-27 23:52:22 +00:00
parent 929932954d
commit 432030e843
6 changed files with 106 additions and 0 deletions

View File

@ -226,6 +226,27 @@ DenseMap<const InputSectionBase *, int> CallGraphSort::run() {
for (int SecIndex : C.Sections) for (int SecIndex : C.Sections)
OrderMap[Sections[SecIndex]] = CurOrder++; OrderMap[Sections[SecIndex]] = CurOrder++;
if (!Config->PrintSymbolOrder.empty()) {
std::error_code EC;
raw_fd_ostream OS(Config->PrintSymbolOrder, EC, sys::fs::F_None);
if (EC) {
error("cannot open " + Config->PrintSymbolOrder + ": " + EC.message());
return OrderMap;
}
// Print the symbols ordered by C3, in the order of increasing CurOrder
// Instead of sorting all the OrderMap, just repeat the loops above.
for (const Cluster &C : Clusters)
for (int SecIndex : C.Sections)
// Search all the symbols in the file of the section
// and find out a Defined symbol with name that is within the section.
for (Symbol *Sym: Sections[SecIndex]->File->getSymbols())
if (!Sym->isSection()) // Filter out section-type symbols here.
if (auto *D = dyn_cast<Defined>(Sym))
if (Sections[SecIndex] == D->Section)
OS << Sym->getName() << "\n";
}
return OrderMap; return OrderMap;
} }

View File

@ -101,6 +101,7 @@ struct Configuration {
llvm::StringRef OptRemarksFilename; llvm::StringRef OptRemarksFilename;
llvm::StringRef OptRemarksPasses; llvm::StringRef OptRemarksPasses;
llvm::StringRef ProgName; llvm::StringRef ProgName;
llvm::StringRef PrintSymbolOrder;
llvm::StringRef SoName; llvm::StringRef SoName;
llvm::StringRef Sysroot; llvm::StringRef Sysroot;
llvm::StringRef ThinLTOCacheDir; llvm::StringRef ThinLTOCacheDir;

View File

@ -836,6 +836,8 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
Args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false); Args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false);
Config->PrintGcSections = Config->PrintGcSections =
Args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false); Args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
Config->PrintSymbolOrder =
Args.getLastArgValue(OPT_print_symbol_order);
Config->Rpath = getRpath(Args); Config->Rpath = getRpath(Args);
Config->Relocatable = Args.hasArg(OPT_relocatable); Config->Relocatable = Args.hasArg(OPT_relocatable);
Config->SaveTemps = Args.hasArg(OPT_save_temps); Config->SaveTemps = Args.hasArg(OPT_save_temps);

View File

@ -274,6 +274,9 @@ defm print_icf_sections: B<"print-icf-sections",
"List identical folded sections", "List identical folded sections",
"Do not list identical folded sections (default)">; "Do not list identical folded sections (default)">;
defm print_symbol_order: Eq<"print-symbol-order",
"Print a symbol order specified by --call-graph-ordering-file into the speficied file">;
def pop_state: F<"pop-state">, def pop_state: F<"pop-state">,
HelpText<"Undo the effect of -push-state">; HelpText<"Undo the effect of -push-state">;

View File

@ -0,0 +1,37 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "A B 5" > %t.call_graph
# RUN: echo "B C 50" >> %t.call_graph
# RUN: echo "C D 40" >> %t.call_graph
# RUN: echo "D B 10" >> %t.call_graph
# RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2 --print-symbol-order=%t3
# RUN: FileCheck %s --input-file %t3
# CHECK: B
# CHECK-NEXT: C
# CHECK-NEXT: D
# CHECK-NEXT: A
.section .text.A,"ax",@progbits
.globl A
A:
nop
.section .text.B,"ax",@progbits
.globl B
B:
nop
.section .text.C,"ax",@progbits
.globl C
C:
nop
.section .text.D,"ax",@progbits
.globl D
D:
nop

View File

@ -0,0 +1,42 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "A B 5" > %t.call_graph
# RUN: echo "B C 50" >> %t.call_graph
# RUN: echo "C D 40" >> %t.call_graph
# RUN: echo "D B 10" >> %t.call_graph
# RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2 --print-symbol-order=%t3
# RUN: ld.lld -e A %t --symbol-ordering-file %t3 -o %t2
# RUN: llvm-readobj -symbols %t2 | FileCheck %s
# CHECK: Name: A
# CHECK-NEXT: Value: 0x201003
# CHECK: Name: B
# CHECK-NEXT: Value: 0x201000
# CHECK: Name: C
# CHECK-NEXT: Value: 0x201001
# CHECK: Name: D
# CHECK-NEXT: Value: 0x201002
.section .text.A,"ax",@progbits
.globl A
A:
nop
.section .text.B,"ax",@progbits
.globl B
B:
nop
.section .text.C,"ax",@progbits
.globl C
C:
nop
.section .text.D,"ax",@progbits
.globl D
D:
nop