Commit a567c03f authored by Anna Kogan's avatar Anna Kogan

Switched to TEST_CYCLE_MULTIRUN for fast tests

parent 6ebb0e2a
...@@ -52,7 +52,8 @@ PERF_TEST_P( Size_MatType_CmpType, compareScalar, ...@@ -52,7 +52,8 @@ PERF_TEST_P( Size_MatType_CmpType, compareScalar,
declare.in(src1, src2, WARMUP_RNG).out(dst); declare.in(src1, src2, WARMUP_RNG).out(dst);
TEST_CYCLE() cv::compare(src1, src2, dst, cmpType); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) cv::compare(src1, src2, dst, cmpType);
SANITY_CHECK(dst); SANITY_CHECK(dst);
} }
...@@ -29,9 +29,9 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo, ...@@ -29,9 +29,9 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,
Mat src(sz, CV_MAKETYPE(depthSrc, channels)); Mat src(sz, CV_MAKETYPE(depthSrc, channels));
randu(src, 0, 255); randu(src, 0, 255);
Mat dst(sz, CV_MAKETYPE(depthDst, channels)); Mat dst(sz, CV_MAKETYPE(depthDst, channels));
declare.iterations(500);
TEST_CYCLE() src.convertTo(dst, depthDst, alpha); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) src.convertTo(dst, depthDst, alpha);
SANITY_CHECK(dst, alpha == 1.0 ? 1e-12 : 1e-7); SANITY_CHECK(dst, alpha == 1.0 ? 1e-12 : 1e-7);
} }
...@@ -18,7 +18,8 @@ PERF_TEST_P(Size_MatType, Mat_Eye, ...@@ -18,7 +18,8 @@ PERF_TEST_P(Size_MatType, Mat_Eye,
declare.out(diagonalMatrix); declare.out(diagonalMatrix);
TEST_CYCLE() int runs = (size.width <= 640) ? 15 : 5;
TEST_CYCLE_MULTIRUN(runs)
{ {
diagonalMatrix = Mat::eye(size, type); diagonalMatrix = Mat::eye(size, type);
} }
...@@ -38,7 +39,8 @@ PERF_TEST_P(Size_MatType, Mat_Zeros, ...@@ -38,7 +39,8 @@ PERF_TEST_P(Size_MatType, Mat_Zeros,
declare.out(zeroMatrix); declare.out(zeroMatrix);
TEST_CYCLE() int runs = (size.width <= 640) ? 15 : 5;
TEST_CYCLE_MULTIRUN(runs)
{ {
zeroMatrix = Mat::zeros(size, type); zeroMatrix = Mat::zeros(size, type);
} }
......
...@@ -30,7 +30,8 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge, ...@@ -30,7 +30,8 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
} }
Mat dst; Mat dst;
TEST_CYCLE() merge( (vector<Mat> &)mv, dst ); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) merge( (vector<Mat> &)mv, dst );
SANITY_CHECK(dst, 1e-12); SANITY_CHECK(dst, 1e-12);
} }
\ No newline at end of file
...@@ -26,8 +26,8 @@ PERF_TEST_P( Size_Depth_Channels, split, ...@@ -26,8 +26,8 @@ PERF_TEST_P( Size_Depth_Channels, split,
randu(m, 0, 255); randu(m, 0, 255);
vector<Mat> mv; vector<Mat> mv;
int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE() split(m, (vector<Mat>&)mv); TEST_CYCLE_MULTIRUN(runs) split(m, (vector<Mat>&)mv);
SANITY_CHECK(mv, 1e-12); SANITY_CHECK(mv, 1e-12);
} }
...@@ -97,7 +97,8 @@ PERF_TEST_P(Size_MatType, countNonZero, testing::Combine( testing::Values( TYPIC ...@@ -97,7 +97,8 @@ PERF_TEST_P(Size_MatType, countNonZero, testing::Combine( testing::Values( TYPIC
declare.in(src, WARMUP_RNG); declare.in(src, WARMUP_RNG);
TEST_CYCLE() cnt = countNonZero(src); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) cnt = countNonZero(src);
SANITY_CHECK(cnt); SANITY_CHECK(cnt);
} }
...@@ -299,10 +299,10 @@ PERF_TEST_P(Size_CvtMode2, cvtColorYUV420, ...@@ -299,10 +299,10 @@ PERF_TEST_P(Size_CvtMode2, cvtColorYUV420,
Mat src(sz.height + sz.height / 2, sz.width, CV_8UC(ch.scn)); Mat src(sz.height + sz.height / 2, sz.width, CV_8UC(ch.scn));
Mat dst(sz, CV_8UC(ch.dcn)); Mat dst(sz, CV_8UC(ch.dcn));
declare.time(100);
declare.in(src, WARMUP_RNG).out(dst); declare.in(src, WARMUP_RNG).out(dst);
TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn);
SANITY_CHECK(dst, 1); SANITY_CHECK(dst, 1);
} }
...@@ -31,9 +31,9 @@ PERF_TEST_P(Size_MatType_ThreshType, threshold, ...@@ -31,9 +31,9 @@ PERF_TEST_P(Size_MatType_ThreshType, threshold,
double maxval = theRNG().uniform(1, 254); double maxval = theRNG().uniform(1, 254);
declare.in(src, WARMUP_RNG).out(dst); declare.in(src, WARMUP_RNG).out(dst);
declare.iterations(500);
TEST_CYCLE() threshold(src, dst, thresh, maxval, threshType); int runs = (sz.width <= 640) ? 8 : 1;
TEST_CYCLE_MULTIRUN(runs) threshold(src, dst, thresh, maxval, threshType);
SANITY_CHECK(dst); SANITY_CHECK(dst);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment