Merge pull request #11410 from alalek:ipp_norm_L1_16UC3_mask_AVX512

e785afd3 · Alexander Alekhin · 1031dfe4 · 856a0771 · e785afd3
Commit e785afd3 authored Apr 27, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

norm.cpp modules/core/src/norm.cpp +6 -1

No files found.
--- a/modules/core/src/norm.cpp
+++ b/modules/core/src/norm.cpp
@@ -1005,7 +1005,12 @@ static bool ipp_norm(InputArray _src1, InputArray _src2, int normType, InputArra
                type == CV_16UC3 ? (ippiMaskNormDiffFuncC3)ippiNormDiff_L2_16u_C3CMR :
                type == CV_32FC3 ? (ippiMaskNormDiffFuncC3)ippiNormDiff_L2_32f_C3CMR :
                0) : 0;
-            if (cv::ipp::getIppTopFeatures() & ippCPUID_AVX2) // IPP_DISABLE_NORM_16UC3_mask_small (#11399)
+            if (cv::ipp::getIppTopFeatures() & (
+#if IPP_VERSION_X100 >= 201700
+                    ippCPUID_AVX512F |
+#endif
+                    ippCPUID_AVX2)
+            ) // IPP_DISABLE_NORM_16UC3_mask_small (#11399)
            {
                if (normType == NORM_L1 && type == CV_16UC3 && sz.width < 16)
                    return false;