Updated performance tests sanity data; fixed some tests

diff --git a/modules/core/perf/perf_convertTo.cpp b/modules/core/perf/perf_convertTo.cpp
index 6eaed4a..ef0bf65 100644 (file)
--- a/modules/core/perf/perf_convertTo.cpp
+++ b/modules/core/perf/perf_convertTo.cpp
@@ -32,5 +32,5 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,
 \r
     TEST_CYCLE() src.convertTo(dst, depthDst, alpha);\r
 \r
-    SANITY_CHECK(dst);\r
+    SANITY_CHECK(dst, 1e-12);\r
 }\r

diff --git a/modules/core/perf/perf_merge.cpp b/modules/core/perf/perf_merge.cpp
index 576ad23..302b9b2 100644 (file)
--- a/modules/core/perf/perf_merge.cpp
+++ b/modules/core/perf/perf_merge.cpp
@@ -32,5 +32,5 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
     Mat dst;\r
     TEST_CYCLE() merge( (vector<Mat> &)mv, dst );\r
 \r
-    SANITY_CHECK(dst);\r
+    SANITY_CHECK(dst, 1e-12);\r
 }
\ No newline at end of file

diff --git a/modules/core/perf/perf_split.cpp b/modules/core/perf/perf_split.cpp
index db75165..ea4e5ab 100644 (file)
--- a/modules/core/perf/perf_split.cpp
+++ b/modules/core/perf/perf_split.cpp
@@ -29,5 +29,5 @@ PERF_TEST_P( Size_Depth_Channels, split,
 \r
     TEST_CYCLE() split(m, (vector<Mat>&)mv);\r
 \r
-    SANITY_CHECK(mv);\r
+    SANITY_CHECK(mv, 1e-12);\r
 }\r

diff --git a/modules/imgproc/perf/perf_blur.cpp b/modules/imgproc/perf/perf_blur.cpp
index 58992fe..5c27747 100644 (file)
--- a/modules/imgproc/perf/perf_blur.cpp
+++ b/modules/imgproc/perf/perf_blur.cpp
@@ -1,4 +1,5 @@
 #include "perf_precomp.hpp"
+#include "opencv2/core/internal.hpp"
 
 using namespace std;
 using namespace cv;
@@ -62,7 +63,11 @@ PERF_TEST_P(Size_MatType_BorderType3x3, gaussianBlur3x3,
 
     TEST_CYCLE() GaussianBlur(src, dst, Size(3,3), 0, 0, btype);
 
+#if CV_SSE2
+    SANITY_CHECK(dst, 1);
+#else
     SANITY_CHECK(dst);
+#endif
 }
 
 PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3,

diff --git a/modules/imgproc/perf/perf_cornerHarris.cpp b/modules/imgproc/perf/perf_cornerHarris.cpp
index c7a30b5..b3dc760 100644 (file)
--- a/modules/imgproc/perf/perf_cornerHarris.cpp
+++ b/modules/imgproc/perf/perf_cornerHarris.cpp
@@ -35,5 +35,5 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris,
 
     TEST_CYCLE() cornerHarris(src, dst, blockSize, apertureSize, k, borderType);
 
-    SANITY_CHECK(dst);
+    SANITY_CHECK(dst, 2e-6);
 }
\ No newline at end of file