commit 09160fda17f8ea765e810ffbc234f5c6773ae92d
author Michael Butler <butlermichael@google.com> Thu Feb 04 22:05:22 2021 -0800
committer Michael Butler <butlermichael@google.com> Wed Feb 17 10:14:33 2021 -0800
tree 27800d9d6bbc92baa979b7d2d1be1379933d7737
parent b3082a55b2e71a39340a0803696bc1c686c2067e

Store AHWB in NN canonical memory type -- runtime

Prior to this CL, the canonical memory type only held a SharedHandle,
which mirrors the behavior of native_handle_t/hidl_handle. This means
memory types including AHardwareBuffer were stored as this SharedHandle
type. With this CL, the canonical memory type is stored directly as
AHardwareBuffer to avoid using non-NDK AHardwareBuffer calls in the NN
runtime.

Bug: 179906132
Test: mma
Test: NeuralNetworksTest_static
Test: presubmit
Change-Id: Ic269a5297ac1cec17fc5c30821c240c2254eedab
Merged-In: Ic269a5297ac1cec17fc5c30821c240c2254eedab
(cherry picked from commit d0ed0309474dca1daabe6f6c73ed1d5f5e92e3fb)

runtime/Memory.cpp

diff --git a/runtime/Memory.cpp b/runtime/Memory.cpp
index 511ffd3..e00c0f9 100644
--- a/runtime/Memory.cpp
+++ b/runtime/Memory.cpp
@@ -560,7 +560,8 @@
 MemoryFd::MemoryFd(SharedMemory memory) : RuntimeMemory(std::move(memory)) {}
 
 std::pair<int, std::unique_ptr<MemoryAHWB>> MemoryAHWB::create(const AHardwareBuffer& ahwb) {
-    auto memory = createSharedMemoryFromAHWB(ahwb);
+    auto memory = createSharedMemoryFromAHWB(const_cast<AHardwareBuffer*>(&ahwb),
+                                             /*takeOwnership=*/false);
     if (!memory.has_value()) {
         LOG(ERROR) << "Failed to create memory from AHWB: " << memory.error().message;
         return {convertErrorStatusToResultCode(memory.error().code), nullptr};
@@ -593,9 +594,8 @@
         LOG(ERROR) << "Failed to allocate BLOB mode AHWB.";
         return {ANEURALNETWORKS_OP_FAILED, nullptr};
     }
-    auto ahwbGuard = base::make_scope_guard([ahwb]() { AHardwareBuffer_release(ahwb); });
 
-    auto memory = createSharedMemoryFromAHWB(*ahwb);
+    auto memory = createSharedMemoryFromAHWB(ahwb, /*takeOWnership=*/true);
     if (!memory.has_value()) {
         LOG(ERROR) << "Failed to allocate BLOB mode AHWB: " << memory.error().message;
         return {convertErrorStatusToResultCode(memory.error().code), nullptr};
@@ -605,8 +605,8 @@
         LOG(ERROR) << "Failed to map BLOB mode AHWB: " << mapping.error().message;
         return {convertErrorStatusToResultCode(mapping.error().code), nullptr};
     }
-    auto memoryAHWB = std::make_unique<MemoryRuntimeAHWB>(
-            std::move(memory).value(), std::move(ahwbGuard), std::move(mapping).value());
+    auto memoryAHWB = std::make_unique<MemoryRuntimeAHWB>(std::move(memory).value(),
+                                                          std::move(mapping).value());
     return {ANEURALNETWORKS_NO_ERROR, std::move(memoryAHWB)};
 }
 
@@ -614,12 +614,8 @@
     return static_cast<uint8_t*>(std::get<void*>(kMapping.pointer));
 }
 
-MemoryRuntimeAHWB::MemoryRuntimeAHWB(SharedMemory memory,
-                                     base::ScopeGuard<std::function<void()>> ahwbScopeGuard,
-                                     Mapping mapping)
-    : RuntimeMemory(std::move(memory)),
-      kAhwbScopeGuard(std::move(ahwbScopeGuard)),
-      kMapping(std::move(mapping)) {}
+MemoryRuntimeAHWB::MemoryRuntimeAHWB(SharedMemory memory, Mapping mapping)
+    : RuntimeMemory(std::move(memory)), kMapping(std::move(mapping)) {}
 
 std::pair<int, std::unique_ptr<MemoryFromDevice>> MemoryFromDevice::create(SharedBuffer buffer) {
     if (buffer == nullptr) {