[PATCH] D10966: [ARM] Make GlobalMerge merge extern globals by default

[John Brawn]

john.brawn set the repository for this revision to rL LLVM.
john.brawn updated this revision to Diff 31115.
john.brawn added a comment.

New patch that disables merging of extern globals on Mach-O.


Repository:
  rL LLVM

http://reviews.llvm.org/D10966

Files:
  lib/Target/ARM/ARMTargetMachine.cpp
  test/CodeGen/ARM/global-merge-external.ll

Index: test/CodeGen/ARM/global-merge-external.ll
===================================================================
--- /dev/null
+++ test/CodeGen/ARM/global-merge-external.ll
@@ -0,0 +1,48 @@
+; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge                                 | FileCheck %s --check-prefix=CHECK-MERGE
+; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge -global-merge-on-external=true  | FileCheck %s --check-prefix=CHECK-MERGE
+; RUN: llc < %s -mtriple=arm-eabi  -arm-global-merge -global-merge-on-external=false | FileCheck %s --check-prefix=CHECK-NO-MERGE
+; RUN: llc < %s -mtriple=arm-macho -arm-global-merge                                 | FileCheck %s --check-prefix=CHECK-NO-MERGE
+
+ at x = global i32 0, align 4
+ at y = global i32 0, align 4
+ at z = global i32 0, align 4
+
+define void @f1(i32 %a1, i32 %a2) {
+;CHECK:          f1:
+;CHECK:          ldr {{r[0-9]+}}, [[LABEL1:\.LCPI[0-9]+_[0-9]]]
+;CHECK:          [[LABEL1]]:
+;CHECK-MERGE:    .long _MergedGlobals_x
+;CHECK-NO-MERGE: .long {{_?x}}
+  store i32 %a1, i32* @x, align 4
+  store i32 %a2, i32* @y, align 4
+  ret void
+}
+
+define void @g1(i32 %a1, i32 %a2) {
+;CHECK:          g1:
+;CHECK:          ldr {{r[0-9]+}}, [[LABEL2:\.LCPI[0-9]+_[0-9]]]
+;CHECK:          [[LABEL2]]:
+;CHECK-MERGE:    .long _MergedGlobals_x
+;CHECK-NO-MERGE: .long {{_?y}}
+  store i32 %a1, i32* @y, align 4
+  store i32 %a2, i32* @z, align 4
+  ret void
+}
+
+;CHECK-NO-MERGE-NOT: .globl _MergedGlobals_x
+
+;CHECK-MERGE:	.type	_MergedGlobals_x,%object
+;CHECK-MERGE:	.globl	_MergedGlobals_x
+;CHECK-MERGE:	.align	2
+;CHECK-MERGE: _MergedGlobals_x:
+;CHECK-MERGE:	.size	_MergedGlobals_x, 12
+
+;CHECK-MERGE:	.globl	x
+;CHECK-MERGE: x = _MergedGlobals_x
+;CHECK-MERGE: .size x, 4
+;CHECK-MERGE:	.globl	y
+;CHECK-MERGE: y = _MergedGlobals_x+4
+;CHECK-MERGE: .size y, 4
+;CHECK-MERGE:	.globl	z
+;CHECK-MERGE: z = _MergedGlobals_x+8
+;CHECK-MERGE: .size z, 4
Index: lib/Target/ARM/ARMTargetMachine.cpp
===================================================================
--- lib/Target/ARM/ARMTargetMachine.cpp
+++ lib/Target/ARM/ARMTargetMachine.cpp
@@ -348,7 +348,13 @@
     // tricky when doing code gen per function.
     bool OnlyOptimizeForSize = (TM->getOptLevel() < CodeGenOpt::Aggressive) &&
                                (EnableGlobalMerge == cl::BOU_UNSET);
-    addPass(createGlobalMergePass(TM, 127, OnlyOptimizeForSize));
+    // Merging of extern globals is enabled by default on non-Mach-O as we
+    // expect it to be generally either beneficial or harmless. On Mach-O it
+    // is disabled as we emit the .subsections_via_symbols directive which
+    // means that merging extern globals is not safe.
+    bool MergeExternalByDefault = !TM->getTargetTriple().isOSBinFormatMachO();
+    addPass(createGlobalMergePass(TM, 127, OnlyOptimizeForSize,
+                                  MergeExternalByDefault));
   }
 
   return false;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10966.31115.patch
Type: text/x-patch
Size: 2917 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150731/5a9f6d0f/attachment.bin>