commit e394bd99f1a55e099445823b7a951f0faa84d439
author Keith Davis <keith.davis@arm.com> Mon Dec 02 15:12:19 2019 +0000
committer Keith Davis <keith.davis@arm.com> Fri Dec 13 16:21:12 2019 +0000
tree ced6e6d4a2932bda64c1f4c5e280b82d87b77929
parent 60a20fb62c992c4c6369bb7f532957f3e151f3d8

IVGCVSW-4178 Add code to increment the 3 ArmNN counters

 * Increment at Runtime.cpp | BackendRegistry.cpp | LoadedNetwork.cpp
 * Update unit tests
 * UID generation is now handled by backends

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: Ifa53763409078c14839675206d8b260cdc36a8df

src/profiling/test/SendCounterPacketTests.hpp

diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp
index 4395d81..79ebcd6 100644
--- a/src/profiling/test/SendCounterPacketTests.hpp
+++ b/src/profiling/test/SendCounterPacketTests.hpp
@@ -420,7 +420,9 @@
         return counterSetPtr;
     }
 
-    const Counter* RegisterCounter(const std::string& parentCategoryName,
+    const Counter* RegisterCounter(const BackendId& backendId,
+                                   const uint16_t uid,
+                                   const std::string& parentCategoryName,
                                    uint16_t counterClass,
                                    uint16_t interpolation,
                                    double multiplier,
@@ -441,7 +443,7 @@
         uint16_t counterSetUidValue = counterSetUid.has_value() ? counterSetUid.value() : 0;
 
         // Get the counter UIDs and calculate the max counter UID
-        std::vector<uint16_t> counterUids = GetNextCounterUids(deviceCores);
+        std::vector<uint16_t> counterUids = GetNextCounterUids(uid, deviceCores);
         BOOST_ASSERT(!counterUids.empty());
         uint16_t maxCounterUid = deviceCores <= 1 ? counterUids.front() : counterUids.back();
 
@@ -449,7 +451,8 @@
         const std::string unitsValue = units.has_value() ? units.value() : "";
 
         // Create the counter
-        CounterPtr counter = std::make_shared<Counter>(counterUids.front(),
+        CounterPtr counter = std::make_shared<Counter>(armnn::profiling::BACKEND_ID,
+                                                       counterUids.front(),
                                                        maxCounterUid,
                                                        counterClass,
                                                        interpolation,