[PATCH] D117387: [lld-macho] Allow deduplicate-literals to be overridden

[Vincent Lee via Phabricator via llvm-commits]

thevinster created this revision.
Herald added a project: lld-macho.
Herald added a reviewer: lld-macho.
thevinster edited the summary of this revision.
thevinster published this revision for review.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

It's still uncertain but whether we want to have `deduplicate-literals` be the 
default flag for LLD out of the box or not. If `deduplicate-literals` is the default 
behavior, then we will need a way override it and not deduplicate. Luckily, we 
have `no_deduplicate` to fill this gap. For now, I've set the default to be false
which aligns with the existing behavior. That can only always be changed after
discussions on D117250 <https://reviews.llvm.org/D117250>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D117387

Files:
  lld/MachO/Driver.cpp
  lld/test/MachO/literal-dedup.s
  lld/test/MachO/silent-ignore.s


Index: lld/test/MachO/silent-ignore.s
===================================================================
--- lld/test/MachO/silent-ignore.s
+++ lld/test/MachO/silent-ignore.s
@@ -6,7 +6,6 @@
 ## `--version` flag.)
 # RUN: %lld --version \
 # RUN:   -dynamic \
-# RUN:   -no_deduplicate \
 # RUN:   -lto_library /lib/foo \
 # RUN:   -macosx_version_min 0 \
 # RUN:   -no_dtrace_dof \
Index: lld/test/MachO/literal-dedup.s
===================================================================
--- lld/test/MachO/literal-dedup.s
+++ lld/test/MachO/literal-dedup.s
@@ -6,6 +6,29 @@
 # RUN: llvm-objdump --macho --section="__TEXT,__literals" --section="__DATA,ptrs" --syms %t/test | FileCheck %s
 # RUN: llvm-readobj --section-headers %t/test | FileCheck %s --check-prefix=HEADER
 
+## Make sure literal deduplication can be overridden or that the later flag wins.
+# RUN: %lld -dylib --deduplicate-literals -no_deduplicate %t/test.o %t/qux.o -o %t/no-dedup-test
+# RUN: llvm-objdump --macho --section="__TEXT,__literals" --section="__DATA,ptrs" %t/no-dedup-test | FileCheck %s --check-prefix=NO-DEDUP
+
+# RUN: %lld -dylib -no_deduplicate --deduplicate-literals %t/test.o %t/qux.o -o %t/test
+# RUN: llvm-objdump --macho --section="__TEXT,__literals" --section="__DATA,ptrs" --syms %t/test | FileCheck %s
+# RUN: llvm-readobj --section-headers %t/test | FileCheck %s --check-prefix=HEADER
+
+# NO-DEDUP-NOT:  Contents of (__TEXT,__literals) section
+# NO-DEDUP:      Contents of (__DATA,ptrs) section
+# NO-DEDUP-NEXT: __TEXT:__literal16:0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal16:0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal16:0xfeedface 0xfeedface 0xfeedface 0xfeedface
+# NO-DEDUP-NEXT: __TEXT:__literal16:0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal8:0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal8:0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal8:0xfeedface 0xfeedface
+# NO-DEDUP-NEXT: __TEXT:__literal8:0xdeadbeef 0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal4:0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal4:0xdeadbeef
+# NO-DEDUP-NEXT: __TEXT:__literal4:0xfeedface
+# NO-DEDUP-NEXT: __TEXT:__literal4:0xdeadbeef
+
 # CHECK:      Contents of (__TEXT,__literals) section
 # CHECK-NEXT: [[#%.16x,DEADBEEF16:]] ef be ad de ef be ad de ef be ad de ef be ad de
 # CHECK-NEXT: [[#%.16x,FEEDFACE16:]] ce fa ed fe ce fa ed fe ce fa ed fe ce fa ed fe
Index: lld/MachO/Driver.cpp
===================================================================
--- lld/MachO/Driver.cpp
+++ lld/MachO/Driver.cpp
@@ -1262,8 +1262,9 @@
   config->emitDataInCodeInfo =
       args.hasFlag(OPT_data_in_code_info, OPT_no_data_in_code_info, true);
   config->icfLevel = getICFLevel(args);
-  config->dedupLiterals = args.hasArg(OPT_deduplicate_literals) ||
-                          config->icfLevel != ICFLevel::none;
+  config->dedupLiterals =
+      args.hasFlag(OPT_deduplicate_literals, OPT_icf_eq, false) ||
+      config->icfLevel != ICFLevel::none;
   config->warnDylibInstallName = args.hasFlag(
       OPT_warn_dylib_install_name, OPT_no_warn_dylib_install_name, false);
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117387.400250.patch
Type: text/x-patch
Size: 3181 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220115/c8bdfa15/attachment.bin>