From e394bd99f1a55e099445823b7a951f0faa84d439 Mon Sep 17 00:00:00 2001
From: Keith Davis <keith.davis@arm.com>
Date: Mon, 2 Dec 2019 15:12:19 +0000
Subject: 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/CounterDirectory.hpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/profiling/CounterDirectory.hpp')

diff --git a/src/profiling/CounterDirectory.hpp b/src/profiling/CounterDirectory.hpp
index bff5cfef98..b0ddbcea3f 100644
--- a/src/profiling/CounterDirectory.hpp
+++ b/src/profiling/CounterDirectory.hpp
@@ -8,6 +8,7 @@
 #include "ICounterDirectory.hpp"
 
 #include <armnn/Optional.hpp>
+#include <armnn/BackendId.hpp>
 
 #include <string>
 #include <unordered_set>
@@ -37,16 +38,18 @@ public:
     const CounterSet* RegisterCounterSet(const std::string& counterSetName,
                                          uint16_t count = 0,
                                          const Optional<std::string>& parentCategoryName = EmptyOptional());
-    const Counter*    RegisterCounter   (const std::string& parentCategoryName,
-                                         uint16_t counterClass,
-                                         uint16_t interpolation,
-                                         double multiplier,
-                                         const std::string& name,
-                                         const std::string& description,
-                                         const Optional<std::string>& units = EmptyOptional(),
-                                         const Optional<uint16_t>& numberOfCores = EmptyOptional(),
-                                         const Optional<uint16_t>& deviceUid = EmptyOptional(),
-                                         const Optional<uint16_t>& counterSetUid = EmptyOptional());
+    const Counter* RegisterCounter(const BackendId& backendId,
+                                   const uint16_t uid,
+                                   const std::string& parentCategoryName,
+                                   uint16_t counterClass,
+                                   uint16_t interpolation,
+                                   double multiplier,
+                                   const std::string& name,
+                                   const std::string& description,
+                                   const Optional<std::string>& units = EmptyOptional(),
+                                   const Optional<uint16_t>& numberOfCores = EmptyOptional(),
+                                   const Optional<uint16_t>& deviceUid = EmptyOptional(),
+                                   const Optional<uint16_t>& counterSetUid = EmptyOptional());
 
     // Getters for counts
     uint16_t GetCategoryCount()   const override { return boost::numeric_cast<uint16_t>(m_Categories.size());  }
-- 
cgit v1.2.1