[PATCH] D53683: [ELF] Add --{, no-}call-graph-profile-sort (enabled by default)

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 171205.
MaskRay added a comment.

Rebase as it would otherwise have to touch file touched by https://reviews.llvm.org/D53669


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D53683

Files:
  ELF/Config.h
  ELF/Driver.cpp
  ELF/Options.td
  test/ELF/cgprofile-obj.s


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", at 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
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: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -770,6 +770,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);
@@ -1621,10 +1623,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<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-      readCallGraph(*Buffer);
-  readCallGraphsFromObjectFiles<ELFT>();
+  if (Config->CallGraphProfileSort) {
+    if (auto *Arg = Args.getLastArg(OPT_call_graph_ordering_file))
+      if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
+        readCallGraph(*Buffer);
+    readCallGraphsFromObjectFiles<ELFT>();
+  }
 
   // Write the result to the file.
   writeResult<ELFT>();
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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53683.171205.patch
Type: text/x-patch
Size: 3302 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181025/262d2f88/attachment.bin>