add sanity checks into the filters gpu performance tests

diff --git a/modules/gpu/perf/perf_filters.cpp b/modules/gpu/perf/perf_filters.cpp
index 64ab829..158af10 100644 (file)
--- a/modules/gpu/perf/perf_filters.cpp
+++ b/modules/gpu/perf/perf_filters.cpp
@@ -21,7 +21,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur, Combine(GPU_TYPICAL_MAT_SIZES, Value
     cv::Mat src(size, type);\r
     fillRandom(src);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -32,6 +32,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur, Combine(GPU_TYPICAL_MAT_SIZES, Value
         {\r
             cv::gpu::blur(d_src, d_dst, cv::Size(ksize, ksize));\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -43,6 +45,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur, Combine(GPU_TYPICAL_MAT_SIZES, Value
         {\r
             cv::blur(src, dst, cv::Size(ksize, ksize));\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -60,7 +64,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Sobel, Combine(GPU_TYPICAL_MAT_SIZES, Valu
     cv::Mat src(size, type);\r
     fillRandom(src);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -72,6 +76,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Sobel, Combine(GPU_TYPICAL_MAT_SIZES, Valu
         {\r
             cv::gpu::Sobel(d_src, d_dst, -1, 1, 1, d_buf, ksize);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -83,6 +89,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Sobel, Combine(GPU_TYPICAL_MAT_SIZES, Valu
         {\r
             cv::Sobel(src, dst, -1, 1, 1, ksize);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -99,7 +107,7 @@ PERF_TEST_P(Sz_Type, Filters_Scharr, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
     cv::Mat src(size, type);\r
     fillRandom(src);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -111,6 +119,8 @@ PERF_TEST_P(Sz_Type, Filters_Scharr, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
         {\r
             cv::gpu::Scharr(d_src, d_dst, -1, 1, 0, d_buf);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -122,6 +132,8 @@ PERF_TEST_P(Sz_Type, Filters_Scharr, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
         {\r
             cv::Scharr(src, dst, -1, 1, 0);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -139,7 +151,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_GaussianBlur, Combine(GPU_TYPICAL_MAT_SIZE
     cv::Mat src(size, type);\r
     fillRandom(src);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -151,6 +163,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_GaussianBlur, Combine(GPU_TYPICAL_MAT_SIZE
         {\r
             cv::gpu::GaussianBlur(d_src, d_dst, cv::Size(ksize, ksize), d_buf, 0.5);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -162,6 +176,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_GaussianBlur, Combine(GPU_TYPICAL_MAT_SIZE
         {\r
             cv::GaussianBlur(src, dst, cv::Size(ksize, ksize), 0.5);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -179,7 +195,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Laplacian, Combine(GPU_TYPICAL_MAT_SIZES,
     cv::Mat src(size, type);\r
     fillRandom(src);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -190,6 +206,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Laplacian, Combine(GPU_TYPICAL_MAT_SIZES,
         {\r
             cv::gpu::Laplacian(d_src, d_dst, -1, ksize);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -201,6 +219,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Laplacian, Combine(GPU_TYPICAL_MAT_SIZES,
         {\r
             cv::Laplacian(src, dst, -1, ksize);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -219,7 +239,7 @@ PERF_TEST_P(Sz_Type, Filters_Erode, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8UC
 \r
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -231,6 +251,8 @@ PERF_TEST_P(Sz_Type, Filters_Erode, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8UC
         {\r
             cv::gpu::erode(d_src, d_dst, ker, d_buf);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -242,6 +264,8 @@ PERF_TEST_P(Sz_Type, Filters_Erode, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8UC
         {\r
             cv::erode(src, dst, ker);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -260,7 +284,7 @@ PERF_TEST_P(Sz_Type, Filters_Dilate, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
 \r
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -272,6 +296,8 @@ PERF_TEST_P(Sz_Type, Filters_Dilate, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
         {\r
             cv::gpu::dilate(d_src, d_dst, ker, d_buf);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -283,6 +309,8 @@ PERF_TEST_P(Sz_Type, Filters_Dilate, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
         {\r
             cv::dilate(src, dst, ker);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -307,7 +335,7 @@ PERF_TEST_P(Sz_Type_Op, Filters_MorphologyEx, Combine(GPU_TYPICAL_MAT_SIZES, Val
 \r
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -320,6 +348,8 @@ PERF_TEST_P(Sz_Type_Op, Filters_MorphologyEx, Combine(GPU_TYPICAL_MAT_SIZES, Val
         {\r
             cv::gpu::morphologyEx(d_src, d_dst, morphOp, ker, d_buf1, d_buf2);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -331,6 +361,8 @@ PERF_TEST_P(Sz_Type_Op, Filters_MorphologyEx, Combine(GPU_TYPICAL_MAT_SIZES, Val
         {\r
             cv::morphologyEx(src, dst, morphOp, ker);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -351,7 +383,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Filter2D, Combine(GPU_TYPICAL_MAT_SIZES, V
     cv::Mat kernel(ksize, ksize, CV_32FC1);\r
     fillRandom(kernel, 0.0, 1.0);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -362,6 +394,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Filter2D, Combine(GPU_TYPICAL_MAT_SIZES, V
         {\r
             cv::gpu::filter2D(d_src, d_dst, -1, kernel);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -373,6 +407,8 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Filter2D, Combine(GPU_TYPICAL_MAT_SIZES, V
         {\r
             cv::filter2D(src, dst, -1, kernel);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r