[opencv] 30/251: AVX optimized implementation of undistort migrated to separate file
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Sun Aug 27 23:27:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.
commit 526d1d6db15d87b8a2ca0743259296b1b751fdf9
Author: Vitaly Tuzov <terfendail at mediana.jetos.com>
Date: Wed Jun 28 19:57:26 2017 +0300
AVX optimized implementation of undistort migrated to separate file
---
modules/imgproc/src/undistort.avx2.cpp | 200 +++++++++++++++++++++++++++++++++
modules/imgproc/src/undistort.cpp | 148 +-----------------------
modules/imgproc/src/undistort.hpp | 59 ++++++++++
3 files changed, 265 insertions(+), 142 deletions(-)
diff --git a/modules/imgproc/src/undistort.avx2.cpp b/modules/imgproc/src/undistort.avx2.cpp
new file mode 100644
index 0000000..c26fe75
--- /dev/null
+++ b/modules/imgproc/src/undistort.avx2.cpp
@@ -0,0 +1,200 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+// By downloading, copying, installing or using the software you agree to this license.
+// If you do not agree to this license, do not download, install,
+// copy or use the software.
+//
+//
+// License Agreement
+// For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistribution's of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// * Redistribution's in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// * The name of the copyright holders may not be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+#include "undistort.hpp"
+
+namespace cv
+{
+
+int initUndistortRectifyMapLine_AVX(float* m1f, float* m2f, short* m1, ushort* m2, double* matTilt, const double* ir,
+ double& _x, double& _y, double& _w, int width, int m1type,
+ double& k1, double& k2, double& k3, double& k4, double& k5, double& k6,
+ double& p1, double& p2, double& s1, double& s2, double& s3, double& s4,
+ double& u0, double& v0, double& fx, double& fy)
+{
+ int j = 0;
+
+ static const __m256d __one = _mm256_set1_pd(1.0);
+ static const __m256d __two = _mm256_set1_pd(2.0);
+
+ const __m256d __matTilt_00 = _mm256_set1_pd(matTilt[0]);
+ const __m256d __matTilt_10 = _mm256_set1_pd(matTilt[3]);
+ const __m256d __matTilt_20 = _mm256_set1_pd(matTilt[6]);
+
+ const __m256d __matTilt_01 = _mm256_set1_pd(matTilt[1]);
+ const __m256d __matTilt_11 = _mm256_set1_pd(matTilt[4]);
+ const __m256d __matTilt_21 = _mm256_set1_pd(matTilt[7]);
+
+ const __m256d __matTilt_02 = _mm256_set1_pd(matTilt[2]);
+ const __m256d __matTilt_12 = _mm256_set1_pd(matTilt[5]);
+ const __m256d __matTilt_22 = _mm256_set1_pd(matTilt[8]);
+
+ for (; j <= width - 4; j += 4, _x += 4 * ir[0], _y += 4 * ir[3], _w += 4 * ir[6])
+ {
+ // Question: Should we load the constants first?
+ __m256d __w = _mm256_div_pd(__one, _mm256_set_pd(_w + 3 * ir[6], _w + 2 * ir[6], _w + ir[6], _w));
+ __m256d __x = _mm256_mul_pd(_mm256_set_pd(_x + 3 * ir[0], _x + 2 * ir[0], _x + ir[0], _x), __w);
+ __m256d __y = _mm256_mul_pd(_mm256_set_pd(_y + 3 * ir[3], _y + 2 * ir[3], _y + ir[3], _y), __w);
+ __m256d __x2 = _mm256_mul_pd(__x, __x);
+ __m256d __y2 = _mm256_mul_pd(__y, __y);
+ __m256d __r2 = _mm256_add_pd(__x2, __y2);
+ __m256d __2xy = _mm256_mul_pd(__two, _mm256_mul_pd(__x, __y));
+ __m256d __kr = _mm256_div_pd(
+#if CV_FMA3
+ _mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_set1_pd(k3), __r2, _mm256_set1_pd(k2)), __r2, _mm256_set1_pd(k1)), __r2, __one),
+ _mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_set1_pd(k6), __r2, _mm256_set1_pd(k5)), __r2, _mm256_set1_pd(k4)), __r2, __one)
+#else
+ _mm256_add_pd(__one, _mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_set1_pd(k3), __r2), _mm256_set1_pd(k2)), __r2), _mm256_set1_pd(k1)), __r2)),
+ _mm256_add_pd(__one, _mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_set1_pd(k6), __r2), _mm256_set1_pd(k5)), __r2), _mm256_set1_pd(k4)), __r2))
+#endif
+ );
+ __m256d __r22 = _mm256_mul_pd(__r2, __r2);
+#if CV_FMA3
+ __m256d __xd = _mm256_fmadd_pd(__x, __kr,
+ _mm256_add_pd(
+ _mm256_fmadd_pd(_mm256_set1_pd(p1), __2xy, _mm256_mul_pd(_mm256_set1_pd(p2), _mm256_fmadd_pd(__two, __x2, __r2))),
+ _mm256_fmadd_pd(_mm256_set1_pd(s1), __r2, _mm256_mul_pd(_mm256_set1_pd(s2), __r22))));
+ __m256d __yd = _mm256_fmadd_pd(__y, __kr,
+ _mm256_add_pd(
+ _mm256_fmadd_pd(_mm256_set1_pd(p1), _mm256_fmadd_pd(__two, __y2, __r2), _mm256_mul_pd(_mm256_set1_pd(p2), __2xy)),
+ _mm256_fmadd_pd(_mm256_set1_pd(s3), __r2, _mm256_mul_pd(_mm256_set1_pd(s4), __r22))));
+
+ __m256d __vecTilt2 = _mm256_fmadd_pd(__matTilt_20, __xd, _mm256_fmadd_pd(__matTilt_21, __yd, __matTilt_22));
+#else
+ __m256d __xd = _mm256_add_pd(
+ _mm256_mul_pd(__x, __kr),
+ _mm256_add_pd(
+ _mm256_add_pd(
+ _mm256_mul_pd(_mm256_set1_pd(p1), __2xy),
+ _mm256_mul_pd(_mm256_set1_pd(p2), _mm256_add_pd(__r2, _mm256_mul_pd(__two, __x2)))),
+ _mm256_add_pd(
+ _mm256_mul_pd(_mm256_set1_pd(s1), __r2),
+ _mm256_mul_pd(_mm256_set1_pd(s2), __r22))));
+ __m256d __yd = _mm256_add_pd(
+ _mm256_mul_pd(__y, __kr),
+ _mm256_add_pd(
+ _mm256_add_pd(
+ _mm256_mul_pd(_mm256_set1_pd(p1), _mm256_add_pd(__r2, _mm256_mul_pd(__two, __y2))),
+ _mm256_mul_pd(_mm256_set1_pd(p2), __2xy)),
+ _mm256_add_pd(
+ _mm256_mul_pd(_mm256_set1_pd(s3), __r2),
+ _mm256_mul_pd(_mm256_set1_pd(s4), __r22))));
+
+ __m256d __vecTilt2 = _mm256_add_pd(_mm256_add_pd(
+ _mm256_mul_pd(__matTilt_20, __xd), _mm256_mul_pd(__matTilt_21, __yd)), __matTilt_22);
+#endif
+ __m256d __invProj = _mm256_blendv_pd(
+ __one, _mm256_div_pd(__one, __vecTilt2),
+ _mm256_cmp_pd(__vecTilt2, _mm256_setzero_pd(), _CMP_EQ_OQ));
+
+#if CV_FMA3
+ __m256d __u = _mm256_fmadd_pd(__matTilt_00, __xd, _mm256_fmadd_pd(__matTilt_01, __yd, __matTilt_02));
+ __u = _mm256_fmadd_pd(_mm256_mul_pd(_mm256_set1_pd(fx), __invProj), __u, _mm256_set1_pd(u0));
+
+ __m256d __v = _mm256_fmadd_pd(__matTilt_10, __xd, _mm256_fmadd_pd(__matTilt_11, __yd, __matTilt_12));
+ __v = _mm256_fmadd_pd(_mm256_mul_pd(_mm256_set1_pd(fy), __invProj), __v, _mm256_set1_pd(v0));
+#else
+ __m256d __u = _mm256_add_pd(_mm256_add_pd(
+ _mm256_mul_pd(__matTilt_00, __xd), _mm256_mul_pd(__matTilt_01, __yd)), __matTilt_02);
+ __u = _mm256_add_pd(_mm256_mul_pd(_mm256_mul_pd(_mm256_set1_pd(fx), __invProj), __u), _mm256_set1_pd(u0));
+
+ __m256d __v = _mm256_add_pd(_mm256_add_pd(
+ _mm256_mul_pd(__matTilt_10, __xd), _mm256_mul_pd(__matTilt_11, __yd)), __matTilt_12);
+ __v = _mm256_add_pd(_mm256_mul_pd(_mm256_mul_pd(_mm256_set1_pd(fy), __invProj), __v), _mm256_set1_pd(v0));
+#endif
+
+ if (m1type == CV_32FC1)
+ {
+ _mm_storeu_ps(&m1f[j], _mm256_cvtpd_ps(__u));
+ _mm_storeu_ps(&m2f[j], _mm256_cvtpd_ps(__v));
+ }
+ else if (m1type == CV_32FC2)
+ {
+ __m128 __u_float = _mm256_cvtpd_ps(__u);
+ __m128 __v_float = _mm256_cvtpd_ps(__v);
+
+ _mm_storeu_ps(&m1f[j * 2], _mm_unpacklo_ps(__u_float, __v_float));
+ _mm_storeu_ps(&m1f[j * 2 + 4], _mm_unpackhi_ps(__u_float, __v_float));
+ }
+ else // m1type == CV_16SC2
+ {
+ __u = _mm256_mul_pd(__u, _mm256_set1_pd(INTER_TAB_SIZE));
+ __v = _mm256_mul_pd(__v, _mm256_set1_pd(INTER_TAB_SIZE));
+
+ __m128 __u_float = _mm256_cvtpd_ps(__u);
+ __m128 __v_float = _mm256_cvtpd_ps(__v);
+ _mm256_zeroupper();
+ static const __m128 __int_max = _mm_set1_ps((float)(std::numeric_limits<int>::max()));
+ static const __m128 __int_min = _mm_set1_ps((float)(std::numeric_limits<int>::min()));
+ __u_float = _mm_max_ps(_mm_min_ps(__u_float, __int_max), __int_min);
+ __v_float = _mm_max_ps(_mm_min_ps(__v_float, __int_max), __int_min);
+
+ __m128i __iu = _mm_cvtps_epi32(__u_float);
+ __m128i __iv = _mm_cvtps_epi32(__v_float);
+
+ static const __m128i __INTER_TAB_SIZE_m1 = _mm_set1_epi32(INTER_TAB_SIZE - 1);
+ __m128i __m2 = _mm_add_epi32(
+ _mm_mullo_epi32(_mm_and_si128(__iv, __INTER_TAB_SIZE_m1), _mm_set1_epi32(INTER_TAB_SIZE)),
+ _mm_and_si128(__iu, __INTER_TAB_SIZE_m1));
+ __m2 = _mm_packus_epi32(__m2, __m2);
+ _mm_maskstore_epi64((long long int*) &m2[j], _mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF), __m2);
+
+ // gcc4.9 does not support _mm256_set_m128
+ // __m256i __m1 = _mm256_set_m128i(__iv, __iu);
+ __m256i __m1 = _mm256_setzero_si256();
+ __m1 = _mm256_inserti128_si256(__m1, __iu, 0);
+ __m1 = _mm256_inserti128_si256(__m1, __iv, 1);
+ __m1 = _mm256_srai_epi32(__m1, INTER_BITS); // v3 v2 v1 v0 u3 u2 u1 u0 (int32_t)
+ static const __m256i __permute_mask = _mm256_set_epi32(7, 3, 6, 2, 5, 1, 4, 0);
+ __m1 = _mm256_permutevar8x32_epi32(__m1, __permute_mask); // v3 u3 v2 u2 v1 u1 v0 u0 (int32_t)
+ __m1 = _mm256_packs_epi32(__m1, __m1); // x x x x v3 u3 v2 u2 x x x x v1 u1 v0 u0 (int16_t)
+ _mm_storeu_si128((__m128i*) &m1[j * 2], _mm256_extracti128_si256(_mm256_permute4x64_epi64(__m1, (2 << 2) + 0), 0));
+ }
+ }
+
+ return j;
+}
+
+}
+
+/* End of file */
diff --git a/modules/imgproc/src/undistort.cpp b/modules/imgproc/src/undistort.cpp
index fbce448..4931d02 100644
--- a/modules/imgproc/src/undistort.cpp
+++ b/modules/imgproc/src/undistort.cpp
@@ -42,6 +42,7 @@
#include "precomp.hpp"
#include "opencv2/imgproc/detail/distortion_model.hpp"
+#include "undistort.hpp"
cv::Mat cv::getDefaultNewCameraMatrix( InputArray _cameraMatrix, Size imgsize,
bool centerPrincipalPoint )
@@ -136,7 +137,7 @@ void cv::initUndistortRectifyMap( InputArray _cameraMatrix, InputArray _distCoef
cv::Matx33d matTilt = cv::Matx33d::eye();
cv::detail::computeTiltProjectionMatrix(tauX, tauY, &matTilt);
-#if CV_AVX2
+#if CV_TRY_AVX2
bool USE_AVX2 = cv::checkHardwareSupport(CV_CPU_AVX2);
#endif
@@ -157,147 +158,10 @@ void cv::initUndistortRectifyMap( InputArray _cameraMatrix, InputArray _distCoef
else
CV_Assert(m1 != NULL);
-#if CV_AVX2
-if( USE_AVX2 )
-{
- static const __m256d __one = _mm256_set1_pd(1.0);
- static const __m256d __two = _mm256_set1_pd(2.0);
-
- const __m256d __matTilt_00 = _mm256_set1_pd(matTilt(0, 0));
- const __m256d __matTilt_10 = _mm256_set1_pd(matTilt(1, 0));
- const __m256d __matTilt_20 = _mm256_set1_pd(matTilt(2, 0));
-
- const __m256d __matTilt_01 = _mm256_set1_pd(matTilt(0, 1));
- const __m256d __matTilt_11 = _mm256_set1_pd(matTilt(1, 1));
- const __m256d __matTilt_21 = _mm256_set1_pd(matTilt(2, 1));
-
- const __m256d __matTilt_02 = _mm256_set1_pd(matTilt(0, 2));
- const __m256d __matTilt_12 = _mm256_set1_pd(matTilt(1, 2));
- const __m256d __matTilt_22 = _mm256_set1_pd(matTilt(2, 2));
-
- for( ; j <= size.width - 4; j += 4, _x += 4 * ir[0], _y += 4 * ir[3], _w += 4 * ir[6] )
- {
- // Question: Should we load the constants first?
- __m256d __w = _mm256_div_pd(__one, _mm256_set_pd(_w + 3 * ir[6], _w + 2 * ir[6], _w + ir[6], _w));
- __m256d __x = _mm256_mul_pd(_mm256_set_pd(_x + 3 * ir[0], _x + 2 * ir[0], _x + ir[0], _x), __w);
- __m256d __y = _mm256_mul_pd(_mm256_set_pd(_y + 3 * ir[3], _y + 2 * ir[3], _y + ir[3], _y), __w);
- __m256d __x2 = _mm256_mul_pd(__x, __x);
- __m256d __y2 = _mm256_mul_pd(__y, __y);
- __m256d __r2 = _mm256_add_pd(__x2, __y2);
- __m256d __2xy = _mm256_mul_pd(__two, _mm256_mul_pd(__x, __y));
- __m256d __kr = _mm256_div_pd(
-#if CV_FMA3
- _mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_set1_pd(k3), __r2, _mm256_set1_pd(k2)), __r2, _mm256_set1_pd(k1)), __r2, __one),
- _mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_fmadd_pd(_mm256_set1_pd(k6), __r2, _mm256_set1_pd(k5)), __r2, _mm256_set1_pd(k4)), __r2, __one)
-#else
- _mm256_add_pd(__one, _mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_set1_pd(k3), __r2), _mm256_set1_pd(k2)), __r2), _mm256_set1_pd(k1)), __r2)),
- _mm256_add_pd(__one, _mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_add_pd(_mm256_mul_pd(_mm256_set1_pd(k6), __r2), _mm256_set1_pd(k5)), __r2), _mm256_set1_pd(k4)), __r2))
-#endif
- );
- __m256d __r22 = _mm256_mul_pd(__r2, __r2);
-#if CV_FMA3
- __m256d __xd = _mm256_fmadd_pd(__x, __kr,
- _mm256_add_pd(
- _mm256_fmadd_pd(_mm256_set1_pd(p1), __2xy, _mm256_mul_pd(_mm256_set1_pd(p2), _mm256_fmadd_pd(__two, __x2, __r2))),
- _mm256_fmadd_pd(_mm256_set1_pd(s1), __r2, _mm256_mul_pd(_mm256_set1_pd(s2), __r22))));
- __m256d __yd = _mm256_fmadd_pd(__y, __kr,
- _mm256_add_pd(
- _mm256_fmadd_pd(_mm256_set1_pd(p1), _mm256_fmadd_pd(__two, __y2, __r2), _mm256_mul_pd(_mm256_set1_pd(p2), __2xy)),
- _mm256_fmadd_pd(_mm256_set1_pd(s3), __r2, _mm256_mul_pd(_mm256_set1_pd(s4), __r22))));
-
- __m256d __vecTilt2 = _mm256_fmadd_pd(__matTilt_20, __xd, _mm256_fmadd_pd(__matTilt_21, __yd, __matTilt_22));
-#else
- __m256d __xd = _mm256_add_pd(
- _mm256_mul_pd(__x, __kr),
- _mm256_add_pd(
- _mm256_add_pd(
- _mm256_mul_pd(_mm256_set1_pd(p1), __2xy),
- _mm256_mul_pd(_mm256_set1_pd(p2), _mm256_add_pd(__r2, _mm256_mul_pd(__two, __x2)))),
- _mm256_add_pd(
- _mm256_mul_pd(_mm256_set1_pd(s1), __r2),
- _mm256_mul_pd(_mm256_set1_pd(s2), __r22))));
- __m256d __yd = _mm256_add_pd(
- _mm256_mul_pd(__y, __kr),
- _mm256_add_pd(
- _mm256_add_pd(
- _mm256_mul_pd(_mm256_set1_pd(p1), _mm256_add_pd(__r2, _mm256_mul_pd(__two, __y2))),
- _mm256_mul_pd(_mm256_set1_pd(p2), __2xy)),
- _mm256_add_pd(
- _mm256_mul_pd(_mm256_set1_pd(s3), __r2),
- _mm256_mul_pd(_mm256_set1_pd(s4), __r22))));
-
- __m256d __vecTilt2 = _mm256_add_pd(_mm256_add_pd(
- _mm256_mul_pd(__matTilt_20, __xd), _mm256_mul_pd(__matTilt_21, __yd)), __matTilt_22);
-#endif
- __m256d __invProj = _mm256_blendv_pd(
- __one, _mm256_div_pd(__one, __vecTilt2),
- _mm256_cmp_pd(__vecTilt2, _mm256_setzero_pd(), _CMP_EQ_OQ));
-
-#if CV_FMA3
- __m256d __u = _mm256_fmadd_pd(__matTilt_00, __xd, _mm256_fmadd_pd(__matTilt_01, __yd, __matTilt_02));
- __u = _mm256_fmadd_pd(_mm256_mul_pd(_mm256_set1_pd(fx), __invProj), __u, _mm256_set1_pd(u0));
-
- __m256d __v = _mm256_fmadd_pd(__matTilt_10, __xd, _mm256_fmadd_pd(__matTilt_11, __yd, __matTilt_12));
- __v = _mm256_fmadd_pd(_mm256_mul_pd(_mm256_set1_pd(fy), __invProj), __v, _mm256_set1_pd(v0));
-#else
- __m256d __u = _mm256_add_pd(_mm256_add_pd(
- _mm256_mul_pd(__matTilt_00, __xd), _mm256_mul_pd(__matTilt_01, __yd)), __matTilt_02);
- __u = _mm256_add_pd(_mm256_mul_pd(_mm256_mul_pd(_mm256_set1_pd(fx), __invProj), __u), _mm256_set1_pd(u0));
-
- __m256d __v = _mm256_add_pd(_mm256_add_pd(
- _mm256_mul_pd(__matTilt_10, __xd), _mm256_mul_pd(__matTilt_11, __yd)), __matTilt_12);
- __v = _mm256_add_pd(_mm256_mul_pd(_mm256_mul_pd(_mm256_set1_pd(fy), __invProj), __v), _mm256_set1_pd(v0));
-#endif
-
- if ( m1type == CV_32FC1 )
- {
- _mm_storeu_ps(&m1f[j], _mm256_cvtpd_ps(__u));
- _mm_storeu_ps(&m2f[j], _mm256_cvtpd_ps(__v));
- }
- else if ( m1type == CV_32FC2 )
- {
- __m128 __u_float = _mm256_cvtpd_ps(__u);
- __m128 __v_float = _mm256_cvtpd_ps(__v);
-
- _mm_storeu_ps(&m1f[j*2], _mm_unpacklo_ps(__u_float, __v_float));
- _mm_storeu_ps(&m1f[j*2 + 4], _mm_unpackhi_ps(__u_float, __v_float));
- }
- else // m1type == CV_16SC2
- {
- __u = _mm256_mul_pd(__u, _mm256_set1_pd(INTER_TAB_SIZE));
- __v = _mm256_mul_pd(__v, _mm256_set1_pd(INTER_TAB_SIZE));
-
- __m128 __u_float = _mm256_cvtpd_ps(__u);
- __m128 __v_float = _mm256_cvtpd_ps(__v);
- _mm256_zeroupper();
- static const __m128 __int_max = _mm_set1_ps(std::numeric_limits<int>::max());
- static const __m128 __int_min = _mm_set1_ps(std::numeric_limits<int>::min());
- __u_float = _mm_max_ps(_mm_min_ps(__u_float, __int_max), __int_min);
- __v_float = _mm_max_ps(_mm_min_ps(__v_float, __int_max), __int_min);
-
- __m128i __iu = _mm_cvtps_epi32(__u_float);
- __m128i __iv = _mm_cvtps_epi32(__v_float);
-
- static const __m128i __INTER_TAB_SIZE_m1 = _mm_set1_epi32(INTER_TAB_SIZE-1);
- __m128i __m2 = _mm_add_epi32(
- _mm_mul_epi32(_mm_and_si128(__iv, __INTER_TAB_SIZE_m1), _mm_set1_epi32(INTER_TAB_SIZE)),
- _mm_and_si128(__iu, __INTER_TAB_SIZE_m1));
- __m2 = _mm_packus_epi16(__m2, __m2);
- _mm_maskstore_epi64((long long int*) &m2[j], _mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF), __m2);
-
- // gcc4.9 does not support _mm256_set_m128
- // __m256i __m1 = _mm256_set_m128i(__iv, __iu);
- __m256i __m1;
- __m1 = _mm256_inserti128_si256(__m1, __iu, 0);
- __m1 = _mm256_inserti128_si256(__m1, __iv, 1);
- __m1 = _mm256_srli_epi32(__m1, INTER_BITS); // v3 v2 v1 v0 u3 u2 u1 u0 (int32_t)
- static const __m256i __permute_mask = _mm256_set_epi32(7, 3, 6, 2, 5, 1 ,4, 0);
- __m1 = _mm256_permutevar8x32_epi32(__m1, __permute_mask); // v3 u3 v2 u2 v1 u1 v0 u0 (int32_t)
- __m1 = _mm256_packs_epi32(__m1, __m1); // x x x x v3 u3 v2 u2 x x x x v1 u1 v0 u0 (int16_t)
- _mm_storeu_si128((__m128i*) &m1[j*2], _mm256_extracti128_si256(_mm256_permute4x64_epi64(__m1, (2 << 2) + 0), 0));
- }
- }
-}
+#if CV_TRY_AVX2
+ if( USE_AVX2 )
+ j = cv::initUndistortRectifyMapLine_AVX(m1f, m2f, m1, m2, matTilt.val, ir, _x, _y, _w, size.width, m1type,
+ k1, k2, k3, k4, k5, k6, p1, p2, s1, s2, s3, s4, u0, v0, fx, fy);
#endif
for( ; j < size.width; j++, _x += ir[0], _y += ir[3], _w += ir[6] )
{
diff --git a/modules/imgproc/src/undistort.hpp b/modules/imgproc/src/undistort.hpp
new file mode 100644
index 0000000..c17de04
--- /dev/null
+++ b/modules/imgproc/src/undistort.hpp
@@ -0,0 +1,59 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+// By downloading, copying, installing or using the software you agree to this license.
+// If you do not agree to this license, do not download, install,
+// copy or use the software.
+//
+//
+// License Agreement
+// For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistribution's of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// * Redistribution's in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// * The name of the copyright holders may not be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_IMGPROC_UNDISTORT_HPP
+#define OPENCV_IMGPROC_UNDISTORT_HPP
+
+namespace cv
+{
+#if CV_TRY_AVX2
+ int initUndistortRectifyMapLine_AVX(float* m1f, float* m2f, short* m1, ushort* m2, double* matTilt, const double* ir,
+ double& _x, double& _y, double& _w, int width, int m1type,
+ double& k1, double& k2, double& k3, double& k4, double& k5, double& k6,
+ double& p1, double& p2, double& s1, double& s2, double& s3, double& s4,
+ double& u0, double& v0, double& fx, double& fy);
+#endif
+}
+
+#endif
+
+/* End of file */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list