From 8c82decf5b69f0271280a233b2aa1febc71e24e1 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 4 Oct 2013 19:44:04 +0400 Subject: [PATCH] added plain branch to HoughCircle perf test --- modules/ocl/perf/perf_hough.cpp | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/modules/ocl/perf/perf_hough.cpp b/modules/ocl/perf/perf_hough.cpp index 61e8e48..f259bd1 100644 --- a/modules/ocl/perf/perf_hough.cpp +++ b/modules/ocl/perf/perf_hough.cpp @@ -59,9 +59,10 @@ PERF_TEST_P(Size_Dp_MinDist, OCL_HoughCircles, testing::Values(1.0f, 2.0f, 4.0f), testing::Values(1.0f, 10.0f))) { - const cv::Size size = std::tr1::get<0>(GetParam()); - const float dp = std::tr1::get<1>(GetParam()); - const float minDist = std::tr1::get<2>(GetParam()); + const Size_Dp_MinDist_t params = GetParam(); + const cv::Size size = std::tr1::get<0>(params); + const float dp = std::tr1::get<1>(params); + const float minDist = std::tr1::get<2>(params); const int minRadius = 10; const int maxRadius = 30; @@ -70,7 +71,7 @@ PERF_TEST_P(Size_Dp_MinDist, OCL_HoughCircles, cv::RNG rng(123456789); - cv::Mat src(size, CV_8UC1, cv::Scalar::all(0)); + cv::Mat src(size, CV_8UC1, cv::Scalar::all(0)), circles; const int numCircles = rng.uniform(50, 100); for (int i = 0; i < numCircles; ++i) @@ -81,18 +82,25 @@ PERF_TEST_P(Size_Dp_MinDist, OCL_HoughCircles, cv::circle(src, center, radius, cv::Scalar::all(255), -1); } - cv::ocl::oclMat ocl_src(src); - cv::ocl::oclMat ocl_circles; - declare.time(10.0).iterations(25); - TEST_CYCLE() + if (RUN_OCL_IMPL) + { + cv::ocl::oclMat ocl_src(src), ocl_circles; + + OCL_TEST_CYCLE() cv::ocl::HoughCircles(ocl_src, ocl_circles, HOUGH_GRADIENT, dp, minDist, + cannyThreshold, votesThreshold, minRadius, maxRadius); + } + else if (RUN_PLAIN_IMPL) { - cv::ocl::HoughCircles(ocl_src, ocl_circles, HOUGH_GRADIENT, dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius); + TEST_CYCLE() cv::HoughCircles(src, circles, HOUGH_GRADIENT, dp, minDist, cannyThreshold, + votesThreshold, minRadius, maxRadius); } + else + OCL_PERF_ELSE - cv::Mat circles(ocl_circles); - SANITY_CHECK(circles); + int value = 0; + SANITY_CHECK(value); } #endif // HAVE_OPENCL -- 2.7.4