IVGCVSW-5816 Constant memory access

 * Add new class ManagedConstTensorHandle to Unmap when out of scope
 * Integrate into existing layers that have constants
 * Add unit tests

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I0a05e14e438804b37e9862e76b5ca329483f6b45

1 files changed, 5 insertions, 3 deletions

diff --git a/src/armnn/layers/DetectionPostProcessLayer.cpp b/src/armnn/layers/DetectionPostProcessLayer.cpp
index e5bbeca424..b5086172dd 100644
--- a/src/armnn/layers/DetectionPostProcessLayer.cpp
+++ b/src/armnn/layers/DetectionPostProcessLayer.cpp
@@ -80,14 +80,16 @@ Layer::ConstantTensors DetectionPostProcessLayer::GetConstantTensorsByRef()
 
 void DetectionPostProcessLayer::Accept(ILayerVisitor& visitor) const
 {
-    ConstTensor anchorTensor(m_Anchors->GetTensorInfo(), m_Anchors->GetConstTensor<void>());
+    ManagedConstTensorHandle managedAnchors(m_Anchors);
+    ConstTensor anchorTensor(managedAnchors.GetTensorInfo(), managedAnchors.Map());
     visitor.VisitDetectionPostProcessLayer(this, GetParameters(), anchorTensor, GetName());
+    m_Anchors->Unmap();
 }
 
 void DetectionPostProcessLayer::ExecuteStrategy(IStrategy& strategy) const
 {
-    std::vector<armnn::ConstTensor> constTensors { {m_Anchors->GetTensorInfo(), m_Anchors->GetConstTensor<void>()} };
-
+    ManagedConstTensorHandle managedAnchors(m_Anchors);
+    std::vector<armnn::ConstTensor> constTensors { {managedAnchors.GetTensorInfo(), managedAnchors.Map()} };
     strategy.ExecuteStrategy(this, GetParameters(), constTensors, GetName());
 }