[locoex/customop] Introducing VariadicArityNode (#4189)

* [locoex/customop] Introducing VariadicArityNode

In case of custom op, we don't know how many inputs custom op has.
Because of this, previous we need this (previous FixedArityNode cannot handle this situation)

Signed-off-by: Hyun Sik Yoon <hyunsik.yoon@samsung.com>
* unsigned to uint32_t, remove _arity member variable and duplicate assert()

* test case

* removed customop dir and namespace

* use unused var pull_02

diff --git a/contrib/locoex-customop/CMakeLists.txt b/contrib/locoex-customop/CMakeLists.txt
index 3a3b197..0f2b38f 100644 (file)
--- a/contrib/locoex-customop/CMakeLists.txt
+++ b/contrib/locoex-customop/CMakeLists.txt
@@ -1,4 +1,16 @@
 file(GLOB_RECURSE SOURCES "src/*.cpp")
+file(GLOB_RECURSE TESTS "src/*.test.cpp")
+list(REMOVE_ITEM SOURCES ${TESTS})
 
 add_library(locoex_customop SHARED ${SOURCES})
 target_include_directories(locoex_customop PUBLIC include)
+target_link_libraries(locoex_customop PUBLIC loco)
+
+if(NOT ENABLE_TEST)
+  return()
+endif(NOT ENABLE_TEST)
+
+nncc_find_package(GTest REQUIRED)
+
+GTest_AddTest(locoex_customop_test ${TESTS})
+target_link_libraries(locoex_customop_test loco locoex_customop)

diff --git a/contrib/locoex-customop/include/locoex/VariadicArityNode.h b/contrib/locoex-customop/include/locoex/VariadicArityNode.h
new file mode 100644 (file)
index 0000000..fce754c
--- /dev/null
+++ b/contrib/locoex-customop/include/locoex/VariadicArityNode.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __LOCOEX_VARIADICARITYNODES_OP_H__
+#define __LOCOEX_VARIADICARITYNODES_OP_H__
+
+#include <loco/IR/Node.h>
+#include <loco/IR/Use.h>
+
+#include <vector>
+#include <memory>
+#include <cassert>
+
+namespace locoex
+{
+
+/**
+ * @brief Nodes with the variadic inputs
+ */
+template <typename Base> class VariadicArityNode : public Base
+{
+public:
+  VariadicArityNode(uint32_t arity)
+  {
+    for (uint32_t n = 0; n < arity; ++n)
+    {
+      _args.emplace_back(std::move(std::unique_ptr<loco::Use>{new loco::Use{this}}));
+    }
+  };
+
+  virtual ~VariadicArityNode() = default;
+
+public:
+  uint32_t arity(void) const final { return _args.size(); }
+
+  loco::Node *arg(uint32_t n) const final
+  {
+    assert(n < _args.size());
+    return _args.at(n)->node();
+  }
+
+  void drop(void) final
+  {
+    for (uint32_t n = 0; n < _args.size(); ++n)
+    {
+      _args.at(n)->node(nullptr);
+    }
+  }
+
+protected:
+  // This API allows inherited classes to access "_args" field.
+  loco::Use *at(uint32_t n) const
+  {
+    assert(n < _args.size());
+    return _args.at(n).get();
+  }
+
+private:
+  std::vector<std::unique_ptr<loco::Use>> _args;
+};
+
+} // namespace locoex
+
+#endif // __LOCOEX_VARIADICARITYNODES_OP_H__

diff --git a/contrib/locoex-customop/requires.cmake b/contrib/locoex-customop/requires.cmake
new file mode 100644 (file)
index 0000000..44f6870
--- /dev/null
+++ b/contrib/locoex-customop/requires.cmake
@@ -0,0 +1 @@
+require("loco")

diff --git a/contrib/locoex-customop/src/VariadicArityNode.test.cpp b/contrib/locoex-customop/src/VariadicArityNode.test.cpp
new file mode 100644 (file)
index 0000000..a618824
--- /dev/null
+++ b/contrib/locoex-customop/src/VariadicArityNode.test.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "locoex/VariadicArityNode.h"
+
+#include <loco/IR/Nodes.h>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+using namespace locoex;
+
+class TestNode : public VariadicArityNode<loco::Node>
+{
+public:
+  TestNode(uint32_t arity) : VariadicArityNode<loco::Node>(arity) {}
+
+  void input(uint32_t idx, loco::Node *node) { at(idx)->node(node); }
+  loco::Node *input(uint32_t idx) const { return at(idx)->node(); }
+
+  const loco::Dialect *dialect(void) const { return nullptr; } // this won't be called for testing
+  uint32_t opnum(void) const { return -1; }                    // this won't be called for testing
+};
+
+class ZeroInputNode : public TestNode
+{
+public:
+  ZeroInputNode() : TestNode(0) {}
+};
+
+class BinaryInputNode : public TestNode
+{
+public:
+  BinaryInputNode() : TestNode(2) {}
+};
+}
+
+TEST(CustomOpTest, VariadicArityNode_arity_0)
+{
+  loco::Pull pull;
+
+  ZeroInputNode z_node;
+
+  ASSERT_EQ(z_node.arity(), 0);
+}
+
+TEST(CustomOpTest, VariadicArityNode_arity_2)
+{
+  loco::Pull pull_00, pull_01;
+
+  BinaryInputNode b_node;
+  b_node.input(0, &pull_00);
+  b_node.input(1, &pull_01);
+
+  ASSERT_EQ(b_node.arity(), 2);
+  ASSERT_EQ(b_node.input(0), &pull_00);
+  ASSERT_EQ(b_node.input(1), &pull_01);
+}