From ed9006038966d8ab059964e9bd4918e8d5180512 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@amazon.com>
Date: Tue, 21 Nov 2023 01:26:40 -0500
Subject: [PATCH] Avoids AVX2 optimizations being disabled
---
silk/x86/main_sse.h | 2 +-
silk/x86/x86_silk_map.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/silk/x86/main_sse.h b/silk/x86/main_sse.h
index b6b328e56..2e4386bf6 100644
--- a/silk/x86/main_sse.h
+++ b/silk/x86/main_sse.h
@@ -180,7 +180,7 @@ void silk_NSQ_del_dec_avx2(
((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, \
diff --git a/silk/x86/x86_silk_map.c b/silk/x86/x86_silk_map.c
index dfec26149..4f9039ce5 100644
--- 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)
--
GitLab