From 8266ae50a7da14ce27592f89181287be81969fd0 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Tue, 15 Jun 2021 11:41:59 +0100 Subject: Rework the CLConvolutionLayer heuristic - Call winograd for large kernel size (> 5x5) Resolves COMPMID-4582 Change-Id: I78a187d91bc8099bec7b5c6fa941223cfc1423ba Signed-off-by: Gian Marco Iodice Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5814 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Georgios Pinitas --- src/runtime/CL/functions/CLConvolutionLayer.cpp | 46 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'src/runtime/CL/functions/CLConvolutionLayer.cpp') diff --git a/src/runtime/CL/functions/CLConvolutionLayer.cpp b/src/runtime/CL/functions/CLConvolutionLayer.cpp index 96d7cc72c2..3204497fb3 100644 --- a/src/runtime/CL/functions/CLConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLConvolutionLayer.cpp @@ -218,32 +218,46 @@ ConvolutionMethod CLConvolutionLayer::get_convolution_method(const ITensorInfo * } else { - // SRGAN + const bool is_direct_valid = bool(CLDirectConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info)); + const bool is_wino_valid = bool(CLWinogradConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info, enable_fast_math)); + + // SRGAN case if((input->dimension(idx_h) > 720U) && (output->dimension(idx_h) > 720U) && (weights->dimension(idx_h) == 9) && (conv_info.pad_top() < 3) - && (CLDirectConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info))) + && is_direct_valid) { return ConvolutionMethod::DIRECT; } - if(gpu_target == GPUTarget::G71) + + // Floating-point case: GeMM/Direct/Winograd + if(is_data_type_float(input->data_type())) { - if((weights->dimension(idx_h) > 7) && (input->dimension(idx_c) >= output->dimension(idx_c)) - && (CLFFTConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info, enable_fast_math))) + const bool is_large_kernel_sz = (weights->dimension(idx_w) >= 5) && (weights->dimension(idx_h) >= 5); + + // Large kernel size with IFMs >= OFMs + if(is_large_kernel_sz) { - return ConvolutionMethod::FFT; + // First check if we can use Winograd + if(is_wino_valid) + { + return ConvolutionMethod::WINOGRAD; + } + + if(is_direct_valid) + { + return ConvolutionMethod::DIRECT; + } + + // Default implementation for floating-point-data-type + return ConvolutionMethod::GEMM; } - } - else if(is_data_type_float(input->data_type())) - { - if((weights->dimension(idx_h) >= 5) && (input->dimension(idx_c) >= output->dimension(idx_c)) && (CLDirectConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info))) + else // Small kernel size { - return ConvolutionMethod::DIRECT; + return is_wino_valid ? ConvolutionMethod::WINOGRAD : ConvolutionMethod::GEMM; } } - if(input->dimension(idx_c) < 16) - { - return ConvolutionMethod::GEMM; - } - return bool(CLWinogradConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info, enable_fast_math)) ? ConvolutionMethod::WINOGRAD : ConvolutionMethod::GEMM; + + // Generic case for quantized. Only GeMM + return ConvolutionMethod::GEMM; } } } -- cgit v1.2.1