Merge pull request #4504 from jrsurge/topic/fix-windows-denormals

[scsynth][supernova] fix Windows not guarding denormals
supercollider · Feb 15, 2020 · 2f42c47 · 2f42c47
2 parents bc32f32 + ff2c03d
commit 2f42c47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/server/scsynth/SC_World.cpp b/server/scsynth/SC_World.cpp
@@ -55,6 +55,12 @@
 
 #include "malloc_aligned.hpp"
 
+#include <boost/predef/hardware.h>
+
+#ifdef BOOST_HW_SIMD_AVAILABLE >= BOOST_HW_SIMD_X86_SSE_VERSION
+#    include <xmmintrin.h>
+#endif
+
 // undefine the shadowed scfft functions
 #undef scfft_create
 #undef scfft_dofft
@@ -148,26 +154,12 @@ void zfree(void* ptr) { return free_alig(ptr); }
 ////////////////////////////////////////////////////////////////////////////////
 
 // Set denormal FTZ mode on CPUs that need/support it.
-void sc_SetDenormalFlags();
-
-#ifdef __SSE2__
-#    include <xmmintrin.h>
-
 void sc_SetDenormalFlags() {
+#if BOOST_HW_SIMD_X86 >= BOOST_HW_SIMD_X86_SSE_VERSION
     _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
     _mm_setcsr(_mm_getcsr() | 0x40); // DAZ
-}
-
-#elif defined(__SSE__)
-#    include <xmmintrin.h>
-
-void sc_SetDenormalFlags() { _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); }
-
-#else
-
-void sc_SetDenormalFlags() {}
-
 #endif
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/server/supernova/server/server.cpp b/server/supernova/server/server.cpp
@@ -36,6 +36,8 @@
 #    include <CoreAudio/CoreAudioTypes.h>
 #endif
 
+#include <boost/predef/hardware.h>
+
 namespace nova {
 
 class nova_server* instance = nullptr;
@@ -207,7 +209,7 @@ static void name_current_thread(int thread_index) {
 }
 
 static void set_daz_ftz(void) {
-#ifdef __SSE__
+#if BOOST_HW_SIMD_X86 >= BOOST_X86_SSE_VERSION
     /* denormal handling */
     _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
     _mm_setcsr(_mm_getcsr() | 0x40);