mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-31 18:07:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: support CPU_DISPATCH=ALL, fix misused CPU_DISPATCH

Browse Source 
- CPU_DISPATCH_FINAL should be used for filtering
This commit is contained in:
Alexander Alekhin 2019-05-04 20:49:25 +00:00
parent 5a77f4cee3
commit 6b6222bfbb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/OpenCVCompilerOptimizations.cmake
View File

@ -380,6 +380,10 @@ if(CV_DISABLE_OPTIMIZATION)
set(CPU_DISPATCH_REQUIRE "") set(CPU_DISPATCH_REQUIRE "")
endif() endif()
if("x${CPU_DISPATCH}" STREQUAL "xALL")
set(CPU_DISPATCH "${CPU_KNOWN_OPTIMIZATIONS}")
endif()
macro(ocv_check_compiler_optimization OPT) macro(ocv_check_compiler_optimization OPT)
if(NOT DEFINED CPU_${OPT}_SUPPORTED) if(NOT DEFINED CPU_${OPT}_SUPPORTED)
if((DEFINED CPU_${OPT}_FLAGS_ON AND NOT "x${CPU_${OPT}_FLAGS_ON}" STREQUAL "x") OR CPU_${OPT}_TEST_FILE) if((DEFINED CPU_${OPT}_FLAGS_ON AND NOT "x${CPU_${OPT}_FLAGS_ON}" STREQUAL "x") OR CPU_${OPT}_TEST_FILE)
@ -854,19 +858,19 @@ macro(__ocv_add_dispatched_file filename target_src_var src_directory dst_direct
file(WRITE "${__file}" "${__codestr}") file(WRITE "${__file}" "${__codestr}")
endif() endif()
if(";${CPU_DISPATCH};" MATCHES "${OPT}" OR __CPU_DISPATCH_INCLUDE_ALL) if(";${CPU_DISPATCH_FINAL};" MATCHES "${OPT}" OR __CPU_DISPATCH_INCLUDE_ALL)
if(EXISTS "${src_directory}/${filename}.${OPT_LOWER}.cpp") if(EXISTS "${src_directory}/${filename}.${OPT_LOWER}.cpp")
message(STATUS "Using overrided ${OPT} source: ${src_directory}/${filename}.${OPT_LOWER}.cpp") message(STATUS "Using overrided ${OPT} source: ${src_directory}/${filename}.${OPT_LOWER}.cpp")
else() else()
list(APPEND ${target_src_var} "${__file}") list(APPEND ${target_src_var} "${__file}")
endif() endif()
endif()
set(__declarations_str "${__declarations_str} set(__declarations_str "${__declarations_str}
#define CV_CPU_DISPATCH_MODE ${OPT} #define CV_CPU_DISPATCH_MODE ${OPT}
#include \"opencv2/core/private/cv_cpu_include_simd_declarations.hpp\" #include \"opencv2/core/private/cv_cpu_include_simd_declarations.hpp\"
") ")
set(__dispatch_modes "${OPT}, ${__dispatch_modes}") set(__dispatch_modes "${OPT}, ${__dispatch_modes}")
endif()
endforeach() endforeach()
set(__declarations_str "${__declarations_str} set(__declarations_str "${__declarations_str}