Update CpuGemmConv2d and CpuFlatten to use CpuReshape operator

- Following CpuReshapeKernel Optimizations, update the CpuGemmConv2D and CpuFlatten
  to use CpuReshape operator instead of CpuReshapeKernel
- Minor changes to comment in NEReorgLayerKernel.h

Resolves COMPMID-6504

Signed-off-by: Anitha Raj <anitha.raj@arm.com>
Change-Id: Ib6ee1fdc313d91249f9fe41c81e73324031c1ff4
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10186
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 17 insertions, 6 deletions

diff --git a/src/cpu/operators/CpuFlatten.cpp b/src/cpu/operators/CpuFlatten.cpp
index f6ae139794..7bab9e481c 100644
--- a/src/cpu/operators/CpuFlatten.cpp
+++ b/src/cpu/operators/CpuFlatten.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Arm Limited.
+ * Copyright (c) 2021, 2023 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@
  */
 #include "src/cpu/operators/CpuFlatten.h"
 
-#include "src/cpu/kernels/CpuReshapeKernel.h"
+#include "src/cpu/operators/CpuReshape.h"
 
 #include "src/common/utils/Log.h"
 
@@ -31,17 +31,28 @@ namespace arm_compute
 {
 namespace cpu
 {
+CpuFlatten::CpuFlatten()
+    : _reshape(nullptr)
+{
+}
+
+CpuFlatten::~CpuFlatten() = default;
+
 void CpuFlatten::configure(const ITensorInfo *src, ITensorInfo *dst)
 {
     ARM_COMPUTE_LOG_PARAMS(src, dst);
-    auto k = std::make_unique<kernels::CpuReshapeKernel>();
-    k->configure(src, dst);
-    _kernel = std::move(k);
+    _reshape = std::make_unique<CpuReshape>();
+    _reshape->configure(src, dst);
 }
 
 Status CpuFlatten::validate(const ITensorInfo *src, const ITensorInfo *dst)
 {
-    return kernels::CpuReshapeKernel::validate(src, dst);
+    return CpuReshape::validate(src, dst);
+}
+
+void CpuFlatten::run(ITensorPack &tensors)
+{
+    _reshape->run(tensors);
 }
 } // namespace cpu
 } // namespace arm_compute