mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-16 14:50:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12637 from savuor:fix/instr_ipp_ocl

Browse Source 
Fixes for instrumentation of IPP and OCL (#12637)

* fixed warning about re-declaring variable when both IPP and instrumentation are enabled

* fixed segfault when no funName provided

* compilation fixed when both OCL and instrumentation are enabled
This commit is contained in:
Rostislav Vasilikhin 2018-09-27 22:39:06 +03:00 committed by Alexander Alekhin
parent 0706bd72b8
commit be989b3b60
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/private.hpp
View File

@ -713,12 +713,12 @@ CV_EXPORTS InstrNode* getCurrentNode();
if(::cv::instr::useInstrumentation()){\ if(::cv::instr::useInstrumentation()){\
::cv::instr::IntrumentationRegion __instr__(#FUN, __FILE__, __LINE__, NULL, false, TYPE, IMPL);\ ::cv::instr::IntrumentationRegion __instr__(#FUN, __FILE__, __LINE__, NULL, false, TYPE, IMPL);\
try{\ try{\
auto status = ((FUN)(__VA_ARGS__));\ auto instrStatus = ((FUN)(__VA_ARGS__));\
if(ERROR_COND){\ if(ERROR_COND){\
::cv::instr::getCurrentNode()->m_payload.m_funError = true;\ ::cv::instr::getCurrentNode()->m_payload.m_funError = true;\
CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\ CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\
}\ }\
return status;\ return instrStatus;\
}catch(...){\ }catch(...){\
::cv::instr::getCurrentNode()->m_payload.m_funError = true;\ ::cv::instr::getCurrentNode()->m_payload.m_funError = true;\
CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\ CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\
@ -759,7 +759,7 @@ CV_EXPORTS InstrNode* getCurrentNode();
// Wrapper region instrumentation macro // Wrapper region instrumentation macro
#define CV_INSTRUMENT_REGION_IPP(); CV_INSTRUMENT_REGION_META(__FUNCTION__, false, ::cv::instr::TYPE_WRAPPER, ::cv::instr::IMPL_IPP) #define CV_INSTRUMENT_REGION_IPP(); CV_INSTRUMENT_REGION_META(__FUNCTION__, false, ::cv::instr::TYPE_WRAPPER, ::cv::instr::IMPL_IPP)
// Function instrumentation macro // Function instrumentation macro
#define CV_INSTRUMENT_FUN_IPP(FUN, ...) CV_INSTRUMENT_FUN_RT_META(::cv::instr::TYPE_FUN, ::cv::instr::IMPL_IPP, status < 0, FUN, __VA_ARGS__) #define CV_INSTRUMENT_FUN_IPP(FUN, ...) CV_INSTRUMENT_FUN_RT_META(::cv::instr::TYPE_FUN, ::cv::instr::IMPL_IPP, instrStatus < 0, FUN, __VA_ARGS__)
// Diagnostic markers // Diagnostic markers
#define CV_INSTRUMENT_MARK_IPP(NAME) CV_INSTRUMENT_MARK_META(::cv::instr::IMPL_IPP, NAME) #define CV_INSTRUMENT_MARK_IPP(NAME) CV_INSTRUMENT_MARK_META(::cv::instr::IMPL_IPP, NAME)

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

@ -3091,7 +3091,7 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
bool Kernel::Impl::run(int dims, size_t globalsize[], size_t localsize[], bool Kernel::Impl::run(int dims, size_t globalsize[], size_t localsize[],
bool sync, int64* timeNS, const Queue& q) bool sync, int64* timeNS, const Queue& q)
{ {
CV_INSTRUMENT_REGION_OPENCL_RUN(name.c_str();); CV_INSTRUMENT_REGION_OPENCL_RUN(name.c_str());
if (!handle || isInProgress) if (!handle || isInProgress)
return false; return false;

2
modules/core/src/system.cpp
View File

@ -1836,7 +1836,7 @@ FLAGS getFlags()
NodeData::NodeData(const char* funName, const char* fileName, int lineNum, void* retAddress, bool alwaysExpand, cv::instr::TYPE instrType, cv::instr::IMPL implType) NodeData::NodeData(const char* funName, const char* fileName, int lineNum, void* retAddress, bool alwaysExpand, cv::instr::TYPE instrType, cv::instr::IMPL implType)
{ {
m_funName = funName; m_funName = funName ? cv::String(funName) : cv::String(); // std::string doesn't accept NULL
m_instrType = instrType; m_instrType = instrType;
m_implType = implType; m_implType = implType;
m_fileName = fileName; m_fileName = fileName;