diff options
| author | Elias Naur <elias.naur@gmail.com> | 2017-10-01 12:51:54 +0200 |
|---|---|---|
| committer | Elias Naur <elias.naur@gmail.com> | 2017-10-02 09:57:23 +0000 |
| commit | 9735fcfce78360eeaaa62fb44bd597f7b85ff429 (patch) | |
| tree | 778f8393fe9c39a4c34aff9f6c1d8755480a44e8 | |
| parent | f2af0c178099c0d785efe3b6f5f2282277f9ee9c (diff) | |
| download | go-9735fcfce78360eeaaa62fb44bd597f7b85ff429.tar.xz | |
sync/atomic: add memory barriers to Load/StoreInt32 on darwin/arm
After switching to an iPhone 5 for the darwin/arm builds,
TestStoreLoadRelAcq32 started to timeout on every builder run.
Adding the same memory barriers as armLoadUint64 and armStoreUint64
makes the test complete successfully.
Fixes sync/atomic tests on the darwin/arm builder.
Change-Id: Id73de31679304e259bdbd7f2f94383ae7fd70ee4
Reviewed-on: https://go-review.googlesource.com/67390
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
| -rw-r--r-- | src/sync/atomic/asm_darwin_arm.s | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/sync/atomic/asm_darwin_arm.s b/src/sync/atomic/asm_darwin_arm.s index c64336034d..226822926f 100644 --- a/src/sync/atomic/asm_darwin_arm.s +++ b/src/sync/atomic/asm_darwin_arm.s @@ -6,6 +6,12 @@ // Darwin/ARM atomic operations. +#define DMB_ISHST_7 \ + WORD $0xf57ff05a // dmb ishst + +#define DMB_ISH_7 \ + WORD $0xf57ff05b // dmb ish + TEXT ·CompareAndSwapInt32(SB),NOSPLIT,$0 B ·CompareAndSwapUint32(SB) @@ -58,9 +64,11 @@ TEXT ·LoadUint32(SB),NOSPLIT,$0-8 MOVW addr+0(FP), R1 load32loop: LDREX (R1), R2 // loads R2 + DMB_ISHST_7 STREX R2, (R1), R0 // stores R2 CMP $0, R0 BNE load32loop + DMB_ISH_7 MOVW R2, val+4(FP) RET @@ -84,9 +92,11 @@ TEXT ·StoreUint32(SB),NOSPLIT,$0-8 MOVW val+4(FP), R2 storeloop: LDREX (R1), R4 // loads R4 + DMB_ISHST_7 STREX R2, (R1), R0 // stores R2 CMP $0, R0 BNE storeloop + DMB_ISH_7 RET TEXT ·StoreInt64(SB),NOSPLIT,$0 |