Merge pull request #339 from devnexen/spin_impl_upd

Restricts cpu yield instructions a little.
microsoft · Dec 17, 2020 · 03503ea · 03503ea
2 parents 33614cc + 33a10b4
commit 03503ea
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/include/mimalloc-atomic.h b/include/mimalloc-atomic.h
@@ -282,16 +282,22 @@ static inline void mi_atomic_yield(void) {
   YieldProcessor();
 }
 #elif (defined(__GNUC__) || defined(__clang__)) && \
-      (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))
+      (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__))
 #if defined(__x86_64__) || defined(__i386__)
 static inline void mi_atomic_yield(void) {
   __asm__ volatile ("pause" ::: "memory");
 }
-#elif defined(__arm__) || defined(__aarch64__)
+#elif (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__)
 static inline void mi_atomic_yield(void) {
-  __asm__ volatile("yield");
+  __asm__ volatile("yield" ::: "memory");
 }
 #endif
+#elif defined(__sun)
+// Fallback for other archs
+#include <synch.h>
+static inline void mi_atomic_yield(void) {
+  smt_pause();
+}
 #elif defined(__wasi__)
 #include <sched.h>
 static inline void mi_atomic_yield(void) {
@@ -305,4 +311,4 @@ static inline void mi_atomic_yield(void) {
 #endif
 
 
-#endif // __MIMALLOC_ATOMIC_H
+#endif // __MIMALLOC_ATOMIC_H