2018-02-06 20:02:51 +08:00
|
|
|
// This file is part of OpenCV project.
|
|
|
|
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
|
|
|
// of this distribution and at http://opencv.org/license.html
|
|
|
|
|
2015-12-03 19:43:37 +08:00
|
|
|
|
|
|
|
#include "precomp.hpp"
|
|
|
|
|
|
|
|
namespace cv { namespace hal {
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_CPU_OPTIMIZATION_NAMESPACE_BEGIN
|
|
|
|
|
|
|
|
void merge8u(const uchar** src, uchar* dst, int len, int cn);
|
|
|
|
void merge16u(const ushort** src, ushort* dst, int len, int cn);
|
|
|
|
void merge32s(const int** src, int* dst, int len, int cn);
|
|
|
|
void merge64s(const int64** src, int64* dst, int len, int cn);
|
|
|
|
|
|
|
|
#ifndef CV_CPU_OPTIMIZATION_DECLARATIONS_ONLY
|
2015-12-03 19:43:37 +08:00
|
|
|
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
#if (CV_SIMD || CV_SIMD_SCALABLE)
|
2018-07-26 17:04:28 +08:00
|
|
|
/*
|
|
|
|
The trick with STORE_UNALIGNED/STORE_ALIGNED_NOCACHE is the following:
|
|
|
|
on IA there are instructions movntps and such to which
|
|
|
|
v_store_interleave(...., STORE_ALIGNED_NOCACHE) is mapped.
|
|
|
|
Those instructions write directly into memory w/o touching cache
|
|
|
|
that results in dramatic speed improvements, especially on
|
|
|
|
large arrays (FullHD, 4K etc.).
|
|
|
|
|
|
|
|
Those intrinsics require the destination address to be aligned
|
|
|
|
by 16/32 bits (with SSE2 and AVX2, respectively).
|
|
|
|
So we potentially split the processing into 3 stages:
|
|
|
|
1) the optional prefix part [0:i0), where we use simple unaligned stores.
|
|
|
|
2) the optional main part [i0:len - VECSZ], where we use "nocache" mode.
|
|
|
|
But in some cases we have to use unaligned stores in this part.
|
|
|
|
3) the optional suffix part (the tail) (len - VECSZ:len) where we switch back to "unaligned" mode
|
|
|
|
to process the remaining len - VECSZ elements.
|
|
|
|
In principle there can be very poorly aligned data where there is no main part.
|
|
|
|
For that we set i0=0 and use unaligned stores for the whole array.
|
|
|
|
*/
|
2018-07-24 22:27:56 +08:00
|
|
|
template<typename T, typename VecT> static void
|
|
|
|
vecmerge_( const T** src, T* dst, int len, int cn )
|
|
|
|
{
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
const int VECSZ = VTraits<VecT>::vlanes();
|
2018-07-26 17:04:28 +08:00
|
|
|
int i, i0 = 0;
|
2018-07-24 22:27:56 +08:00
|
|
|
const T* src0 = src[0];
|
|
|
|
const T* src1 = src[1];
|
2015-12-03 19:43:37 +08:00
|
|
|
|
2018-08-02 21:54:33 +08:00
|
|
|
const int dstElemSize = cn * sizeof(T);
|
2018-07-26 17:04:28 +08:00
|
|
|
int r = (int)((size_t)(void*)dst % (VECSZ*sizeof(T)));
|
|
|
|
hal::StoreMode mode = hal::STORE_ALIGNED_NOCACHE;
|
|
|
|
if( r != 0 )
|
|
|
|
{
|
|
|
|
mode = hal::STORE_UNALIGNED;
|
2018-08-07 23:11:05 +08:00
|
|
|
if (r % dstElemSize == 0 && len > VECSZ*2)
|
2018-08-02 21:54:33 +08:00
|
|
|
i0 = VECSZ - (r / dstElemSize);
|
2018-07-26 17:04:28 +08:00
|
|
|
}
|
|
|
|
|
2018-07-24 22:27:56 +08:00
|
|
|
if( cn == 2 )
|
|
|
|
{
|
|
|
|
for( i = 0; i < len; i += VECSZ )
|
|
|
|
{
|
2018-07-26 17:04:28 +08:00
|
|
|
if( i > len - VECSZ )
|
|
|
|
{
|
|
|
|
i = len - VECSZ;
|
|
|
|
mode = hal::STORE_UNALIGNED;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
VecT a = vx_load(src0 + i), b = vx_load(src1 + i);
|
2018-07-26 17:04:28 +08:00
|
|
|
v_store_interleave(dst + i*cn, a, b, mode);
|
|
|
|
if( i < i0 )
|
|
|
|
{
|
|
|
|
i = i0 - VECSZ;
|
|
|
|
mode = hal::STORE_ALIGNED_NOCACHE;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
}
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
else if( cn == 3 )
|
|
|
|
{
|
|
|
|
const T* src2 = src[2];
|
|
|
|
for( i = 0; i < len; i += VECSZ )
|
|
|
|
{
|
2018-07-26 17:04:28 +08:00
|
|
|
if( i > len - VECSZ )
|
|
|
|
{
|
|
|
|
i = len - VECSZ;
|
|
|
|
mode = hal::STORE_UNALIGNED;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
VecT a = vx_load(src0 + i), b = vx_load(src1 + i), c = vx_load(src2 + i);
|
2018-07-26 17:04:28 +08:00
|
|
|
v_store_interleave(dst + i*cn, a, b, c, mode);
|
|
|
|
if( i < i0 )
|
|
|
|
{
|
|
|
|
i = i0 - VECSZ;
|
|
|
|
mode = hal::STORE_ALIGNED_NOCACHE;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
}
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
CV_Assert( cn == 4 );
|
|
|
|
const T* src2 = src[2];
|
|
|
|
const T* src3 = src[3];
|
|
|
|
for( i = 0; i < len; i += VECSZ )
|
|
|
|
{
|
2018-07-26 17:04:28 +08:00
|
|
|
if( i > len - VECSZ )
|
|
|
|
{
|
|
|
|
i = len - VECSZ;
|
|
|
|
mode = hal::STORE_UNALIGNED;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
VecT a = vx_load(src0 + i), b = vx_load(src1 + i);
|
|
|
|
VecT c = vx_load(src2 + i), d = vx_load(src3 + i);
|
2018-07-26 17:04:28 +08:00
|
|
|
v_store_interleave(dst + i*cn, a, b, c, d, mode);
|
|
|
|
if( i < i0 )
|
|
|
|
{
|
|
|
|
i = i0 - VECSZ;
|
|
|
|
mode = hal::STORE_ALIGNED_NOCACHE;
|
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
}
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
2018-07-24 22:27:56 +08:00
|
|
|
vx_cleanup();
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
template<typename T> static void
|
|
|
|
merge_( const T** src, T* dst, int len, int cn )
|
|
|
|
{
|
|
|
|
int k = cn % 4 ? cn % 4 : 4;
|
|
|
|
int i, j;
|
|
|
|
if( k == 1 )
|
|
|
|
{
|
|
|
|
const T* src0 = src[0];
|
|
|
|
for( i = j = 0; i < len; i++, j += cn )
|
|
|
|
dst[j] = src0[i];
|
|
|
|
}
|
|
|
|
else if( k == 2 )
|
|
|
|
{
|
|
|
|
const T *src0 = src[0], *src1 = src[1];
|
|
|
|
i = j = 0;
|
|
|
|
for( ; i < len; i++, j += cn )
|
|
|
|
{
|
|
|
|
dst[j] = src0[i];
|
|
|
|
dst[j+1] = src1[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( k == 3 )
|
|
|
|
{
|
|
|
|
const T *src0 = src[0], *src1 = src[1], *src2 = src[2];
|
|
|
|
i = j = 0;
|
|
|
|
for( ; i < len; i++, j += cn )
|
|
|
|
{
|
|
|
|
dst[j] = src0[i];
|
|
|
|
dst[j+1] = src1[i];
|
|
|
|
dst[j+2] = src2[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const T *src0 = src[0], *src1 = src[1], *src2 = src[2], *src3 = src[3];
|
|
|
|
i = j = 0;
|
|
|
|
for( ; i < len; i++, j += cn )
|
|
|
|
{
|
|
|
|
dst[j] = src0[i]; dst[j+1] = src1[i];
|
|
|
|
dst[j+2] = src2[i]; dst[j+3] = src3[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for( ; k < cn; k += 4 )
|
|
|
|
{
|
|
|
|
const T *src0 = src[k], *src1 = src[k+1], *src2 = src[k+2], *src3 = src[k+3];
|
|
|
|
for( i = 0, j = k; i < len; i++, j += cn )
|
|
|
|
{
|
|
|
|
dst[j] = src0[i]; dst[j+1] = src1[i];
|
|
|
|
dst[j+2] = src2[i]; dst[j+3] = src3[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void merge8u(const uchar** src, uchar* dst, int len, int cn )
|
|
|
|
{
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_INSTRUMENT_REGION();
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
#if (CV_SIMD || CV_SIMD_SCALABLE)
|
|
|
|
if( len >= VTraits<v_uint8>::vlanes() && 2 <= cn && cn <= 4 )
|
2018-07-24 22:27:56 +08:00
|
|
|
vecmerge_<uchar, v_uint8>(src, dst, len, cn);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
merge_(src, dst, len, cn);
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void merge16u(const ushort** src, ushort* dst, int len, int cn )
|
|
|
|
{
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_INSTRUMENT_REGION();
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
#if (CV_SIMD || CV_SIMD_SCALABLE)
|
|
|
|
if( len >= VTraits<v_uint16>::vlanes() && 2 <= cn && cn <= 4 )
|
2018-07-24 22:27:56 +08:00
|
|
|
vecmerge_<ushort, v_uint16>(src, dst, len, cn);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
merge_(src, dst, len, cn);
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void merge32s(const int** src, int* dst, int len, int cn )
|
|
|
|
{
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_INSTRUMENT_REGION();
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
#if (CV_SIMD || CV_SIMD_SCALABLE)
|
|
|
|
if( len >= VTraits<v_int32>::vlanes() && 2 <= cn && cn <= 4 )
|
2018-07-24 22:27:56 +08:00
|
|
|
vecmerge_<int, v_int32>(src, dst, len, cn);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
merge_(src, dst, len, cn);
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void merge64s(const int64** src, int64* dst, int len, int cn )
|
|
|
|
{
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_INSTRUMENT_REGION();
|
Merge pull request #23980 from hanliutong:rewrite-core
Rewrite Universal Intrinsic code by using new API: Core module. #23980
The goal of this PR is to match and modify all SIMD code blocks guarded by `CV_SIMD` macro in the `opencv/modules/core` folder and rewrite them by using the new Universal Intrinsic API.
The patch is almost auto-generated by using the [rewriter](https://github.com/hanliutong/rewriter), related PR #23885.
Most of the files have been rewritten, but I marked this PR as draft because, the `CV_SIMD` macro also exists in the following files, and the reasons why they are not rewrited are:
1. ~~code design for fixed-size SIMD (v_int16x8, v_float32x4, etc.), need to manually rewrite.~~ Rewrited
- ./modules/core/src/stat.simd.hpp
- ./modules/core/src/matrix_transform.cpp
- ./modules/core/src/matmul.simd.hpp
2. Vector types are wrapped in other class/struct, that are not supported by the compiler in variable-length backends. Can not be rewrited directly.
- ./modules/core/src/mathfuncs_core.simd.hpp
```cpp
struct v_atan_f32
{
explicit v_atan_f32(const float& scale)
{
...
}
v_float32 compute(const v_float32& y, const v_float32& x)
{
...
}
...
v_float32 val90; // sizeless type can not used in a class
v_float32 val180;
v_float32 val360;
v_float32 s;
};
```
3. The API interface does not support/does not match
- ./modules/core/src/norm.cpp
Use `v_popcount`, ~~waiting for #23966~~ Fixed
- ./modules/core/src/has_non_zero.simd.hpp
Use illegal Universal Intrinsic API: For float type, there is no logical operation `|`. Further discussion needed
```cpp
/** @brief Bitwise OR
Only for integer types. */
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
```
```cpp
#if CV_SIMD
typedef v_float32 v_type;
const v_type v_zero = vx_setzero_f32();
constexpr const int unrollCount = 8;
int step = v_type::nlanes * unrollCount;
int len0 = len & -step;
const float* srcSimdEnd = src+len0;
int countSIMD = static_cast<int>((srcSimdEnd-src)/step);
while(!res && countSIMD--)
{
v_type v0 = vx_load(src);
src += v_type::nlanes;
v_type v1 = vx_load(src);
src += v_type::nlanes;
....
src += v_type::nlanes;
v0 |= v1; //Illegal ?
....
//res = v_check_any(((v0 | v4) != v_zero));//beware : (NaN != 0) returns "false" since != is mapped to _CMP_NEQ_OQ and not _CMP_NEQ_UQ
res = !v_check_all(((v0 | v4) == v_zero));
}
v_cleanup();
#endif
```
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [ ] I agree to contribute to the project under Apache 2 License.
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-08-11 13:33:33 +08:00
|
|
|
#if (CV_SIMD || CV_SIMD_SCALABLE)
|
|
|
|
if( len >= VTraits<v_int64>::vlanes() && 2 <= cn && cn <= 4 )
|
2018-07-24 22:27:56 +08:00
|
|
|
vecmerge_<int64, v_int64>(src, dst, len, cn);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
merge_(src, dst, len, cn);
|
2015-12-03 19:43:37 +08:00
|
|
|
}
|
|
|
|
|
2018-02-06 20:02:51 +08:00
|
|
|
#endif
|
2019-02-22 19:17:18 +08:00
|
|
|
CV_CPU_OPTIMIZATION_NAMESPACE_END
|
|
|
|
}} // namespace
|