1 files changed, 62 insertions, 6 deletions

diff --git a/src/runtime/CL/functions/CLDeconvolutionLayer.cpp b/src/runtime/CL/functions/CLDeconvolutionLayer.cpp
index c348bfcd0c..a4db6d7770 100644
--- a/src/runtime/CL/functions/CLDeconvolutionLayer.cpp
+++ b/src/runtime/CL/functions/CLDeconvolutionLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021 Arm Limited.
+ * Copyright (c) 2017-2022 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,6 +29,8 @@
 #include "arm_compute/core/utils/quantization/AsymmHelpers.h"
 #include "arm_compute/runtime/CL/CLScheduler.h"
 #include "src/core/CL/ICLKernel.h"
+#include "src/gpu/cl/IClOperator.h"
+#include "src/gpu/cl/operators/ClTransposedConvolution.h"
 
 #include "src/common/utils/Log.h"
 
@@ -39,8 +41,19 @@
 using namespace arm_compute;
 using namespace arm_compute::misc::shape_calculator;
 
+struct CLDeconvolutionLayer::Impl
+{
+    const ICLTensor                     *src{ nullptr };
+    const ICLTensor                     *weights{ nullptr };
+    const ICLTensor                     *biases{ nullptr };
+    ICLTensor                           *dst{ nullptr };
+    std::unique_ptr<opencl::IClOperator> op{ nullptr };
+};
+
+CLDeconvolutionLayer::~CLDeconvolutionLayer() = default;
+
 CLDeconvolutionLayer::CLDeconvolutionLayer(std::shared_ptr<IMemoryManager> memory_manager)
-    : _memory_manager(std::move(memory_manager)), _function()
+    : _memory_manager(std::move(memory_manager)), _function(), _impl(std::make_unique<Impl>())
 {
 }
 
@@ -60,6 +73,19 @@ void CLDeconvolutionLayer::configure(const CLCompileContext &compile_context, IC
     {
         case DeconvolutionMethod::DIRECT:
         {
+            auto op = std::make_unique<opencl::ClTransposedConvolution>();
+            op->configure(compile_context, input->info(), weights->info(), bias != nullptr ? bias->info() : nullptr, output->info(), deconv_info);
+
+            _impl->src     = input;
+            _impl->weights = weights;
+            _impl->biases  = bias;
+            _impl->dst     = output;
+
+            _impl->op = std::move(op);
+            break;
+        }
+        case DeconvolutionMethod::UPSCALE_CONV2D:
+        {
             auto f = std::make_unique<CLDirectDeconvolutionLayer>();
             f->configure(compile_context, input, weights, bias, output, deconv_info, weights_info);
             _function = std::move(f);
@@ -86,6 +112,12 @@ Status CLDeconvolutionLayer::validate(const ITensorInfo *input, const ITensorInf
     {
         case DeconvolutionMethod::DIRECT:
         {
+            // Validate transposed convolution operator
+            ARM_COMPUTE_RETURN_ON_ERROR(opencl::ClTransposedConvolution::validate(input, weights, bias, output, deconv_info));
+            break;
+        }
+        case DeconvolutionMethod::UPSCALE_CONV2D:
+        {
             // Validate direct convolution layer
             ARM_COMPUTE_RETURN_ON_ERROR(CLDirectDeconvolutionLayer::validate(input, weights, bias, output, deconv_info, weights_info));
             break;
@@ -109,11 +141,16 @@ DeconvolutionMethod CLDeconvolutionLayer::get_deconvolution_method(const ITensor
 {
     ARM_COMPUTE_UNUSED(output, bias, weights_info);
 
-    if(is_data_type_quantized_per_channel(weights->data_type()))
+    if(input->data_layout() == DataLayout::NHWC && (input->data_type() == DataType::F32 || input->data_type() == DataType::F16))
     {
         return DeconvolutionMethod::DIRECT;
     }
 
+    if(is_data_type_quantized_per_channel(weights->data_type()))
+    {
+        return DeconvolutionMethod::UPSCALE_CONV2D;
+    }
+
     const DataLayout data_layout = input->data_layout();
 
     const size_t idx_w = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
@@ -121,7 +158,7 @@ DeconvolutionMethod CLDeconvolutionLayer::get_deconvolution_method(const ITensor
 
     if(weights->dimension(idx_w) != deconv_info.stride().first || weights->dimension(idx_h) != deconv_info.stride().second)
     {
-        return DeconvolutionMethod::DIRECT;
+        return DeconvolutionMethod::UPSCALE_CONV2D;
     }
 
     return DeconvolutionMethod::GEMM;
@@ -130,10 +167,29 @@ DeconvolutionMethod CLDeconvolutionLayer::get_deconvolution_method(const ITensor
 void CLDeconvolutionLayer::run()
 {
     prepare();
-    _function->run();
+
+    if(_impl->op != nullptr)
+    {
+        // Optimized Operator will be used
+        ITensorPack pack;
+
+        pack.add_tensor(TensorType::ACL_SRC_0, _impl->src);
+        pack.add_tensor(TensorType::ACL_SRC_1, _impl->weights);
+        pack.add_tensor(TensorType::ACL_SRC_2, _impl->biases);
+        pack.add_tensor(TensorType::ACL_DST, _impl->dst);
+
+        _impl->op->run(pack);
+    }
+    else
+    {
+        _function->run();
+    }
 }
 
 void CLDeconvolutionLayer::prepare()
 {
-    _function->prepare();
+    if(_impl->op == nullptr)
+    {
+        _function->prepare();
+    }
 }