This is an archive of the discontinued LLVM Phabricator instance.

Differential D93379

Revert "[Compiler-rt][AArch64] Workaround for .cfi_startproc assembler parser bug."
ClosedPublic

Authored by tambre on Dec 16 2020, 12:17 AM.

Details

Reviewers
ilinpv
MaskRay
Commits
rGb2851aea80e5: Revert "[Compiler-rt][AArch64] Workaround for .cfi_startproc assembler parser…
Summary

039cb03dd0dcff4daa17a062f7414ac22bf5f2eb (D93378) fixed the assembly separator, so the workaround is no longer necessary.

This reverts commit 3000c19df64f89ff319590f3a6e4d6b93d20983d.

Diff Detail

Event Timeline

tambre created this revision.Dec 16 2020, 12:17 AM
Herald added subscribers: danielkiss, kristof.beyls, dberris. · View Herald TranscriptDec 16 2020, 12:17 AM
tambre requested review of this revision.Dec 16 2020, 12:17 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 16 2020, 12:17 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
This revision was not accepted when it landed; it landed in state Needs Review.Dec 16 2020, 12:22 AM
This revision was landed with ongoing or failed builds.
Closed by commit rGb2851aea80e5: Revert "[Compiler-rt][AArch64] Workaround for .cfi_startproc assembler parser… (authored by tambre). · Explain Why
This revision was automatically updated to reflect the committed changes.
tambre added a commit: rGb2851aea80e5: Revert "[Compiler-rt][AArch64] Workaround for .cfi_startproc assembler parser….
Harbormaster completed remote builds in B82601: Diff 312137.Dec 16 2020, 1:53 AM
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/
9 lines
8 lines

Diff 312138

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

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Lines
#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(NAME(cas))
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(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
#define CAS GLUE4(cas, A, L, S) s(0), s(1), [x2] #define CAS GLUE4(cas, A, L, S) s(0), s(1), [x2]
#else #else
#define CAS .inst 0x08a07c41 + B + M #define CAS .inst 0x08a07c41 + B + M
#endif #endif
CAS // s(0), s(1), [x2] CAS // s(0), s(1), [x2]
Show All 36 Lines
#endif // L_cas #endif // L_cas
#ifdef L_swp #ifdef L_swp
#ifdef HAS_ASM_LSE #ifdef HAS_ASM_LSE
#define SWP GLUE4(swp, A, L, S) s(0), s(0), [x1] #define SWP GLUE4(swp, A, L, S) s(0), s(0), [x1]
#else #else
#define SWP .inst 0x38208020 + B + N #define SWP .inst 0x38208020 + B + N
#endif #endif
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(swp)) DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp))
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(swp))
JUMP_IF_NOT_LSE 8f JUMP_IF_NOT_LSE 8f
SWP // s(0), s(0), [x1] SWP // s(0), s(0), [x1]
ret ret
8: 8:
mov s(tmp0), s(0) mov s(tmp0), s(0)
0: 0:
LDXR s(0), [x1] LDXR s(0), [x1]
STXR w(tmp1), s(tmp0), [x1] STXR w(tmp1), s(tmp0), [x1]
Show All 26 Lines
#endif #endif
#ifdef HAS_ASM_LSE #ifdef HAS_ASM_LSE
#define LDOP GLUE4(LDNM, A, L, S) s(0), s(0), [x1] #define LDOP GLUE4(LDNM, A, L, S) s(0), s(0), [x1]
#else #else
#define LDOP .inst 0x38200020 + OPN + B + N #define LDOP .inst 0x38200020 + OPN + B + N
#endif #endif
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(LDNM)) DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM))
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(LDNM))
JUMP_IF_NOT_LSE 8f JUMP_IF_NOT_LSE 8f
LDOP // s(0), s(0), [x1] LDOP // s(0), s(0), [x1]
ret ret
8: 8:
mov s(tmp0), s(0) mov s(tmp0), s(0)
0: 0:
LDXR s(0), [x1] LDXR s(0), [x1]
OP s(tmp1), s(0), s(tmp0) OP s(tmp1), s(0), s(tmp0)
Show All 12 Lines

compiler-rt/lib/builtins/assembly.h

Show First 20 Lines • Show All 237 Lines • ▼ Show 20 Lines
#define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \ #define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \
DEFINE_CODE_STATE \ DEFINE_CODE_STATE \
.globl name SEPARATOR \ .globl name SEPARATOR \
SYMBOL_IS_FUNC(name) SEPARATOR \ SYMBOL_IS_FUNC(name) SEPARATOR \
HIDDEN(name) SEPARATOR \ HIDDEN(name) SEPARATOR \
DECLARE_FUNC_ENCODING \ DECLARE_FUNC_ENCODING \
name: name:
// TODO(ilinpv) START & END parts will be merged when assembly parser bug #define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(name) \
// (kristina) in MasmParser::parseDirectiveCFIStartProc() is fixed.
#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(name) \
DEFINE_CODE_STATE \ DEFINE_CODE_STATE \
FUNC_ALIGN \ FUNC_ALIGN \
.globl name SEPARATOR \ .globl name SEPARATOR \
SYMBOL_IS_FUNC(name) SEPARATOR \ SYMBOL_IS_FUNC(name) SEPARATOR \
DECLARE_SYMBOL_VISIBILITY(name) DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \
#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(name) \
CFI_START SEPARATOR \ CFI_START SEPARATOR \
DECLARE_FUNC_ENCODING \ DECLARE_FUNC_ENCODING \
name: SEPARATOR BTI_C name: SEPARATOR BTI_C
#define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target) \ #define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target) \
.globl SYMBOL_NAME(name) SEPARATOR \ .globl SYMBOL_NAME(name) SEPARATOR \
SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \
DECLARE_SYMBOL_VISIBILITY(SYMBOL_NAME(name)) SEPARATOR \ DECLARE_SYMBOL_VISIBILITY(SYMBOL_NAME(name)) SEPARATOR \
Show All 22 Lines