mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 15:20:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ocl: fix usage of invalid OpenCL cache on mixed 64/32-bit platforms

Browse Source 
Observed during launch of 32/64-bit applications on Windows.
Added '32-bit' prefix for 32-bit OpenCL devices. No prefix on 64-bit configurations.
This commit is contained in:
Alexander Alekhin 2017-12-01 14:02:20 +03:00
parent 800294ad4b
commit 0595ab3eef
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1163,6 +1163,7 @@ struct Device::Impl
maxWorkGroupSize_ = getProp<size_t, size_t>(CL_DEVICE_MAX_WORK_GROUP_SIZE); maxWorkGroupSize_ = getProp<size_t, size_t>(CL_DEVICE_MAX_WORK_GROUP_SIZE);
type_ = getProp<cl_device_type, int>(CL_DEVICE_TYPE); type_ = getProp<cl_device_type, int>(CL_DEVICE_TYPE);
driverVersion_ = getStrProp(CL_DRIVER_VERSION); driverVersion_ = getStrProp(CL_DRIVER_VERSION);
addressBits_ = getProp<cl_uint, int>(CL_DEVICE_ADDRESS_BITS);
String deviceVersion_ = getStrProp(CL_DEVICE_VERSION); String deviceVersion_ = getStrProp(CL_DEVICE_VERSION);
parseDeviceVersion(deviceVersion_, deviceVersionMajor_, deviceVersionMinor_); parseDeviceVersion(deviceVersion_, deviceVersionMajor_, deviceVersionMinor_);
@ -1240,6 +1241,7 @@ struct Device::Impl
int maxComputeUnits_; int maxComputeUnits_;
size_t maxWorkGroupSize_; size_t maxWorkGroupSize_;
int type_; int type_;
int addressBits_;
int deviceVersionMajor_; int deviceVersionMajor_;
int deviceVersionMinor_; int deviceVersionMinor_;
String driverVersion_; String driverVersion_;
@ -1335,7 +1337,7 @@ int Device::type() const
{ return p ? p->type_ : 0; } { return p ? p->type_ : 0; }
int Device::addressBits() const int Device::addressBits() const
{ return p ? p->getProp<cl_uint, int>(CL_DEVICE_ADDRESS_BITS) : 0; } { return p ? p->addressBits_ : 0; }
bool Device::available() const bool Device::available() const
{ return p ? p->getBoolProp(CL_DEVICE_AVAILABLE) : false; } { return p ? p->getBoolProp(CL_DEVICE_AVAILABLE) : false; }
@ -2062,7 +2064,10 @@ struct Context::Impl
{ {
CV_Assert(!devices.empty()); CV_Assert(!devices.empty());
const Device& d = devices[0]; const Device& d = devices[0];
prefix = d.vendorName() + "--" + d.name() + "--" + d.driverVersion(); int bits = d.addressBits();
if (bits > 0 && bits != 64)
prefix = cv::format("%d-bit--", bits);
prefix += d.vendorName() + "--" + d.name() + "--" + d.driverVersion();
// sanitize chars // sanitize chars
for (size_t i = 0; i < prefix.size(); i++) for (size_t i = 0; i < prefix.size(); i++)
{ {
@ -2081,7 +2086,10 @@ struct Context::Impl
if (prefix_base.empty()) if (prefix_base.empty())
{ {
const Device& d = devices[0]; const Device& d = devices[0];
prefix_base = d.vendorName() + "--" + d.name() + "--"; int bits = d.addressBits();
if (bits > 0 && bits != 64)
prefix_base = cv::format("%d-bit--", bits);
prefix_base += d.vendorName() + "--" + d.name() + "--";
// sanitize chars // sanitize chars
for (size_t i = 0; i < prefix_base.size(); i++) for (size_t i = 0; i < prefix_base.size(); i++)
{ {

3
modules/ts/src/ocl_test.cpp
View File

@ -159,6 +159,9 @@ void dumpOpenCLDevice()
DUMP_MESSAGE_STDOUT(" Driver version = " << device.driverVersion()); DUMP_MESSAGE_STDOUT(" Driver version = " << device.driverVersion());
DUMP_PROPERTY_XML("cv_ocl_current_driverVersion", device.driverVersion()); DUMP_PROPERTY_XML("cv_ocl_current_driverVersion", device.driverVersion());
DUMP_MESSAGE_STDOUT(" Address bits = " << device.addressBits());
DUMP_PROPERTY_XML("cv_ocl_current_addressBits", device.addressBits());
DUMP_MESSAGE_STDOUT(" Compute units = "<< device.maxComputeUnits()); DUMP_MESSAGE_STDOUT(" Compute units = "<< device.maxComputeUnits());
DUMP_PROPERTY_XML("cv_ocl_current_maxComputeUnits", device.maxComputeUnits()); DUMP_PROPERTY_XML("cv_ocl_current_maxComputeUnits", device.maxComputeUnits());