mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
Andrei Fedorov
664f59e750
Implemented a check to enable instrumentation for IPP HAL #29542 To enable instrumentation for IPP HAL correctly it needed to generalize a part of `private.hpp` and put it to the separate file that can be included in `private.hpp` and `ipp_utils.hpp` both to avoid duplication. Built with `-DENABLE_INSTRUMENTATION=ON` and ran `opencv_perf_imgproc --perf_instrument=1`: | Test | IPP weight before | IPP weight after | |---|---|---| | `distanceTransform` (8U->32F) | 0.0% | ~76% | | `ippSobel` | 0.0% | ~98% | | `scharrViaSobelFilter` | 0.0% | ~90% | ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
77 lines
3.1 KiB
CMake
77 lines
3.1 KiB
CMake
project(ipphal)
|
|
|
|
set(IPP_HAL_VERSION 0.0.1 CACHE INTERNAL "")
|
|
set(IPP_HAL_LIBRARIES "ipphal" CACHE INTERNAL "")
|
|
set(IPP_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include" CACHE INTERNAL "")
|
|
set(IPP_HAL_HEADERS
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/include/ipp_hal_core.hpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/include/ipp_hal_imgproc.hpp"
|
|
CACHE INTERNAL "")
|
|
|
|
add_library(ipphal STATIC
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/math_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/mean_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/minmax_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/norm_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/cart_polar_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/transforms_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/warp_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/deriv_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/resize_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/box_filter_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/sum_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/color_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/filter_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/matchtemplate_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/canny_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/threshold_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/distancetransform_ipp.cpp"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/histogram_ipp.cpp"
|
|
)
|
|
|
|
#TODO: HAVE_IPP_ICV and HAVE_IPP_IW added as private macro till OpenCV itself is
|
|
# source of IPP and public definitions lead to redefinition warning
|
|
# The macro should be redefined as PUBLIC when IPP part is removed from core
|
|
# to make HAL the source of IPP integration. The same is true for WITH_IPP_CALLS_ENFORCED
|
|
if(HAVE_IPP_ICV)
|
|
target_compile_definitions(ipphal PRIVATE HAVE_IPP_ICV)
|
|
endif()
|
|
|
|
if(HAVE_IPP_IW)
|
|
target_compile_definitions(ipphal PRIVATE HAVE_IPP_IW)
|
|
endif()
|
|
|
|
if(WITH_IPP_CALLS_ENFORCED)
|
|
target_compile_definitions(ipphal PRIVATE IPP_CALLS_ENFORCED)
|
|
message("WITH_IPP_CALLS_ENFORCED=${WITH_IPP_CALLS_ENFORCED}: enforced IPP calls are enabled in IPP HAL")
|
|
endif()
|
|
|
|
# Enable cv::instr tracing of IPP calls inside the HAL so they show up in the
|
|
# instrumentation trace / IPP weight. Reuses the engine exported from
|
|
# opencv_core (symbols resolved at link time as ipphal is archived into core).
|
|
if(ENABLE_INSTRUMENTATION)
|
|
target_compile_definitions(ipphal PRIVATE ENABLE_INSTRUMENTATION)
|
|
endif()
|
|
|
|
target_include_directories(ipphal PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-suggest-override)
|
|
|
|
target_include_directories(ipphal PRIVATE
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src"
|
|
${CMAKE_SOURCE_DIR}/modules/core/include
|
|
${CMAKE_SOURCE_DIR}/modules/imgproc/include
|
|
${IPP_INCLUDE_DIRS}
|
|
)
|
|
|
|
target_link_libraries(ipphal PUBLIC ${IPP_IW_LIBRARIES} ${IPP_LIBRARIES})
|
|
|
|
set_target_properties(ipphal PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}")
|
|
|
|
if(NOT BUILD_SHARED_LIBS)
|
|
ocv_install_target(ipphal EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
|
|
endif()
|
|
|
|
if(ENABLE_SOLUTION_FOLDERS)
|
|
set_target_properties(ipphal PROPERTIES FOLDER "3rdparty")
|
|
endif()
|