eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-07 07:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CMake - change avx to avx2 and fma

Browse source
This commit is contained in:
Marcus Asteborg 2023-05-24 21:28:36 -07:00 • committed by Jean-Marc Valin
parent e9dc5d1793
commit 84484a6790
No known key found for this signature in database
GPG key ID: 531A52533318F00A
4 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

50
CMakeLists.txt
View file

@ -177,13 +177,13 @@ if(OPUS_CPU_X86 OR OPUS_CPU_X64)
OFF) OFF)
add_feature_info(OPUS_X86_MAY_HAVE_SSE4_1 OPUS_X86_MAY_HAVE_SSE4_1 ${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR}) add_feature_info(OPUS_X86_MAY_HAVE_SSE4_1 OPUS_X86_MAY_HAVE_SSE4_1 ${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR})
set(OPUS_X86_MAY_HAVE_AVX_HELP_STR "does runtime check for AVX support.") set(OPUS_X86_MAY_HAVE_AVX2_HELP_STR "does runtime check for AVX FMA AVX2 support.")
cmake_dependent_option(OPUS_X86_MAY_HAVE_AVX cmake_dependent_option(OPUS_X86_MAY_HAVE_AVX2
${OPUS_X86_MAY_HAVE_AVX_HELP_STR} ${OPUS_X86_MAY_HAVE_AVX2_HELP_STR}
ON ON
"AVX_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS" "AVX2_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
OFF) OFF)
add_feature_info(OPUS_X86_MAY_HAVE_AVX OPUS_X86_MAY_HAVE_AVX ${OPUS_X86_MAY_HAVE_AVX_HELP_STR}) add_feature_info(OPUS_X86_MAY_HAVE_AVX2 OPUS_X86_MAY_HAVE_AVX2 ${OPUS_X86_MAY_HAVE_AVX2_HELP_STR})
# PRESUME depends on MAY HAVE, but PRESUME will override runtime detection # PRESUME depends on MAY HAVE, but PRESUME will override runtime detection
set(OPUS_X86_PRESUME_SSE_HELP_STR "assume target CPU has SSE1 support (override runtime check).") set(OPUS_X86_PRESUME_SSE_HELP_STR "assume target CPU has SSE1 support (override runtime check).")
@ -224,13 +224,13 @@ if(OPUS_CPU_X86 OR OPUS_CPU_X64)
OFF) OFF)
add_feature_info(OPUS_X86_PRESUME_SSE4_1 OPUS_X86_PRESUME_SSE4_1 ${OPUS_X86_PRESUME_SSE4_1_HELP_STR}) add_feature_info(OPUS_X86_PRESUME_SSE4_1 OPUS_X86_PRESUME_SSE4_1 ${OPUS_X86_PRESUME_SSE4_1_HELP_STR})
set(OPUS_X86_PRESUME_AVX_HELP_STR "assume target CPU has AVX support (override runtime check).") set(OPUS_X86_PRESUME_AVX2_HELP_STR "assume target CPU has AVX FMA AVX2 support (override runtime check).")
cmake_dependent_option(OPUS_X86_PRESUME_AVX cmake_dependent_option(OPUS_X86_PRESUME_AVX2
${OPUS_X86_PRESUME_AVX_HELP_STR} ${OPUS_X86_PRESUME_AVX2_HELP_STR}
OFF OFF
"OPUS_X86_MAY_HAVE_AVX; NOT OPUS_DISABLE_INTRINSICS" "OPUS_X86_MAY_HAVE_AVX2; NOT OPUS_DISABLE_INTRINSICS"
OFF) OFF)
add_feature_info(OPUS_X86_PRESUME_AVX OPUS_X86_PRESUME_AVX ${OPUS_X86_PRESUME_AVX_HELP_STR}) add_feature_info(OPUS_X86_PRESUME_AVX2 OPUS_X86_PRESUME_AVX2 ${OPUS_X86_PRESUME_AVX2_HELP_STR})
endif() endif()
feature_summary(WHAT ALL) feature_summary(WHAT ALL)
@ -382,7 +382,7 @@ if(NOT OPUS_DISABLE_INTRINSICS)
if(((OPUS_X86_MAY_HAVE_SSE AND NOT OPUS_X86_PRESUME_SSE) OR if(((OPUS_X86_MAY_HAVE_SSE AND NOT OPUS_X86_PRESUME_SSE) OR
(OPUS_X86_MAY_HAVE_SSE2 AND NOT OPUS_X86_PRESUME_SSE2) OR (OPUS_X86_MAY_HAVE_SSE2 AND NOT OPUS_X86_PRESUME_SSE2) OR
(OPUS_X86_MAY_HAVE_SSE4_1 AND NOT OPUS_X86_PRESUME_SSE4_1) OR (OPUS_X86_MAY_HAVE_SSE4_1 AND NOT OPUS_X86_PRESUME_SSE4_1) OR
(OPUS_X86_MAY_HAVE_AVX AND NOT OPUS_X86_PRESUME_AVX)) AND (OPUS_X86_MAY_HAVE_AVX2 AND NOT OPUS_X86_PRESUME_AVX2)) AND
RUNTIME_CPU_CAPABILITY_DETECTION) RUNTIME_CPU_CAPABILITY_DETECTION)
target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD) target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD)
if(NOT MSVC) if(NOT MSVC)
@ -454,22 +454,28 @@ if(NOT OPUS_DISABLE_INTRINSICS)
endif() endif()
endif() endif()
if(AVX_SUPPORTED) if(AVX2_SUPPORTED)
# mostly placeholder in case of avx intrinsics is added if(OPUS_X86_MAY_HAVE_AVX2)
if(OPUS_X86_MAY_HAVE_AVX) add_sources_group(opus celt ${celt_sources_avx2})
target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_AVX) target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_AVX2)
if(MSVC)
set(AVX2_FLAGS "${AVX2_FLAGS} /arch:AVX2")
else()
set(AVX2_FLAGS "${AVX2_FLAGS} -mavx2 -mfma -mavx")
endif()
set_source_files_properties(${celt_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS})
endif() endif()
if(OPUS_X86_PRESUME_AVX) if(OPUS_X86_PRESUME_AVX2)
target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_AVX) target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_AVX2)
if(NOT MSVC) if(NOT MSVC)
target_compile_options(opus PRIVATE -mavx) target_compile_options(opus PRIVATE -mavx2 -mfma -mavx)
endif() endif()
endif() endif()
endif() endif()
if(MSVC) if(MSVC)
if(AVX_SUPPORTED AND OPUS_X86_PRESUME_AVX) # on 64 bit and 32 bits if(AVX2_SUPPORTED AND OPUS_X86_PRESUME_AVX2) # on 64 bit and 32 bits
add_definitions(/arch:AVX) add_definitions(/arch:AVX2)
elseif(OPUS_CPU_X86) # if AVX not supported then set SSE flag elseif(OPUS_CPU_X86) # if AVX not supported then set SSE flag
if((SSE4_1_SUPPORTED AND OPUS_X86_PRESUME_SSE4_1) if((SSE4_1_SUPPORTED AND OPUS_X86_PRESUME_SSE4_1)
OR (SSE2_SUPPORTED AND OPUS_X86_PRESUME_SSE2)) OR (SSE2_SUPPORTED AND OPUS_X86_PRESUME_SSE2))
@ -602,10 +608,6 @@ if(OPUS_BUILD_PROGRAMS)
add_executable(opus_compare ${opus_compare_sources}) add_executable(opus_compare ${opus_compare_sources})
target_include_directories(opus_compare PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(opus_compare PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(opus_compare PRIVATE opus ${OPUS_REQUIRED_LIBRARIES}) target_link_libraries(opus_compare PRIVATE opus ${OPUS_REQUIRED_LIBRARIES})
if(MSVC)
# move cosmetic warning to level 4 for opus_compare
target_compile_options(opus_compare PRIVATE /w44244)
endif()
endif() endif()
if(BUILD_TESTING AND NOT BUILD_SHARED_LIBS) if(BUILD_TESTING AND NOT BUILD_SHARED_LIBS)

5
cmake/OpusConfig.cmake
View file

@ -102,7 +102,10 @@ if(MINGW)
endif() endif()
endif() endif()
if(NOT MSVC) if(MSVC)
# move cosmetic warnings to level 4
add_compile_options(/w44244 /w44305 /w44267)
else()
set(WARNING_LIST -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow) set(WARNING_LIST -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
foreach(WARNING_FLAG ${WARNING_LIST}) foreach(WARNING_FLAG ${WARNING_LIST})

20
cmake/OpusFunctions.cmake
View file

@ -47,10 +47,12 @@ function(check_flag NAME FLAG)
endfunction() endfunction()
include(CheckIncludeFile) include(CheckIncludeFile)
# function to check if compiler supports SSE, SSE2, SSE4.1 and AVX if target
# systems may not have SSE support then use OPUS_MAY_HAVE_SSE option if target # This function determines if the compiler has support for SSE, SSE2, SSE4.1, AVX,
# system is guaranteed to have SSE support then OPUS_PRESUME_SSE can be used to # AVX2 and FMA. Should the target systems potentially lack SSE support, the
# skip SSE runtime check # OPUS_MAY_HAVE_SSE option is recommended for use. If, however, the target system is
# assured to support SSE, the OPUS_PRESUME_SSE option can be employed, thus
# eliminating the necessity for an SSE runtime check.
function(opus_detect_sse COMPILER_SUPPORT_SIMD) function(opus_detect_sse COMPILER_SUPPORT_SIMD)
message(STATUS "Check SIMD support by compiler") message(STATUS "Check SIMD support by compiler")
check_include_file(xmmintrin.h HAVE_XMMINTRIN_H) # SSE1 check_include_file(xmmintrin.h HAVE_XMMINTRIN_H) # SSE1
@ -111,20 +113,20 @@ function(opus_detect_sse COMPILER_SUPPORT_SIMD)
PARENT_SCOPE) PARENT_SCOPE)
endif() endif()
check_include_file(immintrin.h HAVE_IMMINTRIN_H) # AVX check_include_file(immintrin.h HAVE_IMMINTRIN_H) # AVX2
if(HAVE_IMMINTRIN_H) if(HAVE_IMMINTRIN_H)
if(MSVC) if(MSVC)
check_flag(AVX /arch:AVX) check_flag(AVX2 /arch:AVX2)
else() else()
check_flag(AVX -mavx) check_flag(AVX2 -mavx2 -mfma -mavx)
endif() endif()
else() else()
set(AVX_SUPPORTED set(AVX2_SUPPORTED
0 0
PARENT_SCOPE) PARENT_SCOPE)
endif() endif()
if(SSE1_SUPPORTED OR SSE2_SUPPORTED OR SSE4_1_SUPPORTED OR AVX_SUPPORTED) if(SSE1_SUPPORTED OR SSE2_SUPPORTED OR SSE4_1_SUPPORTED OR AVX2_SUPPORTED)
set(COMPILER_SUPPORT_SIMD 1 PARENT_SCOPE) set(COMPILER_SUPPORT_SIMD 1 PARENT_SCOPE)
else() else()
message(STATUS "No SIMD support in compiler") message(STATUS "No SIMD support in compiler")

1
cmake/OpusSources.cmake
View file

@ -29,6 +29,7 @@ get_opus_sources(CELT_SOURCES_X86_RTCD celt_sources.mk celt_sources_x86_rtcd)
get_opus_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse) get_opus_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse)
get_opus_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2) get_opus_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2)
get_opus_sources(CELT_SOURCES_SSE4_1 celt_sources.mk celt_sources_sse4_1) get_opus_sources(CELT_SOURCES_SSE4_1 celt_sources.mk celt_sources_sse4_1)
get_opus_sources(CELT_SOURCES_AVX2 celt_sources.mk celt_sources_avx2)
get_opus_sources(CELT_SOURCES_ARM_RTCD celt_sources.mk celt_sources_arm_rtcd) get_opus_sources(CELT_SOURCES_ARM_RTCD celt_sources.mk celt_sources_arm_rtcd)
get_opus_sources(CELT_SOURCES_ARM_ASM celt_sources.mk celt_sources_arm_asm) get_opus_sources(CELT_SOURCES_ARM_ASM celt_sources.mk celt_sources_arm_asm)
get_opus_sources(CELT_AM_SOURCES_ARM_ASM celt_sources.mk get_opus_sources(CELT_AM_SOURCES_ARM_ASM celt_sources.mk