Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1755 from KonstantinMatskevich:dump_info

Browse Source
pull/1759/merge
Roman Donchenko 11 years ago committed by OpenCV Buildbot
parent 0fb629915f e9edfd1c54
commit 0be2752366
3 changed files with 66 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      modules/ocl/include/opencv2/ocl/private/opencl_dumpinfo.hpp
  2. 13
      modules/ocl/perf/main.cpp
  3. 12
      modules/ocl/test/main.cpp

83
modules/ocl/include/opencv2/ocl/private/opencl_dumpinfo.hpp
Unescape View File

@ -39,16 +39,16 @@
// //
//M*/ //M*/
#if !defined(DUMP_INFO_STDOUT) && !defined(DUMP_INFO_XML) #if !defined(DUMP_MESSAGE_STDOUT) && !defined(DUMP_PROPERTY_XML)
#error Invalid usage #error Invalid usage
#endif #endif
#if !defined(DUMP_INFO_STDOUT) #if !defined(DUMP_PROPERTY_XML)
#define DUMP_INFO_STDOUT(...) #define DUMP_PROPERTY_XML(...)
#endif #endif
#if !defined(DUMP_INFO_XML) #if !defined(DUMP_MESSAGE_STDOUT)
#define DUMP_INFO_XML(...) #define DUMP_MESSAGE_STDOUT(...)
#endif #endif
#include <sstream> #include <sstream>
@ -85,51 +85,70 @@ static void dumpOpenCLDevice()
using namespace cv::ocl; using namespace cv::ocl;
try try
{ {
cv::ocl::PlatformsInfo platforms;
cv::ocl::getOpenCLPlatforms(platforms);
DUMP_MESSAGE_STDOUT("OpenCL Platforms: ");
const char* deviceTypeStr;
for(unsigned int i=0; i < platforms.size(); i++)
{
DUMP_MESSAGE_STDOUT(" " << platforms.at(i)->platformName);
const cv::ocl::DevicesInfo& devices = platforms.at(i)->devices;
for(unsigned int j=0; j < devices.size(); j++)
{
const cv::ocl::DeviceInfo& current_device = *devices.at(j);
deviceTypeStr = current_device.deviceType == CVCL_DEVICE_TYPE_CPU
? ("CPU") : (current_device.deviceType == CVCL_DEVICE_TYPE_GPU ? "GPU" : "unknown");
DUMP_MESSAGE_STDOUT( " " << deviceTypeStr << " : " << current_device.deviceName << " : " << current_device.deviceVersion );
DUMP_PROPERTY_XML("cv_ocl_platform_"<< i<<"_device_"<<j, "(Platform=" << current_device.platform->platformName << ")(Type="
<< deviceTypeStr <<")(Name="<< current_device.deviceName << ")(Version="<< current_device.deviceVersion<<")");
}
}
DUMP_MESSAGE_STDOUT("Current OpenCL device: ");
const cv::ocl::DeviceInfo& deviceInfo = cv::ocl::Context::getContext()->getDeviceInfo(); const cv::ocl::DeviceInfo& deviceInfo = cv::ocl::Context::getContext()->getDeviceInfo();
const char* deviceTypeStr = deviceInfo.deviceType == CVCL_DEVICE_TYPE_CPU DUMP_MESSAGE_STDOUT(" Platform = "<< deviceInfo.platform->platformName);
? "CPU" : DUMP_PROPERTY_XML("cv_ocl_current_platformName", deviceInfo.platform->platformName);
(deviceInfo.deviceType == CVCL_DEVICE_TYPE_GPU ? "GPU" : "unknown");
DUMP_INFO_STDOUT("Device type", deviceTypeStr);
DUMP_INFO_XML("cv_ocl_deviceType", deviceTypeStr);
DUMP_INFO_STDOUT("Platform name", deviceInfo.platform->platformName); deviceTypeStr = deviceInfo.deviceType == CVCL_DEVICE_TYPE_CPU
DUMP_INFO_XML("cv_ocl_platformName", deviceInfo.platform->platformName); ? "CPU" : (deviceInfo.deviceType == CVCL_DEVICE_TYPE_GPU ? "GPU" : "unknown");
DUMP_MESSAGE_STDOUT(" Type = "<< deviceTypeStr);
DUMP_PROPERTY_XML("cv_ocl_current_deviceType", deviceTypeStr);
DUMP_INFO_STDOUT("Device name", deviceInfo.deviceName); DUMP_MESSAGE_STDOUT(" Name = "<< deviceInfo.deviceName);
DUMP_INFO_XML("cv_ocl_deviceName", deviceInfo.deviceName); DUMP_PROPERTY_XML("cv_ocl_current_deviceName", deviceInfo.deviceName);
DUMP_INFO_STDOUT("Device version", deviceInfo.deviceVersion); DUMP_MESSAGE_STDOUT(" Version = " << deviceInfo.deviceVersion);
DUMP_INFO_XML("cv_ocl_deviceVersion", deviceInfo.deviceVersion); DUMP_PROPERTY_XML("cv_ocl_current_deviceVersion", deviceInfo.deviceVersion);
DUMP_INFO_STDOUT("Compute units", deviceInfo.maxComputeUnits); DUMP_MESSAGE_STDOUT(" Compute units = "<< deviceInfo.maxComputeUnits);
DUMP_INFO_XML("cv_ocl_maxComputeUnits", deviceInfo.maxComputeUnits); DUMP_PROPERTY_XML("cv_ocl_current_maxComputeUnits", deviceInfo.maxComputeUnits);
DUMP_INFO_STDOUT("Max work group size", deviceInfo.maxWorkGroupSize); DUMP_MESSAGE_STDOUT(" Max work group size = "<< deviceInfo.maxWorkGroupSize);
DUMP_INFO_XML("cv_ocl_maxWorkGroupSize", deviceInfo.maxWorkGroupSize); DUMP_PROPERTY_XML("cv_ocl_current_maxWorkGroupSize", deviceInfo.maxWorkGroupSize);
std::string localMemorySizeStr = bytesToStringRepr(deviceInfo.localMemorySize); std::string localMemorySizeStr = bytesToStringRepr(deviceInfo.localMemorySize);
DUMP_INFO_STDOUT("Local memory size", localMemorySizeStr.c_str()); DUMP_MESSAGE_STDOUT(" Local memory size = "<< localMemorySizeStr.c_str());
DUMP_INFO_XML("cv_ocl_localMemorySize", deviceInfo.localMemorySize); DUMP_PROPERTY_XML("cv_ocl_current_localMemorySize", deviceInfo.localMemorySize);
std::string maxMemAllocSizeStr = bytesToStringRepr(deviceInfo.maxMemAllocSize); std::string maxMemAllocSizeStr = bytesToStringRepr(deviceInfo.maxMemAllocSize);
DUMP_INFO_STDOUT("Max memory allocation size", maxMemAllocSizeStr.c_str()); DUMP_MESSAGE_STDOUT(" Max memory allocation size = "<< maxMemAllocSizeStr.c_str());
DUMP_INFO_XML("cv_ocl_maxMemAllocSize", deviceInfo.maxMemAllocSize); DUMP_PROPERTY_XML("cv_ocl_current_maxMemAllocSize", deviceInfo.maxMemAllocSize);
const char* doubleSupportStr = deviceInfo.haveDoubleSupport ? "Yes" : "No"; const char* doubleSupportStr = deviceInfo.haveDoubleSupport ? "Yes" : "No";
DUMP_INFO_STDOUT("Double support", doubleSupportStr); DUMP_MESSAGE_STDOUT(" Double support = "<< doubleSupportStr);
DUMP_INFO_XML("cv_ocl_haveDoubleSupport", deviceInfo.haveDoubleSupport); DUMP_PROPERTY_XML("cv_ocl_current_haveDoubleSupport", deviceInfo.haveDoubleSupport);
const char* isUnifiedMemoryStr = deviceInfo.isUnifiedMemory ? "Yes" : "No"; const char* isUnifiedMemoryStr = deviceInfo.isUnifiedMemory ? "Yes" : "No";
DUMP_INFO_STDOUT("Unified memory", isUnifiedMemoryStr); DUMP_MESSAGE_STDOUT(" Unified memory = "<< isUnifiedMemoryStr);
DUMP_INFO_XML("cv_ocl_isUnifiedMemory", deviceInfo.isUnifiedMemory); DUMP_PROPERTY_XML("cv_ocl_current_isUnifiedMemory", deviceInfo.isUnifiedMemory);
} }
catch (...) catch (...)
{ {
DUMP_INFO_STDOUT("OpenCL device", "not available"); DUMP_MESSAGE_STDOUT("OpenCL device not available");
DUMP_INFO_XML("cv_ocl", "not available"); DUMP_PROPERTY_XML("cv_ocl", "not available");
} }
} }
#undef DUMP_INFO_STDOUT #undef DUMP_MESSAGE_STDOUT
#undef DUMP_INFO_XML #undef DUMP_PROPERTY_XML

