13
0

correctly switch between windows and (other) when deciding whether to use AVX code

This commit is contained in:
Paul Davis 2015-08-12 00:01:02 -04:00
parent c86b82aa8a
commit 6de707b3fc

View File

@ -164,12 +164,17 @@ setup_hardware_optimization (bool try_optimization)
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS) #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
#if 0 /* AVX code doesn't compile on Linux yet, don't use generic code instead */ #ifdef PLATFORM_WINDOWS
/* We have AVX-optimized code for Windows */
if (fpu->has_avx()) { if (fpu->has_avx()) {
#else
/* AVX code doesn't compile on Linux yet */
if (false) {
#endif
info << "Using AVX optimized routines" << endmsg; info << "Using AVX optimized routines" << endmsg;
// AVX SET // AVX SET
compute_peak = x86_sse_avx_compute_peak; compute_peak = x86_sse_avx_compute_peak;
find_peaks = x86_sse_avx_find_peaks; find_peaks = x86_sse_avx_find_peaks;
@ -180,9 +185,7 @@ setup_hardware_optimization (bool try_optimization)
generic_mix_functions = false; generic_mix_functions = false;
} else } else if (fpu->has_sse()) {
#endif
if (fpu->has_sse()) {
info << "Using SSE optimized routines" << endmsg; info << "Using SSE optimized routines" << endmsg;