Merge pull request opencv#9176 from alalek:fix_nightly_builds

alalek · alalek · commit 1fbf91434854 · 2017-07-17T13:37:46.000Z
diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp
@@ -3678,7 +3678,7 @@ cvtScale_<short, int, float>( const short* src, size_t sstep,
         if (CV_CPU_HAS_SUPPORT_AVX2)
         {
             opt_AVX2::cvtScale_s16s32f32Line_AVX2(src, dst, scale, shift, size.width);
-            return;
+            continue;
         }
         #endif
         #if CV_SSE2
diff --git a/modules/imgproc/src/imgwarp.avx2.cpp b/modules/imgproc/src/imgwarp.avx2.cpp
@@ -125,6 +125,7 @@ class resizeNNInvokerAVX4 :
                 }
             }
         }
+        _mm256_zeroupper();
     }
 
 private:
@@ -230,6 +231,7 @@ class resizeNNInvokerAVX2 :
                 }
             }
         }
+        _mm256_zeroupper();
     }
 
 private:
diff --git a/modules/imgproc/src/imgwarp.sse4_1.cpp b/modules/imgproc/src/imgwarp.sse4_1.cpp
@@ -387,19 +387,19 @@ class WarpPerspectiveLine_SSE4_Impl: public WarpPerspectiveLine_SSE4
 public:
     WarpPerspectiveLine_SSE4_Impl(const double *M)
     {
-        v_M0 = _mm_set1_pd(M[0]);
-        v_M3 = _mm_set1_pd(M[3]);
-        v_M6 = _mm_set1_pd(M[6]);
-        v_intmax = _mm_set1_pd((double)INT_MAX);
-        v_intmin = _mm_set1_pd((double)INT_MIN);
-        v_2 = _mm_set1_pd(2);
-        v_zero = _mm_setzero_pd();
-        v_1 = _mm_set1_pd(1);
-        v_its = _mm_set1_pd(INTER_TAB_SIZE);
-        v_itsi1 = _mm_set1_epi32(INTER_TAB_SIZE - 1);
+        CV_UNUSED(M);
     }
     virtual void processNN(const double *M, short* xy, double X0, double Y0, double W0, int bw)
     {
+        const __m128d v_M0 = _mm_set1_pd(M[0]);
+        const __m128d v_M3 = _mm_set1_pd(M[3]);
+        const __m128d v_M6 = _mm_set1_pd(M[6]);
+        const __m128d v_intmax = _mm_set1_pd((double)INT_MAX);
+        const __m128d v_intmin = _mm_set1_pd((double)INT_MIN);
+        const __m128d v_2 = _mm_set1_pd(2);
+        const __m128d v_zero = _mm_setzero_pd();
+        const __m128d v_1 = _mm_set1_pd(1);
+
         int x1 = 0;
         __m128d v_X0d = _mm_set1_pd(X0);
         __m128d v_Y0d = _mm_set1_pd(Y0);
@@ -521,6 +521,16 @@ class WarpPerspectiveLine_SSE4_Impl: public WarpPerspectiveLine_SSE4
     }
     virtual void process(const double *M, short* xy, short* alpha, double X0, double Y0, double W0, int bw)
     {
+        const __m128d v_M0 = _mm_set1_pd(M[0]);
+        const __m128d v_M3 = _mm_set1_pd(M[3]);
+        const __m128d v_M6 = _mm_set1_pd(M[6]);
+        const __m128d v_intmax = _mm_set1_pd((double)INT_MAX);
+        const __m128d v_intmin = _mm_set1_pd((double)INT_MIN);
+        const __m128d v_2 = _mm_set1_pd(2);
+        const __m128d v_zero = _mm_setzero_pd();
+        const __m128d v_its = _mm_set1_pd(INTER_TAB_SIZE);
+        const __m128i v_itsi1 = _mm_set1_epi32(INTER_TAB_SIZE - 1);
+
         int x1 = 0;
 
         __m128d v_X0d = _mm_set1_pd(X0);
@@ -656,17 +666,6 @@ class WarpPerspectiveLine_SSE4_Impl: public WarpPerspectiveLine_SSE4
         }
     }
     virtual ~WarpPerspectiveLine_SSE4_Impl() {};
-private:
-    __m128d v_M0;
-    __m128d v_M3;
-    __m128d v_M6;
-    __m128d v_intmax;
-    __m128d v_intmin;
-    __m128d v_2,
-            v_zero,
-            v_1,
-            v_its;
-    __m128i v_itsi1;
 };
 
 Ptr<WarpPerspectiveLine_SSE4> WarpPerspectiveLine_SSE4::getImpl(const double *M)

Original file line number	Diff line number	Diff line change
`@@ -3678,7 +3678,7 @@ cvtScale_<short, int, float>( const short* src, size_t sstep,`
`3678`	`3678`	`if (CV_CPU_HAS_SUPPORT_AVX2)`
`3679`	`3679`	`{`
`3680`	`3680`	`opt_AVX2::cvtScale_s16s32f32Line_AVX2(src, dst, scale, shift, size.width);`
`3681`		`- return;`
	`3681`	`+ continue;`
`3682`	`3682`	`}`
`3683`	`3683`	`#endif`
`3684`	`3684`	`#if CV_SSE2`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ class resizeNNInvokerAVX4 :`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`
	`128`	`+ _mm256_zeroupper();`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`private:`
`@@ -230,6 +231,7 @@ class resizeNNInvokerAVX2 :`
`230`	`231`	`}`
`231`	`232`	`}`
`232`	`233`	`}`
	`234`	`+ _mm256_zeroupper();`
`233`	`235`	`}`
`234`	`236`
`235`	`237`	`private:`