Make CL Elementwise Unary kernels and functions state-less

Resolves COMPMID-4004

Change-Id: I1dfe8bc52c1ff394ea208ba98b51033c738746a4
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4922
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

1 files changed, 40 insertions, 126 deletions

diff --git a/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp b/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp
index 0ded640f51..dbf2121bfd 100644
--- a/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp
+++ b/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Arm Limited.
+ * Copyright (c) 2018-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,104 +23,18 @@
  */
 #include "arm_compute/runtime/CL/functions/CLElementWiseUnaryLayer.h"
 
-#include "src/core/CL/kernels/CLElementWiseUnaryLayerKernel.h"
-
-#include <utility>
+#include "arm_compute/core/CL/CLKernelLibrary.h"
+#include "arm_compute/core/CL/ICLTensor.h"
+#include "src/core/CL/ICLKernel.h"
+#include "src/runtime/gpu/cl/operators/ClElementwiseUnary.h"
 
 namespace arm_compute
 {
-namespace experimental
-{
-void CLRsqrt::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::RSQRT);
-    _kernel = std::move(k);
-}
-
-Status CLRsqrt::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::RSQRT);
-}
-
-void CLExp::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::EXP);
-    _kernel = std::move(k);
-}
-
-Status CLExp::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::EXP);
-}
-
-void CLNeg::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::NEG);
-    _kernel = std::move(k);
-}
-
-Status CLNeg::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::NEG);
-}
-
-void CLSin::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::SIN);
-    _kernel = std::move(k);
-}
-
-Status CLSin::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::SIN);
-}
-
-void CLAbs::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::ABS);
-    _kernel = std::move(k);
-}
-
-Status CLAbs::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::ABS);
-}
-
-void CLLog::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::LOG);
-    _kernel = std::move(k);
-}
-
-Status CLLog::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::LOG);
-}
-
-void CLRound::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output)
-{
-    auto k = std::make_unique<CLElementWiseUnaryLayerKernel>();
-    k->configure(compile_context, input, output, ElementWiseUnary::ROUND);
-    _kernel = std::move(k);
-}
-
-Status CLRound::validate(const ITensorInfo *input, const ITensorInfo *output)
-{
-    return arm_compute::CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::ROUND);
-}
-} // namespace experimental
-
 struct CLRsqrtLayer::Impl
 {
-    const ICLTensor                       *src{ nullptr };
-    ICLTensor                             *dst{ nullptr };
-    std::unique_ptr<experimental::CLRsqrt> op{ nullptr };
+    const ICLTensor                 *src{ nullptr };
+    ICLTensor                       *dst{ nullptr };
+    std::unique_ptr<opencl::ClRsqrt> op{ nullptr };
 };
 
 CLRsqrtLayer::CLRsqrtLayer()
@@ -141,13 +55,13 @@ void CLRsqrtLayer::configure(const CLCompileContext &compile_context, const ICLT
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLRsqrt>();
+    _impl->op  = std::make_unique<opencl::ClRsqrt>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 
 Status CLRsqrtLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLRsqrt::validate(input, output);
+    return opencl::ClRsqrt::validate(input, output);
 }
 
 void CLRsqrtLayer::run()
@@ -160,9 +74,9 @@ void CLRsqrtLayer::run()
 
 struct CLExpLayer::Impl
 {
-    const ICLTensor                     *src{ nullptr };
-    ICLTensor                           *dst{ nullptr };
-    std::unique_ptr<experimental::CLExp> op{ nullptr };
+    const ICLTensor               *src{ nullptr };
+    ICLTensor                     *dst{ nullptr };
+    std::unique_ptr<opencl::ClExp> op{ nullptr };
 };
 
 CLExpLayer::CLExpLayer()
@@ -183,13 +97,13 @@ void CLExpLayer::configure(const CLCompileContext &compile_context, const ICLTen
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLExp>();
+    _impl->op  = std::make_unique<opencl::ClExp>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 
 Status CLExpLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLExp::validate(input, output);
+    return opencl::ClExp::validate(input, output);
 }
 
 void CLExpLayer::run()
@@ -202,9 +116,9 @@ void CLExpLayer::run()
 
 struct CLNegLayer::Impl
 {
-    const ICLTensor                     *src{ nullptr };
-    ICLTensor                           *dst{ nullptr };
-    std::unique_ptr<experimental::CLNeg> op{ nullptr };
+    const ICLTensor               *src{ nullptr };
+    ICLTensor                     *dst{ nullptr };
+    std::unique_ptr<opencl::ClNeg> op{ nullptr };
 };
 
 CLNegLayer::CLNegLayer()
