Enable LogicalNot op for ACL neon (#7159)

This commit enables to support LogicalNot 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 48e4658..456ac5b 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/KernelGenerator.cc
+++ b/runtimes/neurun/backend/acl_neon/KernelGenerator.cc
@@ -656,6 +656,27 @@ void KernelGenerator::visit(const model::operation::L2Pool2DNode &node)
   ActivationBuilder{*_execution_builder}.append(activation, ofm_alloc->handle());
 }
 
+void KernelGenerator::visit(const model::operation::LogicalNotNode &node)
+{
+  const auto output_index{node.getOutputs().at(0)};
+  const auto input_index{node.getInputs().at(model::operation::LogicalNotNode::Input::INPUT)};
+
+  auto output_alloc = _tensor_builder->at(output_index).get();
+  auto input_alloc = _tensor_builder->at(input_index).get();
+
+  std::unique_ptr<::arm_compute::IFunction> fn;
+
+  auto l = nnfw::cpp14::make_unique<::arm_compute::NEBitwiseNot>();
+
+  l->configure(input_alloc->handle(), output_alloc->handle());
+
+  fn = std::move(l);
+
+  auto acl_fn = asAclFunction(std::move(fn));
+
+  _execution_builder->append(std::move(acl_fn));
+}
+
 void KernelGenerator::visit(const model::operation::LogisticNode &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 b03a8c7..ba65c55 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/KernelGenerator.h
+++ b/runtimes/neurun/backend/acl_neon/KernelGenerator.h
@@ -47,6 +47,7 @@ public:
   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::LogicalNotNode &) override;
   void visit(const model::operation::LogisticNode &) override;
   void visit(const model::operation::MulNode &) override;
   void visit(const model::operation::ReLUNode &) override;

diff --git a/runtimes/neurun/backend/acl_neon/ShapeFixer.cc b/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
index b642580..1630d4c 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
+++ b/runtimes/neurun/backend/acl_neon/ShapeFixer.cc
@@ -100,6 +100,8 @@ void ShapeFixer::visit(const model::operation::L2NormalizationNode &) { /* DO NO
 
 void ShapeFixer::visit(const model::operation::L2Pool2DNode &) { /* DO NOTHING */}
 
+void ShapeFixer::visit(const model::operation::LogicalNotNode &) { /* DO NOTHING */}
+
 void ShapeFixer::visit(const model::operation::LogisticNode &) { /* DO NOTHING */}
 
 void ShapeFixer::visit(const model::operation::MulNode &node)

diff --git a/runtimes/neurun/backend/acl_neon/ShapeFixer.h b/runtimes/neurun/backend/acl_neon/ShapeFixer.h
index abfb4fd..938501e 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/ShapeFixer.h
+++ b/runtimes/neurun/backend/acl_neon/ShapeFixer.h
@@ -49,6 +49,7 @@ public:
   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::LogicalNotNode &) override;
   void visit(const model::operation::LogisticNode &) override;
   void visit(const model::operation::MulNode &) override;
   void visit(const model::operation::ReLUNode &) override;

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
index dbe43cf..50991d9 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
+++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
@@ -37,10 +37,6 @@ GeneratedTests.topk_v2*
 # Unexpected result
 GeneratedTests.split*
 GeneratedTests.pack*
-generatedtests.logical_not_ex*
-# Need to be fixed
-GeneratedTests.logical_not_ex_1D
-GeneratedTests.logical_not_ex_4D
 # Float error
 GeneratedTests.exp_ex_1D_float
 GeneratedTests.exp_ex_2D_float