generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp

Browse Source
This commit is contained in:
Alexander Alekhin 2013-09-18 01:14:41 +04:00
parent 6fae07ba88
commit f1b5cbc8fe
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/core.hpp
View File

@ -339,6 +339,7 @@ template<typename _Tp> static inline _Tp* alignPtr(_Tp* ptr, int n=(int)sizeof(_
*/ */
static inline size_t alignSize(size_t sz, int n) static inline size_t alignSize(size_t sz, int n)
{ {
assert((n & (n - 1)) == 0); // n is a power of 2
return (sz + n-1) & -n; return (sz + n-1) & -n;
} }

16
modules/ocl/src/initialization.cpp
View File

@ -679,6 +679,16 @@ namespace cv
CV_Assert( localThreads[0] * localThreads[1] * localThreads[2] <= clCxt->impl->maxWorkGroupSize ); CV_Assert( localThreads[0] * localThreads[1] * localThreads[2] <= clCxt->impl->maxWorkGroupSize );
} }
static inline size_t roundUp(size_t sz, size_t n)
{
// we don't assume that n is a power of 2 (see alignSize)
// equal to divUp(sz, n) * n
size_t t = sz + n - 1;
size_t rem = t % n;
size_t result = t - rem;
return result;
}
#ifdef PRINT_KERNEL_RUN_TIME #ifdef PRINT_KERNEL_RUN_TIME
static double total_execute_time = 0; static double total_execute_time = 0;
static double total_kernel_time = 0; static double total_kernel_time = 0;
@ -702,9 +712,9 @@ namespace cv
if ( localThreads != NULL) if ( localThreads != NULL)
{ {
globalThreads[0] = alignSize(globalThreads[0], localThreads[0]); globalThreads[0] = roundUp(globalThreads[0], localThreads[0]);
globalThreads[1] = alignSize(globalThreads[1], localThreads[1]); globalThreads[1] = roundUp(globalThreads[1], localThreads[1]);
globalThreads[2] = alignSize(globalThreads[2], localThreads[2]); globalThreads[2] = roundUp(globalThreads[2], localThreads[2]);
cv::ocl::openCLVerifyKernel(clCxt, kernel, localThreads); cv::ocl::openCLVerifyKernel(clCxt, kernel, localThreads);
} }