eden-emu/opus
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using the same condition for enabling rtcd

Browse source 
for cmake, force PRESEUME_SSE4_1 on PRESUME_AVX2
This commit is contained in:
Jean-Marc Valin 2023-11-21 16:59:28 -05:00
parent 3e18d96759
commit f5821193e6
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -485,6 +485,7 @@ if(NOT OPUS_DISABLE_INTRINSICS)
endif() endif()
if(OPUS_X86_PRESUME_AVX2) if(OPUS_X86_PRESUME_AVX2)
target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_AVX2) target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_AVX2)
target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_SSE4_1)
if(NOT MSVC) if(NOT MSVC)
target_compile_options(opus PRIVATE -mavx2 -mfma -mavx) target_compile_options(opus PRIVATE -mavx2 -mfma -mavx)
endif() endif()

6
celt/x86/x86cpu.h
View file

@ -52,7 +52,11 @@
# define MAY_HAVE_AVX2(name) name ## _c # define MAY_HAVE_AVX2(name) name ## _c
# endif # endif
# if defined(OPUS_HAVE_RTCD) # if defined(OPUS_HAVE_RTCD) && \
((defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \
(defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \
(defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \
(defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_PRESUME_AVX2)))
int opus_select_arch(void); int opus_select_arch(void);
# endif # endif