13
modules/ocl/perf/main.cpp
Unescape View File

@ -42,17 +42,20 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#define DUMP_INFO_STDOUT(propertyDisplayName, propertyValue) \ #define DUMP_PROPERTY_XML(propertyName, propertyValue) \
do { \ do { \
std::cout << (propertyDisplayName) << ": " << (propertyValue) << std::endl; \ std::stringstream ssName, ssValue;\
ssName << propertyName;\
ssValue << propertyValue; \
::testing::Test::RecordProperty(ssName.str(), ssValue.str()); \
} while (false) } while (false)
#define DUMP_INFO_XML(propertyXMLName, propertyValue) \ #define DUMP_MESSAGE_STDOUT(msg) \
do { \ do { \
std::stringstream ss; ss << propertyValue; \ std::cout << msg << std::endl; \
::testing::Test::RecordProperty((propertyXMLName), ss.str()); \
} while (false) } while (false)
#include "opencv2/ocl/private/opencl_dumpinfo.hpp" #include "opencv2/ocl/private/opencl_dumpinfo.hpp"
static const char * impls[] = static const char * impls[] =

12
modules/ocl/test/main.cpp
Unescape View File

@ -42,15 +42,17 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#define DUMP_INFO_STDOUT(propertyDisplayName, propertyValue) \ #define DUMP_PROPERTY_XML(propertyName, propertyValue) \
do { \ do { \
std::cout << (propertyDisplayName) << ": " << (propertyValue) << std::endl; \ std::stringstream ssName, ssValue;\
ssName << propertyName;\
ssValue << propertyValue; \
::testing::Test::RecordProperty(ssName.str(), ssValue.str()); \
} while (false) } while (false)
#define DUMP_INFO_XML(propertyXMLName, propertyValue) \ #define DUMP_MESSAGE_STDOUT(msg) \
do { \ do { \
std::stringstream ss; ss << propertyValue; \ std::cout << msg << std::endl; \
::testing::Test::RecordProperty((propertyXMLName), ss.str()); \
} while (false) } while (false)
#include "opencv2/ocl/private/opencl_dumpinfo.hpp" #include "opencv2/ocl/private/opencl_dumpinfo.hpp"

Write Preview
Loading…
Cancel
Save