Tuned restrictions for Canny, Warp, FAST, Accumulate and Convolution OpenVX HAL calls on small images

terfendail · terfendail · commit 9dc36a1ece1a · 2017-04-14T13:20:25.000+03:00
diff --git a/3rdparty/openvx/hal/openvx_hal.cpp b/3rdparty/openvx/hal/openvx_hal.cpp
@@ -82,10 +82,13 @@ inline bool dimTooBig(int size)
 }
 
 //OpenVX calls have essential overhead so it make sense to skip them for small images
-template <int kernel_id> inline bool              skipSmallImages(int w, int h) { return w*h < 7680 * 4320; }
-template <> inline bool       skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return w*h <  640 *  480; }
-template <> inline bool  skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return w*h < 2048 * 1536; }
-template <> inline bool skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return w*h <  640 *  480; }
+template <int kernel_id> inline bool                  skipSmallImages(int w, int h) { return w*h < 7680 * 4320; }
+template <> inline bool           skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return w*h <  640 *  480; }
+template <> inline bool      skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return w*h < 2048 * 1536; }
+template <> inline bool     skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return w*h <  640 *  480; }
+template <> inline bool        skipSmallImages<VX_KERNEL_WARP_AFFINE>(int w, int h) { return w*h < 1280 *  720; }
+template <> inline bool   skipSmallImages<VX_KERNEL_WARP_PERSPECTIVE>(int w, int h) { return w*h <  320 *  240; }
+template <> inline bool skipSmallImages<VX_KERNEL_CUSTOM_CONVOLUTION>(int w, int h) { return w*h <  320 *  240; }
 
 inline void setConstantBorder(ivx::border_t &border, vx_uint8 val)
 {
@@ -553,6 +556,7 @@ int ovx_hal_filterInit(cvhalFilter2D **filter_context, uchar *kernel_data, size_
             for (int i = 0; i < kernel_width; ++i)
                 data.push_back(row[i]);
         }
+        break;
     default:
         return CV_HAL_ERROR_NOT_IMPLEMENTED;
     }
diff --git a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp
@@ -32,7 +32,9 @@ template <> inline bool skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(int w, int h) {
 template <> inline bool skipSmallImages<VX_KERNEL_BOX_3x3>(int w, int h) { return w*h < 640 * 480; }
 template <> inline bool skipSmallImages<VX_KERNEL_HISTOGRAM>(int w, int h) { return w*h < 2048 * 1536; }
 template <> inline bool skipSmallImages<VX_KERNEL_SOBEL_3x3>(int w, int h) { return w*h < 320 * 240; }
-
+template <> inline bool skipSmallImages<VX_KERNEL_CANNY_EDGE_DETECTOR>(int w, int h) { return w*h < 640 * 480; }
+template <> inline bool skipSmallImages<VX_KERNEL_ACCUMULATE>(int w, int h) { return w*h < 120 * 60; }
+template <> inline bool skipSmallImages<VX_KERNEL_FAST_CORNERS>(int w, int h) { return w*h < 800 * 600; }
 }}
 
 #define CV_OVX_RUN(condition, func, ...)          \

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,13 @@ inline bool dimTooBig(int size)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`//OpenVX calls have essential overhead so it make sense to skip them for small images`
`85`		`-template <int kernel_id> inline bool skipSmallImages(int w, int h) { return wh < 7680 4320; }`
`86`		`-template <> inline bool skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return wh < 640 480; }`
`87`		`-template <> inline bool skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return wh < 2048 1536; }`
`88`		`-template <> inline bool skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return wh < 640 480; }`
	`85`	`+template <int kernel_id> inline bool skipSmallImages(int w, int h) { return wh < 7680 4320; }`
	`86`	`+template <> inline bool skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return wh < 640 480; }`
	`87`	`+template <> inline bool skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return wh < 2048 1536; }`
	`88`	`+template <> inline bool skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return wh < 640 480; }`
	`89`	`+template <> inline bool skipSmallImages<VX_KERNEL_WARP_AFFINE>(int w, int h) { return wh < 1280 720; }`
	`90`	`+template <> inline bool skipSmallImages<VX_KERNEL_WARP_PERSPECTIVE>(int w, int h) { return wh < 320 240; }`
	`91`	`+template <> inline bool skipSmallImages<VX_KERNEL_CUSTOM_CONVOLUTION>(int w, int h) { return wh < 320 240; }`
`89`	`92`
`90`	`93`	`inline void setConstantBorder(ivx::border_t &border, vx_uint8 val)`
`91`	`94`	`{`
`@@ -553,6 +556,7 @@ int ovx_hal_filterInit(cvhalFilter2D *filter_context, uchar kernel_data, size_`
`553`	`556`	`for (int i = 0; i < kernel_width; ++i)`
`554`	`557`	`data.push_back(row[i]);`
`555`	`558`	`}`
	`559`	`+ break;`
`556`	`560`	`default:`
`557`	`561`	`return CV_HAL_ERROR_NOT_IMPLEMENTED;`
`558`	`562`	`}`