Merge pull request opencv#10136 from alalek:issue_10134

alalek · alalek · commit e4aa2ccd66f3 · 2017-11-22T18:39:47.000Z
diff --git a/modules/core/include/opencv2/core/hal/intrin_sse.hpp b/modules/core/include/opencv2/core/hal/intrin_sse.hpp
@@ -1024,24 +1024,28 @@ OPENCV_HAL_IMPL_SSE_SHIFT_OP(v_uint64x2, v_int64x2, epi64, v_srai_epi64)
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_right(const _Tpvec &a)
 {
-    return _Tpvec(_mm_srli_si128(a.val, imm*(sizeof(typename _Tpvec::lane_type))));
+    enum { CV_SHIFT = imm*(sizeof(typename _Tpvec::lane_type)) };
+    return _Tpvec(_mm_srli_si128(a.val, CV_SHIFT));
 }
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_left(const _Tpvec &a)
 {
-    return _Tpvec(_mm_slli_si128(a.val, imm*(sizeof(typename _Tpvec::lane_type))));
+    enum { CV_SHIFT = imm*(sizeof(typename _Tpvec::lane_type)) };
+    return _Tpvec(_mm_slli_si128(a.val, CV_SHIFT));
 }
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_right(const _Tpvec &a, const _Tpvec &b)
 {
-    const int cWidth = sizeof(typename _Tpvec::lane_type);
-    return _Tpvec(_mm_or_si128(_mm_srli_si128(a.val, imm*cWidth), _mm_slli_si128(b.val, (16 - imm*cWidth))));
+    enum { CV_SHIFT1 = imm*(sizeof(typename _Tpvec::lane_type)) };
+    enum { CV_SHIFT2 = 16 - imm*(sizeof(typename _Tpvec::lane_type)) };
+    return _Tpvec(_mm_or_si128(_mm_srli_si128(a.val, CV_SHIFT1), _mm_slli_si128(b.val, CV_SHIFT2)));
 }
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_left(const _Tpvec &a, const _Tpvec &b)
 {
-    const int cWidth = sizeof(typename _Tpvec::lane_type);
-    return _Tpvec(_mm_or_si128(_mm_slli_si128(a.val, imm*cWidth), _mm_srli_si128(b.val, (16 - imm*cWidth))));
+    enum { CV_SHIFT1 = imm*(sizeof(typename _Tpvec::lane_type)) };
+    enum { CV_SHIFT2 = 16 - imm*(sizeof(typename _Tpvec::lane_type)) };
+    return _Tpvec(_mm_or_si128(_mm_slli_si128(a.val, CV_SHIFT1), _mm_srli_si128(b.val, CV_SHIFT2)));
 }
 
 #define OPENCV_HAL_IMPL_SSE_LOADSTORE_INT_OP(_Tpvec, _Tp) \
diff --git a/modules/core/include/opencv2/core/hal/intrin_vsx.hpp b/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
@@ -634,19 +634,19 @@ OPENCV_IMPL_VSX_ROTATE_LR(v_int64x2,  vec_dword2)
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b)
 {
-    const int wd = imm * sizeof(typename _Tpvec::lane_type);
-    if (wd == 0)
+    enum { CV_SHIFT = 16 - imm * (sizeof(typename _Tpvec::lane_type)) };
+    if (CV_SHIFT == 16)
         return a;
-    return _Tpvec(vec_sld(b.val, a.val, 16 - wd));
+    return _Tpvec(vec_sld(b.val, a.val, CV_SHIFT));
 }
 
 template<int imm, typename _Tpvec>
 inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b)
 {
-    const int wd = imm * sizeof(typename _Tpvec::lane_type);
-    if (wd == 16)
+    enum { CV_SHIFT = imm * (sizeof(typename _Tpvec::lane_type)) };
+    if (CV_SHIFT == 16)
         return b;
-    return _Tpvec(vec_sld(a.val, b.val, wd));
+    return _Tpvec(vec_sld(a.val, b.val, CV_SHIFT));
 }
 
 #define OPENCV_IMPL_VSX_ROTATE_64(_Tpvec, suffix, rg1, rg2)       \

Original file line number	Diff line number	Diff line change
`@@ -1024,24 +1024,28 @@ OPENCV_HAL_IMPL_SSE_SHIFT_OP(v_uint64x2, v_int64x2, epi64, v_srai_epi64)`
`1024`	`1024`	`template<int imm, typename _Tpvec>`
`1025`	`1025`	`inline _Tpvec v_rotate_right(const _Tpvec &a)`
`1026`	`1026`	`{`
`1027`		`- return _Tpvec(_mm_srli_si128(a.val, imm*(sizeof(typename _Tpvec::lane_type))));`
	`1027`	`+ enum { CV_SHIFT = imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1028`	`+ return _Tpvec(_mm_srli_si128(a.val, CV_SHIFT));`
`1028`	`1029`	`}`
`1029`	`1030`	`template<int imm, typename _Tpvec>`
`1030`	`1031`	`inline _Tpvec v_rotate_left(const _Tpvec &a)`
`1031`	`1032`	`{`
`1032`		`- return _Tpvec(_mm_slli_si128(a.val, imm*(sizeof(typename _Tpvec::lane_type))));`
	`1033`	`+ enum { CV_SHIFT = imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1034`	`+ return _Tpvec(_mm_slli_si128(a.val, CV_SHIFT));`
`1033`	`1035`	`}`
`1034`	`1036`	`template<int imm, typename _Tpvec>`
`1035`	`1037`	`inline _Tpvec v_rotate_right(const _Tpvec &a, const _Tpvec &b)`
`1036`	`1038`	`{`
`1037`		`- const int cWidth = sizeof(typename _Tpvec::lane_type);`
`1038`		`- return _Tpvec(_mm_or_si128(_mm_srli_si128(a.val, immcWidth), _mm_slli_si128(b.val, (16 - immcWidth))));`
	`1039`	`+ enum { CV_SHIFT1 = imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1040`	`+ enum { CV_SHIFT2 = 16 - imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1041`	`+ return _Tpvec(_mm_or_si128(_mm_srli_si128(a.val, CV_SHIFT1), _mm_slli_si128(b.val, CV_SHIFT2)));`
`1039`	`1042`	`}`
`1040`	`1043`	`template<int imm, typename _Tpvec>`
`1041`	`1044`	`inline _Tpvec v_rotate_left(const _Tpvec &a, const _Tpvec &b)`
`1042`	`1045`	`{`
`1043`		`- const int cWidth = sizeof(typename _Tpvec::lane_type);`
`1044`		`- return _Tpvec(_mm_or_si128(_mm_slli_si128(a.val, immcWidth), _mm_srli_si128(b.val, (16 - immcWidth))));`
	`1046`	`+ enum { CV_SHIFT1 = imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1047`	`+ enum { CV_SHIFT2 = 16 - imm*(sizeof(typename _Tpvec::lane_type)) };`
	`1048`	`+ return _Tpvec(_mm_or_si128(_mm_slli_si128(a.val, CV_SHIFT1), _mm_srli_si128(b.val, CV_SHIFT2)));`
`1045`	`1049`	`}`
`1046`	`1050`
`1047`	`1051`	`#define OPENCV_HAL_IMPL_SSE_LOADSTORE_INT_OP(_Tpvec, _Tp) \`
Original file line number	Diff line number	Diff line change
`@@ -634,19 +634,19 @@ OPENCV_IMPL_VSX_ROTATE_LR(v_int64x2, vec_dword2)`
`634`	`634`	`template<int imm, typename _Tpvec>`
`635`	`635`	`inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b)`
`636`	`636`	`{`
`637`		`- const int wd = imm * sizeof(typename _Tpvec::lane_type);`
`638`		`- if (wd == 0)`
	`637`	`+ enum { CV_SHIFT = 16 - imm * (sizeof(typename _Tpvec::lane_type)) };`
	`638`	`+ if (CV_SHIFT == 16)`
`639`	`639`	`return a;`
`640`		`- return _Tpvec(vec_sld(b.val, a.val, 16 - wd));`
	`640`	`+ return _Tpvec(vec_sld(b.val, a.val, CV_SHIFT));`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`template<int imm, typename _Tpvec>`
`644`	`644`	`inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b)`
`645`	`645`	`{`
`646`		`- const int wd = imm * sizeof(typename _Tpvec::lane_type);`
`647`		`- if (wd == 16)`
	`646`	`+ enum { CV_SHIFT = imm * (sizeof(typename _Tpvec::lane_type)) };`
	`647`	`+ if (CV_SHIFT == 16)`
`648`	`648`	`return b;`
`649`		`- return _Tpvec(vec_sld(a.val, b.val, wd));`
	`649`	`+ return _Tpvec(vec_sld(a.val, b.val, CV_SHIFT));`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`#define OPENCV_IMPL_VSX_ROTATE_64(_Tpvec, suffix, rg1, rg2) \`