Enable L2Pool2D op for ACL neon (#7134)

This commit enables to support L2Pool2D op for ACL neon.

Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>

diff --git a/runtimes/neurun/backend/acl_neon/KernelGenerator.cc b/runtimes/neurun/backend/acl_neon/KernelGenerator.cc
index 01d8da6..2947d02 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/KernelGenerator.cc
+++ b/runtimes/neurun/backend/acl_neon/KernelGenerator.cc
@@ -619,6 +619,43 @@ void KernelGenerator::visit(const model::operation::L2NormalizationNode &node)
   _execution_builder->append(std::move(acl_fn));
 }
 
+void KernelGenerator::visit(const model::operation::L2Pool2DNode &node)
+{
+  const auto ofm_index{node.getOutputs().at(0)};
+  const auto ifm_index{node.getInputs().at(model::operation::L2Pool2DNode::Input::INPUT)};
+
+  const auto ifm_shape = _ctx.at(ifm_index).shape().asFeature(_current_subg_layout);
+  const auto ofm_shape = _ctx.at(ofm_index).shape().asFeature(_current_subg_layout);
+
+  uint32_t kw = node.param().kw;
+  uint32_t kh = node.param().kh;
+  const auto stride = node.param().stride;
+  const auto padding =
+      neurun::util::calculatePadding(node.param().padding, ifm_shape, ofm_shape, stride, kw, kh);
+  const auto activation = node.param().activation;
+
+  auto ofm_alloc = _tensor_builder->at(ofm_index).get();
+  auto ifm_alloc = _tensor_builder->at(ifm_index).get();
+
+  ::arm_compute::PoolingLayerInfo info{
+      ::arm_compute::PoolingType::L2, ::arm_compute::Size2D{kw, kh},
+      ::neurun::backend::acl_common::asPadStrideInfo(padding, stride)};
+
+  std::unique_ptr<::arm_compute::IFunction> fn;
+
+  auto l = nnfw::cpp14::make_unique<::arm_compute::NEPoolingLayer>();
+
+  l->configure(ifm_alloc->handle(), ofm_alloc->handle(), info);
+
+  fn = std::move(l);
+
+  auto acl_fn = asAclFunction(std::move(fn));
+
+  _execution_builder->append(std::move(acl_fn));
+
+  ActivationBuilder{*_execution_builder}.append(activation, ofm_alloc->handle());
+}
+
 void KernelGenerator::visit(const model::operation::MulNode &node)
 {
   const auto ofm_index{node.getOutputs().at(0)};

diff --git a/runtimes/neurun/backend/acl_neon/KernelGenerator.h b/runtimes/neurun/backend/acl_neon/KernelGenerator.h
index 5f37e5a..4a2855b 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/KernelGenerator.h
+++ b/runtimes/neurun/backend/acl_neon/KernelGenerator.h
@@ -46,6 +46,7 @@ public:
   void visit(const model::operation::FloorNode &) override;
   void visit(const model::operation::FullyConnectedNode &) override;
   void visit(const model::operation::L2NormalizationNode &) override;
+  void visit(const model::operation::L2Pool2DNode &) override;
   void visit(const model::operation::MulNode &) override;
   void visit(const model::operation::ReLUNode &) override;
   void visit(const model::operation::ReLU1Node &) override;

diff --git a/runtimes/neurun/backend/acl_neon/ShapeFixer.cc b/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
index b4df517..3c4b753 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
+++ b/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
@@ -98,6 +98,8 @@ void ShapeFixer::visit(const model::operation::FullyConnectedNode &node)
 
 void ShapeFixer::visit(const model::operation::L2NormalizationNode &) { /* DO NOTHING */}
 
+void ShapeFixer::visit(const model::operation::L2Pool2DNode &) { /* DO NOTHING */}
+
 void ShapeFixer::visit(const model::operation::MulNode &node)
 {
   const auto lhs_index{node.getInputs().at(model::operation::MulNode::Input::LHS)};

diff --git a/runtimes/neurun/backend/acl_neon/ShapeFixer.h b/runtimes/neurun/backend/acl_neon/ShapeFixer.h
index 37181fc..f377a44 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/ShapeFixer.h
+++ b/runtimes/neurun/backend/acl_neon/ShapeFixer.h
@@ -48,6 +48,7 @@ public:
   void visit(const model::operation::FloorNode &) override;
   void visit(const model::operation::FullyConnectedNode &) override;
   void visit(const model::operation::L2NormalizationNode &) override;
+  void visit(const model::operation::L2Pool2DNode &) override;
   void visit(const model::operation::MulNode &) override;
   void visit(const model::operation::ReLUNode &) override;
   void visit(const model::operation::ReLU1Node &) override;

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
index 629b15a..57819cf 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
+++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
@@ -11,7 +11,6 @@ GeneratedTests.embedding_lookup_2d_nnfw
 GeneratedTests.embedding_lookup_4d_nnfw
 GeneratedTests.greater_equal_ex*
 GeneratedTests.hashtable_lookup*
-GeneratedTests.l2_pool*
 GeneratedTests.local_response_norm*
 GeneratedTests.logical_and_ex*
 GeneratedTests.logical_or_ex*

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt b/tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt
index 7dda80a..1bcf468 100644 (file)
--- a/tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt
+++ b/tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt
@@ -5,6 +5,7 @@ concat
 conv_2d
 depthwise_conv_2d
 fullyconnected/fc1
+l2_pool_2d
 max_pool_2d
 relu
 relu6