commit 2d704a5cc488c9f541c8ba8efd2d5cd194a910bf
author Xusong Wang <xusongw@google.com> Mon Feb 08 20:48:10 2021 -0800
committer Xusong Wang <xusongw@google.com> Thu Mar 18 13:02:19 2021 -0700
tree c8fb63bb15e87d4170d3547d4c9d2c9026caffce
parent 5e81b012c2c4b39038ef6a6746a7a42154f91513

Make the NDK execution object reusable.

This CL enables reusable execution object at NDK level.
- Add new API ANNExecution_setReusable
- Modify NDK specification related to execution usablility
- Change NNAPI ExecutionBuilder to allow reusable execution
- Add validation and generated tests

This CL only enables reusable execution object in the NNAPI runtime.
Optimizations will be applied in subsequent CLs.

Additionally, this CL changes a behavior of computations: Previously, we
wouldn't mark the builder as started until we get past the initial
validation, whereas now we mark the builder as started before the
validations and then mark it as completed if the validation fails.

Bug: 179692400
Test: NNT_static
Test: CtsNNAPITestCases
Change-Id: I0e2539f2adb7316af5b5364ac961f53e4ec09c59
Merged-In: I0e2539f2adb7316af5b5364ac961f53e4ec09c59
(cherry picked from commit 0b261d5651728eed74dd4c6033e25129b5e16368)

runtime/NeuralNetworks.cpp

diff --git a/runtime/NeuralNetworks.cpp b/runtime/NeuralNetworks.cpp
index 3df11df..c16bf39 100644
--- a/runtime/NeuralNetworks.cpp
+++ b/runtime/NeuralNetworks.cpp
@@ -1381,8 +1381,7 @@
     }
 
     IEvent* e = reinterpret_cast<IEvent*>(event);
-    e->wait();
-    return convertErrorStatusToResultCode(e->getStatus());
+    return convertErrorStatusToResultCode(e->wait());
 }
 
 void ANeuralNetworksEvent_free(ANeuralNetworksEvent* event) {
@@ -1481,7 +1480,8 @@
         *event = nullptr;
         return ANEURALNETWORKS_BAD_DATA;
     }
-    std::unique_ptr<SyncFenceEvent> e = std::make_unique<SyncFenceEvent>(syncFenceFd, nullptr);
+    std::unique_ptr<SyncFenceEvent> e =
+            std::make_unique<SyncFenceEvent>(syncFenceFd, nullptr, nullptr);
     *event = reinterpret_cast<ANeuralNetworksEvent*>(e.release());
     return ANEURALNETWORKS_NO_ERROR;
 }
@@ -1559,8 +1559,11 @@
 
     int syncFenceToSignal = -1;
     int n = r->computeFenced(waitForList, duration, &syncFenceToSignal);
-    std::unique_ptr<SyncFenceEvent> e =
-            std::make_unique<SyncFenceEvent>(syncFenceToSignal, r->getExecuteFencedInfoCallback());
+    std::unique_ptr<SyncFenceEvent> e = std::make_unique<SyncFenceEvent>(
+            syncFenceToSignal, r->getExecuteFencedInfoCallback(),
+            // TODO(miaowang): support dynamic output shape only with memory domain.
+            // For now just return empty output shapes.
+            [r](ErrorStatus status) { return r->finishComputation(status, {}); });
     if (n != ANEURALNETWORKS_NO_ERROR) {
         *event = nullptr;
     } else {
@@ -1635,3 +1638,13 @@
     const CompilationBuilder* c = reinterpret_cast<const CompilationBuilder*>(compilation);
     return c->getPreferredMemoryPaddingForOutput(index, padding);
 }
+
+int ANeuralNetworksExecution_setReusable(ANeuralNetworksExecution* execution, bool reusable) {
+    NNTRACE_RT(NNTRACE_PHASE_EXECUTION, "ANeuralNetworksExecution_setReusable");
+    if (!execution) {
+        LOG(ERROR) << "ANeuralNetworksExecution_setReusable passed a nullptr";
+        return ANEURALNETWORKS_UNEXPECTED_NULL;
+    }
+    ExecutionBuilder* r = reinterpret_cast<ExecutionBuilder*>(execution);
+    return r->setReusable(reusable);
+}