mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ocl: force clBuildProgram() call after clCreateProgramWithBinary()

Browse Source
This commit is contained in:
Alexander Alekhin 2018-01-29 15:49:50 +03:00
parent 32d71cf85f
commit ebdb0eb0c1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3793,16 +3793,10 @@ struct Program::Impl
} }
} }
if (!handle) if (!handle)
return false;
cl_build_status build_status = CL_BUILD_NONE;
size_t retsz = 0;
CV_OCL_DBG_CHECK(result = clGetProgramBuildInfo(handle, devices[0], CL_PROGRAM_BUILD_STATUS,
sizeof(build_status), &build_status, &retsz));
if (result == CL_SUCCESS && build_status == CL_BUILD_SUCCESS)
{ {
CV_LOG_VERBOSE(NULL, 0, "clGetProgramBuildInfo() pre-check returns CL_BUILD_SUCCESS. Skip clBuildProgram() call"); return false;
} }
else // call clBuildProgram()
{ {
result = clBuildProgram(handle, (cl_uint)ndevices, (cl_device_id*)devices_, buildflags.c_str(), 0, 0); result = clBuildProgram(handle, (cl_uint)ndevices, (cl_device_id*)devices_, buildflags.c_str(), 0, 0);
CV_OCL_DBG_CHECK_RESULT(result, cv::format("clBuildProgram(binary: %s/%s)", sourceModule_.c_str(), sourceName_.c_str()).c_str()); CV_OCL_DBG_CHECK_RESULT(result, cv::format("clBuildProgram(binary: %s/%s)", sourceModule_.c_str(), sourceName_.c_str()).c_str());
@ -3817,8 +3811,10 @@ struct Program::Impl
return false; return false;
} }
} }
if (build_status != CL_BUILD_SUCCESS) // check build status
{ {
cl_build_status build_status = CL_BUILD_NONE;
size_t retsz = 0;
CV_OCL_DBG_CHECK(result = clGetProgramBuildInfo(handle, devices[0], CL_PROGRAM_BUILD_STATUS, CV_OCL_DBG_CHECK(result = clGetProgramBuildInfo(handle, devices[0], CL_PROGRAM_BUILD_STATUS,
sizeof(build_status), &build_status, &retsz)); sizeof(build_status), &build_status, &retsz));
if (result == CL_SUCCESS) if (result == CL_SUCCESS)
@ -3847,7 +3843,7 @@ struct Program::Impl
if (handle && CV_OPENCL_VALIDATE_BINARY_PROGRAMS_VALUE) if (handle && CV_OPENCL_VALIDATE_BINARY_PROGRAMS_VALUE)
{ {
CV_LOG_INFO(NULL, "OpenCL: query kernel names (binary)..."); CV_LOG_INFO(NULL, "OpenCL: query kernel names (binary)...");
retsz = 0; size_t retsz = 0;
char kernels_buffer[4096] = {0}; char kernels_buffer[4096] = {0};
result = clGetProgramInfo(handle, CL_PROGRAM_KERNEL_NAMES, sizeof(kernels_buffer), &kernels_buffer[0], &retsz); result = clGetProgramInfo(handle, CL_PROGRAM_KERNEL_NAMES, sizeof(kernels_buffer), &kernels_buffer[0], &retsz);
if (retsz < sizeof(kernels_buffer)) if (retsz < sizeof(kernels_buffer))