Skip to content

O
opencv
Commit b66c349b authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

core(stat): add required CV_AVX_GUARD 

Added guard with 'vzeroupper' instruction
parent c45d3568
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
modules/core/include/opencv2/core/cv_cpu_dispatch.h
View file @ b66c349b
...@@ -111,6 +111,12 @@ struct VZeroUpperGuard { ...@@ -111,6 +111,12 @@ struct VZeroUpperGuard {
#define __CV_AVX_GUARD VZeroUpperGuard __vzeroupper_guard; #define __CV_AVX_GUARD VZeroUpperGuard __vzeroupper_guard;
#endif #endif
#ifdef __CV_AVX_GUARD
#define CV_AVX_GUARD __CV_AVX_GUARD
#else
#define CV_AVX_GUARD
#endif
#endif // __OPENCV_BUILD #endif // __OPENCV_BUILD
......
modules/core/src/stat.simd.hpp
View file @ b66c349b
...@@ -28,6 +28,8 @@ static inline int _mm256_extract_epi32_(__m256i reg, const int i) ...@@ -28,6 +28,8 @@ static inline int _mm256_extract_epi32_(__m256i reg, const int i)
int normHamming(const uchar* a, int n) int normHamming(const uchar* a, int n)
{ {
CV_AVX_GUARD;
int i = 0; int i = 0;
int result = 0; int result = 0;
#if CV_AVX2 #if CV_AVX2
...@@ -94,6 +96,8 @@ int normHamming(const uchar* a, int n) ...@@ -94,6 +96,8 @@ int normHamming(const uchar* a, int n)
int normHamming(const uchar* a, const uchar* b, int n) int normHamming(const uchar* a, const uchar* b, int n)
{ {
CV_AVX_GUARD;
int i = 0; int i = 0;
int result = 0; int result = 0;
#if CV_AVX2 #if CV_AVX2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment