mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20740 from Nicholas-Ho-arm:3.4_SymmColumnVec_32f8u

Browse Source 
* Add SymmColumnVec_32f8u

* Fix double to float warnings
This commit is contained in:
Nicholas Ho 2021-10-15 12:47:53 +01:00 committed by GitHub
parent 0b5cbcefdd
commit bd0732b1d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
modules/imgproc/src/filter.simd.hpp
View File

@ -1160,6 +1160,81 @@ struct SymmColumnVec_32s8u
Mat kernel; Mat kernel;
}; };
struct SymmColumnVec_32f8u
{
SymmColumnVec_32f8u() { symmetryType = 0; delta = 0; }
SymmColumnVec_32f8u(const Mat& _kernel, int _symmetryType, int, double _delta)
{
symmetryType = _symmetryType;
kernel = _kernel;
delta = (float)_delta;
CV_Assert( (symmetryType & (KERNEL_SYMMETRICAL | KERNEL_ASYMMETRICAL)) != 0 );
}
int operator()(const uchar** _src, uchar* _dst, int width) const
{
CV_INSTRUMENT_REGION();
int _ksize = kernel.rows + kernel.cols - 1;
if( _ksize == 1 ) return 0;
const int ksize2 = _ksize / 2;
const float* ky = kernel.ptr<float>() + ksize2;
int i = 0, k;
bool symmetrical = (symmetryType & KERNEL_SYMMETRICAL) != 0;
const float** src = (const float**)_src;
if( symmetrical )
{
for( ; i <= width - v_uint8::nlanes; i += v_uint8::nlanes )
{
v_float32 v_ky0 = vx_setall_f32(ky[0]);
v_float32 v32_delta = vx_setall_f32(delta);
const float* S = src[0] + i;
v_float32 s0 = v_muladd(v_ky0, vx_load(S), v32_delta);
v_float32 s1 = v_muladd(v_ky0, vx_load(S + v_float32::nlanes), v32_delta);
v_float32 s2 = v_muladd(v_ky0, vx_load(S + 2*v_float32::nlanes), v32_delta);
v_float32 s3 = v_muladd(v_ky0, vx_load(S + 3*v_float32::nlanes), v32_delta);
for( k = 1; k <= ksize2; k++ )
{
v_float32 v_kyk = vx_setall_f32(ky[k]);
const float* S0 = src[k] + i;
const float* S1 = src[-k] + i;
s0 = v_muladd(v_kyk, vx_load(S0) + vx_load(S1), s0);
s1 = v_muladd(v_kyk, vx_load(S0 + v_float32::nlanes) + vx_load(S1 + v_float32::nlanes), s1);
s2 = v_muladd(v_kyk, vx_load(S0 + 2*v_float32::nlanes) + vx_load(S1 + 2*v_float32::nlanes), s2);
s3 = v_muladd(v_kyk, vx_load(S0 + 3*v_float32::nlanes) + vx_load(S1 + 3*v_float32::nlanes), s3);
}
v_store(_dst + i, v_pack_u(v_pack(v_round(s0), v_round(s1)), v_pack(v_round(s2), v_round(s3))));
}
}
else
{
for( ; i <= width - v_uint8::nlanes; i += v_uint8::nlanes )
{
v_float32 s0 = vx_setall_f32(delta);
v_float32 s1 = vx_setall_f32(delta);
v_float32 s2 = vx_setall_f32(delta);
v_float32 s3 = vx_setall_f32(delta);
for( k = 1; k <= ksize2; k++ )
{
v_float32 v_kyk = vx_setall_f32(ky[k]);
const float* S0 = src[k] + i;
const float* S1 = src[-k] + i;
s0 = v_muladd(v_kyk, vx_load(S0) - vx_load(S1), s0);
s1 = v_muladd(v_kyk, vx_load(S0 + v_float32::nlanes) - vx_load(S1 + v_float32::nlanes), s1);
s2 = v_muladd(v_kyk, vx_load(S0 + 2*v_float32::nlanes) - vx_load(S1 + 2*v_float32::nlanes), s2);
s3 = v_muladd(v_kyk, vx_load(S0 + 3*v_float32::nlanes) - vx_load(S1 + 3*v_float32::nlanes), s3);
}
v_store(_dst + i, v_pack_u(v_pack(v_round(s0), v_round(s1)), v_pack(v_round(s2), v_round(s3))));
}
}
return i;
}
int symmetryType;
float delta;
Mat kernel;
};
struct SymmColumnSmallVec_32s16s struct SymmColumnSmallVec_32s16s
{ {
@ -2341,6 +2416,7 @@ typedef RowNoVec RowVec_32f;
typedef SymmRowSmallNoVec SymmRowSmallVec_8u32s; typedef SymmRowSmallNoVec SymmRowSmallVec_8u32s;
typedef SymmRowSmallNoVec SymmRowSmallVec_32f; typedef SymmRowSmallNoVec SymmRowSmallVec_32f;
typedef ColumnNoVec SymmColumnVec_32s8u; typedef ColumnNoVec SymmColumnVec_32s8u;
typedef ColumnNoVec SymmColumnVec_32f8u;
typedef ColumnNoVec SymmColumnVec_32f16s; typedef ColumnNoVec SymmColumnVec_32f16s;
typedef ColumnNoVec SymmColumnVec_32f; typedef ColumnNoVec SymmColumnVec_32f;
typedef SymmColumnSmallNoVec SymmColumnSmallVec_32s16s; typedef SymmColumnSmallNoVec SymmColumnSmallVec_32s16s;
@ -3031,8 +3107,9 @@ Ptr<BaseColumnFilter> getLinearColumnFilter(
(kernel, anchor, delta, symmetryType, FixedPtCastEx<int, uchar>(bits), (kernel, anchor, delta, symmetryType, FixedPtCastEx<int, uchar>(bits),
SymmColumnVec_32s8u(kernel, symmetryType, bits, delta)); SymmColumnVec_32s8u(kernel, symmetryType, bits, delta));
if( ddepth == CV_8U && sdepth == CV_32F ) if( ddepth == CV_8U && sdepth == CV_32F )
return makePtr<SymmColumnFilter<Cast<float, uchar>, ColumnNoVec> > return makePtr<SymmColumnFilter<Cast<float, uchar>, SymmColumnVec_32f8u> >
(kernel, anchor, delta, symmetryType); (kernel, anchor, delta, symmetryType, Cast<float, uchar>(),
SymmColumnVec_32f8u(kernel, symmetryType, 0, delta));
if( ddepth == CV_8U && sdepth == CV_64F ) if( ddepth == CV_8U && sdepth == CV_64F )
return makePtr<SymmColumnFilter<Cast<double, uchar>, ColumnNoVec> > return makePtr<SymmColumnFilter<Cast<double, uchar>, ColumnNoVec> >
(kernel, anchor, delta, symmetryType); (kernel, anchor, delta, symmetryType);