From c9c8905350d8409dfefd1f95d90009f4718ba852 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 26 Jan 2021 10:20:17 +0000 Subject: Make CL Elementwise Unary kernels and functions state-less Resolves COMPMID-4004 Change-Id: I1dfe8bc52c1ff394ea208ba98b51033c738746a4 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4922 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- .../CL/functions/CLElementWiseUnaryLayer.cpp | 166 +++++---------------- src/runtime/CL/functions/CLLogicalNot.cpp | 39 ++--- 2 files changed, 50 insertions(+), 155 deletions(-) (limited to 'src/runtime/CL') 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 +#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(); - 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(); - 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(); - 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(); - 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(); - 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(); - 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(); - 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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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 op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr 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(); + _impl->op = std::make_unique(); _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() diff --git a/src/runtime/CL/functions/CLLogicalNot.cpp b/src/runtime/CL/functions/CLLogicalNot.cpp index d3774da597..388d2bce86 100644 --- a/src/runtime/CL/functions/CLLogicalNot.cpp +++ b/src/runtime/CL/functions/CLLogicalNot.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -22,38 +22,19 @@ * SOFTWARE. */ #include "arm_compute/runtime/CL/functions/CLLogicalNot.h" -#include "arm_compute/core/CL/ICLTensor.h" -#include "src/core/CL/kernels/CLElementWiseUnaryLayerKernel.h" -#include +#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/ClLogicalNot.h" namespace arm_compute { -namespace experimental -{ -void CLLogicalNot::configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(compile_context, input, output, ElementWiseUnary::LOGICAL_NOT); - _kernel = std::move(k); -} - -Status CLLogicalNot::validate(const ITensorInfo *input, const ITensorInfo *output) -{ - return CLElementWiseUnaryLayerKernel::validate(input, output, ElementWiseUnary::LOGICAL_NOT); -} - -void CLLogicalNot::run(ITensorPack &tensors) -{ - ICLOperator::run(tensors); -} -} // namespace experimental - struct CLLogicalNot::Impl { - const ICLTensor *src{ nullptr }; - ICLTensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + std::unique_ptr op{ nullptr }; }; CLLogicalNot::CLLogicalNot() @@ -73,13 +54,13 @@ void CLLogicalNot::configure(const CLCompileContext &compile_context, const ICLT { _impl->src = input; _impl->dst = output; - _impl->op = std::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(compile_context, input->info(), output->info()); } Status CLLogicalNot::validate(const ITensorInfo *input, const ITensorInfo *output) { - return experimental::CLLogicalNot::validate(input, output); + return opencl::ClLogicalNot::validate(input, output); } void CLLogicalNot::run() -- cgit v1.2.1