From 62a3b0c1b3b698f5834d49a018db2f2817e9c27e Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Mon, 6 Dec 2021 12:15:00 +0000 Subject: DepthwiseConv reports full assembly kernel name * Fixed the kernel name in CpuDepthwiseConv2dAssemblyWrapperKernel * Resolves MLCE-706 Change-Id: I01ddbe2c030e22e5ba6761ed32110a35c314ccae Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6787 Reviewed-by: Giorgio Arena Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- .../arm_conv/depthwise/depthwise_implementation.hpp | 9 ++++++++- src/core/NEON/kernels/assembly/depthwise.hpp | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src/core/NEON') diff --git a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_implementation.hpp b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_implementation.hpp index 1d52b56d36..ea41529d81 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_implementation.hpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_implementation.hpp @@ -136,7 +136,14 @@ UniqueDepthwiseCommon depthwise(const DepthwiseArgs &a { const DepthwiseImplementation *impl = nullptr; const bool success = find_implementation(args, os, impl); - return UniqueDepthwiseCommon(success ? impl->get_instance(args, os) : nullptr); + + if(success) + { + auto i = impl->get_instance(args, os); + i->set_name(impl->name); + return UniqueDepthwiseCommon(i); + } + return nullptr; } } // namespace depthwise diff --git a/src/core/NEON/kernels/assembly/depthwise.hpp b/src/core/NEON/kernels/assembly/depthwise.hpp index eadf48d003..9262ea05a4 100644 --- a/src/core/NEON/kernels/assembly/depthwise.hpp +++ b/src/core/NEON/kernels/assembly/depthwise.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -78,10 +78,20 @@ struct DepthwiseArgs template class DepthwiseCommon : public IDepthwiseCommon { +private: + std::string _name{}; + protected: const DepthwiseArgs m_args; // Copy of arguments - public: + std::string name() const + { + return _name; + } + void set_name(const std::string &n) + { + _name = n; + } DepthwiseCommon(const DepthwiseArgs &args) : m_args(args) {}; DepthwiseCommon(DepthwiseCommon &) = delete; -- cgit v1.2.1