Skip to content

Commit

Permalink
[Clang] Propagate guaranteed alignment for malloc and others
Browse files Browse the repository at this point in the history
LLVM should be smarter about *known* malloc's alignment and this knowledge may enable other optimizations.

Originally started as LLVM patch - https://reviews.llvm.org/D100862 but this logic should be really in Clang.

Reviewed By: rjmccall

Differential Revision: https://reviews.llvm.org/D100879
  • Loading branch information
davidbolvansky committed Apr 23, 2021
1 parent a819e73 commit c229754
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 2 deletions.
4 changes: 2 additions & 2 deletions clang/include/clang/Basic/TargetInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ class TargetInfo : public virtual TransferrableTargetInfo,
}

/// Return the largest alignment for which a suitably-sized allocation with
/// '::operator new(size_t)' is guaranteed to produce a correctly-aligned
/// pointer.
/// '::operator new(size_t)' or 'malloc' is guaranteed to produce a
/// correctly-aligned pointer.
unsigned getNewAlign() const {
return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);
}
Expand Down
18 changes: 18 additions & 0 deletions clang/lib/CodeGen/CGCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2048,6 +2048,24 @@ void CodeGenModule::ConstructAttributeList(
// allows it to work on indirect virtual function calls.
if (AttrOnCallSite && TargetDecl->hasAttr<NoMergeAttr>())
FuncAttrs.addAttribute(llvm::Attribute::NoMerge);

// Add known guaranteed alignment for allocation functions.
if (unsigned BuiltinID = Fn->getBuiltinID()) {
switch (BuiltinID) {
case Builtin::BIaligned_alloc:
case Builtin::BIcalloc:
case Builtin::BImalloc:
case Builtin::BImemalign:
case Builtin::BIrealloc:
case Builtin::BIstrdup:
case Builtin::BIstrndup:
RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /
Context.getTargetInfo().getCharWidth());
break;
default:
break;
}
}
}

// 'const', 'pure' and 'noalias' attributed functions are also nounwind.
Expand Down
35 changes: 35 additions & 0 deletions clang/test/CodeGen/alloc-fns-alignment.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
// RUN: %clang_cc1 -triple i386-apple-darwin -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
// RUN: %clang_cc1 -triple i386-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN8
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-malloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-MALLOC
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-calloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-CALLOC
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-realloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-REALLOC

typedef __SIZE_TYPE__ size_t;

void *malloc(size_t);
void *calloc(size_t, size_t);
void *realloc(void *, size_t);

void *malloc_test(size_t n) {
return malloc(n);
}

void *calloc_test(size_t n) {
return calloc(1, n);
}

void *raalloc_test(void *p, size_t n) {
return realloc(p, n);
}

// ALIGN16: align 16 i8* @malloc
// ALIGN16: align 16 i8* @calloc
// ALIGN16: align 16 i8* @realloc
// ALIGN8: align 8 i8* @malloc
// ALIGN8: align 8 i8* @calloc
// ALIGN8: align 8 i8* @realloc
// NOBUILTIN-MALLOC: declare i8* @malloc
// NOBUILTIN-CALLOC: declare i8* @calloc
// NOBUILTIN-REALLOC: declare i8* @realloc

0 comments on commit c229754

Please sign in to comment.