This is an archive of the discontinued LLVM Phabricator instance.

Differential D61050

[compiler-rt][builtins] Implement some fetch-and-x operations for Cortex-M
AbandonedPublic

Authored by aykevl on Apr 23 2019, 6:54 PM.

Details

Reviewers
howard.hinnant
Summary

This patch adds support for the following builtins on the Cortex-M0 and Cortex-M3:

sync_fetch_and_add_4
sync_fetch_and_add_8
sync_fetch_and_and_4
sync_fetch_and_and_8
sync_fetch_and_nand_4
sync_fetch_and_nand_8
sync_fetch_and_or_4
sync_fetch_and_or_8
sync_fetch_and_sub_4
sync_fetch_and_sub_8
sync_fetch_and_xor_4
sync_fetch_and_xor_8

The assembly for Cortex-M3 and up could be slightly more efficient, but I've chosen to keep it simple so that all ARM processors can deal with it.

Diff Detail

Event Timeline

aykevl created this revision.Apr 23 2019, 6:54 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 23 2019, 6:54 PM
Herald added subscribers: Restricted Project, llvm-commits, kristof.beyls and 2 others. · View Herald Transcript
aykevl abandoned this revision.Apr 23 2019, 6:54 PM

wrong patch

Revision Contents

Diff 196363

lib/builtins/arm/sync-ops.h

