From d6d863f7d421513805e8db3ad6aaa91f8ae76933 Mon Sep 17 00:00:00 2001 From: Ramy Elgammal Date: Wed, 17 Aug 2022 16:26:26 +0100 Subject: Revert "Fix performance regression in ClConv2D" - Reverting commit e54d8c07e75d70baeb80fecbb43088027ea45658 because it has caused unexpected regressions. Resolves: COMPMID-5504 Signed-off-by: Ramy Elgammal Change-Id: I2a0bcc6a311009a81f20a146079758ad138fff5b Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8092 Benchmark: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/gpu/cl/operators/ClConv2d.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/gpu/cl/operators/ClConv2d.cpp b/src/gpu/cl/operators/ClConv2d.cpp index cd64c8d6b0..8119fc8e3d 100644 --- a/src/gpu/cl/operators/ClConv2d.cpp +++ b/src/gpu/cl/operators/ClConv2d.cpp @@ -273,11 +273,6 @@ ConvolutionMethod ClConv2d::get_convolution_method(const ITensorInfo *src, const { return ConvolutionMethod::WINOGRAD; } - - if(weights->dimension(idx_w) > 3 && weights->dimension(idx_h) > 3) - { - return ConvolutionMethod::WINOGRAD; - } } else { @@ -306,11 +301,7 @@ ConvolutionMethod ClConv2d::get_convolution_method(const ITensorInfo *src, const { if( ((is_large_kernel_sz || is_m_one) && workload_gte_8192) || is_ofm_lte_8 ) { - // Do not use direct convolution when the kernel is large and the stride is unit - if(!(is_large_kernel_sz && conv_info.stride().first == 1 && conv_info.stride().second == 1)) - { - return ConvolutionMethod::DIRECT; - } + return ConvolutionMethod::DIRECT; } } } -- cgit v1.2.1