Skip to content

[LLD] Do not combine cg_profile from obj and ordering file #121325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2025
Merged

[LLD] Do not combine cg_profile from obj and ordering file #121325

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d66829a
[LLD] Track cg_profile from combination of obj and ordering file
HaohaiWen Dec 30, 2024
9591f5a
[LLD] Do not combine cg_profile from obj and ordering file
HaohaiWen Dec 30, 2024
a306c3d
Merge branch 'main' into lld
HaohaiWen Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lld/COFF/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2812,10 +2812,10 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
// Handle /call-graph-ordering-file and /call-graph-profile-sort (default on).
if (config->callGraphProfileSort) {
llvm::TimeTraceScope timeScope("Call graph");
if (auto *arg = args.getLastArg(OPT_call_graph_ordering_file)) {
if (auto *arg = args.getLastArg(OPT_call_graph_ordering_file))
parseCallGraphFile(arg->getValue());
}
readCallGraphsFromObjectFiles(ctx);
else
readCallGraphsFromObjectFiles(ctx);
}

// Handle /print-symbol-order.
Expand Down
5 changes: 3 additions & 2 deletions lld/ELF/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3215,11 +3215,12 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {

// Read the callgraph now that we know what was gced or icfed
if (ctx.arg.callGraphProfileSort != CGProfileSortKind::None) {
if (auto *arg = args.getLastArg(OPT_call_graph_ordering_file))
if (auto *arg = args.getLastArg(OPT_call_graph_ordering_file)) {
if (std::optional<MemoryBufferRef> buffer =
readFile(ctx, arg->getValue()))
readCallGraph(ctx, *buffer);
readCallGraphsFromObjectFiles<ELFT>(ctx);
} else
readCallGraphsFromObjectFiles<ELFT>(ctx);
}

// Write the result to the file.
Expand Down
19 changes: 13 additions & 6 deletions lld/test/COFF/cgprofile-obj.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-win32 %s -o %t
# RUN: lld-link /subsystem:console /entry:A %t /out:%t2 /debug:symtab
# RUN: llvm-nm --numeric-sort %t2 | FileCheck %s
# RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=CG-OBJ
# RUN: lld-link /call-graph-profile-sort:no /subsystem:console /entry:A %t /out:%t3 /debug:symtab
# RUN: llvm-nm --numeric-sort %t3 | FileCheck %s --check-prefix=NO-CG
# RUN: echo "D A 200" > %t.call_graph
# RUN: lld-link /subsystem:console /entry:A %t /out:%t4 /debug:symtab /call-graph-ordering-file:%t.call_graph
# RUN: llvm-nm --numeric-sort %t4 | FileCheck %s --check-prefix=CG-OBJ-OF

.section .text,"ax", one_only, D
D:
Expand Down Expand Up @@ -33,13 +36,17 @@ Aa:
.cg_profile B, C, 30
.cg_profile C, D, 90

# CHECK: 140001000 T A
# CHECK: 140001001 T B
# CHECK: 140001002 T C
# CHECK: 140001003 t D

# CG-OBJ: 140001000 T A
# CG-OBJ: 140001001 T B
# CG-OBJ: 140001002 T C
# CG-OBJ: 140001003 t D

# NO-CG: 140001000 t D
# NO-CG: 140001001 T C
# NO-CG: 140001002 T B
# NO-CG: 140001003 T A

# CG-OBJ-OF: 140001000 t D
# CG-OBJ-OF: 140001001 T A
# CG-OBJ-OF: 140001004 T C
# CG-OBJ-OF: 140001005 T B
18 changes: 13 additions & 5 deletions lld/test/ELF/cgprofile-obj.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
# RUN: ld.lld -e A %t.o -o %t
# RUN: llvm-nm --no-sort %t | FileCheck %s
# RUN: llvm-nm --no-sort %t | FileCheck %s --check-prefix=CG-OBJ
# RUN: ld.lld --call-graph-profile-sort=none -e A %t.o -o %t
# RUN: llvm-nm --no-sort %t | FileCheck %s --check-prefix=NO-CG
## --no-call-graph-profile-sort is an alias for --call-graph-profile-sort=none.
# RUN: ld.lld --no-call-graph-profile-sort -e A %t.o -o %t1
# RUN: cmp %t %t1
# RUN: echo "D A 200" > %t.call_graph
# RUN: ld.lld -e A %t.o -call-graph-ordering-file=%t.call_graph -o %t2
# RUN: llvm-nm --no-sort %t2 | FileCheck %s --check-prefix=CG-OBJ-OF

.section .text.D,"ax",@progbits
D:
Expand Down Expand Up @@ -36,12 +39,17 @@ Aa:
.cg_profile B, C, 30
.cg_profile C, D, 90

# CHECK: 0000000000201123 t D
# CHECK: 0000000000201122 T C
# CHECK: 0000000000201121 T B
# CHECK: 0000000000201120 T A
# CG-OBJ: 0000000000201123 t D
# CG-OBJ: 0000000000201122 T C
# CG-OBJ: 0000000000201121 T B
# CG-OBJ: 0000000000201120 T A

# NO-CG: 0000000000201120 t D
# NO-CG: 0000000000201121 T C
# NO-CG: 0000000000201122 T B
# NO-CG: 0000000000201123 T A

# CG-OBJ-OF: 0000000000201120 t D
# CG-OBJ-OF: 0000000000201124 T C
# CG-OBJ-OF: 0000000000201125 T B
# CG-OBJ-OF: 0000000000201121 T A
Loading