This is an archive of the discontinued LLVM Phabricator instance.

Differential D93390

[compiler-rt] [builtins] Fix name of __aarch64_have_lse_atomics on Darwin
ClosedPublic

Authored by sberg on Dec 16 2020, 3:53 AM.

Details

Reviewers
kubamracek
ilinpv
tambre
dmajor
Commits
rG75f98f0f8c81: [PATCH] [compiler-rt] [builtins] Fix name of __aarch64_have_lse_atomics on…
Summary

...where the name of that variable defined in
compiler-rt/lib/builtins/cpu_model.c is decorated with a leading underscore

Diff Detail

Unit TestsFailed

TimeTest
15,740 msx64 debian > LLVM.Bindings/Go::go.test
60 msx64 windows > LLVM.CodeGen/XCore::threads.ll

Event Timeline

sberg created this revision.Dec 16 2020, 3:53 AM
Herald added subscribers: danielkiss, jfb, kristof.beyls, dberris. · View Herald TranscriptDec 16 2020, 3:53 AM
sberg requested review of this revision.Dec 16 2020, 3:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 16 2020, 3:53 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
tambre added a comment.Dec 16 2020, 3:58 AM

The one in cpu_model.c has 2 underscores. Where do the three come from for non-Apple?

sberg added a comment.Dec 16 2020, 4:01 AM
In D93390#2457554, @tambre wrote:

The one in cpu_model.c has 2 underscores. Where do the three come from for non-Apple?

It's the other way around, the third underscore is for Apple only, where C symbols are generally decorated with a leading underscore.

Harbormaster completed remote builds in B82618: Diff 312170.Dec 16 2020, 4:21 AM
ilinpv accepted this revision.Dec 16 2020, 5:19 AM

Thanks for fixing this.

This revision is now accepted and ready to land.Dec 16 2020, 5:19 AM
This revision was landed with ongoing or failed builds.Dec 16 2020, 5:42 AM
Closed by commit rG75f98f0f8c81: [PATCH] [compiler-rt] [builtins] Fix name of __aarch64_have_lse_atomics on… (authored by sberg). · Explain Why
This revision was automatically updated to reflect the committed changes.
sberg added a commit: rG75f98f0f8c81: [PATCH] [compiler-rt] [builtins] Fix name of __aarch64_have_lse_atomics on….
tambre mentioned this in D93278: Re-apply "[CMake][compiler-rt][AArch64] Avoid preprocessing LSE builtins separately".Dec 16 2020, 7:38 AM

Revision Contents

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

Diff 312170

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

Show All 22 Lines
#ifdef __aarch64__ #ifdef __aarch64__
#ifdef HAS_ASM_LSE #ifdef HAS_ASM_LSE
.arch armv8-a+lse .arch armv8-a+lse
#else #else
.arch armv8-a .arch armv8-a
#endif #endif
#if !defined(__APPLE__)
HIDDEN(__aarch64_have_lse_atomics) HIDDEN(__aarch64_have_lse_atomics)
#else
HIDDEN(___aarch64_have_lse_atomics)
#endif
// Generate mnemonics for // Generate mnemonics for
// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 // L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4
// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 // L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4
#if SIZE == 1 #if SIZE == 1
#define S b #define S b
#define UXT uxtb #define UXT uxtb
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
#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__) #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 #else
adrp x(tmp0), __aarch64_have_lse_atomics@page adrp x(tmp0), ___aarch64_have_lse_atomics@page
ldrb w(tmp0), [x(tmp0), __aarch64_have_lse_atomics@pageoff] ldrb w(tmp0), [x(tmp0), ___aarch64_have_lse_atomics@pageoff]
#endif #endif
cbz w(tmp0), \label cbz w(tmp0), \label
.endm .endm
#ifdef L_cas #ifdef L_cas
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(cas)) DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(cas))
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(cas)) DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(cas))
JUMP_IF_NOT_LSE 8f JUMP_IF_NOT_LSE 8f
▲ Show 20 Lines • Show All 117 Lines • Show Last 20 Lines