In the ARM global merging pass, allow extraneous alignment specifiers. This pass

already makes the assumption, which is correct on ARM, that a type's alignment is
less than its alloc size. This improves codegen with Clang (which inserts a lot of
extraneous alignment specifiers) and fixes <rdar://problem/9695089>.

llvm-svn: 134106
This commit is contained in:
Cameron Zwarich 2011-06-29 22:24:25 +00:00
parent 8cc0459907
commit 34c8f51d65
2 changed files with 16 additions and 2 deletions

View File

@ -175,7 +175,9 @@ bool ARMGlobalMerge::doInitialization(Module &M) {
continue;
// Ignore fancy-aligned globals for now.
if (I->getAlignment() != 0)
unsigned Alignment = I->getAlignment();
unsigned AllocSize = TD->getTypeAllocSize(I->getType()->getElementType());
if (Alignment > AllocSize)
continue;
// Ignore all 'special' globals.
@ -183,7 +185,7 @@ bool ARMGlobalMerge::doInitialization(Module &M) {
I->getName().startswith(".llvm."))
continue;
if (TD->getTypeAllocSize(I->getType()->getElementType()) < MaxOffset) {
if (AllocSize < MaxOffset) {
const TargetLoweringObjectFile &TLOF = TLI->getObjFileLowering();
if (TLOF.getKindForGlobal(I, TLI->getTargetMachine()).isBSSLocal())
BSSGlobals.push_back(I);

View File

@ -0,0 +1,12 @@
; RUN: llc < %s -mtriple=thumbv7-apple-darwin10 | FileCheck %s
; CHECK: .zerofill __DATA,__bss,__MergedGlobals,16,2
%struct.config = type { i16, i16, i16, i16 }
@prev = external global [0 x i16]
@max_lazy_match = internal unnamed_addr global i32 0, align 4
@read_buf = external global i32 (i8*, i32)*
@window = external global [0 x i8]
@lookahead = internal unnamed_addr global i32 0, align 4
@eofile.b = internal unnamed_addr global i1 false
@ins_h = internal unnamed_addr global i32 0, align 4