ref: ed9006038966d8ab059964e9bd4918e8d5180512
parent: c066af1bf155c5157aa67f355d808be119d79fd1
author: Jean-Marc Valin <jmvalin@amazon.com>
date: Mon Nov 20 20:26:40 EST 2023
Avoids AVX2 optimizations being disabled
--- a/silk/x86/main_sse.h
+++ b/silk/x86/main_sse.h
@@ -180,7 +180,7 @@
((void)(arch),silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
-# elif defined (OPUS_X86_PRESUME_SSE4_1)
+# elif defined (OPUS_X86_PRESUME_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2)
# define OVERRIDE_silk_NSQ_del_dec
# define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
--- a/silk/x86/x86_silk_map.c
+++ b/silk/x86/x86_silk_map.c
@@ -35,7 +35,7 @@
#include "pitch.h"
#include "main.h"
-#if defined(OPUS_HAVE_RTCD) && !defined(OPUS_X86_PRESUME_SSE4_1)
+#if defined(OPUS_HAVE_RTCD) && !defined(OPUS_X86_PRESUME_AVX2)
#if defined(FIXED_POINT)
--
⑨