This is an archive of the discontinued LLVM Phabricator instance.

Differential D95910

Fix the guaranteed alignment of memory returned by malloc/new on Darwin
ClosedPublic

Authored by ahatanak on Feb 2 2021, 5:31 PM.

Details

Reviewers
rjmccall
arphaman
ab
Commits
rGaade0ec23b59: Fix the guaranteed alignment of memory returned by malloc/new on Darwin
Summary

The guaranteed alignment is 16 bytes on Darwin.

rdar://73431623

Diff Detail

Unit TestsFailed

TimeTest
320 msx64 debian > libarcher.races::task-dependency.c
280 msx64 debian > libarcher.races::task-taskgroup-unrelated.c
310 msx64 debian > libarcher.races::task-taskwait-nested.c
320 msx64 debian > libarcher.races::task-two.c
250 msx64 debian > libarcher.task::task-barrier.c
View Full Test Results (13 Failed)

Event Timeline

ahatanak created this revision.Feb 2 2021, 5:31 PM
Herald added subscribers: ributzka, jkorous. · View Herald TranscriptFeb 2 2021, 5:31 PM
ahatanak requested review of this revision.Feb 2 2021, 5:31 PM
Harbormaster completed remote builds in B87613: Diff 320955.Feb 2 2021, 6:21 PM
rjmccall added a comment.Feb 3 2021, 2:31 PM

It's 16 bytes on all Darwin platforms, including 32-bit.

ahatanak updated this revision to Diff 321251.Feb 3 2021, 3:57 PM
ahatanak edited the summary of this revision. (Show Details)

Make the alignment 16 bytes on 32-bit systems too.

rjmccall accepted this revision.Feb 3 2021, 4:26 PM

LGTM

This revision is now accepted and ready to land.Feb 3 2021, 4:26 PM
Harbormaster completed remote builds in B87799: Diff 321251.Feb 3 2021, 6:10 PM
This revision was landed with ongoing or failed builds.Feb 3 2021, 7:41 PM
Closed by commit rGaade0ec23b59: Fix the guaranteed alignment of memory returned by malloc/new on Darwin (authored by ahatanak). · Explain Why
This revision was automatically updated to reflect the committed changes.
ahatanak added a commit: rGaade0ec23b59: Fix the guaranteed alignment of memory returned by malloc/new on Darwin.
xbolva00 mentioned this in D118804: Revert "[Clang] Propagate guaranteed alignment for malloc and others".Feb 2 2022, 11:09 AM

Revision Contents

PathSize
clang/
lib/
Basic/
5 lines
test/
Preprocessor/
3 lines

Diff 320955

clang/lib/Basic/TargetInfo.cpp

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 LinesTargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
LongAccumScale = 31; LongAccumScale = 31;
SuitableAlign = 64; SuitableAlign = 64;
DefaultAlignForAttributeAligned = 128; DefaultAlignForAttributeAligned = 128;
MinGlobalAlign = 0; MinGlobalAlign = 0;
// From the glibc documentation, on GNU systems, malloc guarantees 16-byte // From the glibc documentation, on GNU systems, malloc guarantees 16-byte
// alignment on 64-bit systems and 8-byte alignment on 32-bit systems. See // alignment on 64-bit systems and 8-byte alignment on 32-bit systems. See
// https://www.gnu.org/software/libc/manual/html_node/Malloc-Examples.html. // https://www.gnu.org/software/libc/manual/html_node/Malloc-Examples.html.
// This alignment guarantee also applies to Windows and Android. // This alignment guarantee also applies to Windows, Android, and Darwin.
if (T.isGNUEnvironment() || T.isWindowsMSVCEnvironment() || T.isAndroid()) if (T.isGNUEnvironment() || T.isWindowsMSVCEnvironment() || T.isAndroid() ||
T.isOSDarwin())
NewAlign = Triple.isArch64Bit() ? 128 : Triple.isArch32Bit() ? 64 : 0; NewAlign = Triple.isArch64Bit() ? 128 : Triple.isArch32Bit() ? 64 : 0;
else else
NewAlign = 0; // Infer from basic type alignment. NewAlign = 0; // Infer from basic type alignment.
HalfWidth = 16; HalfWidth = 16;
HalfAlign = 16; HalfAlign = 16;
FloatWidth = 32; FloatWidth = 32;
FloatAlign = 32; FloatAlign = 32;
DoubleWidth = 64; DoubleWidth = 64;
▲ Show 20 Lines • Show All 767 Lines • Show Last 20 Lines

clang/test/Preprocessor/init-aarch64.c

Show First 20 Lines • Show All 526 Lines • ▼ Show 20 Lines
// AARCH64-DARWIN: #define __WCHAR_MAX__ 2147483647 // AARCH64-DARWIN: #define __WCHAR_MAX__ 2147483647
// AARCH64-DARWIN: #define __WCHAR_TYPE__ int // AARCH64-DARWIN: #define __WCHAR_TYPE__ int
// AARCH64-DARWIN-NOT: #define __WCHAR_UNSIGNED__ // AARCH64-DARWIN-NOT: #define __WCHAR_UNSIGNED__
// AARCH64-DARWIN: #define __WCHAR_WIDTH__ 32 // AARCH64-DARWIN: #define __WCHAR_WIDTH__ 32
// AARCH64-DARWIN: #define __WINT_TYPE__ int // AARCH64-DARWIN: #define __WINT_TYPE__ int
// AARCH64-DARWIN: #define __WINT_WIDTH__ 32 // AARCH64-DARWIN: #define __WINT_WIDTH__ 32
// AARCH64-DARWIN: #define __aarch64__ 1 // AARCH64-DARWIN: #define __aarch64__ 1
// RUN: %clang_cc1 -E -dM -triple=aarch64-apple-ios7.0 -x c++ < /dev/null | FileCheck -match-full-lines -check-prefix AARCH64-DARWIN-CXX %s
// AARCH64-DARWIN-CXX: #define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16UL
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=aarch64-windows-msvc < /dev/null | FileCheck -match-full-lines -check-prefix AARCH64-MSVC %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=aarch64-windows-msvc < /dev/null | FileCheck -match-full-lines -check-prefix AARCH64-MSVC %s
// AARCH64-MSVC: #define _INTEGRAL_MAX_BITS 64 // AARCH64-MSVC: #define _INTEGRAL_MAX_BITS 64
// AARCH64-MSVC-NOT: #define _LP64 1 // AARCH64-MSVC-NOT: #define _LP64 1
// AARCH64-MSVC: #define _M_ARM64 1 // AARCH64-MSVC: #define _M_ARM64 1
// AARCH64-MSVC: #define _WIN32 1 // AARCH64-MSVC: #define _WIN32 1
// AARCH64-MSVC: #define _WIN64 1 // AARCH64-MSVC: #define _WIN64 1
// AARCH64-MSVC: #define __AARCH64EL__ 1 // AARCH64-MSVC: #define __AARCH64EL__ 1
▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines