add sanity checks into the calib3d gpu performance tests

diff --git a/modules/gpu/perf/perf_calib3d.cpp b/modules/gpu/perf/perf_calib3d.cpp
index 9293ec0..55d20c7 100644 (file)
--- a/modules/gpu/perf/perf_calib3d.cpp
+++ b/modules/gpu/perf/perf_calib3d.cpp
@@ -24,7 +24,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(pair_string("gpu/perf/aloe.png",
     const int preset = 0;\r
     const int ndisp = 256;\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::StereoBM_GPU d_bm(preset, ndisp);\r
 \r
@@ -38,6 +38,8 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(pair_string("gpu/perf/aloe.png",
         {\r
             d_bm(d_imgLeft, d_imgRight, d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -51,6 +53,8 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(pair_string("gpu/perf/aloe.png",
         {\r
             bm(imgLeft, imgRight, dst);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -69,7 +73,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(pair_string("gpu/
 \r
     const int ndisp = 64;\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::StereoBeliefPropagation d_bp(ndisp);\r
 \r
@@ -83,10 +87,12 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(pair_string("gpu/
         {\r
             d_bp(d_imgLeft, d_imgRight, d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
-        FAIL();\r
+        FAIL() << "No such CPU implementation analogy.";\r
     }\r
 }\r
 \r
@@ -105,7 +111,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(pair_string("gpu/st
 \r
     const int ndisp = 128;\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::StereoConstantSpaceBP d_csbp(ndisp);\r
 \r
@@ -119,10 +125,12 @@ PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(pair_string("gpu/st
         {\r
             d_csbp(d_imgLeft, d_imgRight, d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
-        FAIL();\r
+        FAIL() << "No such CPU implementation analogy.";\r
     }\r
 }\r
 \r
@@ -139,7 +147,7 @@ PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(pair_string("gpu
 \r
     const int ndisp = 128;\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::DisparityBilateralFilter d_filter(ndisp);\r
 \r
@@ -153,10 +161,12 @@ PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(pair_string("gpu
         {\r
             d_filter(d_disp, d_img, d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
-        FAIL();\r
+        FAIL() << "No such CPU implementation analogy.";\r
     }\r
 }\r
 \r
@@ -175,7 +185,7 @@ PERF_TEST_P(Count, Calib3D_TransformPoints, Values(5000, 10000, 20000))
     const cv::Mat rvec = cv::Mat::ones(1, 3, CV_32FC1);\r
     const cv::Mat tvec = cv::Mat::ones(1, 3, CV_32FC1);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -186,10 +196,12 @@ PERF_TEST_P(Count, Calib3D_TransformPoints, Values(5000, 10000, 20000))
         {\r
             cv::gpu::transformPoints(d_src, rvec, tvec, d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
-        FAIL();\r
+        FAIL() << "No such CPU implementation analogy.";\r
     }\r
 }\r
 \r
@@ -207,7 +219,7 @@ PERF_TEST_P(Count, Calib3D_ProjectPoints, Values(5000, 10000, 20000))
     const cv::Mat tvec = cv::Mat::ones(1, 3, CV_32FC1);\r
     const cv::Mat camera_mat = cv::Mat::ones(3, 3, CV_32FC1);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -218,6 +230,8 @@ PERF_TEST_P(Count, Calib3D_ProjectPoints, Values(5000, 10000, 20000))
         {\r
             cv::gpu::projectPoints(d_src, rvec, tvec, camera_mat, cv::Mat(), d_dst);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -229,6 +243,8 @@ PERF_TEST_P(Count, Calib3D_ProjectPoints, Values(5000, 10000, 20000))
         {\r
             cv::projectPoints(src, rvec, tvec, camera_mat, cv::noArray(), dst);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -265,7 +281,7 @@ PERF_TEST_P(Count, Calib3D_SolvePnPRansac, Values(5000, 10000, 20000))
     cv::Mat rvec;\r
     cv::Mat tvec;\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);\r
 \r
@@ -283,6 +299,9 @@ PERF_TEST_P(Count, Calib3D_SolvePnPRansac, Values(5000, 10000, 20000))
             cv::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);\r
         }\r
     }\r
+\r
+    CPU_SANITY_CHECK(rvec);\r
+    CPU_SANITY_CHECK(tvec);\r
 }\r
 \r
 //////////////////////////////////////////////////////////////////////\r
@@ -299,7 +318,7 @@ PERF_TEST_P(Sz_Depth, Calib3D_ReprojectImageTo3D, Combine(GPU_TYPICAL_MAT_SIZES,
     cv::Mat Q(4, 4, CV_32FC1);\r
     fillRandom(Q, 0.1, 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
@@ -310,6 +329,8 @@ PERF_TEST_P(Sz_Depth, Calib3D_ReprojectImageTo3D, Combine(GPU_TYPICAL_MAT_SIZES,
         {\r
             cv::gpu::reprojectImageTo3D(d_src, d_dst, Q);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
@@ -321,6 +342,8 @@ PERF_TEST_P(Sz_Depth, Calib3D_ReprojectImageTo3D, Combine(GPU_TYPICAL_MAT_SIZES,
         {\r
             cv::reprojectImageTo3D(src, dst, Q);\r
         }\r
+\r
+        CPU_SANITY_CHECK(dst);\r
     }\r
 }\r
 \r
@@ -335,7 +358,7 @@ PERF_TEST_P(Sz_Depth, Calib3D_DrawColorDisp, Combine(GPU_TYPICAL_MAT_SIZES, Valu
     cv::Mat src(size, type);\r
     fillRandom(src, 0, 255);\r
 \r
-    if (runOnGpu)\r
+    if (PERF_RUN_GPU())\r
     {\r
         cv::gpu::GpuMat d_src(src);\r
         cv::gpu::GpuMat d_dst;\r
@@ -346,10 +369,12 @@ PERF_TEST_P(Sz_Depth, Calib3D_DrawColorDisp, Combine(GPU_TYPICAL_MAT_SIZES, Valu
         {\r
             cv::gpu::drawColorDisp(d_src, d_dst, 255);\r
         }\r
+\r
+        GPU_SANITY_CHECK(d_dst);\r
     }\r
     else\r
     {\r
-        FAIL();\r
+        FAIL() << "No such CPU implementation analogy.";\r
     }\r
 }\r
 \r