most of the performance tests was rewritten in google-test manner

modules/ocl/perf/perf_norm.cpp

@@ -45,43 +45,46 @@
 //M*/
 #include "perf_precomp.hpp"
 
+using namespace perf;
+using std::tr1::tuple;
+using std::tr1::get;
+
 ///////////// norm////////////////////////
-PERFTEST(norm)
+
+typedef TestBaseWithParam<Size> normFixture;
+
+PERF_TEST_P(normFixture, DISABLED_norm, OCL_TYPICAL_MAT_SIZES)
 {
-    Mat src1, src2, ocl_src1;
-    ocl::oclMat d_src1, d_src2;
+    // getting params
+    const Size srcSize = GetParam();
+    const std::string impl = getSelectedImpl();
+    double value = 0.0;
 
-    for (int size = Min_Size; size <= Max_Size; size *= Multiple)
+    // creating src data
+    Mat src1(srcSize, CV_8UC1), src2(srcSize, CV_8UC1);
+    declare.in(src1, src2);
+    randu(src1, 0, 1);
+    randu(src2, 0, 1);
+
+    // select implementation
+    if (impl == "ocl")
     {
-        SUBTEST << size << 'x' << size << "; CV_8UC1; NORM_INF";
+        ocl::oclMat oclSrc1(src1), oclSrc2(src2);
 
-        gen(src1, size, size, CV_8UC1, Scalar::all(0), Scalar::all(1));
-        gen(src2, size, size, CV_8UC1, Scalar::all(0), Scalar::all(1));
+        TEST_CYCLE() value = cv::ocl::norm(oclSrc1, oclSrc2, NORM_INF);
 
-        norm(src1, src2, NORM_INF);
-
-        CPU_ON;
-        norm(src1, src2, NORM_INF);
-        CPU_OFF;
-
-        d_src1.upload(src1);
-        d_src2.upload(src2);
-
-        WARMUP_ON;
-        ocl::norm(d_src1, d_src2, NORM_INF);
-        WARMUP_OFF;
-
-        d_src1.download(ocl_src1);
-        TestSystem::instance().ExpectedMatNear(src1, ocl_src1, .5);
-
-        GPU_ON;
-        ocl::norm(d_src1, d_src2, NORM_INF);
-        GPU_OFF;
-
-        GPU_FULL_ON;
-        d_src1.upload(src1);
-        d_src2.upload(src2);
-        ocl::norm(d_src1, d_src2, NORM_INF);
-        GPU_FULL_OFF;
+        SANITY_CHECK(value);
     }
+    else if (impl == "plain")
+    {
+        TEST_CYCLE() value = cv::norm(src1, src2, NORM_INF);
+
+        SANITY_CHECK(value);
+    }
+#ifdef HAVE_OPENCV_GPU
+    else if (impl == "gpu")
+        CV_TEST_FAIL_NO_IMPL();
+#endif
+    else
+        CV_TEST_FAIL_NO_IMPL();
 }