added minMaxLoc, cornerHarris, remap and dft performance tests

diff --git a/samples/gpu/performance/performance.cpp b/samples/gpu/performance/performance.cpp
index 03e0065..668b733 100644 (file)
--- a/samples/gpu/performance/performance.cpp
+++ b/samples/gpu/performance/performance.cpp
@@ -14,6 +14,15 @@ void Test::gen(Mat& mat, int rows, int cols, int type)
 }\r
 \r
 \r
+void Test::gen(Mat& mat, int rows, int cols, int type, double low, double high)\r
+{\r
+    mat.create(rows, cols, type);\r
+\r
+    RNG rng(0);\r
+    rng.fill(mat, RNG::UNIFORM, Scalar::all(low), Scalar::all(high));\r
+}\r
+\r
+\r
 void TestSystem::run()\r
 {\r
     cout << setiosflags(ios_base::left);\r
@@ -46,13 +55,12 @@ void TestSystem::flush()
 \r
     int cpu_time = static_cast<int>(cpu_elapsed_ / getTickFrequency() * 1000.0);\r
     int gpu_time = static_cast<int>(gpu_elapsed_ / getTickFrequency() * 1000.0);\r
-\r
-    double speedup = static_cast<double>(cpu_time) / gpu_time;\r
-    speedup_total_ += speedup;\r
-\r
     cpu_elapsed_ = 0;\r
     gpu_elapsed_ = 0;\r
 \r
+    double speedup = static_cast<double>(cpu_time) / std::max(1, gpu_time);\r
+    speedup_total_ += speedup;\r
+\r
     cout << "    " << setiosflags(ios_base::fixed | ios_base::left);\r
 \r
     stringstream stream;\r

diff --git a/samples/gpu/performance/performance.h b/samples/gpu/performance/performance.h
index 8fbe667..9fbb1f6 100644 (file)
--- a/samples/gpu/performance/performance.h
+++ b/samples/gpu/performance/performance.h
@@ -15,6 +15,7 @@ public:
     const std::string& name() const { return name_; }\r
 \r
     void gen(cv::Mat& mat, int rows, int cols, int type);\r
+    void gen(cv::Mat& mat, int rows, int cols, int type, double low, double high);\r
 \r
     virtual void run() = 0;\r
 \r
@@ -83,7 +84,7 @@ private:
 \r
 \r
 #define TEST(name) \\r
-    struct name##_test: public Test \\r
+    struct name##_test: Test \\r
     { \\r
         name##_test(): Test(#name) { TestSystem::instance()->add(this); } \\r
         void run(); \\r

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index db31237..f7753c5 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -8,30 +8,30 @@ using namespace cv;
 TEST(matchTemplate)\r
 {\r
     Mat image, templ, result;\r
-    gen(image, 3000, 3000, CV_8U);\r
+    gen(image, 3000, 3000, CV_32F);\r
 \r
     gpu::GpuMat d_image(image), d_templ, d_result;\r
 \r
     for (int templ_size = 5; templ_size <= 1000; templ_size *= 2)\r
     {\r
-        SUBTEST << "img 3000, templ " << templ_size << ", 8U, SQDIFF";\r
+        SUBTEST << "img " << image.rows << ", templ " << templ_size << ", 32F, CCORR";\r
 \r
-        gen(templ, templ_size, templ_size, CV_8U);\r
+        gen(templ, templ_size, templ_size, CV_32F);\r
 \r
         CPU_ON;\r
-        matchTemplate(image, templ, result, CV_TM_SQDIFF);\r
+        matchTemplate(image, templ, result, CV_TM_CCORR);\r
         CPU_OFF;\r
 \r
         d_templ = templ;\r
 \r
         GPU_ON;\r
-        gpu::matchTemplate(d_image, d_templ, d_result, CV_TM_SQDIFF);\r
+        gpu::matchTemplate(d_image, d_templ, d_result, CV_TM_CCORR);\r
         GPU_OFF;\r
     }\r
 }\r
 \r
 \r
-TEST(minMaxLoc) \r
+TEST(minMaxLoc)\r
 {\r
     Mat src;\r
     gpu::GpuMat d_src;\r
@@ -55,4 +55,80 @@ TEST(minMaxLoc)
         gpu::minMaxLoc(d_src, &min_val, &max_val, &min_loc, &max_loc);\r
         GPU_OFF;\r
     }\r
+}\r
+\r
+\r
+TEST(remap)\r
+{\r
+    Mat src, dst, xmap, ymap;\r
+    gpu::GpuMat d_src, d_dst, d_xmap, d_ymap;\r
+\r
+    for (int size = 1000; size <= 8000; size *= 2)\r
+    {\r
+        SUBTEST << "img " << size << " and 8UC1, 32FC1 maps";\r
+\r
+        gen(src, size, size, CV_8UC1);\r
+        gen(xmap, size, size, CV_32FC1, 0, size);\r
+        gen(ymap, size, size, CV_32FC1, 0, size);\r
+\r
+        CPU_ON;\r
+        remap(src, dst, xmap, ymap, INTER_LINEAR);\r
+        CPU_OFF;\r
+\r
+        d_src = src;\r
+        d_xmap = xmap;\r
+        d_ymap = ymap;\r
+\r
+        GPU_ON;\r
+        gpu::remap(d_src, d_dst, d_xmap, d_ymap);\r
+        GPU_OFF;\r
+    }\r
+}\r
+\r
+\r
+TEST(dft)\r
+{\r
+    Mat src, dst;\r
+    gpu::GpuMat d_src, d_dst;\r
+\r
+    for (int size = 1000; size <= 4000; size += 1000)\r
+    {\r
+        SUBTEST << "size " << size << ", 32FC2, complex-to-complex";\r
+\r
+        gen(src, size, size, CV_32FC2);\r
+\r
+        CPU_ON;\r
+        dft(src, dst);\r
+        CPU_OFF;\r
+\r
+        d_src = src;\r
+\r
+        GPU_ON;\r
+        gpu::dft(d_src, d_dst, Size(size, size));\r
+        GPU_OFF;\r
+    }\r
+}\r
+\r
+\r
+TEST(cornerHarris)\r
+{\r
+    Mat src, dst;\r
+    gpu::GpuMat d_src, d_dst;\r
+\r
+    for (int size = 2000; size <= 4000; size *= 2)\r
+    {\r
+        SUBTEST << "size " << size << ", 32FC1";\r
+\r
+        gen(src, size, size, CV_32FC1);\r
+\r
+        CPU_ON;\r
+        cornerHarris(src, dst, 5, 7, 0.1, BORDER_REFLECT101);\r
+        CPU_OFF;\r
+\r
+        d_src = src;\r
+\r
+        GPU_ON;\r
+        gpu::cornerHarris(d_src, d_dst, 5, 7, 0.1);\r
+        GPU_OFF;\r
+    }\r
 }
\ No newline at end of file