mirror of
https://github.com/opencv/opencv.git
synced 2026-09-26 04:09:43 +03:00
Andrei Fedorov
96ec0c97df
Extend core performance tests - #29922 Added more cases for performance tests. It's a part of a bigger PR https://github.com/opencv/opencv/pull/29631 execution time increased by <18% per my measurements. Duplication of https://github.com/opencv/opencv/pull/29900, but from a different fork. `opencv_extra` PR is https://github.com/opencv/opencv_extra/pull/1410 Following was added: | File | Test | Added | |------|------|-------| | `perf_arithm.cpp` | `BinaryOpTest.*` (add/subtract/multiply/absdiff/min/max/transpose2d) | types `CV_16UC1`, `CV_64FC1` | | `perf_compare.cpp` | `compareScalar` | types `CV_16UC1`, `CV_16SC1` | | `perf_dot.cpp` | `dot` | type `CV_64FC1` | | `perf_flip.cpp` | `flip` (`FLIP_TYPES`) | types `CV_32FC3`, `CV_32FC4` | | `perf_mat.cpp` | `Mat_CopyToWithMask` | types `CV_32FC3` | | `perf_mat.cpp` | `Mat_SetToWithMask` | types `CV_8UC3, CV_8UC4, CV_16UC3, CV_16UC4, CV_32FC3, CV_32FC4` | | `perf_norm.cpp` | `norm` | norm type `NORM_L2SQR` | | `perf_norm.cpp` | `norm_mask` | types `CV_8UC3`, `CV_16UC3`, `CV_32FC3`; norm type `NORM_L2SQR` | | `perf_norm.cpp` | `norm2` | norm types `NORM_L2SQR`, `NORM_RELATIVE+NORM_L2SQR` | | `perf_norm.cpp` | `norm2_mask` | types `CV_8UC3`, `CV_16UC3`, `CV_32FC3`; norm types `NORM_L2SQR`, `NORM_RELATIVE\|NORM_L2SQR` | | `perf_sort.cpp` | `sort`, `sorIdx` (`TYPICAL_MAT_TYPES_SORT`) | types `CV_16SC1`, `CV_32SC1`, `CV_64FC1` | | `perf_stat.cpp` | `sum`, `mean` | types widened `{8UC1,8UC4,32FC1}` → `8U/16U/16S/32F × C1/C3/C4` | | `perf_stat.cpp` | `mean_mask`, `meanStdDev`, `meanStdDev_mask` | types widened `{8UC1,8UC4,32FC1}` → `8U/16U/32F × C1/C3/C4` | ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] 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 - [x] There is a reference to the original bug report and related work - [x] 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
59 lines
1.6 KiB
C++
59 lines
1.6 KiB
C++
#include "perf_precomp.hpp"
|
|
|
|
namespace opencv_test
|
|
{
|
|
using namespace perf;
|
|
|
|
CV_ENUM(CmpType, CMP_EQ, CMP_GT, CMP_GE, CMP_LT, CMP_LE, CMP_NE)
|
|
|
|
typedef tuple<Size, MatType, CmpType> Size_MatType_CmpType_t;
|
|
typedef perf::TestBaseWithParam<Size_MatType_CmpType_t> Size_MatType_CmpType;
|
|
|
|
PERF_TEST_P( Size_MatType_CmpType, compare,
|
|
testing::Combine(
|
|
testing::Values(::perf::szVGA, ::perf::sz1080p),
|
|
testing::Values(CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1),
|
|
CmpType::all()
|
|
)
|
|
)
|
|
{
|
|
Size sz = get<0>(GetParam());
|
|
int matType1 = get<1>(GetParam());
|
|
CmpType cmpType = get<2>(GetParam());
|
|
|
|
Mat src1(sz, matType1);
|
|
Mat src2(sz, matType1);
|
|
Mat dst(sz, CV_8UC(CV_MAT_CN(matType1)));
|
|
|
|
declare.in(src1, src2, WARMUP_RNG).out(dst);
|
|
|
|
TEST_CYCLE() cv::compare(src1, src2, dst, cmpType);
|
|
|
|
SANITY_CHECK(dst);
|
|
}
|
|
|
|
PERF_TEST_P( Size_MatType_CmpType, compareScalar,
|
|
testing::Combine(
|
|
testing::Values(TYPICAL_MAT_SIZES),
|
|
testing::Values(CV_8UC1, CV_8UC4, CV_16UC1, CV_16SC1, CV_32FC1),
|
|
CmpType::all()
|
|
)
|
|
)
|
|
{
|
|
Size sz = get<0>(GetParam());
|
|
int matType = get<1>(GetParam());
|
|
CmpType cmpType = get<2>(GetParam());
|
|
|
|
Mat src1(sz, matType);
|
|
Scalar src2;
|
|
Mat dst(sz, CV_8UC(CV_MAT_CN(matType)));
|
|
|
|
declare.in(src1, src2, WARMUP_RNG).out(dst);
|
|
|
|
int runs = (sz.width <= 640) ? 8 : 1;
|
|
TEST_CYCLE_MULTIRUN(runs) cv::compare(src1, src2, dst, cmpType);
|
|
|
|
SANITY_CHECK(dst);
|
|
}
|
|
|
|
} // namespace
|