generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More accurate AVX and AVX2 control.

Browse Source 
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
This commit is contained in:
Alexander Smorkalov
2014-12-30 20:11:42 +03:00
parent 4e9cb475da
commit c778011f14
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVCompilerOptions.cmake
View File

@@ -144,11 +144,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# SSE3 and further should be disabled under MingW because it generates compiler errors # SSE3 and further should be disabled under MingW because it generates compiler errors
if(NOT MINGW) if(NOT MINGW)
if(ENABLE_AVX) if(ENABLE_AVX)
ocv_check_flag_support(CXX "-mavx" _varname) add_extra_compiler_option("-mavx")
endif() endif()
if(ENABLE_AVX2) if(ENABLE_AVX2)
ocv_check_flag_support(CXX "-mavx2" _varname) add_extra_compiler_option("-mavx2")
endif() endif()
# GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed. # GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed.

4
modules/ts/src/ts_func.cpp
View File

@@ -3002,8 +3002,12 @@ void printVersionInfo(bool useStdOut)
#if CV_SSE4_2 #if CV_SSE4_2
if (checkHardwareSupport(CV_CPU_SSE4_2)) cpu_features += " sse4.2"; if (checkHardwareSupport(CV_CPU_SSE4_2)) cpu_features += " sse4.2";
#endif #endif
#if CV_AVX
if (checkHardwareSupport(CV_CPU_AVX)) cpu_features += " avx"; if (checkHardwareSupport(CV_CPU_AVX)) cpu_features += " avx";
#endif
#if CV_AVX2
if (checkHardwareSupport(CV_CPU_AVX2)) cpu_features += " avx2"; if (checkHardwareSupport(CV_CPU_AVX2)) cpu_features += " avx2";
#endif
#if CV_NEON #if CV_NEON
cpu_features += " neon"; // NEON is currently not checked at runtime cpu_features += " neon"; // NEON is currently not checked at runtime
#endif #endif