mirror of
https://github.com/opencv/opencv.git
synced 2026-07-26 05:43:05 +04:00
Madan mohan Manokar
e6d0c0340b
core: Fix mul32f and addWeighted32f to use native f32 SIMD paths #29413 OpenCV Extra: https://github.com/opencv/opencv_extra/pull/1388 - add 32FC1 coverage to addWeighted benchmark - avoid intermediate double for f32 variants of scaled multiply and addWeighted. - Relax AddWeighted 32F test tolerance to match f32 FMA semantics. ### 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 - [x] The PR is proposed to the proper branch - [ ] 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. - [x] The feature is well documented and sample code can be built with the project CMake
41 lines
1.1 KiB
C++
41 lines
1.1 KiB
C++
#include "perf_precomp.hpp"
|
|
|
|
namespace opencv_test
|
|
{
|
|
using namespace perf;
|
|
|
|
#define TYPICAL_MAT_TYPES_ADWEIGHTED CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1
|
|
#define TYPICAL_MATS_ADWEIGHTED testing::Combine(testing::Values(szVGA, sz720p, sz1080p), testing::Values(TYPICAL_MAT_TYPES_ADWEIGHTED))
|
|
|
|
PERF_TEST_P(Size_MatType, addWeighted, TYPICAL_MATS_ADWEIGHTED)
|
|
{
|
|
Size size = get<0>(GetParam());
|
|
int type = get<1>(GetParam());
|
|
int depth = CV_MAT_DEPTH(type);
|
|
Mat src1(size, type);
|
|
Mat src2(size, type);
|
|
double alpha = 3.75;
|
|
double beta = -0.125;
|
|
double gamma = 100.0;
|
|
|
|
Mat dst(size, type);
|
|
|
|
declare.in(src1, src2, dst, WARMUP_RNG).out(dst);
|
|
|
|
if (depth == CV_32S)
|
|
{
|
|
// there might be not enough precision for integers
|
|
src1 /= 2048;
|
|
src2 /= 2048;
|
|
}
|
|
|
|
TEST_CYCLE() cv::addWeighted( src1, alpha, src2, beta, gamma, dst, dst.type() );
|
|
|
|
if (depth == CV_32F)
|
|
SANITY_CHECK(dst, 1e-4, ERROR_RELATIVE);
|
|
else
|
|
SANITY_CHECK(dst, depth == CV_32S ? 4 : 1);
|
|
}
|
|
|
|
} // namespace
|