fixed gpu performance tests

diff --git a/modules/gpu/perf/perf_arithm.cpp b/modules/gpu/perf/perf_arithm.cpp
index d740388..f62d6bf 100644 (file)
--- a/modules/gpu/perf/perf_arithm.cpp
+++ b/modules/gpu/perf/perf_arithm.cpp
@@ -17,9 +17,7 @@ PERF_TEST_P(DevInfo_Size_MatType, transpose, testing::Combine(testing::ValuesIn(
     GpuMat src(src_host);\r
     GpuMat dst(size.width, size.height, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         transpose(src, dst);\r
     }\r
@@ -48,9 +46,7 @@ PERF_TEST_P(DevInfo_Size_MatType_FlipCode, flip, testing::Combine(testing::Value
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         flip(src, dst, flipCode);\r
     }\r
@@ -78,9 +74,7 @@ PERF_TEST_P(DevInfo_Size_MatType, LUT, testing::Combine(testing::ValuesIn(device
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         LUT(src, lut, dst);\r
     }\r
@@ -108,9 +102,7 @@ PERF_TEST_P(DevInfo_Size, cartToPolar, testing::Combine(testing::ValuesIn(device
     GpuMat magnitude(size, CV_32FC1);\r
     GpuMat angle(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         cartToPolar(x, y, magnitude, angle);\r
     }\r
@@ -140,9 +132,7 @@ PERF_TEST_P(DevInfo_Size, polarToCart, testing::Combine(testing::ValuesIn(device
     GpuMat x(size, CV_32FC1);\r
     GpuMat y(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         polarToCart(magnitude, angle, x, y);\r
     }\r
@@ -173,9 +163,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addMat, testing::Combine(testing::ValuesIn(dev
     GpuMat b(b_host);\r
     GpuMat c(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         add(a, b, c);\r
     }\r
@@ -203,9 +191,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addScalar, testing::Combine(testing::ValuesIn(
     Scalar b(1,2,3,4);\r
     GpuMat c(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         add(a, b, c);\r
     }\r
@@ -234,9 +220,7 @@ PERF_TEST_P(DevInfo_Size_MatType, subtractMat, testing::Combine(testing::ValuesI
     GpuMat b(b_host);\r
     GpuMat c(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         subtract(a, b, c);\r
     }\r
@@ -254,7 +238,7 @@ PERF_TEST_P(DevInfo_Size, multiplyMat, testing::Combine(testing::ValuesIn(device
 \r
     setDevice(devInfo.deviceID());\r
 \r
-    Mat a_host(size, CV_8UC1);\r
+    Mat a_host(size, CV_8UC4);\r
     Mat b_host(size, CV_32FC1);\r
 \r
     declare.in(a_host, b_host, WARMUP_RNG);\r
@@ -263,9 +247,7 @@ PERF_TEST_P(DevInfo_Size, multiplyMat, testing::Combine(testing::ValuesIn(device
     GpuMat b(b_host);\r
     GpuMat c;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         multiply(a, b, c);\r
     }\r
@@ -293,9 +275,7 @@ PERF_TEST_P(DevInfo_Size_MatType, multiplyScalar, testing::Combine(testing::Valu
     Scalar b(1,2,3,4);\r
     GpuMat c(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         multiply(a, b, c);\r
     }\r
@@ -320,9 +300,7 @@ PERF_TEST_P(DevInfo_Size, exp, testing::Combine(testing::ValuesIn(devices()),
     GpuMat a(a_host);\r
     GpuMat b(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         exp(a, b);\r
     }\r
@@ -349,9 +327,7 @@ PERF_TEST_P(DevInfo_Size_MatType, pow, testing::Combine(testing::ValuesIn(device
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         pow(src, 2.0, dst);\r
     }\r
@@ -382,9 +358,7 @@ PERF_TEST_P(DevInfo_Size_MatType_CmpOp, compare, testing::Combine(testing::Value
     GpuMat src2(src2_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         compare(src1, src2, dst, cmpop);\r
     }\r
@@ -411,9 +385,7 @@ PERF_TEST_P(DevInfo_Size_MatType, bitwise_not, testing::Combine(testing::ValuesI
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         bitwise_not(src, dst);\r
     }\r
@@ -442,9 +414,7 @@ PERF_TEST_P(DevInfo_Size_MatType, bitwise_and, testing::Combine(testing::ValuesI
     GpuMat src2(src2_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         bitwise_and(src1, src2, dst);\r
     }\r
@@ -473,9 +443,7 @@ PERF_TEST_P(DevInfo_Size_MatType, min, testing::Combine(testing::ValuesIn(device
     GpuMat src2(src2_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         min(src1, src2, dst);\r
     }\r
@@ -501,9 +469,7 @@ PERF_TEST_P(DevInfo_Size, meanStdDev, testing::Combine(testing::ValuesIn(devices
     Scalar mean;\r
     Scalar stddev;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         meanStdDev(src, mean, stddev);\r
     }\r
@@ -532,9 +498,7 @@ PERF_TEST_P(DevInfo_Size_MatType_NormType, norm, testing::Combine(testing::Value
     double dst;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         dst = norm(src, normType, buf);\r
     }\r
@@ -561,9 +525,7 @@ PERF_TEST_P(DevInfo_Size_NormType, normDiff, testing::Combine(testing::ValuesIn(
     GpuMat src2(src2_host);\r
     double dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         dst = norm(src1, src2, normType);\r
     }\r
@@ -589,9 +551,7 @@ PERF_TEST_P(DevInfo_Size_MatType, sum, testing::Combine(testing::ValuesIn(device
     Scalar dst;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         dst = sum(src, buf);\r
     }\r
@@ -617,9 +577,7 @@ PERF_TEST_P(DevInfo_Size_MatType, minMax, testing::Combine(testing::ValuesIn(dev
     double minVal, maxVal;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         minMax(src, &minVal, &maxVal, GpuMat(), buf);\r
     }\r
@@ -647,9 +605,7 @@ PERF_TEST_P(DevInfo_Size_MatType, minMaxLoc, testing::Combine(testing::ValuesIn(
     Point minLoc, maxLoc;\r
     GpuMat valbuf, locbuf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         minMaxLoc(src, &minVal, &maxVal, &minLoc, &maxLoc, GpuMat(), valbuf, locbuf);\r
     }\r
@@ -676,9 +632,7 @@ PERF_TEST_P(DevInfo_Size_MatType, countNonZero, testing::Combine(testing::Values
     int dst=0;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         dst = countNonZero(src, buf);\r
     }\r
@@ -705,9 +659,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addWeighted, testing::Combine(testing::ValuesI
     GpuMat src2(src2_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         addWeighted(src1, 0.5, src2, 0.5, 0.0, dst);\r
     }\r
@@ -736,9 +688,7 @@ PERF_TEST_P(DevInfo_Size_MatType_FlipCode, reduce, testing::Combine(testing::Val
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         reduce(src, dst, dim, CV_REDUCE_MIN);\r
     }\r
@@ -769,7 +719,7 @@ PERF_TEST_P(DevInfo_Size, gemm, testing::Combine(testing::ValuesIn(devices()),
 \r
     declare.time(5.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         gemm(src1, src2, 1.0, src3, 1.0, dst);\r
     }\r

diff --git a/modules/gpu/perf/perf_calib3d.cpp b/modules/gpu/perf/perf_calib3d.cpp
index 4ac922e..510a65b 100644 (file)
--- a/modules/gpu/perf/perf_calib3d.cpp
+++ b/modules/gpu/perf/perf_calib3d.cpp
@@ -13,9 +13,7 @@ PERF_TEST_P(DevInfo, transformPoints, testing::ValuesIn(devices()))
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         transformPoints(src, Mat::ones(1, 3, CV_32FC1), Mat::ones(1, 3, CV_32FC1), dst);\r
     }\r
@@ -38,9 +36,7 @@ PERF_TEST_P(DevInfo, projectPoints, testing::ValuesIn(devices()))
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         projectPoints(src, Mat::ones(1, 3, CV_32FC1), Mat::ones(1, 3, CV_32FC1), Mat::ones(3, 3, CV_32FC1), Mat(), dst);\r
     }\r
@@ -65,7 +61,7 @@ PERF_TEST_P(DevInfo, solvePnPRansac, testing::ValuesIn(devices()))
 \r
     declare.time(3.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         solvePnPRansac(object, image, Mat::ones(3, 3, CV_32FC1), Mat(1, 8, CV_32F, Scalar::all(0)), rvec, tvec);\r
     }\r
@@ -93,9 +89,9 @@ PERF_TEST_P(DevInfo, StereoBM, testing::ValuesIn(devices()))
 \r
     StereoBM_GPU bm(0, 256);\r
 \r
-    declare.time(0.5).iterations(100);\r
+    declare.time(5.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         bm(img_l, img_r, dst);\r
     }\r
@@ -126,7 +122,7 @@ PERF_TEST_P(DevInfo, StereoBeliefPropagation, testing::ValuesIn(devices()))
 \r
     declare.time(10.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         bp(img_l, img_r, dst);\r
     }\r
@@ -157,7 +153,7 @@ PERF_TEST_P(DevInfo, StereoConstantSpaceBP, testing::ValuesIn(devices()))
 \r
     declare.time(10.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         bp(img_l, img_r, dst);\r
     }\r
@@ -186,9 +182,7 @@ PERF_TEST_P(DevInfo, DisparityBilateralFilter, testing::ValuesIn(devices()))
 \r
     DisparityBilateralFilter f(128);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         f(disp, img, dst);\r
     }\r

diff --git a/modules/gpu/perf/perf_features2d.cpp b/modules/gpu/perf/perf_features2d.cpp
index 894c752..a23edd7 100644 (file)
--- a/modules/gpu/perf/perf_features2d.cpp
+++ b/modules/gpu/perf/perf_features2d.cpp
@@ -21,7 +21,7 @@ PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_match, testing::Combine(testing:
 \r
     declare.time(3.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         matcher.matchSingle(query, train, trainIdx, distance);\r
     }\r
@@ -56,7 +56,7 @@ PERF_TEST_P(DevInfo_K_DescSize, BruteForceMatcher_knnMatch, testing::Combine(tes
 \r
     declare.time(3.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         matcher.knnMatchSingle(query, train, trainIdx, distance, allDist, k);\r
     }\r
@@ -87,7 +87,7 @@ PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_radiusMatch, testing::Combine(te
 \r
     declare.time(3.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         matcher.radiusMatchSingle(query, train, trainIdx, distance, nMatches, 2.0);\r
     }\r
@@ -118,7 +118,7 @@ PERF_TEST_P(DevInfo, SURF, testing::ValuesIn(devices()))
 \r
     declare.time(2.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         surf(img, GpuMat(), keypoints, descriptors);\r
     }\r

diff --git a/modules/gpu/perf/perf_filters.cpp b/modules/gpu/perf/perf_filters.cpp
index da813bf..fc4ca56 100644 (file)
--- a/modules/gpu/perf/perf_filters.cpp
+++ b/modules/gpu/perf/perf_filters.cpp
@@ -21,9 +21,7 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, boxFilter, testing::Combine(testing
 \r
     Ptr<FilterEngine_GPU> filter = createBoxFilter_GPU(type, type, Size(ksize, ksize));\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         filter->apply(src, dst);\r
     }\r
@@ -56,9 +54,7 @@ PERF_TEST_P(DevInfo_Size_MatType_MorphOp_KernelSize, morphologyFilter, testing::
 \r
     Ptr<FilterEngine_GPU> filter = createMorphologyFilter_GPU(op, type, Mat::ones(ksize, ksize, CV_8U));\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         filter->apply(src, dst);\r
     }\r
@@ -89,9 +85,9 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, linearFilter, testing::Combine(test
 \r
     Ptr<FilterEngine_GPU> filter = createLinearFilter_GPU(type, type, Mat::ones(ksize, ksize, CV_8U));\r
 \r
-    declare.time(1.0).iterations(100);\r
+    declare.time(1.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         filter->apply(src, dst);\r
     }\r
@@ -123,9 +119,9 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, separableLinearFilter, testing::Com
     Mat kernel = getGaussianKernel(ksize, 0.5, CV_32F);\r
     Ptr<FilterEngine_GPU> filter = createSeparableLinearFilter_GPU(type, type, kernel, kernel, Point(-1,-1));\r
 \r
-    declare.time(1.0).iterations(100);\r
+    declare.time(1.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         filter->apply(src, dst, Rect(0, 0, src.cols, src.rows));\r
     }\r

diff --git a/modules/gpu/perf/perf_imgproc.cpp b/modules/gpu/perf/perf_imgproc.cpp
index 7b8ffe4..3bc476c 100644 (file)
--- a/modules/gpu/perf/perf_imgproc.cpp
+++ b/modules/gpu/perf/perf_imgproc.cpp
@@ -29,9 +29,9 @@ PERF_TEST_P(DevInfo_Size_MatType_Interpolation_BorderMode, remap, testing::Combi
     GpuMat xmap(xmap_host);\r
     GpuMat ymap(ymap_host);\r
 \r
-    declare.time(3.0).iterations(100);\r
+    declare.time(3.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         remap(src, dst, xmap, ymap, interpolation, borderMode);\r
     }\r
@@ -56,9 +56,9 @@ PERF_TEST_P(DevInfo, meanShiftFiltering, testing::ValuesIn(devices()))
     GpuMat src(rgba);\r
     GpuMat dst(src.size(), CV_8UC4);\r
 \r
-    declare.time(5.0).iterations(100);\r
+    declare.time(5.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         meanShiftFiltering(src, dst, 50, 50);\r
     }\r
@@ -84,9 +84,9 @@ PERF_TEST_P(DevInfo, meanShiftProc, testing::ValuesIn(devices()))
     GpuMat dstr(src.size(), CV_8UC4);\r
     GpuMat dstsp(src.size(), CV_16SC2);\r
 \r
-    declare.time(5.0).iterations(100);\r
+    declare.time(5.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         meanShiftProc(src, dstr, dstsp, 50, 50);\r
     }\r
@@ -113,9 +113,9 @@ PERF_TEST_P(DevInfo, meanShiftSegmentation, testing::ValuesIn(devices()))
     GpuMat src(rgba);\r
     Mat dst(src.size(), CV_8UC4);\r
 \r
-    declare.time(5.0).iterations(100);\r
+    declare.time(5.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         meanShiftSegmentation(src, dst, 10, 10, 20);\r
     }\r
@@ -140,9 +140,7 @@ PERF_TEST_P(DevInfo_Size_MatType, drawColorDisp, testing::Combine(testing::Value
     GpuMat src(src_host);\r
     GpuMat dst(size, CV_8UC4);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         drawColorDisp(src, dst, 255);\r
     }\r
@@ -169,9 +167,7 @@ PERF_TEST_P(DevInfo_Size_MatType, reprojectImageTo3D, testing::Combine(testing::
     GpuMat src(src_host);\r
     GpuMat dst(size, CV_32FC4);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         reprojectImageTo3D(src, dst, Mat::ones(4, 4, CV_32FC1));\r
     }\r
@@ -202,9 +198,7 @@ PERF_TEST_P(DevInfo_Size_MatType_CvtColorInfo, cvtColor, testing::Combine(testin
     GpuMat src(src_host);\r
     GpuMat dst(size, CV_MAKETYPE(type, info.dcn));\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         cvtColor(src, dst, info.code, info.dcn);\r
     }\r
@@ -231,9 +225,7 @@ PERF_TEST_P(DevInfo_Size_MatType, threshold, testing::Combine(testing::ValuesIn(
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         threshold(src, dst, 100.0, 255.0, THRESH_BINARY);\r
     }\r
@@ -264,9 +256,9 @@ PERF_TEST_P(DevInfo_Size_MatType_Interpolation_SizeCoeff, resize, testing::Combi
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(1.0).iterations(100);\r
+    declare.time(1.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         resize(src, dst, Size(), f, f, interpolation);\r
     }\r
@@ -301,9 +293,7 @@ PERF_TEST_P(DevInfo_Size_MatType_Interpolation, warpAffine, testing::Combine(tes
     reflect[1][2] = size.height;\r
     Mat M(2, 3, CV_64F, (void*)reflect); \r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         warpAffine(src, dst, M, size, interpolation);\r
     }\r
@@ -339,9 +329,7 @@ PERF_TEST_P(DevInfo_Size_MatType_Interpolation, warpPerspective, testing::Combin
     reflect[1][2] = size.height;\r
     Mat M(3, 3, CV_64F, (void*)reflect); \r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         warpPerspective(src, dst, M, size, interpolation);\r
     }\r
@@ -362,9 +350,7 @@ PERF_TEST_P(DevInfo_Size, buildWarpPlaneMaps, testing::Combine(testing::ValuesIn
     GpuMat map_x(size, CV_32FC1);\r
     GpuMat map_y(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         buildWarpPlaneMaps(size, Rect(0, 0, size.width, size.height), Mat::eye(3, 3, CV_32FC1), \r
                            Mat::ones(3, 3, CV_32FC1), Mat::zeros(1, 3, CV_32F), 1.0, map_x, map_y);\r
@@ -388,9 +374,7 @@ PERF_TEST_P(DevInfo_Size, buildWarpCylindricalMaps, testing::Combine(testing::Va
     GpuMat map_x(size, CV_32FC1);\r
     GpuMat map_y(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         buildWarpCylindricalMaps(size, Rect(0, 0, size.width, size.height), Mat::eye(3, 3, CV_32FC1),\r
                                  Mat::ones(3, 3, CV_32FC1), 1.0, map_x, map_y);\r
@@ -414,9 +398,7 @@ PERF_TEST_P(DevInfo_Size, buildWarpSphericalMaps, testing::Combine(testing::Valu
     GpuMat map_x(size, CV_32FC1);\r
     GpuMat map_y(size, CV_32FC1);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         buildWarpSphericalMaps(size, Rect(0, 0, size.width, size.height), Mat::eye(3, 3, CV_32FC1),\r
                                Mat::ones(3, 3, CV_32FC1), 1.0, map_x, map_y);\r
@@ -448,9 +430,7 @@ PERF_TEST_P(DevInfo_Size_MatType_Interpolation, rotate, testing::Combine(testing
     GpuMat src(src_host);\r
     GpuMat dst(size, type);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         rotate(src, dst, size, 30.0, 0, 0, interpolation);\r
     }\r
@@ -479,9 +459,7 @@ PERF_TEST_P(DevInfo_Size_MatType_BorderMode, copyMakeBorder, testing::Combine(te
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         copyMakeBorder(src, dst, 5, 5, 5, 5, borderType);\r
     }\r
@@ -507,9 +485,7 @@ PERF_TEST_P(DevInfo_Size, integralBuffered, testing::Combine(testing::ValuesIn(d
     GpuMat dst;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         integralBuffered(src, dst, buf);\r
     }\r
@@ -534,9 +510,7 @@ PERF_TEST_P(DevInfo_Size, integral, testing::Combine(testing::ValuesIn(devices()
     GpuMat src(src_host);\r
     GpuMat sum, sqsum;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         integral(src, sum, sqsum);\r
     }\r
@@ -563,9 +537,7 @@ PERF_TEST_P(DevInfo_Size, sqrIntegral, testing::Combine(testing::ValuesIn(device
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         sqrIntegral(src, dst);\r
     }\r
@@ -590,9 +562,7 @@ PERF_TEST_P(DevInfo_Size, columnSum, testing::Combine(testing::ValuesIn(devices(
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         columnSum(src, dst);\r
     }\r
@@ -624,9 +594,7 @@ PERF_TEST_P(DevInfo_MatType, cornerHarris, testing::Combine(testing::ValuesIn(de
     int ksize = 7;        \r
     double k = 0.5;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         cornerHarris(src, dst, Dx, Dy, blockSize, ksize, k);\r
     }\r
@@ -661,9 +629,7 @@ PERF_TEST_P(DevInfo_MatType, cornerMinEigenVal, testing::Combine(testing::Values
     int blockSize = 3;\r
     int ksize = 7; \r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         cornerMinEigenVal(src, dst, Dx, Dy, blockSize, ksize);\r
     }\r
@@ -696,9 +662,7 @@ PERF_TEST_P(DevInfo_Size_MatType, mulSpectrums, testing::Combine(testing::Values
     GpuMat b(b_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         mulSpectrums(a, b, dst, 0);\r
     }\r
@@ -723,9 +687,9 @@ PERF_TEST_P(DevInfo_Size, dft, testing::Combine(testing::ValuesIn(devices()),
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(2.0).iterations(100);\r
+    declare.time(2.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         dft(src, dst, size);\r
     }\r
@@ -754,9 +718,9 @@ PERF_TEST_P(DevInfo_Int_Int, convolve, testing::Combine(testing::ValuesIn(device
     GpuMat dst;\r
     ConvolveBuf buf;\r
 \r
-    declare.time(2.0).iterations(100);\r
+    declare.time(2.0);\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         convolve(image, templ, dst, false, buf);\r
     }\r
@@ -783,9 +747,7 @@ PERF_TEST_P(DevInfo_Size_MatType, pyrDown, testing::Combine(testing::ValuesIn(de
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         pyrDown(src, dst);\r
     }\r
@@ -812,9 +774,7 @@ PERF_TEST_P(DevInfo_Size_MatType, pyrUp, testing::Combine(testing::ValuesIn(devi
     GpuMat src(src_host);\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         pyrUp(src, dst);\r
     }\r
@@ -845,9 +805,7 @@ PERF_TEST_P(DevInfo_Size_MatType, blendLinear, testing::Combine(testing::ValuesI
     GpuMat weights2(size, CV_32FC1, Scalar::all(0.5));\r
     GpuMat dst;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         blendLinear(img1, img2, weights1, weights2, dst);\r
     }\r
@@ -870,9 +828,7 @@ PERF_TEST_P(DevInfo, Canny, testing::ValuesIn(devices()))
     GpuMat dst;\r
     CannyBuf buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         Canny(image, buf, dst, 50.0, 100.0);\r
     }\r
@@ -898,9 +854,7 @@ PERF_TEST_P(DevInfo_Size, calcHist, testing::Combine(testing::ValuesIn(devices()
     GpuMat hist;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         calcHist(src, hist, buf);\r
     }\r
@@ -927,9 +881,7 @@ PERF_TEST_P(DevInfo_Size, equalizeHist, testing::Combine(testing::ValuesIn(devic
     GpuMat hist;\r
     GpuMat buf;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         equalizeHist(src, dst, hist, buf);\r
     }\r

diff --git a/modules/gpu/perf/perf_matop.cpp b/modules/gpu/perf/perf_matop.cpp
index ba66a0c..5449951 100644 (file)
--- a/modules/gpu/perf/perf_matop.cpp
+++ b/modules/gpu/perf/perf_matop.cpp
@@ -18,9 +18,7 @@ PERF_TEST_P(DevInfo_Size_MatType, merge, testing::Combine(testing::ValuesIn(devi
 \r
     GpuMat dst(size, CV_MAKETYPE(type, num_channels));\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         merge(src, dst);\r
     }\r
@@ -48,9 +46,7 @@ PERF_TEST_P(DevInfo_Size_MatType, split, testing::Combine(testing::ValuesIn(devi
     for (int i = 0; i < num_channels; ++i)\r
         dst[i] = GpuMat(size, type); \r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         split(src, dst);\r
     }\r
@@ -75,9 +71,7 @@ PERF_TEST_P(DevInfo_Size_MatType, setTo, testing::Combine(testing::ValuesIn(devi
     GpuMat src(size, type);\r
     Scalar val(1, 2, 3, 4);\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         src.setTo(val);\r
     }\r
@@ -108,9 +102,7 @@ PERF_TEST_P(DevInfo_Size_MatType, setToMasked, testing::Combine(testing::ValuesI
     randu(mask_host, 0.0, 2.0);\r
     GpuMat mask(mask_host);\r
     \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         src.setTo(val, mask);\r
     }\r
@@ -141,9 +133,7 @@ PERF_TEST_P(DevInfo_Size_MatType, copyToMasked, testing::Combine(testing::Values
     randu(mask_host, 0.0, 2.0);\r
     GpuMat mask(mask_host);\r
     \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         src.copyTo(dst, mask);\r
     }\r
@@ -175,9 +165,7 @@ PERF_TEST_P(DevInfo_Size_MatType_MatType, convertTo, testing::Combine(testing::V
     double a = 0.5;\r
     double b = 1.0;\r
     \r
-    declare.time(0.5).iterations(100);\r
-\r
-    SIMPLE_TEST_CYCLE() \r
+    TEST_CYCLE(100)\r
     {\r
         src.convertTo(dst, type2, a, b);\r
     }\r

diff --git a/modules/gpu/perf/perf_objdetect.cpp b/modules/gpu/perf/perf_objdetect.cpp
index 50470d8..4f2f0d1 100644 (file)
--- a/modules/gpu/perf/perf_objdetect.cpp
+++ b/modules/gpu/perf/perf_objdetect.cpp
@@ -11,12 +11,10 @@ PERF_TEST_P(DevInfo, HOGDescriptor, testing::ValuesIn(devices()))
     GpuMat img(img_host);\r
     vector<Rect> found_locations;\r
 \r
-    declare.time(0.5).iterations(100);\r
-\r
     gpu::HOGDescriptor hog;\r
     hog.setSVMDetector(gpu::HOGDescriptor::getDefaultPeopleDetector());\r
 \r
-    SIMPLE_TEST_CYCLE()\r
+    TEST_CYCLE(100)\r
     {\r
         hog.detectMultiScale(img, found_locations);\r
     }\r