commit 3fec1ea7e35420ef87de8a98aed0437570251969
author janeil01 <jan.eilers@arm.com> Thu Nov 07 09:47:20 2019 +0000
committer janeil01 <jan.eilers@arm.com> Fri Nov 08 16:02:26 2019 +0000
tree fbe033328d6e067fc209580928d37e53f1849657
parent ffab16f9f23868b5b9338a1b63393f3be53211cb

IVGCVSW-4067 Change LayerGuid to use ProfilingGuid

* Refactoring to enable ProfilingGuid
* Add profiling includes to Android.mk

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: Ieb25e15e3dc302eb42817d824ad8411ac76dcfe8

src/armnnSerializer/Serializer.cpp

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 81091bc..5d06958 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -61,18 +61,17 @@
     }
 }
 
-uint32_t SerializerVisitor::GetSerializedId(unsigned int guid)
+uint32_t SerializerVisitor::GetSerializedId(armnn::LayerGuid guid)
 {
-    std::pair<unsigned int, uint32_t> guidPair(guid, m_layerId);
-
     if (m_guidMap.empty())
     {
-        m_guidMap.insert(guidPair);
+        m_guidMap.insert(std::make_pair(guid, m_layerId));
     }
     else if (m_guidMap.find(guid) == m_guidMap.end())
     {
-        guidPair.second = ++m_layerId;
-        m_guidMap.insert(guidPair);
+        ++m_layerId;
+        m_guidMap.insert(std::make_pair(guid, m_layerId));
+
         return m_layerId;
     }
     return m_guidMap[guid];
@@ -88,7 +87,7 @@
     auto flatBufferInputBindableBaseLayer = serializer::CreateBindableLayerBase(m_flatBufferBuilder,
                                                                                 flatBufferInputBaseLayer,
                                                                                 id);
-    // Push layer Guid to outputIds.
+    // Push layer index to outputIds.
     m_inputIds.push_back(GetSerializedId(layer->GetGuid()));
 
     // Create the FlatBuffer InputLayer
@@ -108,7 +107,7 @@
     auto flatBufferOutputBindableBaseLayer = serializer::CreateBindableLayerBase(m_flatBufferBuilder,
                                                                                  flatBufferOutputBaseLayer,
                                                                                  id);
-    // Push layer Guid to outputIds.
+    // Push layer index to outputIds.
     m_outputIds.push_back(GetSerializedId(layer->GetGuid()));
 
     // Create the FlatBuffer OutputLayer