1 files changed, 57 insertions, 12 deletions

diff --git a/erts/include/internal/tile/atomic.h b/erts/include/internal/tile/atomic.h
index 59a9250e7c..69569d82d1 100644
--- a/erts/include/internal/tile/atomic.h
+++ b/erts/include/internal/tile/atomic.h
@@ -32,7 +32,9 @@ typedef struct {
     volatile long counter;
 } ethr_native_atomic_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#define ETHR_MEMORY_BARRIER __insn_mf()
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_atomic_init(ethr_native_atomic_t *var, long i)
@@ -43,7 +45,6 @@ ethr_native_atomic_init(ethr_native_atomic_t *var, long i)
 static ETHR_INLINE void
 ethr_native_atomic_set(ethr_native_atomic_t *var, long i)
 {
-    __insn_mf();
     atomic_exchange_acq(&var->counter, i);
 }
 
@@ -56,28 +57,24 @@ ethr_native_atomic_read(ethr_native_atomic_t *var)
 static ETHR_INLINE void
 ethr_native_atomic_add(ethr_native_atomic_t *var, long incr)
 {
-    __insn_mf();
     atomic_add(&var->counter, incr);
 }      
        
 static ETHR_INLINE void
 ethr_native_atomic_inc(ethr_native_atomic_t *var)
 {
-    __insn_mf();
     atomic_increment(&var->counter);
 }
 
 static ETHR_INLINE void
 ethr_native_atomic_dec(ethr_native_atomic_t *var)
 {
-    __insn_mf();
     atomic_decrement(&var->counter);
 }
 
 static ETHR_INLINE long
 ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
 {
-    __insn_mf();
     return atomic_exchange_and_add(&var->counter, incr) + incr;
 }
 
@@ -96,33 +93,81 @@ ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
 static ETHR_INLINE long
 ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
 {
-    /* Implement a barrier suitable for a mutex unlock. */
-    __insn_mf();
     return atomic_and_val(&var->counter, mask);
 }
 
 static ETHR_INLINE long
 ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
 {
-    __insn_mf();
     return atomic_or_val(&var->counter, mask);
 }
 
 static ETHR_INLINE long
 ethr_native_atomic_xchg(ethr_native_atomic_t *var, long val)
 {   
-    __insn_mf();
     return atomic_exchange_acq(&var->counter, val);
 } 
 
 static ETHR_INLINE long
 ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long expected)
 {
-    /* Implement a barrier suitable for a mutex unlock. */
-    __insn_mf();
     return atomic_compare_and_exchange_val_acq(&var->counter, new, expected);
 }
 
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE long
+ethr_native_atomic_read_acqb(ethr_native_atomic_t *var)
+{
+    long res = ethr_native_atomic_read(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+}
+
+static ETHR_INLINE long
+ethr_native_atomic_inc_return_acqb(ethr_native_atomic_t *var)
+{
+    long res = ethr_native_atomic_inc_return(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+}
+
+static ETHR_INLINE void
+ethr_native_atomic_set_relb(ethr_native_atomic_t *var, long val)
+{
+    ETHR_MEMORY_BARRIER;
+    ethr_native_atomic_set(var, val);
+}
+
+static ETHR_INLINE void
+ethr_native_atomic_dec_relb(ethr_native_atomic_t *var)
+{
+    ETHR_MEMORY_BARRIER;
+    ethr_native_atomic_dec(var);
+}
+
+static ETHR_INLINE long
+ethr_native_atomic_dec_return_relb(ethr_native_atomic_t *var)
+{
+    ETHR_MEMORY_BARRIER;
+    return ethr_native_atomic_dec_return(var);
+}
+
+static ETHR_INLINE long
+ethr_native_atomic_cmpxchg_acqb(ethr_native_atomic_t *var, long new, long exp)
+{
+    return ethr_native_atomic_cmpxchg(var, new, exp);
+}
+
+static ETHR_INLINE long
+ethr_native_atomic_cmpxchg_relb(ethr_native_atomic_t *var, long new, long exp)
+{
+    ETHR_MEMORY_BARRIER;
+    return ethr_native_atomic_cmpxchg(var, new, exp);
+}
+
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
 #endif /* ETHREAD_TILE_ATOMIC_H */