Substitution for MemoryBarrier() to avoid including <windows.h>

simd-everywhere · Jul 21, 2024 · a7d6c11 · a7d6c11
1 parent bd05320
commit a7d6c11
Showing 1 changed file with 37 additions and 6 deletions.
diff --git a/simde/x86/sse.h b/simde/x86/sse.h
@@ -33,15 +33,46 @@
 #include "mmx.h"
 #include "../simde-f16.h"
 
-#if defined(_WIN32) && !defined(SIMDE_X86_SSE_NATIVE) && defined(_MSC_VER)
-  #define NOMINMAX
-  #include <windows.h>
-#endif
-
 #if defined(__ARM_ACLE)
   #include <arm_acle.h>
 #endif
 
+// MemoryBarrier() function has been extracted from the original windows headers
+#ifdef _MSC_VER
+  #if defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__)
+    #include <intrin.h>
+  #endif
+
+  #pragma intrinsic(_InterlockedOr)
+  long _InterlockedOr(long volatile*, long);
+
+  #ifdef __i386__
+    static HEDLEY_ALWAYS_INLINE void simde_MemoryBarrier(void) {
+        long dummy;
+        InterlockedOr(&dummy, 0);
+    }
+  #elif defined(__aarch64__) || defined(__arm64ec__)
+    static HEDLEY_ALWAYS_INLINE void simde_MemoryBarrier(void) {
+        __dmb(_ARM64_BARRIER_SY);
+    }
+  #elif defined(__x86_64__)
+    #pragma intrinsic(__faststorefence)
+    void __faststorefence(void);
+
+    static HEDLEY_ALWAYS_INLINE void simde_MemoryBarrier(void) {
+        __faststorefence();
+    }
+  #elif defined(__arm__)
+    static HEDLEY_ALWAYS_INLINE void simde_MemoryBarrier(void) {
+        __dmb(_ARM_BARRIER_SY);
+    }
+  #endif
+#elif defined(__GNUC__)
+  static HEDLEY_ALWAYS_INLINE void simde_MemoryBarrier(void) {
+    __sync_synchronize();
+  }
+#endif
+
 HEDLEY_DIAGNOSTIC_PUSH
 SIMDE_DISABLE_UNWANTED_DIAGNOSTICS
 SIMDE_BEGIN_DECLS_
@@ -4007,7 +4038,7 @@ simde_mm_sfence (void) {
       atomic_thread_fence(memory_order_seq_cst);
     #endif
   #elif defined(_MSC_VER)
-    MemoryBarrier();
+    simde_MemoryBarrier();
   #elif HEDLEY_HAS_EXTENSION(c_atomic)
     __c11_atomic_thread_fence(__ATOMIC_SEQ_CST);
   #elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))