Index: ELF/Config.h =================================================================== --- ELF/Config.h +++ ELF/Config.h @@ -127,6 +127,7 @@ bool AsNeeded = false; bool Bsymbolic; bool BsymbolicFunctions; + bool CallGraphProfileSort; bool CheckSections; bool CompressDebugSections; bool Cref; Index: ELF/Driver.cpp =================================================================== --- ELF/Driver.cpp +++ ELF/Driver.cpp @@ -786,6 +786,8 @@ Config->EhFrameHdr = Args.hasFlag(OPT_eh_frame_hdr, OPT_no_eh_frame_hdr, false); Config->EmitRelocs = Args.hasArg(OPT_emit_relocs); + Config->CallGraphProfileSort = Args.hasFlag( + OPT_call_graph_profile_sort, OPT_no_call_graph_profile_sort, true); Config->EnableNewDtags = Args.hasFlag(OPT_enable_new_dtags, OPT_disable_new_dtags, true); Config->Entry = Args.getLastArgValue(OPT_entry); @@ -1637,10 +1639,12 @@ } // Read the callgraph now that we know what was gced or icfed - if (auto *Arg = Args.getLastArg(OPT_call_graph_ordering_file)) - if (Optional Buffer = readFile(Arg->getValue())) - readCallGraph(*Buffer); - readCallGraphsFromObjectFiles(); + if (Config->CallGraphProfileSort) { + if (auto *Arg = Args.getLastArg(OPT_call_graph_ordering_file)) + if (Optional Buffer = readFile(Arg->getValue())) + readCallGraph(*Buffer); + readCallGraphsFromObjectFiles(); + } // Write the result to the file. writeResult(); Index: ELF/Options.td =================================================================== --- ELF/Options.td +++ ELF/Options.td @@ -74,6 +74,10 @@ defm call_graph_ordering_file: Eq<"call-graph-ordering-file", "Layout sections to optimize the given callgraph">; +defm call_graph_profile_sort: B<"call-graph-profile-sort", + "Reorder sections with call graph profile (default)", + "Do not reorder sections with call graph profile">; + // -chroot doesn't have a help text because it is an internal option. def chroot: Separate<["--", "-"], "chroot">; Index: test/ELF/cgprofile-obj-warn.s =================================================================== --- test/ELF/cgprofile-obj-warn.s +++ test/ELF/cgprofile-obj-warn.s @@ -28,7 +28,10 @@ # CHECK: unable to order absolute symbol: B -# RUN: ld.lld %t -o /dev/null \ -# RUN: -noinhibit-exec -icf=all --no-warn-symbol-ordering 2>&1 \ -# RUN: | FileCheck %s --check-prefix=NOWARN +# No warnings if --no-call-graph-profile-sort or --no-warn-symbol-ordering + +# RUN: ld.lld --no-warn-symbol-ordering %t -o /dev/null \ +# RUN: --noinhibit-exec --icf=all 2>&1 | FileCheck %s --check-prefix=NOWARN +# RUN: ld.lld --no-call-graph-profile-sort %t -o /dev/null \ +# RUN: --noinhibit-exec --icf=all 2>&1 | FileCheck %s --check-prefix=NOWARN # NOWARN-NOT: unable to order Index: test/ELF/cgprofile-obj.s =================================================================== --- test/ELF/cgprofile-obj.s +++ test/ELF/cgprofile-obj.s @@ -1,8 +1,10 @@ # REQUIRES: x86 -# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t -# RUN: ld.lld -e A %t -o %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# 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 %t | FileCheck %s +# RUN: ld.lld --no-call-graph-profile-sort -e A %t.o -o %t +# RUN: llvm-nm %t | FileCheck %s --check-prefix=NO-SORT .section .text.D,"ax",@progbits D: @@ -31,11 +33,12 @@ .cg_profile B, C, 30 .cg_profile C, D, 90 -# CHECK: Name: D -# CHECK-NEXT: Value: 0x201003 -# CHECK: Name: A -# CHECK-NEXT: Value: 0x201000 -# CHECK: Name: B -# CHECK-NEXT: Value: 0x201001 -# CHECK: Name: C -# CHECK-NEXT: Value: 0x201002 +# CHECK: 0000000000201000 T A +# CHECK: 0000000000201001 T B +# CHECK: 0000000000201002 T C +# CHECK: 0000000000201003 t D + +# NO-SORT: 0000000000201003 T A +# NO-SORT: 0000000000201002 T B +# NO-SORT: 0000000000201001 T C +# NO-SORT: 0000000000201000 t D