mirror of https://github.com/opencv/opencv.git
Merge branch 'master' of https://github.com/opencv/opencv into interpMultichannelImg
Added assertios to remap and warpAffine functions As @mshabunin said, remap and warpAffine functions do not support more than 4 channels in Bicubic and Lanczos4 interpolation modes. Assertions were added. Appropriate test was chenged. resolves #8272pull/8377/head
Artem Lukoyanov
8 years ago
commit
84a0a91d16
107 changed files with 2554 additions and 852 deletions
@ -0,0 +1,651 @@ |
||||
# x86/x86-64 arch: |
||||
# SSE / SSE2 (always available on 64-bit CPUs) |
||||
# SSE3 / SSSE3 |
||||
# SSE4_1 / SSE4_2 / POPCNT |
||||
# AVX / AVX2 / AVX512 |
||||
# FMA3 |
||||
|
||||
# CPU_{opt}_SUPPORTED=ON/OFF - compiler support (possibly with additional flag) |
||||
# CPU_{opt}_IMPLIES=<list> |
||||
# CPU_{opt}_FORCE=<list> - subset of "implies" list |
||||
# CPU_{opt}_FLAGS_ON="" |
||||
# CPU_{opt}_FEATURE_ALIAS - mapping to CV_CPU_* HWFeature enum |
||||
|
||||
# Input variables: |
||||
# CPU_BASELINE=<list> - preferred list of baseline optimizations |
||||
# CPU_DISPATCH=<list> - preferred list of dispatched optimizations |
||||
|
||||
# Advanced input variables: |
||||
# CPU_BASELINE_REQUIRE=<list> - list of required baseline optimizations |
||||
# CPU_DISPATCH_REQUIRE=<list> - list of required dispatched optimizations |
||||
# CPU_BASELINE_DISABLE=<list> - list of disabled baseline optimizations |
||||
|
||||
# Output variables: |
||||
# CPU_BASELINE_FINAL=<list> - final list of enabled compiler optimizations |
||||
# CPU_DISPATCH_FINAL=<list> - final list of dispatched optimizations |
||||
# |
||||
# CPU_DISPATCH_FLAGS_${opt} - flags for source files compiled separately (_opt_avx2.cpp) |
||||
|
||||
set(CPU_ALL_OPTIMIZATIONS "SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3") # without AVX512 |
||||
list(APPEND CPU_ALL_OPTIMIZATIONS NEON VFPV3 FP16) |
||||
list(REMOVE_DUPLICATES CPU_ALL_OPTIMIZATIONS) |
||||
|
||||
ocv_update(CPU_VFPV3_FEATURE_ALIAS "") |
||||
|
||||
|
||||
set(HELP_CPU_BASELINE "Specify list of enabled baseline CPU optimizations") |
||||
set(HELP_CPU_BASELINE_REQUIRE "Specify list of required baseline CPU optimizations") |
||||
set(HELP_CPU_BASELINE_DISABLE "Specify list of forbidden baseline CPU optimizations") |
||||
set(HELP_CPU_DISPATCH "Specify list of dispatched CPU optimizations") |
||||
set(HELP_CPU_DISPATCH_REQUIRE "Specify list of required dispatched CPU optimizations") |
||||
|
||||
foreach(var CPU_BASELINE CPU_BASELINE_REQUIRE CPU_BASELINE_DISABLE CPU_DISPATCH CPU_DISPATCH_REQUIRE) |
||||
if(DEFINED ${var}) |
||||
string(REPLACE "," ";" _list "${${var}}") |
||||
set(${var} "${_list}" CACHE STRING "${HELP_${var}}" FORCE) |
||||
endif() |
||||
endforeach() |
||||
|
||||
# process legacy flags |
||||
macro(ocv_optimization_process_obsolete_option legacy_flag OPT legacy_warn) |
||||
if(DEFINED ${legacy_flag}) |
||||
if(${legacy_warn}) |
||||
message(STATUS "WARNING: Option ${legacy_flag}='${${legacy_flag}}' is deprecated and should not be used anymore") |
||||
message(STATUS " Behaviour of this option is not backward compatible") |
||||
message(STATUS " Refer to 'CPU_BASELINE'/'CPU_DISPATCH' CMake options documentation") |
||||
endif() |
||||
if(${legacy_flag}) |
||||
if(NOT ";${CPU_BASELINE_REQUIRE};" MATCHES ";${OPT};") |
||||
set(CPU_BASELINE_REQUIRE "${CPU_BASELINE_REQUIRE};${OPT}" CACHE STRING "${HELP_CPU_BASELINE_REQUIRE}" FORCE) |
||||
endif() |
||||
else() |
||||
if(NOT ";${CPU_BASELINE_DISABLE};" MATCHES ";${OPT};") |
||||
set(CPU_BASELINE_DISABLE "${CPU_BASELINE_DISABLE};${OPT}" CACHE STRING "${HELP_CPU_BASELINE_DISABLE}" FORCE) |
||||
endif() |
||||
endif() |
||||
endif() |
||||
endmacro() |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSE SSE ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSE2 SSE2 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSE3 SSE3 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSSE3 SSSE3 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSE41 SSE4_1 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_SSE42 SSE4_2 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_POPCNT POPCNT ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_AVX AVX ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_AVX2 AVX2 ON) |
||||
ocv_optimization_process_obsolete_option(ENABLE_FMA3 FMA3 ON) |
||||
|
||||
ocv_optimization_process_obsolete_option(ENABLE_VFPV3 VFPV3 OFF) |
||||
ocv_optimization_process_obsolete_option(ENABLE_NEON NEON OFF) |
||||
|
||||
|
||||
macro(ocv_is_optimization_in_list resultvar check_opt) |
||||
set(__checked "") |
||||
set(__queue ${ARGN}) |
||||
set(${resultvar} 0) |
||||
while(__queue AND NOT ${resultvar}) |
||||
list(REMOVE_DUPLICATES __queue) |
||||
set(__queue_current ${__queue}) |
||||
set(__queue "") |
||||
foreach(OPT ${__queue_current}) |
||||
if("x${OPT}" STREQUAL "x${check_opt}") |
||||
set(${resultvar} 1) |
||||
break() |
||||
elseif(NOT ";${__checked};" MATCHES ";${OPT};") |
||||
list(APPEND __queue ${CPU_${OPT}_IMPLIES}) |
||||
endif() |
||||
list(APPEND __checked ${OPT}) |
||||
endforeach() |
||||
endwhile() |
||||
endmacro() |
||||
|
||||
macro(ocv_is_optimization_in_force_list resultvar check_opt) |
||||
set(__checked "") |
||||
set(__queue ${ARGN}) |
||||
set(${resultvar} 0) |
||||
while(__queue AND NOT ${resultvar}) |
||||
list(REMOVE_DUPLICATES __queue) |
||||
set(__queue_current ${__queue}) |
||||
set(__queue "") |
||||
foreach(OPT ${__queue_current}) |
||||
if(OPT STREQUAL "${check_opt}") |
||||
set(${resultvar} 1) |
||||
break() |
||||
elseif(NOT ";${__checked};" MATCHES ";${OPT};") |
||||
list(APPEND __queue ${CPU_${OPT}_FORCE}) |
||||
endif() |
||||
list(APPEND __checked ${OPT}) |
||||
endforeach() |
||||
endwhile() |
||||
endmacro() |
||||
|
||||
macro(ocv_append_optimization_flag var OPT) |
||||
if(CPU_${OPT}_FLAGS_CONFLICT) |
||||
string(REGEX REPLACE " ${CPU_${OPT}_FLAGS_CONFLICT}" "" ${var} " ${${var}}") |
||||
string(REGEX REPLACE "^ +" "" ${var} "${${var}}") |
||||
endif() |
||||
set(${var} "${${var}} ${CPU_${OPT}_FLAGS_ON}") |
||||
endmacro() |
||||
|
||||
# Support GCC -march=native or Intel Compiler -xHost flags |
||||
if(";${CPU_BASELINE};" MATCHES ";NATIVE;" OR ";${CPU_BASELINE};" MATCHES ";HOST;") |
||||
set(CPU_BASELINE_DETECT ON) |
||||
set(_add_native_flag ON) |
||||
elseif(";${CPU_BASELINE};" MATCHES ";DETECT;") |
||||
set(CPU_BASELINE_DETECT ON) |
||||
elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") |
||||
if(DEFINED CPU_BASELINE) |
||||
message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") |
||||
endif() |
||||
set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
set(CPU_BASELINE_DETECT ON) |
||||
endif() |
||||
|
||||
if(X86 OR X86_64) |
||||
ocv_update(CPU_KNOWN_OPTIMIZATIONS "SSE;SSE2;SSE3;SSSE3;SSE4_1;POPCNT;SSE4_2;FP16;FMA3;AVX;AVX2;AVX512") |
||||
|
||||
ocv_update(CPU_SSE_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse.cpp") |
||||
ocv_update(CPU_SSE2_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse2.cpp") |
||||
ocv_update(CPU_SSE3_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse3.cpp") |
||||
ocv_update(CPU_SSSE3_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_ssse3.cpp") |
||||
ocv_update(CPU_SSE4_1_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse41.cpp") |
||||
ocv_update(CPU_SSE4_2_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse42.cpp") |
||||
ocv_update(CPU_POPCNT_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_popcnt.cpp") |
||||
ocv_update(CPU_AVX_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx.cpp") |
||||
ocv_update(CPU_AVX2_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx2.cpp") |
||||
ocv_update(CPU_FP16_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_fp16.cpp") |
||||
ocv_update(CPU_AVX512_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512.cpp") |
||||
|
||||
if(NOT OPENCV_CPU_OPT_IMPLIES_IGNORE) |
||||
ocv_update(CPU_AVX512_IMPLIES "AVX2") |
||||
ocv_update(CPU_AVX512_FORCE "") # Don't force other optimizations |
||||
ocv_update(CPU_AVX2_IMPLIES "AVX;FMA3;FP16") |
||||
ocv_update(CPU_FMA3_IMPLIES "AVX2") |
||||
ocv_update(CPU_FMA3_FORCE "") # Don't force other optimizations |
||||
ocv_update(CPU_FP16_IMPLIES "AVX") |
||||
ocv_update(CPU_FP16_FORCE "") # Don't force other optimizations |
||||
ocv_update(CPU_AVX_IMPLIES "SSE4_2") |
||||
ocv_update(CPU_SSE4_2_IMPLIES "SSE4_1;POPCNT") |
||||
ocv_update(CPU_POPCNT_IMPLIES "SSE4_1") |
||||
ocv_update(CPU_POPCNT_FORCE "") # Don't force other optimizations |
||||
ocv_update(CPU_SSE4_1_IMPLIES "SSE3;SSSE3") |
||||
ocv_update(CPU_SSSE3_IMPLIES "SSE3") |
||||
ocv_update(CPU_SSE3_IMPLIES "SSE2") |
||||
ocv_update(CPU_SSE2_IMPLIES "SSE") |
||||
endif() |
||||
|
||||
if(CV_ICC) |
||||
macro(ocv_intel_compiler_optimization_option name unix_flags msvc_flags) |
||||
ocv_update(CPU_${name}_FLAGS_NAME "${name}") |
||||
if(MSVC) |
||||
set(enable_flags "${msvc_flags}") |
||||
set(flags_conflict "/arch:[^ ]+") |
||||
else() |
||||
set(enable_flags "${unix_flags}") |
||||
set(flags_conflict "-msse[^ ]*|-mssse3|-mavx[^ ]*|-march[^ ]+") |
||||
endif() |
||||
ocv_update(CPU_${name}_FLAGS_ON "${enable_flags}") |
||||
if(flags_conflict) |
||||
ocv_update(CPU_${name}_FLAGS_CONFLICT "${flags_conflict}") |
||||
endif() |
||||
endmacro() |
||||
ocv_intel_compiler_optimization_option(AVX2 "-march=core-avx2" "/arch:CORE-AVX2") |
||||
ocv_intel_compiler_optimization_option(FP16 "-mavx" "/arch:AVX") |
||||
ocv_intel_compiler_optimization_option(AVX "-mavx" "/arch:AVX") |
||||
ocv_intel_compiler_optimization_option(FMA3 "" "") |
||||
ocv_intel_compiler_optimization_option(POPCNT "" "") |
||||
ocv_intel_compiler_optimization_option(SSE4_2 "-msse4.2" "/arch:SSE4.2") |
||||
ocv_intel_compiler_optimization_option(SSE4_1 "-msse4.1" "/arch:SSE4.1") |
||||
ocv_intel_compiler_optimization_option(SSE3 "-msse3" "/arch:SSE3") |
||||
ocv_intel_compiler_optimization_option(SSSE3 "-mssse3" "/arch:SSSE3") |
||||
ocv_intel_compiler_optimization_option(SSE2 "-msse2" "/arch:SSE2") |
||||
if(NOT X86_64) # x64 compiler doesn't support /arch:sse |
||||
ocv_intel_compiler_optimization_option(SSE "-msse" "/arch:SSE") |
||||
endif() |
||||
#ocv_intel_compiler_optimization_option(AVX512 "-march=core-avx512") |
||||
elseif(CMAKE_COMPILER_IS_GNUCXX) |
||||
ocv_update(CPU_AVX2_FLAGS_ON "-mavx2") |
||||
ocv_update(CPU_FP16_FLAGS_ON "-mf16c") |
||||
ocv_update(CPU_AVX_FLAGS_ON "-mavx") |
||||
ocv_update(CPU_FMA3_FLAGS_ON "-mfma") |
||||
ocv_update(CPU_POPCNT_FLAGS_ON "-mpopcnt") |
||||
ocv_update(CPU_SSE4_2_FLAGS_ON "-msse4.2") |
||||
ocv_update(CPU_SSE4_1_FLAGS_ON "-msse4.1") |
||||
ocv_update(CPU_SSE3_FLAGS_ON "-msse3") |
||||
ocv_update(CPU_SSSE3_FLAGS_ON "-mssse3") |
||||
ocv_update(CPU_SSE2_FLAGS_ON "-msse2") |
||||
ocv_update(CPU_SSE_FLAGS_ON "-msse") |
||||
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") |
||||
ocv_update(CPU_AVX512_FLAGS_ON "-mavx512f -mavx512pf -mavx512er -mavx512cd -mavx512vl -mavx512bw -mavx512dq -mavx512ifma -mavx512vbmi") |
||||
endif() |
||||
elseif(MSVC) |
||||
ocv_update(CPU_AVX2_FLAGS_ON "/arch:AVX2") |
||||
ocv_update(CPU_AVX_FLAGS_ON "/arch:AVX") |
||||
if(NOT MSVC64) |
||||
# 64-bit MSVC compiler uses SSE/SSE2 by default |
||||
ocv_update(CPU_SSE_FLAGS_ON "/arch:SSE") |
||||
ocv_update(CPU_SSE_SUPPORTED ON) |
||||
ocv_update(CPU_SSE2_FLAGS_ON "/arch:SSE2") |
||||
ocv_update(CPU_SSE2_SUPPORTED ON) |
||||
else() |
||||
ocv_update(CPU_SSE_SUPPORTED ON) |
||||
ocv_update(CPU_SSE2_SUPPORTED ON) |
||||
endif() |
||||
# Other instruction sets are supported by default since MSVC 2008 at least |
||||
else() |
||||
message(WARNING "TODO: Unsupported compiler") |
||||
endif() |
||||
|
||||
if(NOT DEFINED CPU_DISPATCH) |
||||
set(CPU_DISPATCH "SSE4_1;AVX;FP16;AVX2" CACHE STRING "${HELP_CPU_DISPATCH}") |
||||
endif() |
||||
|
||||
if(NOT DEFINED CPU_BASELINE) |
||||
if(X86_64) |
||||
set(CPU_BASELINE "SSSE3" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
else() |
||||
set(CPU_BASELINE "SSE2" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
endif() |
||||
endif() |
||||
|
||||
elseif(ARM OR AARCH64) |
||||
ocv_update(CPU_FP16_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_fp16.cpp") |
||||
if(NOT AARCH64) |
||||
ocv_update(CPU_KNOWN_OPTIMIZATIONS "VFPV3;NEON;FP16") |
||||
ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon") |
||||
ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3") |
||||
ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16") |
||||
set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
else() |
||||
ocv_update(CPU_KNOWN_OPTIMIZATIONS "NEON;FP16") |
||||
ocv_update(CPU_NEON_FLAGS_ON "") |
||||
set(CPU_BASELINE "NEON" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
endif() |
||||
endif() |
||||
|
||||
# Helper values for cmake-gui |
||||
set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") |
||||
set(CPU_DISPATCH "" CACHE STRING "${HELP_CPU_DISPATCH}") |
||||
set_property(CACHE CPU_BASELINE PROPERTY STRINGS "" ${CPU_KNOWN_OPTIMIZATIONS}) |
||||
set_property(CACHE CPU_DISPATCH PROPERTY STRINGS "" ${CPU_KNOWN_OPTIMIZATIONS}) |
||||
|
||||
set(CPU_BASELINE_FLAGS "") |
||||
|
||||
set(CPU_BASELINE_FINAL "") |
||||
set(CPU_DISPATCH_FINAL "") |
||||
|
||||
macro(ocv_check_compiler_optimization OPT) |
||||
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) |
||||
set(_varname "") |
||||
if(CPU_${OPT}_TEST_FILE) |
||||
set(__available 0) |
||||
if(CPU_BASELINE_DETECT) |
||||
set(_varname "HAVE_CPU_${OPT}_SUPPORT") |
||||
ocv_check_compiler_flag(CXX "${CPU_BASELINE_FLAGS}" "${_varname}" "${CPU_${OPT}_TEST_FILE}") |
||||
if(${_varname}) |
||||
list(APPEND CPU_BASELINE_FINAL ${OPT}) |
||||
set(__available 1) |
||||
endif() |
||||
endif() |
||||
if(NOT __available) |
||||
if(NOT "x${CPU_${OPT}_FLAGS_NAME}" STREQUAL "x") |
||||
set(_varname "HAVE_CPU_${CPU_${OPT}_FLAGS_NAME}") |
||||
set(_compile_flags "${CPU_BASELINE_FLAGS}") |
||||
ocv_append_optimization_flag(_compile_flags ${OPT}) |
||||
ocv_check_compiler_flag(CXX "${_compile_flags}" "${_varname}" "${CPU_${OPT}_TEST_FILE}") |
||||
elseif(NOT "x${CPU_${OPT}_FLAGS_ON}" STREQUAL "x") |
||||
ocv_check_flag_support(CXX "${CPU_${OPT}_FLAGS_ON}" _varname "" "${CPU_${OPT}_TEST_FILE}") |
||||
else() |
||||
set(_varname "HAVE_CPU_${OPT}_SUPPORT") |
||||
set(_compile_flags "${CPU_BASELINE_FLAGS}") |
||||
ocv_append_optimization_flag(_compile_flags ${OPT}) |
||||
ocv_check_compiler_flag(CXX "${_compile_flags}" "${_varname}" "${CPU_${OPT}_TEST_FILE}") |
||||
endif() |
||||
endif() |
||||
else() |
||||
ocv_check_flag_support(CXX "${CPU_${OPT}_FLAGS_ON}" _varname "") |
||||
endif() |
||||
if(_varname AND ${_varname}) |
||||
set(CPU_${OPT}_SUPPORTED ON) |
||||
elseif(NOT CPU_${OPT}_SUPPORTED) |
||||
message(STATUS "${OPT} is not supported by C++ compiler") |
||||
endif() |
||||
else() |
||||
set(CPU_${OPT}_SUPPORTED ON) |
||||
endif() |
||||
endif() |
||||
endmacro() |
||||
|
||||
foreach(OPT ${CPU_KNOWN_OPTIMIZATIONS}) |
||||
set(CPU_${OPT}_USAGE_COUNT 0 CACHE INTERNAL "" FORCE) |
||||
if(NOT DEFINED CPU_${OPT}_FORCE) |
||||
set(CPU_${OPT}_FORCE "${CPU_${OPT}_IMPLIES}") |
||||
endif() |
||||
endforeach() |
||||
|
||||
if(_add_native_flag) |
||||
set(_varname "HAVE_CPU_NATIVE_SUPPORT") |
||||
ocv_check_compiler_flag(CXX "-march=native" "${_varname}" "") |
||||
if(_varname) |
||||
set(CPU_BASELINE_FLAGS "${CPU_BASELINE_FLAGS} -march=native") |
||||
else() |
||||
set(_varname "HAVE_CPU_HOST_SUPPORT") |
||||
if(MSVC) |
||||
set(_flag "/QxHost") |
||||
else() |
||||
set(_flag "-xHost") |
||||
endif() |
||||
ocv_check_compiler_flag(CXX "${_flag}" "${_varname}" "") |
||||
if(_varname) |
||||
set(CPU_BASELINE_FLAGS "${CPU_BASELINE_FLAGS} ${flag}") |
||||
endif() |
||||
endif() |
||||
endif() |
||||
|
||||
foreach(OPT ${CPU_KNOWN_OPTIMIZATIONS}) |
||||
set(__is_disabled 0) |
||||
foreach(OPT2 ${CPU_BASELINE_DISABLE}) |
||||
ocv_is_optimization_in_list(__is_disabled ${OPT2} ${OPT}) |
||||
if(__is_disabled) |
||||
break() |
||||
endif() |
||||
endforeach() |
||||
if(__is_disabled) |
||||
set(__is_from_baseline 0) |
||||
else() |
||||
ocv_is_optimization_in_list(__is_from_baseline ${OPT} ${CPU_BASELINE_REQUIRE}) |
||||
if(NOT __is_from_baseline) |
||||
ocv_is_optimization_in_list(__is_from_baseline ${OPT} ${CPU_BASELINE}) |
||||
endif() |
||||
endif() |
||||
ocv_is_optimization_in_list(__is_from_dispatch ${OPT} ${CPU_DISPATCH_REQUIRE}) |
||||
if(NOT __is_from_dispatch) |
||||
ocv_is_optimization_in_list(__is_from_dispatch ${OPT} ${CPU_DISPATCH}) |
||||
endif() |
||||
if(__is_from_dispatch OR __is_from_baseline OR CPU_BASELINE_DETECT) |
||||
ocv_check_compiler_optimization(${OPT}) |
||||
endif() |
||||
if(CPU_BASELINE_DETECT AND NOT __is_from_baseline AND NOT __is_disabled) |
||||
ocv_is_optimization_in_list(__is_from_baseline ${OPT} ${CPU_BASELINE_FINAL}) |
||||
endif() |
||||
if(CPU_${OPT}_SUPPORTED) |
||||
if(";${CPU_DISPATCH};" MATCHES ";${OPT};" AND NOT __is_from_baseline) |
||||
list(APPEND CPU_DISPATCH_FINAL ${OPT}) |
||||
elseif(__is_from_baseline AND NOT CPU_BASELINE_DETECT) |
||||
list(APPEND CPU_BASELINE_FINAL ${OPT}) |
||||
ocv_append_optimization_flag(CPU_BASELINE_FLAGS ${OPT}) |
||||
endif() |
||||
endif() |
||||
endforeach() |
||||
|
||||
foreach(OPT ${CPU_BASELINE_REQUIRE}) |
||||
if(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};") |
||||
message(SEND_ERROR "Required baseline optimization is not supported: ${OPT} (CPU_BASELINE_REQUIRE=${CPU_BASELINE_REQUIRE})") |
||||
endif() |
||||
endforeach() |
||||
|
||||
foreach(OPT ${CPU_BASELINE}) |
||||
if(OPT STREQUAL "DETECT" OR OPT STREQUAL "HOST" OR OPT STREQUAL "NATIVE") |
||||
# nothing |
||||
elseif(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};") |
||||
message(STATUS "Optimization ${OPT} is not available, skipped") |
||||
endif() |
||||
endforeach() |
||||
|
||||
foreach(OPT ${CPU_DISPATCH_REQUIRE}) |
||||
if(";${CPU_DISPATCH_FINAL};" MATCHES ";${OPT};") |
||||
# OK |
||||
elseif(";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};") |
||||
message(SEND_ERROR "Dispatched optimization ${OPT} is in baseline list (CPU_DISPATCH_REQUIRE=${CPU_DISPATCH_REQUIRE})") |
||||
else() |
||||
message(SEND_ERROR "Required dispatch optimization is not supported: ${OPT} (CPU_DISPATCH_REQUIRE=${CPU_DISPATCH_REQUIRE})") |
||||
endif() |
||||
endforeach() |
||||
|
||||
foreach(OPT ${CPU_DISPATCH}) |
||||
if(";${CPU_DISPATCH_FINAL};" MATCHES ";${OPT};") |
||||
# OK |
||||
elseif(";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};") |
||||
# OK |
||||
else() |
||||
message(STATUS "Dispatch optimization ${OPT} is not available, skipped") |
||||
endif() |
||||
endforeach() |
||||
|
||||
#message(STATUS "CPU_BASELINE_FINAL=${CPU_BASELINE_FINAL}") |
||||
#message(STATUS "CPU_DISPATCH_FINAL=${CPU_DISPATCH_FINAL}") |
||||
|
||||
#if(CPU_DISPATCH_FINAL AND NOT PYTHON_DEFAULT_EXECUTABLE) |
||||
# message(FATAL_ERROR "Python is required for CPU dispatched optimization support") |
||||
#endif() |
||||
|
||||
macro(ocv_compiler_optimization_options) |
||||
set(__flags "${OPENCV_EXTRA_CXX_FLAGS} ${CPU_BASELINE_FLAGS}") |
||||
if(NOT __flags STREQUAL CACHED_CPU_BASELINE_FLAGS) |
||||
set(CACHED_CPU_BASELINE_FLAGS "${__flags}" CACHE INTERNAL "" FORCE) |
||||
ocv_clear_vars(HAVE_CPU_BASELINE_FLAGS) |
||||
endif() |
||||
ocv_check_compiler_flag(CXX "${__flags}" HAVE_CPU_BASELINE_FLAGS) |
||||
if(NOT HAVE_CPU_BASELINE_FLAGS) |
||||
message(FATAL_ERROR "Compiler doesn't support baseline optimization flags: ${CPU_BASELINE_FLAGS}") |
||||
endif() |
||||
add_extra_compiler_option_force("${CPU_BASELINE_FLAGS}") |
||||
|
||||
foreach(OPT ${CPU_DISPATCH_FINAL}) |
||||
set(__dispatch_flags "") |
||||
set(__dispatch_definitions "") |
||||
set(__dispatch_opts "") |
||||
set(__dispatch_opts_force "") |
||||
foreach(OPT2 ${CPU_KNOWN_OPTIMIZATIONS}) |
||||
if(NOT CPU_${OPT2}_SUPPORTED) |
||||
#continue() |
||||
else() |
||||
ocv_is_optimization_in_list(__is_from_baseline ${OPT2} ${CPU_BASELINE_FINAL}) |
||||
if(NOT __is_from_baseline) |
||||
ocv_is_optimization_in_list(__is_active ${OPT2} ${OPT}) |
||||
if(__is_active) |
||||
ocv_append_optimization_flag(__dispatch_flags ${OPT2}) |
||||
list(APPEND __dispatch_definitions "CV_CPU_COMPILE_${OPT2}=1") |
||||
list(APPEND __dispatch_opts "${OPT2}") |
||||
endif() |
||||
ocv_is_optimization_in_force_list(__is_force ${OPT2} ${OPT}) |
||||
if(__is_force) |
||||
list(APPEND __dispatch_opts_force "${OPT2}") |
||||
endif() |
||||
endif() |
||||
endif() |
||||
endforeach() |
||||
set(__flags "${OPENCV_EXTRA_CXX_FLAGS} ${__dispatch_flags}") |
||||
if(NOT __flags STREQUAL CACHED_CPU_DISPATCH_${OPT}_FLAGS) |
||||
set(CACHED_CPU_DISPATCH_${OPT}_FLAGS "${__flags}" CACHE INTERNAL "" FORCE) |
||||
ocv_clear_vars(HAVE_CPU_DISPATCH_FLAGS_${OPT}) |
||||
endif() |
||||
ocv_check_compiler_flag(CXX "${__flags}" HAVE_CPU_DISPATCH_FLAGS_${OPT}) |
||||
if(NOT HAVE_CPU_DISPATCH_FLAGS_${OPT}) |
||||
message(FATAL_ERROR "Compiler doesn't support optimization flags for ${OPT} dispatch mode: ${__dispatch_flags}") |
||||
endif() |
||||
set(CPU_DISPATCH_FLAGS_${OPT} "${__dispatch_flags}") |
||||
set(CPU_DISPATCH_DEFINITIONS_${OPT} "${__dispatch_definitions}") |
||||
set(CPU_DISPATCH_${OPT}_INCLUDED "${__dispatch_opts}") |
||||
set(CPU_DISPATCH_${OPT}_FORCED "${__dispatch_opts_force}") |
||||
endforeach() |
||||
|
||||
if(ENABLE_POWERPC) |
||||
add_extra_compiler_option("-mcpu=G3 -mtune=G5") |
||||
endif() |
||||
if(ARM) |
||||
add_extra_compiler_option("-mfp16-format=ieee") |
||||
endif(ARM) |
||||
if(ENABLE_NEON) |
||||
add_extra_compiler_option("-mfpu=neon") |
||||
endif() |
||||
if(ENABLE_VFPV3 AND NOT ENABLE_NEON) |
||||
add_extra_compiler_option("-mfpu=vfpv3") |
||||
endif() |
||||
endmacro() |
||||
|
||||
macro(ocv_compiler_optimization_options_finalize) |
||||
if(CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) |
||||
if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
if(OPENCV_EXTRA_CXX_FLAGS MATCHES "-m(sse2|avx)") |
||||
add_extra_compiler_option(-mfpmath=sse) # !! important - be on the same wave with x64 compilers |
||||
else() |
||||
add_extra_compiler_option(-mfpmath=387) |
||||
endif() |
||||
endif() |
||||
endif() |
||||
|
||||
if(MSVC) |
||||
# Generate Intrinsic Functions |
||||
set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /Oi") |
||||
|
||||
if((X86 OR X86_64) AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND ";${CPU_BASELINE_FINAL};" MATCHES ";SSE;") |
||||
set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /fp:fast") # !! important - be on the same wave with x64 compilers |
||||
endif() |
||||
endif(MSVC) |
||||
endmacro() |
||||
|
||||
macro(ocv_compiler_optimization_process_sources SOURCES_VAR_NAME LIBS_VAR_NAME TARGET_BASE_NAME) |
||||
set(__result "") |
||||
set(__result_libs "") |
||||
foreach(OPT ${CPU_DISPATCH_FINAL}) |
||||
set(__result_${OPT} "") |
||||
endforeach() |
||||
foreach(fname ${${SOURCES_VAR_NAME}}) |
||||
string(TOLOWER "${fname}" fname_LOWER) |
||||
if(fname_LOWER MATCHES "[.]opt_.*[.]cpp$") |
||||
if(CV_DISABLE_OPTIMIZATION OR NOT CV_ENABLE_INTRINSICS) |
||||
message(STATUS "Excluding from source files list: ${fname}") |
||||
#continue() |
||||
else() |
||||
set(__opt_found 0) |
||||
foreach(OPT ${CPU_BASELINE_FINAL}) |
||||
string(TOLOWER "${OPT}" OPT_LOWER) |
||||
if(fname_LOWER MATCHES "_${OPT_LOWER}[.]cpp$") |
||||
#message("${fname} BASELINE-${OPT}") |
||||
set(__opt_found 1) |
||||
list(APPEND __result "${fname}") |
||||
break() |
||||
endif() |
||||
endforeach() |
||||
foreach(OPT ${CPU_DISPATCH_FINAL}) |
||||
foreach(OPT2 ${CPU_DISPATCH_${OPT}_FORCED}) |
||||
string(TOLOWER "${OPT2}" OPT2_LOWER) |
||||
if(fname_LOWER MATCHES "_${OPT2_LOWER}[.]cpp$") |
||||
list(APPEND __result_${OPT} "${fname}") |
||||
math(EXPR CPU_${OPT}_USAGE_COUNT "${CPU_${OPT}_USAGE_COUNT}+1") |
||||
set(CPU_${OPT}_USAGE_COUNT "${CPU_${OPT}_USAGE_COUNT}" CACHE INTERNAL "" FORCE) |
||||
#message("${fname} ${OPT}") |
||||
#message(" ${CPU_DISPATCH_${OPT}_INCLUDED}") |
||||
#message(" ${CPU_DISPATCH_DEFINITIONS_${OPT}}") |
||||
#message(" ${CPU_DISPATCH_FLAGS_${OPT}}") |
||||
set(__opt_found 1) |
||||
break() |
||||
endif() |
||||
endforeach() |
||||
if(__opt_found) |
||||
set(__opt_found 1) |
||||
break() |
||||
endif() |
||||
endforeach() |
||||
if(NOT __opt_found) |
||||
message(STATUS "Excluding from source files list: ${fname}") |
||||
endif() |
||||
endif() |
||||
else() |
||||
list(APPEND __result "${fname}") |
||||
endif() |
||||
endforeach() |
||||
|
||||
foreach(OPT ${CPU_DISPATCH_FINAL}) |
||||
if(__result_${OPT}) |
||||
#message("${OPT}: ${__result_${OPT}}") |
||||
if(CMAKE_GENERATOR MATCHES "^Visual") |
||||
# extra flags are added before common flags, so switching between optimizations doesn't work correctly |
||||
# Also CMAKE_CXX_FLAGS doesn't work (it is directory-based, so add_subdirectory is required) |
||||
add_library(${TARGET_BASE_NAME}_${OPT} OBJECT ${__result_${OPT}}) |
||||
ocv_append_dependant_targets(${TARGET_BASE_NAME} ${TARGET_BASE_NAME}_${OPT}) |
||||
set_target_properties(${TARGET_BASE_NAME}_${OPT} PROPERTIES COMPILE_DEFINITIONS "${CPU_DISPATCH_DEFINITIONS_${OPT}}") |
||||
set_target_properties(${TARGET_BASE_NAME}_${OPT} PROPERTIES COMPILE_FLAGS "${CPU_DISPATCH_FLAGS_${OPT}}") |
||||
#list(APPEND __result_libs ${TARGET_BASE_NAME}_${OPT}) |
||||
list(APPEND __result "$<TARGET_OBJECTS:${TARGET_BASE_NAME}_${OPT}>") |
||||
else() |
||||
foreach(fname ${__result_${OPT}}) |
||||
set_source_files_properties("${fname}" PROPERTIES COMPILE_DEFINITIONS "${CPU_DISPATCH_DEFINITIONS_${OPT}}") |
||||
set_source_files_properties("${fname}" PROPERTIES COMPILE_FLAGS "${CPU_DISPATCH_FLAGS_${OPT}}") |
||||
endforeach() |
||||
list(APPEND __result ${__result_${OPT}}) |
||||
endif() |
||||
endif() |
||||
endforeach() |
||||
set(${SOURCES_VAR_NAME} "${__result}") |
||||
list(APPEND ${LIBS_VAR_NAME} ${__result_libs}) |
||||
endmacro() |
||||
|
||||
macro(ocv_compiler_optimization_fill_cpu_config) |
||||
set(OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE "") |
||||
foreach(OPT ${CPU_BASELINE_FINAL}) |
||||
set(OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE} |
||||
#define CV_CPU_COMPILE_${OPT} 1 |
||||
#define CV_CPU_BASELINE_COMPILE_${OPT} 1 |
||||
") |
||||
endforeach() |
||||
|
||||
set(OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE} |
||||
#define CV_CPU_BASELINE_FEATURES 0 \\") |
||||
foreach(OPT ${CPU_BASELINE_FINAL}) |
||||
if(NOT DEFINED CPU_${OPT}_FEATURE_ALIAS OR NOT "x${CPU_${OPT}_FEATURE_ALIAS}" STREQUAL "x") |
||||
set(OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE} |
||||
, CV_CPU_${OPT} \\") |
||||
endif() |
||||
endforeach() |
||||
set(OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE}\n") |
||||
|
||||
set(__dispatch_modes "") |
||||
foreach(OPT ${CPU_DISPATCH_FINAL}) |
||||
list(APPEND __dispatch_modes ${CPU_DISPATCH_${OPT}_FORCE} ${OPT}) |
||||
endforeach() |
||||
list(REMOVE_DUPLICATES __dispatch_modes) |
||||
set(OPENCV_CPU_DISPATCH_DEFINITIONS_CONFIGMAKE "") |
||||
foreach(OPT ${__dispatch_modes}) |
||||
set(OPENCV_CPU_DISPATCH_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_DISPATCH_DEFINITIONS_CONFIGMAKE} |
||||
#define CV_CPU_DISPATCH_COMPILE_${OPT} 1") |
||||
endforeach() |
||||
|
||||
set(OPENCV_CPU_CONTROL_DEFINITIONS_CONFIGMAKE "// AUTOGENERATED, DO NOT EDIT\n") |
||||
foreach(OPT ${CPU_ALL_OPTIMIZATIONS}) |
||||
if(NOT DEFINED CPU_${OPT}_FEATURE_ALIAS OR NOT "x${CPU_${OPT}_FEATURE_ALIAS}" STREQUAL "x") |
||||
set(OPENCV_CPU_CONTROL_DEFINITIONS_CONFIGMAKE "${OPENCV_CPU_CONTROL_DEFINITIONS_CONFIGMAKE} |
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_${OPT} |
||||
# define CV_CPU_HAS_SUPPORT_${OPT} 1 |
||||
# define CV_CPU_CALL_${OPT}(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_${OPT} |
||||
# define CV_CPU_HAS_SUPPORT_${OPT} (cv::checkHardwareSupport(CV_CPU_${OPT})) |
||||
# define CV_CPU_CALL_${OPT}(...) if (CV_CPU_HAS_SUPPORT_${OPT}) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_${OPT} 0 |
||||
# define CV_CPU_CALL_${OPT}(...) |
||||
#endif |
||||
") |
||||
endif() |
||||
endforeach() |
||||
|
||||
set(__file "${CMAKE_SOURCE_DIR}/modules/core/include/opencv2/core/cv_cpu_helper.h") |
||||
if(EXISTS "${__file}") |
||||
file(READ "${__file}" __content) |
||||
endif() |
||||
if(__content STREQUAL OPENCV_CPU_CONTROL_DEFINITIONS_CONFIGMAKE) |
||||
#message(STATUS "${__file} contains same content") |
||||
else() |
||||
file(WRITE "${__file}" "${OPENCV_CPU_CONTROL_DEFINITIONS_CONFIGMAKE}") |
||||
message(WARNING "${__file} is updated") |
||||
endif() |
||||
endmacro() |
||||
|
||||
if(CV_DISABLE_OPTIMIZATION OR CV_ICC) |
||||
ocv_update(CV_ENABLE_UNROLLED 0) |
||||
else() |
||||
ocv_update(CV_ENABLE_UNROLLED 1) |
||||
endif() |
||||
@ -0,0 +1,9 @@ |
||||
#if !defined __AVX__ // MSVC supports this flag since MSVS 2013
|
||||
#error "__AVX__ define is missing" |
||||
#endif |
||||
#include <immintrin.h> |
||||
void test() |
||||
{ |
||||
__m256 a = _mm256_set1_ps(0.0f); |
||||
} |
||||
int main() { return 0; } |
||||
@ -0,0 +1,10 @@ |
||||
#if !defined __AVX2__ // MSVC supports this flag since MSVS 2013
|
||||
#error "__AVX2__ define is missing" |
||||
#endif |
||||
#include <immintrin.h> |
||||
void test() |
||||
{ |
||||
int data[8] = {0,0,0,0, 0,0,0,0}; |
||||
__m256i a = _mm256_loadu_si256((const __m256i *)data); |
||||
} |
||||
int main() { return 0; } |
||||
@ -0,0 +1,10 @@ |
||||
#if defined __AVX512__ || defined __AVX512F__ |
||||
#include <immintrin.h> |
||||
void test() |
||||
{ |
||||
__m512i zmm = _mm512_setzero_si512(); |
||||
} |
||||
#else |
||||
#error "AVX512 is not supported" |
||||
#endif |
||||
int main() { return 0; } |
||||
@ -1,6 +1,6 @@ |
||||
#include <stdio.h> |
||||
|
||||
#if defined __F16C__ || (defined _MSC_VER && _MSC_VER >= 1700) |
||||
#if defined __F16C__ || (defined _MSC_VER && _MSC_VER >= 1700) || (defined __INTEL_COMPILER && defined __AVX__) |
||||
#include <immintrin.h> |
||||
int test() |
||||
{ |
||||
@ -0,0 +1,8 @@ |
||||
#include <nmmintrin.h> |
||||
#ifndef _MSC_VER |
||||
#include <popcntintrin.h> |
||||
#endif |
||||
int main() { |
||||
int i = _mm_popcnt_u64(1); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,2 @@ |
||||
#include <xmmintrin.h> |
||||
int main() { return 0; } |
||||
@ -0,0 +1,2 @@ |
||||
#include <emmintrin.h> |
||||
int main() { return 0; } |
||||
@ -0,0 +1,7 @@ |
||||
#include <pmmintrin.h> |
||||
int main() { |
||||
__m128 u, v; |
||||
u = _mm_set1_ps(0.0f); |
||||
v = _mm_moveldup_ps(u); // SSE3
|
||||
return 0; |
||||
} |
||||
@ -0,0 +1,6 @@ |
||||
#include <smmintrin.h> |
||||
int main() { |
||||
__m128i a = _mm_setzero_si128(), b = _mm_setzero_si128(); |
||||
__m128i c = _mm_packus_epi32(a, b); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
#include <nmmintrin.h> |
||||
int main() { |
||||
int i = _mm_popcnt_u64(1); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,7 @@ |
||||
#include <tmmintrin.h> |
||||
const double v = 0; |
||||
int main() { |
||||
__m128i a = _mm_setzero_si128(); |
||||
__m128i b = _mm_abs_epi32(a); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
#include <VX/vx.h> |
||||
int main() |
||||
{ |
||||
return VX_REFERENCE_COUNT == VX_REFERENCE_TYPE ? VX_REFERENCE_NAME : 0; |
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
// OpenCV CPU baseline features
|
||||
@OPENCV_CPU_BASELINE_DEFINITIONS_CONFIGMAKE@ |
||||
|
||||
// OpenCV supported CPU dispatched features
|
||||
@OPENCV_CPU_DISPATCH_DEFINITIONS_CONFIGMAKE@ |
||||
@ -0,0 +1,166 @@ |
||||
// This file is part of OpenCV project.
|
||||
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
||||
// of this distribution and at http://opencv.org/license.html.
|
||||
|
||||
#if defined __OPENCV_BUILD \ |
||||
|
||||
#include "cv_cpu_config.h" |
||||
#include "cv_cpu_helper.h" |
||||
|
||||
#if defined CV_ENABLE_INTRINSICS \ |
||||
&& !defined CV_DISABLE_OPTIMIZATION \
|
||||
&& !defined __CUDACC__ /* do not include SSE/AVX/NEON headers for NVCC compiler */ \
|
||||
|
||||
#ifdef CV_CPU_COMPILE_SSE2 |
||||
# include <emmintrin.h> |
||||
# define CV_MMX 1 |
||||
# define CV_SSE 1 |
||||
# define CV_SSE2 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_SSE3 |
||||
# include <pmmintrin.h> |
||||
# define CV_SSE3 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_SSSE3 |
||||
# include <tmmintrin.h> |
||||
# define CV_SSSE3 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_SSE4_1 |
||||
# include <smmintrin.h> |
||||
# define CV_SSE4_1 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_SSE4_2 |
||||
# include <nmmintrin.h> |
||||
# define CV_SSE4_2 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_POPCNT |
||||
# ifdef _MSC_VER |
||||
# include <nmmintrin.h> |
||||
# if defined(_M_X64) |
||||
# define CV_POPCNT_U64 _mm_popcnt_u64 |
||||
# endif |
||||
# define CV_POPCNT_U32 _mm_popcnt_u32 |
||||
# else |
||||
# include <popcntintrin.h> |
||||
# if defined(__x86_64__) |
||||
# define CV_POPCNT_U64 __builtin_popcountll |
||||
# endif |
||||
# define CV_POPCNT_U32 __builtin_popcount |
||||
# endif |
||||
# define CV_POPCNT 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_AVX |
||||
# include <immintrin.h> |
||||
# define CV_AVX 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_AVX2 |
||||
# include <immintrin.h> |
||||
# define CV_AVX2 1 |
||||
#endif |
||||
#ifdef CV_CPU_COMPILE_FMA3 |
||||
# define CV_FMA3 1 |
||||
#endif |
||||
|
||||
#if (defined WIN32 || defined _WIN32) && defined(_M_ARM) |
||||
# include <Intrin.h> |
||||
# include <arm_neon.h> |
||||
# define CV_NEON 1 |
||||
#elif defined(__ARM_NEON__) || (defined (__ARM_NEON) && defined(__aarch64__)) |
||||
# include <arm_neon.h> |
||||
# define CV_NEON 1 |
||||
#endif |
||||
|
||||
#if defined(__ARM_NEON__) || defined(__aarch64__) |
||||
# include <arm_neon.h> |
||||
#endif |
||||
|
||||
#endif // CV_ENABLE_INTRINSICS && !CV_DISABLE_OPTIMIZATION && !__CUDACC__
|
||||
|
||||
#endif // __OPENCV_BUILD
|
||||
|
||||
|
||||
|
||||
#if !defined __OPENCV_BUILD // Compatibility code
|
||||
|
||||
#if defined __SSE2__ || defined _M_X64 || (defined _M_IX86_FP && _M_IX86_FP >= 2) |
||||
# include <emmintrin.h> |
||||
# define CV_MMX 1 |
||||
# define CV_SSE 1 |
||||
# define CV_SSE2 1 |
||||
#elif (defined WIN32 || defined _WIN32) && defined(_M_ARM) |
||||
# include <Intrin.h> |
||||
# include <arm_neon.h> |
||||
# define CV_NEON 1 |
||||
#elif defined(__ARM_NEON__) || (defined (__ARM_NEON) && defined(__aarch64__)) |
||||
# include <arm_neon.h> |
||||
# define CV_NEON 1 |
||||
#endif |
||||
|
||||
#endif // !__OPENCV_BUILD (Compatibility code)
|
||||
|
||||
|
||||
|
||||
#ifndef CV_MMX |
||||
# define CV_MMX 0 |
||||
#endif |
||||
#ifndef CV_SSE |
||||
# define CV_SSE 0 |
||||
#endif |
||||
#ifndef CV_SSE2 |
||||
# define CV_SSE2 0 |
||||
#endif |
||||
#ifndef CV_SSE3 |
||||
# define CV_SSE3 0 |
||||
#endif |
||||
#ifndef CV_SSSE3 |
||||
# define CV_SSSE3 0 |
||||
#endif |
||||
#ifndef CV_SSE4_1 |
||||
# define CV_SSE4_1 0 |
||||
#endif |
||||
#ifndef CV_SSE4_2 |
||||
# define CV_SSE4_2 0 |
||||
#endif |
||||
#ifndef CV_POPCNT |
||||
# define CV_POPCNT 0 |
||||
#endif |
||||
#ifndef CV_AVX |
||||
# define CV_AVX 0 |
||||
#endif |
||||
#ifndef CV_AVX2 |
||||
# define CV_AVX2 0 |
||||
#endif |
||||
#ifndef CV_FMA3 |
||||
# define CV_FMA3 0 |
||||
#endif |
||||
#ifndef CV_AVX_512F |
||||
# define CV_AVX_512F 0 |
||||
#endif |
||||
#ifndef CV_AVX_512BW |
||||
# define CV_AVX_512BW 0 |
||||
#endif |
||||
#ifndef CV_AVX_512CD |
||||
# define CV_AVX_512CD 0 |
||||
#endif |
||||
#ifndef CV_AVX_512DQ |
||||
# define CV_AVX_512DQ 0 |
||||
#endif |
||||
#ifndef CV_AVX_512ER |
||||
# define CV_AVX_512ER 0 |
||||
#endif |
||||
#ifndef CV_AVX_512IFMA512 |
||||
# define CV_AVX_512IFMA512 0 |
||||
#endif |
||||
#ifndef CV_AVX_512PF |
||||
# define CV_AVX_512PF 0 |
||||
#endif |
||||
#ifndef CV_AVX_512VBMI |
||||
# define CV_AVX_512VBMI 0 |
||||
#endif |
||||
#ifndef CV_AVX_512VL |
||||
# define CV_AVX_512VL 0 |
||||
#endif |
||||
|
||||
#ifndef CV_NEON |
||||
# define CV_NEON 0 |
||||
#endif |
||||
@ -0,0 +1,133 @@ |
||||
// AUTOGENERATED, DO NOT EDIT
|
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSE |
||||
# define CV_CPU_HAS_SUPPORT_SSE 1 |
||||
# define CV_CPU_CALL_SSE(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSE |
||||
# define CV_CPU_HAS_SUPPORT_SSE (cv::checkHardwareSupport(CV_CPU_SSE)) |
||||
# define CV_CPU_CALL_SSE(...) if (CV_CPU_HAS_SUPPORT_SSE) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSE 0 |
||||
# define CV_CPU_CALL_SSE(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSE2 |
||||
# define CV_CPU_HAS_SUPPORT_SSE2 1 |
||||
# define CV_CPU_CALL_SSE2(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSE2 |
||||
# define CV_CPU_HAS_SUPPORT_SSE2 (cv::checkHardwareSupport(CV_CPU_SSE2)) |
||||
# define CV_CPU_CALL_SSE2(...) if (CV_CPU_HAS_SUPPORT_SSE2) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSE2 0 |
||||
# define CV_CPU_CALL_SSE2(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSE3 |
||||
# define CV_CPU_HAS_SUPPORT_SSE3 1 |
||||
# define CV_CPU_CALL_SSE3(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSE3 |
||||
# define CV_CPU_HAS_SUPPORT_SSE3 (cv::checkHardwareSupport(CV_CPU_SSE3)) |
||||
# define CV_CPU_CALL_SSE3(...) if (CV_CPU_HAS_SUPPORT_SSE3) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSE3 0 |
||||
# define CV_CPU_CALL_SSE3(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSSE3 |
||||
# define CV_CPU_HAS_SUPPORT_SSSE3 1 |
||||
# define CV_CPU_CALL_SSSE3(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSSE3 |
||||
# define CV_CPU_HAS_SUPPORT_SSSE3 (cv::checkHardwareSupport(CV_CPU_SSSE3)) |
||||
# define CV_CPU_CALL_SSSE3(...) if (CV_CPU_HAS_SUPPORT_SSSE3) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSSE3 0 |
||||
# define CV_CPU_CALL_SSSE3(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSE4_1 |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_1 1 |
||||
# define CV_CPU_CALL_SSE4_1(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSE4_1 |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_1 (cv::checkHardwareSupport(CV_CPU_SSE4_1)) |
||||
# define CV_CPU_CALL_SSE4_1(...) if (CV_CPU_HAS_SUPPORT_SSE4_1) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_1 0 |
||||
# define CV_CPU_CALL_SSE4_1(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_SSE4_2 |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_2 1 |
||||
# define CV_CPU_CALL_SSE4_2(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_SSE4_2 |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_2 (cv::checkHardwareSupport(CV_CPU_SSE4_2)) |
||||
# define CV_CPU_CALL_SSE4_2(...) if (CV_CPU_HAS_SUPPORT_SSE4_2) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_SSE4_2 0 |
||||
# define CV_CPU_CALL_SSE4_2(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_POPCNT |
||||
# define CV_CPU_HAS_SUPPORT_POPCNT 1 |
||||
# define CV_CPU_CALL_POPCNT(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_POPCNT |
||||
# define CV_CPU_HAS_SUPPORT_POPCNT (cv::checkHardwareSupport(CV_CPU_POPCNT)) |
||||
# define CV_CPU_CALL_POPCNT(...) if (CV_CPU_HAS_SUPPORT_POPCNT) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_POPCNT 0 |
||||
# define CV_CPU_CALL_POPCNT(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_AVX |
||||
# define CV_CPU_HAS_SUPPORT_AVX 1 |
||||
# define CV_CPU_CALL_AVX(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_AVX |
||||
# define CV_CPU_HAS_SUPPORT_AVX (cv::checkHardwareSupport(CV_CPU_AVX)) |
||||
# define CV_CPU_CALL_AVX(...) if (CV_CPU_HAS_SUPPORT_AVX) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_AVX 0 |
||||
# define CV_CPU_CALL_AVX(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_FP16 |
||||
# define CV_CPU_HAS_SUPPORT_FP16 1 |
||||
# define CV_CPU_CALL_FP16(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_FP16 |
||||
# define CV_CPU_HAS_SUPPORT_FP16 (cv::checkHardwareSupport(CV_CPU_FP16)) |
||||
# define CV_CPU_CALL_FP16(...) if (CV_CPU_HAS_SUPPORT_FP16) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_FP16 0 |
||||
# define CV_CPU_CALL_FP16(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_AVX2 |
||||
# define CV_CPU_HAS_SUPPORT_AVX2 1 |
||||
# define CV_CPU_CALL_AVX2(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_AVX2 |
||||
# define CV_CPU_HAS_SUPPORT_AVX2 (cv::checkHardwareSupport(CV_CPU_AVX2)) |
||||
# define CV_CPU_CALL_AVX2(...) if (CV_CPU_HAS_SUPPORT_AVX2) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_AVX2 0 |
||||
# define CV_CPU_CALL_AVX2(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_FMA3 |
||||
# define CV_CPU_HAS_SUPPORT_FMA3 1 |
||||
# define CV_CPU_CALL_FMA3(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_FMA3 |
||||
# define CV_CPU_HAS_SUPPORT_FMA3 (cv::checkHardwareSupport(CV_CPU_FMA3)) |
||||
# define CV_CPU_CALL_FMA3(...) if (CV_CPU_HAS_SUPPORT_FMA3) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_FMA3 0 |
||||
# define CV_CPU_CALL_FMA3(...) |
||||
#endif |
||||
|
||||
#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_NEON |
||||
# define CV_CPU_HAS_SUPPORT_NEON 1 |
||||
# define CV_CPU_CALL_NEON(...) return __VA_ARGS__ |
||||
#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_NEON |
||||
# define CV_CPU_HAS_SUPPORT_NEON (cv::checkHardwareSupport(CV_CPU_NEON)) |
||||
# define CV_CPU_CALL_NEON(...) if (CV_CPU_HAS_SUPPORT_NEON) return __VA_ARGS__ |
||||
#else |
||||
# define CV_CPU_HAS_SUPPORT_NEON 0 |
||||
# define CV_CPU_CALL_NEON(...) |
||||
#endif |
||||
@ -1,2 +1,2 @@ |
||||
set(the_description "2D Features Framework") |
||||
ocv_define_module(features2d opencv_imgproc opencv_ml opencv_flann OPTIONAL opencv_highgui WRAP java python) |
||||
ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui WRAP java python) |
||||
|
||||
@ -1,2 +1,2 @@ |
||||
set(the_description "Object Detection") |
||||
ocv_define_module(objdetect opencv_core opencv_imgproc opencv_ml OPTIONAL opencv_highgui WRAP java python) |
||||
ocv_define_module(objdetect opencv_core opencv_imgproc WRAP java python) |
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue