This is an archive of the discontinued LLVM Phabricator instance.

Differential D92530

[compiler-rt] [builtins] Make lse.S compile on Darwin
ClosedPublic

Authored by kubamracek on Dec 2 2020, 5:30 PM.

Details

Reviewers
arphaman
steven_wu
ilinpv
mstorsjo
danielkiss
t.p.northover
Commits
rGaa772fc85e0f: [compiler-rt] [builtins] Make lse.S compile on Darwin

Diff Detail

Event Timeline

kubamracek created this revision.Dec 2 2020, 5:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 2 2020, 5:30 PM
Herald added subscribers: Restricted Project, jfb, dberris. · View Herald Transcript
kubamracek requested review of this revision.Dec 2 2020, 5:30 PM
Harbormaster completed remote builds in B80890: Diff 309115.Dec 2 2020, 6:50 PM
ilinpv added inline comments.Dec 3 2020, 5:37 AM
compiler-rt/lib/builtins/assembly.h
31

FUNC_ALIGN miss for Darwin were fixed already in https://reviews.llvm.org/D92549

ilinpv added a reviewer: mstorsjo.Dec 3 2020, 5:38 AM
kubamracek updated this revision to Diff 309273.Dec 3 2020, 8:55 AM
kubamracek added reviewers: danielkiss, t.p.northover.
ilinpv accepted this revision.Dec 3 2020, 9:17 AM

LGTM. Thanks!

This revision is now accepted and ready to land.Dec 3 2020, 9:17 AM
dmajor added a subscriber: dmajor.Dec 4 2020, 10:36 AM
ilinpv mentioned this in D92836: [AArch64] don't build out of line atomics on Darwin or Windows.Dec 8 2020, 9:16 AM
ilinpv mentioned this in D93199: Revert "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins separately".Dec 14 2020, 2:58 AM
Closed by commit rGaa772fc85e0f: [compiler-rt] [builtins] Make lse.S compile on Darwin (authored by kubamracek, committed by tambre). · Explain WhyDec 14 2020, 6:39 AM
This revision was automatically updated to reflect the committed changes.
tambre added a commit: rGaa772fc85e0f: [compiler-rt] [builtins] Make lse.S compile on Darwin.
tambre mentioned this in D93211: Re-apply "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins separately".Dec 14 2020, 6:43 AM
tambre mentioned this in rGd0797e62fa8a: Re-apply "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins….Dec 14 2020, 6:45 AM
tambre mentioned this in D93278: Re-apply "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins separately".Dec 14 2020, 10:17 PM
tambre mentioned this in rGa72d462eb9b9: Re-apply "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins….Dec 14 2020, 10:18 PM

Revision Contents

PathSize
compiler-rt/
lib/
builtins/
aarch64/
5 lines
8 lines

Diff 309115

compiler-rt/lib/builtins/aarch64/lse.S

Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Lines
// Define temporary registers. // Define temporary registers.
#define tmp0 16 #define tmp0 16
#define tmp1 17 #define tmp1 17
#define tmp2 15 #define tmp2 15
// Macro for branch to label if no LSE available // Macro for branch to label if no LSE available
.macro JUMP_IF_NOT_LSE label .macro JUMP_IF_NOT_LSE label
#if !defined(__APPLE__)
adrp x(tmp0), __aarch64_have_lse_atomics adrp x(tmp0), __aarch64_have_lse_atomics
ldrb w(tmp0), [x(tmp0), :lo12:__aarch64_have_lse_atomics] ldrb w(tmp0), [x(tmp0), :lo12:__aarch64_have_lse_atomics]
#else
adrp x(tmp0), __aarch64_have_lse_atomics@page
ldrb w(tmp0), [x(tmp0), __aarch64_have_lse_atomics@pageoff]
#endif
cbz w(tmp0), \label cbz w(tmp0), \label
.endm .endm
#ifdef L_cas #ifdef L_cas
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas))
JUMP_IF_NOT_LSE 8f JUMP_IF_NOT_LSE 8f
#if SIZE < 16 #if SIZE < 16
#ifdef HAS_ASM_LSE #ifdef HAS_ASM_LSE
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

compiler-rt/lib/builtins/assembly.h

Show All 21 Lines
#if defined(__APPLE__) #if defined(__APPLE__)
#define HIDDEN(name) .private_extern name #define HIDDEN(name) .private_extern name
#define LOCAL_LABEL(name) L_##name #define LOCAL_LABEL(name) L_##name
// tell linker it can break up file at label boundaries // tell linker it can break up file at label boundaries
#define FILE_LEVEL_DIRECTIVE .subsections_via_symbols #define FILE_LEVEL_DIRECTIVE .subsections_via_symbols
#define SYMBOL_IS_FUNC(name) #define SYMBOL_IS_FUNC(name)
#define CONST_SECTION .const #define CONST_SECTION .const
#if defined(__arm__) || defined(__aarch64__)
#define FUNC_ALIGN \
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-#define FUNC_ALIGN                                                             \
-  .text SEPARATOR                                                              \
-  .balign 16 SEPARATOR
+#define FUNC_ALIGN .text SEPARATOR.balign 16 SEPARATOR
Lint: Pre-merge checks: clang-format: please reformat the code ``` -#define FUNC_ALIGN…
ilinpvUnsubmitted
Not Done
ReplyInline Actions

FUNC_ALIGN miss for Darwin were fixed already in https://reviews.llvm.org/D92549

ilinpv: FUNC_ALIGN miss for Darwin were fixed already in https://reviews.llvm.org/D92549
.text SEPARATOR \
.balign 16 SEPARATOR
#else
#define FUNC_ALIGN
#endif
#define NO_EXEC_STACK_DIRECTIVE #define NO_EXEC_STACK_DIRECTIVE
#elif defined(__ELF__) #elif defined(__ELF__)
#define HIDDEN(name) .hidden name #define HIDDEN(name) .hidden name
#define LOCAL_LABEL(name) .L_##name #define LOCAL_LABEL(name) .L_##name
#define FILE_LEVEL_DIRECTIVE #define FILE_LEVEL_DIRECTIVE
#if defined(__arm__) || defined(__aarch64__) #if defined(__arm__) || defined(__aarch64__)
▲ Show 20 Lines • Show All 238 Lines • Show Last 20 Lines