From bbedebb57cf44bb447837918a02c48979411271a Mon Sep 17 00:00:00 2001 From: Rostislav Vasilikhin Date: Wed, 6 Feb 2019 17:56:44 +0300 Subject: [PATCH 1/3] perf tests for cvtColor for 16U and 32f added --- modules/imgproc/perf/perf_cvt_color.cpp | 120 ++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index e0f32fdab6..e0b55b7fa0 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -100,6 +100,72 @@ CV_ENUM(CvtMode, COLOR_YUV2BGR, COLOR_YUV2RGB, CX_YUV2BGRA, CX_YUV2RGBA ) +CV_ENUM(CvtMode16U, + COLOR_BGR2BGRA, COLOR_BGR2GRAY, + COLOR_BGR2RGB, COLOR_BGR2RGBA, COLOR_BGR2XYZ, + COLOR_BGR2YCrCb, COLOR_BGR2YUV, + + COLOR_BGRA2BGR, COLOR_BGRA2GRAY, COLOR_BGRA2RGBA, + CX_BGRA2XYZ, + CX_BGRA2YCrCb, CX_BGRA2YUV, + + COLOR_GRAY2BGR, COLOR_GRAY2BGRA, + + COLOR_RGB2GRAY, + COLOR_RGB2XYZ, COLOR_RGB2YCrCb, COLOR_RGB2YUV, + + COLOR_RGBA2BGR, COLOR_RGBA2GRAY, + CX_RGBA2XYZ, + CX_RGBA2YCrCb, CX_RGBA2YUV, + + COLOR_XYZ2BGR, COLOR_XYZ2RGB, CX_XYZ2BGRA, CX_XYZ2RGBA, + + COLOR_YCrCb2BGR, COLOR_YCrCb2RGB, CX_YCrCb2BGRA, CX_YCrCb2RGBA, + COLOR_YUV2BGR, COLOR_YUV2RGB, CX_YUV2BGRA, CX_YUV2RGBA + ) + +CV_ENUM(CvtMode32F, + COLOR_BGR2BGRA, COLOR_BGR2GRAY, + COLOR_BGR2HLS, COLOR_BGR2HLS_FULL, COLOR_BGR2HSV, COLOR_BGR2HSV_FULL, + COLOR_BGR2Lab, COLOR_BGR2Luv, COLOR_BGR2RGB, COLOR_BGR2RGBA, COLOR_BGR2XYZ, + COLOR_BGR2YCrCb, COLOR_BGR2YUV, + + COLOR_BGRA2BGR, COLOR_BGRA2GRAY, COLOR_BGRA2RGBA, + CX_BGRA2HLS, CX_BGRA2HLS_FULL, CX_BGRA2HSV, CX_BGRA2HSV_FULL, + CX_BGRA2Lab, CX_BGRA2Luv, CX_BGRA2XYZ, + CX_BGRA2YCrCb, CX_BGRA2YUV, + + COLOR_GRAY2BGR, COLOR_GRAY2BGRA, + + COLOR_HLS2BGR, COLOR_HLS2BGR_FULL, COLOR_HLS2RGB, COLOR_HLS2RGB_FULL, + CX_HLS2BGRA, CX_HLS2BGRA_FULL, CX_HLS2RGBA, CX_HLS2RGBA_FULL, + + COLOR_HSV2BGR, COLOR_HSV2BGR_FULL, COLOR_HSV2RGB, COLOR_HSV2RGB_FULL, + CX_HSV2BGRA, CX_HSV2BGRA_FULL, CX_HSV2RGBA, CX_HSV2RGBA_FULL, + + COLOR_Lab2BGR, COLOR_Lab2LBGR, COLOR_Lab2LRGB, COLOR_Lab2RGB, + CX_Lab2BGRA, CX_Lab2LBGRA, CX_Lab2LRGBA, CX_Lab2RGBA, + + COLOR_LBGR2Lab, COLOR_LBGR2Luv, COLOR_LRGB2Lab, COLOR_LRGB2Luv, + CX_LBGRA2Lab, CX_LBGRA2Luv, CX_LRGBA2Lab, CX_LRGBA2Luv, + + COLOR_Luv2BGR, COLOR_Luv2LBGR, COLOR_Luv2LRGB, COLOR_Luv2RGB, + CX_Luv2BGRA, CX_Luv2LBGRA, CX_Luv2LRGBA, CX_Luv2RGBA, + + COLOR_RGB2GRAY, + COLOR_RGB2HLS, COLOR_RGB2HLS_FULL, COLOR_RGB2HSV, COLOR_RGB2HSV_FULL, + COLOR_RGB2Lab, COLOR_RGB2Luv, COLOR_RGB2XYZ, COLOR_RGB2YCrCb, COLOR_RGB2YUV, + + COLOR_RGBA2BGR, COLOR_RGBA2GRAY, + CX_RGBA2HLS, CX_RGBA2HLS_FULL, CX_RGBA2HSV, CX_RGBA2HSV_FULL, + CX_RGBA2Lab, CX_RGBA2Luv, CX_RGBA2XYZ, + CX_RGBA2YCrCb, CX_RGBA2YUV, + + COLOR_XYZ2BGR, COLOR_XYZ2RGB, CX_XYZ2BGRA, CX_XYZ2RGBA, + + COLOR_YCrCb2BGR, COLOR_YCrCb2RGB, CX_YCrCb2BGRA, CX_YCrCb2RGBA, + COLOR_YUV2BGR, COLOR_YUV2RGB, CX_YUV2BGRA, CX_YUV2RGBA + ) CV_ENUM(CvtModeBayer, COLOR_BayerBG2BGR, COLOR_BayerBG2BGRA, COLOR_BayerBG2BGR_VNG, COLOR_BayerBG2GRAY, @@ -274,6 +340,60 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u, #endif } + +typedef tuple Size_CvtMode16U_t; +typedef perf::TestBaseWithParam Size_CvtMode16U; + +PERF_TEST_P(Size_CvtMode16U, cvtColor_16u, + testing::Combine( + testing::Values(::perf::szODD, ::perf::szVGA, ::perf::sz1080p), + CvtMode16U::all() + ) + ) +{ + Size sz = get<0>(GetParam()); + int _mode = get<1>(GetParam()), mode = _mode; + ChPair ch = getConversionInfo(mode); + mode %= COLOR_COLORCVT_MAX; + Mat src(sz, CV_16UC(ch.scn)); + Mat dst(sz, CV_16UC(ch.scn)); + + declare.time(100); + declare.in(src, WARMUP_RNG).out(dst); + + int runs = sz.width <= 320 ? 100 : 5; + TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn); + + SANITY_CHECK(dst, 1); +} + + +typedef tuple Size_CvtMode32F_t; +typedef perf::TestBaseWithParam Size_CvtMode32F; + +PERF_TEST_P(Size_CvtMode32F, cvtColor_32f, + testing::Combine( + testing::Values(::perf::szODD, ::perf::szVGA, ::perf::sz1080p), + CvtMode32F::all() + ) + ) +{ + Size sz = get<0>(GetParam()); + int _mode = get<1>(GetParam()), mode = _mode; + ChPair ch = getConversionInfo(mode); + mode %= COLOR_COLORCVT_MAX; + Mat src(sz, CV_32FC(ch.scn)); + Mat dst(sz, CV_32FC(ch.scn)); + + declare.time(100); + declare.in(src, WARMUP_RNG).out(dst); + + int runs = sz.width <= 320 ? 100 : 5; + TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn); + + SANITY_CHECK(dst, 1); +} + typedef tuple Size_CvtMode_Bayer_t; typedef perf::TestBaseWithParam Size_CvtMode_Bayer; From 87f651c119d31564e95e8dfb512d68a9f70ffab8 Mon Sep 17 00:00:00 2001 From: Rostislav Vasilikhin Date: Thu, 7 Feb 2019 18:20:29 +0300 Subject: [PATCH 2/3] disabled sanity check for 32f --- modules/imgproc/perf/perf_cvt_color.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index e0b55b7fa0..ac4f62e29f 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -391,7 +391,7 @@ PERF_TEST_P(Size_CvtMode32F, cvtColor_32f, int runs = sz.width <= 320 ? 100 : 5; TEST_CYCLE_MULTIRUN(runs) cvtColor(src, dst, mode, ch.dcn); - SANITY_CHECK(dst, 1); + SANITY_CHECK_NOTHING(); } typedef tuple Size_CvtMode_Bayer_t; From 4e679e1cc5b075ec006b29a58b4fe117523fba1d Mon Sep 17 00:00:00 2001 From: Rostislav Vasilikhin Date: Thu, 7 Feb 2019 19:26:36 +0300 Subject: [PATCH 3/3] disabled 16u and 32f perf tests --- modules/imgproc/perf/perf_cvt_color.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index ac4f62e29f..e3af113bed 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -344,7 +344,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u, typedef tuple Size_CvtMode16U_t; typedef perf::TestBaseWithParam Size_CvtMode16U; -PERF_TEST_P(Size_CvtMode16U, cvtColor_16u, +PERF_TEST_P(Size_CvtMode16U, DISABLED_cvtColor_16u, testing::Combine( testing::Values(::perf::szODD, ::perf::szVGA, ::perf::sz1080p), CvtMode16U::all() @@ -371,7 +371,7 @@ PERF_TEST_P(Size_CvtMode16U, cvtColor_16u, typedef tuple Size_CvtMode32F_t; typedef perf::TestBaseWithParam Size_CvtMode32F; -PERF_TEST_P(Size_CvtMode32F, cvtColor_32f, +PERF_TEST_P(Size_CvtMode32F, DISABLED_cvtColor_32f, testing::Combine( testing::Values(::perf::szODD, ::perf::szVGA, ::perf::sz1080p), CvtMode32F::all()