From 28575c19699c03814e8bab5634fec51308f979f2 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sun, 1 Dec 2013 03:02:13 +0400 Subject: [PATCH] added cv::countNonZero to T-API --- modules/core/src/opencl/count_non_zero.cl | 100 ++++++++++++++++++++++ modules/core/src/stat.cpp | 42 ++++++++- modules/core/test/ocl/test_arithm.cpp | 8 +- 3 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 modules/core/src/opencl/count_non_zero.cl diff --git a/modules/core/src/opencl/count_non_zero.cl b/modules/core/src/opencl/count_non_zero.cl new file mode 100644 index 000000000..cad89eb81 --- /dev/null +++ b/modules/core/src/opencl/count_non_zero.cl @@ -0,0 +1,100 @@ +//////////////////////////////////////////////////////////////////////////////////////// +// +// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. +// +// By downloading, copying, installing or using the software you agree to this license. +// If you do not agree to this license, do not download, install, +// copy or use the software. +// +// +// License Agreement +// For Open Source Computer Vision Library +// +// Copyright (C) 2010-2012, Institute Of Software Chinese Academy Of Science, all rights reserved. +// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved. +// Third party copyrights are property of their respective owners. +// +// @Authors +// Shengen Yan,yanshengen@gmail.com +// +// Redistribution and use in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// +// * Redistribution's of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// * Redistribution's in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// * The name of the copyright holders may not be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// This software is provided by the copyright holders and contributors as is and +// any express or implied warranties, including, but not limited to, the implied +// warranties of merchantability and fitness for a particular purpose are disclaimed. +// In no event shall the Intel Corporation or contributors be liable for any direct, +// indirect, incidental, special, exemplary, or consequential damages +// (including, but not limited to, procurement of substitute goods or services; +// loss of use, data, or profits; or business interruption) however caused +// and on any theory of liability, whether in contract, strict liability, +// or tort (including negligence or otherwise) arising in any way out of +// the use of this software, even if advised of the possibility of such damage. +// + +#ifdef DOUBLE_SUPPORT +#ifdef cl_amd_fp64 +#pragma OPENCL EXTENSION cl_amd_fp64:enable +#elif defined (cl_khr_fp64) +#pragma OPENCL EXTENSION cl_khr_fp64:enable +#endif +#endif + +/**************************************Count NonZero**************************************/ + +__kernel void count_non_zero(__global const uchar * srcptr, int step, int offset, int cols, + int total, int groupnum, __global uchar * dstptr) +{ + int lid = get_local_id(0); + int gid = get_group_id(0); + int id = get_global_id(0); + + __local int localmem[WGS2_ALIGNED]; + if (lid < WGS2_ALIGNED) + localmem[lid] = 0; + barrier(CLK_LOCAL_MEM_FENCE); + + int nonzero = (int)(0), src_index; + srcT zero = (srcT)(0), one = (srcT)(1); + + for (int grain = groupnum * WGS; id < total; id += grain) + { + src_index = mad24(id / cols, step, offset + (id % cols) * (int)sizeof(srcT)); + __global const srcT * src = (__global const srcT *)(srcptr + src_index); + nonzero += src[0] == zero ? zero : one; + } + + if (lid >= WGS2_ALIGNED) + localmem[lid - WGS2_ALIGNED] = nonzero; + barrier(CLK_LOCAL_MEM_FENCE); + + if (lid < WGS2_ALIGNED) + localmem[lid] = nonzero + localmem[lid]; + barrier(CLK_LOCAL_MEM_FENCE); + + for (int lsize = WGS2_ALIGNED >> 1; lsize > 0; lsize >>= 1) + { + if (lid < lsize) + { + int lid2 = lsize + lid; + localmem[lid] = localmem[lid] + localmem[lid2]; + } + barrier(CLK_LOCAL_MEM_FENCE); + } + + if (lid == 0) + { + __global int * dst = (__global int *)(dstptr + (int)sizeof(int) * gid); + dst[0] = localmem[0]; + } +} diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index bb2e1f493..46ec20a97 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -41,6 +41,7 @@ //M*/ #include "precomp.hpp" +#include "opencl_kernels.hpp" #include #include @@ -542,12 +543,51 @@ cv::Scalar cv::sum( InputArray _src ) return s; } +namespace cv { + +static bool ocl_countNonZero( InputArray _src, int & res ) +{ + int depth = _src.depth(); + bool doubleSupport = ocl::Device::getDefault().doubleFPConfig() > 0; + + if (depth == CV_64F && !doubleSupport) + return false; + + int dbsize = ocl::Device::getDefault().maxComputeUnits(); + size_t wgs = ocl::Device::getDefault().maxWorkGroupSize(); + UMat src = _src.getUMat(), db(1, dbsize, CV_32SC1); + + int wgs2_aligned = 1; + while (wgs2_aligned < (int)wgs) + wgs2_aligned <<= 1; + wgs2_aligned >>= 1; + + ocl::Kernel k("count_non_zero", ocl::core::count_non_zero_oclsrc, + format("-D srcT=%s -D WGS=%d -D WGS2_ALIGNED=%d%s", ocl::typeToStr(src.type()), (int)wgs, + wgs2_aligned, doubleSupport ? " -D DOUBLE_SUPPORT" : "")); + k.args(ocl::KernelArg::ReadOnlyNoSize(src), src.cols, (int)src.total(), + dbsize, ocl::KernelArg::PtrWriteOnly(db)); + + size_t globalsize = dbsize * wgs; + if (k.run(1, &globalsize, &wgs, true)) + return res = cv::sum(db.getMat(ACCESS_READ))[0], true; + return false; +} + +} + int cv::countNonZero( InputArray _src ) { + CV_Assert( _src.channels() == 1 ); + + int res = -1; + if (ocl::useOpenCL() && _src.isUMat() && ocl_countNonZero(_src, res)) + return res; + Mat src = _src.getMat(); CountNonZeroFunc func = getCountNonZeroTab(src.depth()); - CV_Assert( src.channels() == 1 && func != 0 ); + CV_Assert( func != 0 ); const Mat* arrays[] = {&src, 0}; uchar* ptrs[1]; diff --git a/modules/core/test/ocl/test_arithm.cpp b/modules/core/test/ocl/test_arithm.cpp index ed6414bf4..d1f2c0170 100644 --- a/modules/core/test/ocl/test_arithm.cpp +++ b/modules/core/test/ocl/test_arithm.cpp @@ -969,10 +969,6 @@ OCL_TEST_P(Magnitude, Mat) OCL_INSTANTIATE_TEST_CASE_P(Arithm, Lut, Combine(::testing::Values(CV_8U, CV_8S), OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool(), Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Add, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Subtract, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); -OCL_INSTANTIATE_TEST_CASE_P(Arithm, Log, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); -OCL_INSTANTIATE_TEST_CASE_P(Arithm, Exp, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); -OCL_INSTANTIATE_TEST_CASE_P(Arithm, Phase, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); -OCL_INSTANTIATE_TEST_CASE_P(Arithm, Magnitude, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Mul, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Div, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Min, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); @@ -993,6 +989,10 @@ OCL_INSTANTIATE_TEST_CASE_P(Arithm, Repeat, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHAN OCL_INSTANTIATE_TEST_CASE_P(Arithm, CountNonZero, Combine(OCL_ALL_DEPTHS, testing::Values(Channels(1)), Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, Sum, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); OCL_INSTANTIATE_TEST_CASE_P(Arithm, MeanStdDev, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool())); +OCL_INSTANTIATE_TEST_CASE_P(Arithm, Log, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); +OCL_INSTANTIATE_TEST_CASE_P(Arithm, Exp, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); +OCL_INSTANTIATE_TEST_CASE_P(Arithm, Phase, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); +OCL_INSTANTIATE_TEST_CASE_P(Arithm, Magnitude, Combine(::testing::Values(CV_32F, CV_64F), OCL_ALL_CHANNELS, Bool())); } } // namespace cvtest::ocl