Support asynchronous execution (#6314)

- Introduce methods for start execution & wait finish in Execution class to support asynchronous execution
- Add test using introduced methods

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/runtimes/neurun/core/include/exec/Execution.h b/runtimes/neurun/core/include/exec/Execution.h
index 55e2a3a..a5b47f0 100644 (file)
--- a/runtimes/neurun/core/include/exec/Execution.h
+++ b/runtimes/neurun/core/include/exec/Execution.h
@@ -24,6 +24,8 @@
 #include "exec/IExecutor.h"
 #include "IODescription.h"
 
+#include <thread>
+
 namespace neurun
 {
 namespace exec
@@ -86,14 +88,28 @@ public:
   void setOutput(const model::IOIndex &index, const model::TypeInfo &type,
                  const model::Shape &shape, void *buffer, size_t length);
   /**
-   * @brief  Start execution
+   * @brief  Execution
    * @note   It should be called after setting input and output buffer
    */
   void execute();
 
+  /**
+   * @brief Start asynchronous execution
+   * @note  It returns after execution thread is started
+   *        It should be called after setting input and output buffer
+   */
+  void startExecute(void);
+
+  /**
+   * @brief Return when execution is finished
+   * @note  It waits until execution is finished
+   */
+  void waitFinish(void);
+
 private:
   const std::shared_ptr<IExecutor> _executor;
   IODescription _io_desc;
+  std::unique_ptr<std::thread> _exec_thread;
 };
 
 } // namespace exec

diff --git a/runtimes/neurun/core/include/exec/IExecutor.h b/runtimes/neurun/core/include/exec/IExecutor.h
index 9a0e612..eb4f5e3 100644 (file)
--- a/runtimes/neurun/core/include/exec/IExecutor.h
+++ b/runtimes/neurun/core/include/exec/IExecutor.h
@@ -61,6 +61,7 @@ struct IExecutor
   /**
    * @brief     Start execution
    * @param[in] desc Input and output description
+   * @note      This method should be thread-safe
    */
   virtual void execute(const IODescription &desc) = 0;
 };

diff --git a/runtimes/neurun/core/src/exec/Execution.cc b/runtimes/neurun/core/src/exec/Execution.cc
index 430870b..1f025d4 100644 (file)
--- a/runtimes/neurun/core/src/exec/Execution.cc
+++ b/runtimes/neurun/core/src/exec/Execution.cc
@@ -16,6 +16,8 @@
 
 #include "exec/Execution.h"
 
+#include "util/logging.h"
+
 namespace neurun
 {
 namespace exec
@@ -83,7 +85,28 @@ void Execution::setOutput(const model::IOIndex &index, const model::TypeInfo &ty
       std::move(nnfw::cpp14::make_unique<OutputDesc>(info, buffer, length));
 }
 
-void Execution::execute() { _executor->execute(_io_desc); }
+void Execution::execute()
+{
+  VERBOSE(Execution) << "Start execution" << std::endl;
+
+  _executor->execute(_io_desc);
+
+  VERBOSE(Execution) << "Execution finished" << std::endl;
+}
+
+void Execution::startExecute()
+{
+  VERBOSE(Execution) << "Create asynchronous execution thread" << std::endl;
+
+  _exec_thread = nnfw::cpp14::make_unique<std::thread>(&Execution::execute, this);
+}
+
+void Execution::waitFinish()
+{
+  VERBOSE(Execution) << "Wait to finish execution" << std::endl;
+
+  _exec_thread->join();
+}
 
 } // namespace exec
 } // namespace neurun

diff --git a/runtimes/neurun/test/core/exec/ExecInstance.cc b/runtimes/neurun/test/core/exec/ExecInstance.cc
index 35dd527..2e962a4 100644 (file)
--- a/runtimes/neurun/test/core/exec/ExecInstance.cc
+++ b/runtimes/neurun/test/core/exec/ExecInstance.cc
@@ -277,30 +277,36 @@ TEST(ExecInstance, twoThreads)
   }
 }
 
-// TODO: Support asynchronous execution
-//       If executor(backend) can support, execute() makes new thread and return
-//       and support wait function
-//       Otherwise, instance run until execution end and return (wait function do nothing)
-//
-// auto exec_instance1 = new neurun::exec::ExecInstance{executor};
-// exec_instance1->setInput(...);
-// exec_instance1->setOutput(...);
-// exec_instance1->execute();
-// auto exec_instance2 = new neurun::exec::ExecInstance{executor};
-// exec_instance2->setInput(...);
-// exec_instance2->setOutput(...);
-// exec_instance2->execute();
-// exec_instance1->wait();
-// ... use output of exec_instance1
-// exec_instance1->setInput(...);
-// exec_instance1->setOutput(...);
-// exec_instance2->wait();
-// ... use output of exec_instance2
-// exec_instance2->setInput(...);
-// exec_instance2->setOutput(...);
-// exec_instance1->wait();
-// ... use output of exec_instance1
-// exec_instance2->wait();
-// ... use output of exec_instance2
+// Support asynchronous execution
+TEST(ExecInstance, async)
+{
+  auto mockup = CompiledMockUpModel();
+  auto graph = mockup.graph;
+  auto executor = mockup.executor;
+
+  auto input1 = IOIndex{0};
+  auto input2 = IOIndex{1};
+  auto output = IOIndex{0};
+
+  const float input1_buffer[4] = {1, 0, -1, -2};
+  const float input2_buffer[4] = {1, -3, 2, -4};
+  float output_buffer[4] = {};
+  const float output_expected[4] = {5, -2, 0, -1};
+
+  auto execution = new neurun::exec::Execution(executor);
+
+  execution->setInput(input1, reinterpret_cast<const void *>(input1_buffer), 16);
+  execution->setInput(input2, reinterpret_cast<const void *>(input2_buffer), 16);
+  execution->setOutput(output, reinterpret_cast<void *>(output_buffer), 16);
+  execution->startExecute();
+  execution->waitFinish();
+
+  for (auto i = 0; i < 4; i++)
+  {
+    EXPECT_EQ(output_buffer[i], output_expected[i]);
+  }
+
+  delete execution;
+}
 
 } // namespace