Show All 9 Lines
* This file implements outline macros for the __sync_fetch_and_* * This file implements outline macros for the __sync_fetch_and_*
* operations. Different instantiations will generate appropriate assembly for * operations. Different instantiations will generate appropriate assembly for
* ARM and Thumb-2 versions of the functions. * ARM and Thumb-2 versions of the functions.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "../assembly.h" #include "../assembly.h"
#if __ARM_ARCH_PROFILE == 'M'
#define SYNC_OP_4(op) \
.thumb ; \
.syntax unified ; \
DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \
mrs r3, PRIMASK ; \
cpsid i ; \
mov r2, r0 ; \
ldr r0, [r2] ; \
op(r1, r1, r0) ; \
str r1, [r2] ; \
msr PRIMASK, r3 ; \
bx lr;
#else
#define SYNC_OP_4(op) \ #define SYNC_OP_4(op) \
.p2align 2 ; \ .p2align 2 ; \
.thumb ; \ .thumb ; \
.syntax unified ; \ .syntax unified ; \
DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \ DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \
dmb ; \ dmb ; \
mov r12, r0 ; \ mov r12, r0 ; \
LOCAL_LABEL(tryatomic_ ## op): \ LOCAL_LABEL(tryatomic_ ## op): \
ldrex r0, [r12] ; \ ldrex r0, [r12] ; \
op(r2, r0, r1) ; \ op(r2, r0, r1) ; \
strex r3, r2, [r12] ; \ strex r3, r2, [r12] ; \
cmp r3, #0 ; \ cmp r3, #0 ; \
bne LOCAL_LABEL(tryatomic_ ## op) ; \ bne LOCAL_LABEL(tryatomic_ ## op) ; \
dmb ; \ dmb ; \
bx lr bx lr
#endif
#if __ARM_ARCH_PROFILE == 'M'
#define SYNC_OP_8(op) \
.thumb ; \
.syntax unified ; \
DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \
push {r4, r5, lr} ; \
mov r4, r0 ; \
mrs r5, PRIMASK ; \
cpsid i ; \
ldr r0, [r4, #0] ; \
ldr r1, [r4, #4] ; \
op(r2, r3, r2, r3, r0, r1) ; \
str r2, [r4, #0] ; \
str r3, [r4, #4] ; \
msr PRIMASK, r5 ; \
pop {r4, r5, pc} ;
#else
#define SYNC_OP_8(op) \ #define SYNC_OP_8(op) \
.p2align 2 ; \ .p2align 2 ; \
.thumb ; \ .thumb ; \
.syntax unified ; \ .syntax unified ; \
DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \ DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_ ## op) \
push {r4, r5, r6, lr} ; \ push {r4, r5, r6, lr} ; \
dmb ; \ dmb ; \
mov r12, r0 ; \ mov r12, r0 ; \
LOCAL_LABEL(tryatomic_ ## op): \ LOCAL_LABEL(tryatomic_ ## op): \
ldrexd r0, r1, [r12] ; \ ldrexd r0, r1, [r12] ; \
op(r4, r5, r0, r1, r2, r3) ; \ op(r4, r5, r0, r1, r2, r3) ; \
strexd r6, r4, r5, [r12] ; \ strexd r6, r4, r5, [r12] ; \
cmp r6, #0 ; \ cmp r6, #0 ; \
bne LOCAL_LABEL(tryatomic_ ## op) ; \ bne LOCAL_LABEL(tryatomic_ ## op) ; \
dmb ; \ dmb ; \
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
#endif
#define MINMAX_4(rD, rN, rM, cmp_kind) \ #define MINMAX_4(rD, rN, rM, cmp_kind) \
cmp rN, rM ; \ cmp rN, rM ; \
mov rD, rM ; \ mov rD, rM ; \
it cmp_kind ; \ it cmp_kind ; \
mov##cmp_kind rD, rN mov##cmp_kind rD, rN
#define MINMAX_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI, cmp_kind) \ #define MINMAX_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI, cmp_kind) \
cmp rN_LO, rM_LO ; \ cmp rN_LO, rM_LO ; \
sbcs rN_HI, rM_HI ; \ sbcs rN_HI, rM_HI ; \
mov rD_LO, rM_LO ; \ mov rD_LO, rM_LO ; \
mov rD_HI, rM_HI ; \ mov rD_HI, rM_HI ; \
itt cmp_kind ; \ itt cmp_kind ; \
mov##cmp_kind rD_LO, rN_LO ; \ mov##cmp_kind rD_LO, rN_LO ; \
mov##cmp_kind rD_HI, rN_HI mov##cmp_kind rD_HI, rN_HI

lib/builtins/arm/sync_fetch_and_add_8.S

/*===-- sync_fetch_and_add_8.S - ------------------------------------------===// /*===-- sync_fetch_and_add_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_add_8 function for the ARM * This file implements the __sync_fetch_and_add_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define add_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define add_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
adds rD_LO, rN_LO, rM_LO ; \ adds rD_LO, rN_LO, rM_LO ; \
adc rD_HI, rN_HI, rM_HI adc rD_HI, rN_HI, rM_HI
SYNC_OP_8(add_8) SYNC_OP_8(add_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_and_8.S

/*===-- sync_fetch_and_and_8.S - ------------------------------------------===// /*===-- sync_fetch_and_and_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_and_8 function for the ARM * This file implements the __sync_fetch_and_and_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define and_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define and_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
and rD_LO, rN_LO, rM_LO ; \ and rD_LO, rN_LO, rM_LO ; \
and rD_HI, rN_HI, rM_HI and rD_HI, rN_HI, rM_HI
SYNC_OP_8(and_8) SYNC_OP_8(and_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_max_8.S

/*===-- sync_fetch_and_max_8.S - ------------------------------------------===// /*===-- sync_fetch_and_max_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_max_8 function for the ARM * This file implements the __sync_fetch_and_max_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define max_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) MINMAX_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI, gt) #define max_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) MINMAX_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI, gt)
SYNC_OP_8(max_8) SYNC_OP_8(max_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_nand_8.S

/*===-- sync_fetch_and_nand_8.S - ------------------------------------------===// /*===-- sync_fetch_and_nand_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_nand_8 function for the ARM * This file implements the __sync_fetch_and_nand_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define nand_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define nand_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
bic rD_LO, rN_LO, rM_LO ; \ bic rD_LO, rN_LO, rM_LO ; \
bic rD_HI, rN_HI, rM_HI bic rD_HI, rN_HI, rM_HI
SYNC_OP_8(nand_8) SYNC_OP_8(nand_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_or_8.S

/*===-- sync_fetch_and_or_8.S - -------------------------------------------===// /*===-- sync_fetch_and_or_8.S - -------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_or_8 function for the ARM * This file implements the __sync_fetch_and_or_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define or_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define or_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
orr rD_LO, rN_LO, rM_LO ; \ orr rD_LO, rN_LO, rM_LO ; \
orr rD_HI, rN_HI, rM_HI orr rD_HI, rN_HI, rM_HI
SYNC_OP_8(or_8) SYNC_OP_8(or_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_sub_8.S

/*===-- sync_fetch_and_sub_8.S - ------------------------------------------===// /*===-- sync_fetch_and_sub_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_sub_8 function for the ARM * This file implements the __sync_fetch_and_sub_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define sub_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define sub_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
subs rD_LO, rN_LO, rM_LO ; \ subs rD_LO, rN_LO, rM_LO ; \
sbc rD_HI, rN_HI, rM_HI sbc rD_HI, rN_HI, rM_HI
SYNC_OP_8(sub_8) SYNC_OP_8(sub_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

lib/builtins/arm/sync_fetch_and_xor_8.S

/*===-- sync_fetch_and_xor_8.S - ------------------------------------------===// /*===-- sync_fetch_and_xor_8.S - ------------------------------------------===//
* *
* The LLVM Compiler Infrastructure * The LLVM Compiler Infrastructure
* *
* This file is dual licensed under the MIT and the University of Illinois Open * This file is dual licensed under the MIT and the University of Illinois Open
* Source Licenses. See LICENSE.TXT for details. * Source Licenses. See LICENSE.TXT for details.
* *
*===----------------------------------------------------------------------===// *===----------------------------------------------------------------------===//
* *
* This file implements the __sync_fetch_and_xor_8 function for the ARM * This file implements the __sync_fetch_and_xor_8 function for the ARM
* architecture. * architecture.
* *
*===----------------------------------------------------------------------===*/ *===----------------------------------------------------------------------===*/
#include "sync-ops.h" #include "sync-ops.h"
#if __ARM_ARCH_PROFILE != 'M'
#define xor_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \ #define xor_8(rD_LO, rD_HI, rN_LO, rN_HI, rM_LO, rM_HI) \
eor rD_LO, rN_LO, rM_LO ; \ eor rD_LO, rN_LO, rM_LO ; \
eor rD_HI, rN_HI, rM_HI eor rD_HI, rN_HI, rM_HI
SYNC_OP_8(xor_8) SYNC_OP_8(xor_8)
#endif
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE