diff options
| -rw-r--r-- | src/util/u_math.c | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/src/util/u_math.c b/src/util/u_math.c index bf0c398eeec..c58af911be7 100644 --- a/src/util/u_math.c +++ b/src/util/u_math.c @@ -29,7 +29,7 @@ #include "pipe/p_config.h" #include "util/u_math.h" -#include "x86/common_x86_features.h" +#include "util/u_cpu_detect.h" #if defined(PIPE_ARCH_SSE) #include <xmmintrin.h> @@ -90,7 +90,7 @@ util_fpstate_get(void) unsigned mxcsr = 0; #if defined(PIPE_ARCH_SSE) - if (cpu_has_xmm) { + if (util_cpu_caps.has_sse) { mxcsr = _mm_getcsr(); } #endif @@ -98,31 +98,6 @@ util_fpstate_get(void) return mxcsr; } -/* TODO: this was copied from u_cpu_detection. It's another case of duplication - * between gallium and core mesa, and it would be nice to get rid of that - * duplication as well. - */ -#if defined(PIPE_ARCH_X86) -PIPE_ALIGN_STACK static inline bool sse2_has_daz(void) -{ - struct { - uint32_t pad1[7]; - uint32_t mxcsr_mask; - uint32_t pad2[128-8]; - } PIPE_ALIGN_VAR(16) fxarea; - - fxarea.mxcsr_mask = 0; -#if defined(PIPE_CC_GCC) - __asm __volatile ("fxsave %0" : "+m" (fxarea)); -#elif defined(PIPE_CC_MSVC) || defined(PIPE_CC_ICL) - _fxsave(&fxarea); -#else - fxarea.mxcsr_mask = 0; -#endif - return !!(fxarea.mxcsr_mask & (1 << 6)); -} -#endif - /** * Make sure that the fp treats the denormalized floating * point numbers as zero. @@ -133,21 +108,13 @@ unsigned util_fpstate_set_denorms_to_zero(unsigned current_mxcsr) { #if defined(PIPE_ARCH_SSE) - if (cpu_has_xmm) { + if (util_cpu_caps.has_sse) { /* Enable flush to zero mode */ current_mxcsr |= _MM_FLUSH_ZERO_MASK; - /* x86_64 cpus always have daz, as do cpus with sse3 in fact, there's - * basically only a handful of very early pentium 4's that have sse2 but - * not daz. - */ -# if !defined(PIPE_ARCH_x86_64) && !defined(PIPE_ARCH_SSSE3) - if (sse2_has_daz()) { -# endif + if (util_cpu_caps.has_daz) { /* Enable denormals are zero mode */ current_mxcsr |= _MM_DENORMALS_ZERO_MASK; -# if !defined(PIPE_ARCH_x86_64) && !defined(PIPE_ARCH_SSSE3) } -#endif util_fpstate_set(current_mxcsr); } #endif @@ -163,7 +130,7 @@ void util_fpstate_set(unsigned mxcsr) { #if defined(PIPE_ARCH_SSE) - if (cpu_has_xmm) { + if (util_cpu_caps.has_sse) { _mm_setcsr(mxcsr); } #endif |