@@ -225,12 +139,12 @@ void CLNegLayer::configure(const CLCompileContext &compile_context, const ICLTen
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLNeg>();
+    _impl->op  = std::make_unique<opencl::ClNeg>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 Status CLNegLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLNeg::validate(input, output);
+    return opencl::ClNeg::validate(input, output);
 }
 
 void CLNegLayer::run()
@@ -243,9 +157,9 @@ void CLNegLayer::run()
 
 struct CLSinLayer::Impl
 {
-    const ICLTensor                     *src{ nullptr };
-    ICLTensor                           *dst{ nullptr };
-    std::unique_ptr<experimental::CLSin> op{ nullptr };
+    const ICLTensor               *src{ nullptr };
+    ICLTensor                     *dst{ nullptr };
+    std::unique_ptr<opencl::ClSin> op{ nullptr };
 };
 
 CLSinLayer::CLSinLayer()
@@ -266,12 +180,12 @@ void CLSinLayer::configure(const CLCompileContext &compile_context, const ICLTen
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLSin>();
+    _impl->op  = std::make_unique<opencl::ClSin>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 Status CLSinLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLSin::validate(input, output);
+    return opencl::ClSin::validate(input, output);
 }
 
 void CLSinLayer::run()
@@ -284,9 +198,9 @@ void CLSinLayer::run()
 
 struct CLAbsLayer::Impl
 {
-    const ICLTensor                     *src{ nullptr };
-    ICLTensor                           *dst{ nullptr };
-    std::unique_ptr<experimental::CLAbs> op{ nullptr };
+    const ICLTensor               *src{ nullptr };
+    ICLTensor                     *dst{ nullptr };
+    std::unique_ptr<opencl::ClAbs> op{ nullptr };
 };
 
 CLAbsLayer::CLAbsLayer()
@@ -307,12 +221,12 @@ void CLAbsLayer::configure(const CLCompileContext &compile_context, const ICLTen
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLAbs>();
+    _impl->op  = std::make_unique<opencl::ClAbs>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 Status CLAbsLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLAbs::validate(input, output);
+    return opencl::ClAbs::validate(input, output);
 }
 
 void CLAbsLayer::run()
@@ -325,9 +239,9 @@ void CLAbsLayer::run()
 
 struct CLLogLayer::Impl
 {
-    const ICLTensor                     *src{ nullptr };
-    ICLTensor                           *dst{ nullptr };
-    std::unique_ptr<experimental::CLLog> op{ nullptr };
+    const ICLTensor               *src{ nullptr };
+    ICLTensor                     *dst{ nullptr };
+    std::unique_ptr<opencl::ClLog> op{ nullptr };
 };
 
 CLLogLayer::CLLogLayer()
@@ -348,12 +262,12 @@ void CLLogLayer::configure(const CLCompileContext &compile_context, const ICLTen
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLLog>();
+    _impl->op  = std::make_unique<opencl::ClLog>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 Status CLLogLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLLog::validate(input, output);
+    return opencl::ClLog::validate(input, output);
 }
 
 void CLLogLayer::run()
@@ -366,9 +280,9 @@ void CLLogLayer::run()
 
 struct CLRoundLayer::Impl
 {
-    const ICLTensor                       *src{ nullptr };
-    ICLTensor                             *dst{ nullptr };
-    std::unique_ptr<experimental::CLRound> op{ nullptr };
+    const ICLTensor                 *src{ nullptr };
+    ICLTensor                       *dst{ nullptr };
+    std::unique_ptr<opencl::ClRound> op{ nullptr };
 };
 
 CLRoundLayer::CLRoundLayer()
@@ -389,12 +303,12 @@ void CLRoundLayer::configure(const CLCompileContext &compile_context, const ICLT
 {
     _impl->src = input;
     _impl->dst = output;
-    _impl->op  = std::make_unique<experimental::CLRound>();
+    _impl->op  = std::make_unique<opencl::ClRound>();
     _impl->op->configure(compile_context, input->info(), output->info());
 }
 Status CLRoundLayer::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return experimental::CLRound::validate(input, output);
+    return opencl::ClRound::validate(input, output);
 }
 
 void CLRoundLayer::run()