From 9bddac1099f49119582d823ea70e38afc9191ecf Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Tue, 22 May 2012 11:27:45 +0000
Subject: [PATCH] fixed gpu-vs-cpu performance tests

---
 modules/gpu/perf_cpu/perf_arithm.cpp     | 2 +-
 modules/gpu/perf_cpu/perf_features2d.cpp | 2 +-
 modules/gpu/perf_cpu/perf_filters.cpp    | 4 ++--
 modules/gpu/perf_cpu/perf_imgproc.cpp    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gpu/perf_cpu/perf_arithm.cpp b/modules/gpu/perf_cpu/perf_arithm.cpp
index da2754a1f8..80f1cae368 100644
--- a/modules/gpu/perf_cpu/perf_arithm.cpp
+++ b/modules/gpu/perf_cpu/perf_arithm.cpp
@@ -596,6 +596,6 @@ GPU_PERF_TEST(GEMM, cv::gpu::DeviceInfo, cv::Size)
 
 INSTANTIATE_TEST_CASE_P(Arithm, GEMM, testing::Combine(
                         ALL_DEVICES,
-                        testing::Values(cv::Size(512, 512), cv::Size(1024, 1024), cv::Size(2048, 2048))));
+                        testing::Values(cv::Size(512, 512), cv::Size(1024, 1024))));
 
 #endif
diff --git a/modules/gpu/perf_cpu/perf_features2d.cpp b/modules/gpu/perf_cpu/perf_features2d.cpp
index c255fb1221..20f544ada4 100644
--- a/modules/gpu/perf_cpu/perf_features2d.cpp
+++ b/modules/gpu/perf_cpu/perf_features2d.cpp
@@ -100,7 +100,7 @@ GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
 
     cv::SURF surf;
 
-    declare.time(10.0);
+    declare.time(30.0);
 
     TEST_CYCLE()
     {
diff --git a/modules/gpu/perf_cpu/perf_filters.cpp b/modules/gpu/perf_cpu/perf_filters.cpp
index ebd9dba765..08c441a045 100644
--- a/modules/gpu/perf_cpu/perf_filters.cpp
+++ b/modules/gpu/perf_cpu/perf_filters.cpp
@@ -79,7 +79,7 @@ GPU_PERF_TEST(LinearFilter, cv::gpu::DeviceInfo, cv::Size, perf::MatType, int)
 
     cv::Ptr<cv::FilterEngine> filter = cv::createLinearFilter(type, type, cv::Mat::ones(ksize, ksize, CV_8U));
 
-    declare.time(1.0);
+    declare.time(10.0);
 
     TEST_CYCLE()
     {
@@ -111,7 +111,7 @@ GPU_PERF_TEST(SeparableLinearFilter, cv::gpu::DeviceInfo, cv::Size, perf::MatTyp
     cv::Mat kernel = cv::getGaussianKernel(ksize, 0.5, CV_32F);
     cv::Ptr<cv::FilterEngine> filter = cv::createSeparableLinearFilter(type, type, kernel, kernel);
 
-    declare.time(1.0);
+    declare.time(10.0);
 
     TEST_CYCLE()
     {
diff --git a/modules/gpu/perf_cpu/perf_imgproc.cpp b/modules/gpu/perf_cpu/perf_imgproc.cpp
index b722740af0..2c7169962c 100644
--- a/modules/gpu/perf_cpu/perf_imgproc.cpp
+++ b/modules/gpu/perf_cpu/perf_imgproc.cpp
@@ -45,7 +45,7 @@ GPU_PERF_TEST_1(MeanShiftFiltering, cv::gpu::DeviceInfo)
 
     cv::Mat dst;
 
-    declare.time(15.0);
+    declare.time(100.0);
 
     TEST_CYCLE()
     {
@@ -133,7 +133,7 @@ GPU_PERF_TEST(Threshold, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
 INSTANTIATE_TEST_CASE_P(ImgProc, Threshold, testing::Combine(
                         ALL_DEVICES,
                         GPU_TYPICAL_MAT_SIZES,
-                        testing::Values(CV_8UC1, CV_16UC1, CV_32FC1)));
+                        testing::Values(CV_8UC1, CV_32FC1)));
 
 //////////////////////////////////////////////////////////////////////
 // Resize