Fix direct conv2d in dynamic fusion

* Put input and output tensor shape value directly to the CL code.
* Use texture for weights when it is possible.

Resolves: COMPMID-5938
Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Change-Id: Ib53b310a80ce857eac36564b352136fdde55b131
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9249
Reviewed-by: SiCong Li <sicong.li@arm.com>
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

2 files changed, 2 insertions, 11 deletions

diff --git a/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.cpp b/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.cpp
index c8e682f34a..3965deced1 100644
--- a/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.cpp
+++ b/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.cpp
@@ -35,15 +35,9 @@ namespace experimental
 {
 namespace dynamic_fusion
 {
-ClComponentDirectConv2dSettings &ClComponentDirectConv2dSettings::export_to_cl_image(bool cl_image)
-{
-    _export_to_cl_image = cl_image;
-    return *this;
-}
-
 bool ClComponentDirectConv2dSettings::export_to_cl_image() const
 {
-    return _export_to_cl_image;
+    return _desc.export_weights_to_cl_image;
 }
 
 ClComponentDirectConv2dSettings &ClComponentDirectConv2dSettings::fast_relaxed_math(bool fast_relaxed_math)
diff --git a/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.h b/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.h
index c3a70ef3ae..8e555dce57 100644
--- a/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.h
+++ b/src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Arm Limited.
+ * Copyright (c) 2022-2023 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -47,8 +47,6 @@ class Conv2dAttributes;
 class ClComponentDirectConv2dSettings
 {
 public:
-    /** Set export_to_cl_image flag */
-    ClComponentDirectConv2dSettings &export_to_cl_image(bool cl_image);
     /** Get export_to_cl_image flag */
     bool export_to_cl_image() const;
 
@@ -63,7 +61,6 @@ public:
     DirectConvComputeKernelInfo direct_conv_descriptor() const;
 
 private:
-    bool                        _export_to_cl_image{ false };
     bool                        _fast_relaxed_math{ true };
     DirectConvComputeKernelInfo _desc{}; // Direct convolution descriptor
 };