From 5b1bcc93820b442bc4035c1e030a8d4a0983df91 Mon Sep 17 00:00:00 2001
From: Nikhil Raj <nikhil.raj@arm.com>
Date: Tue, 8 Jun 2021 12:31:50 +0100
Subject: IVGCVSW-5834 Move the IProfilingGuidGenerator and
 ProfilingGuidGenerator into profiling common

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I0d672cc782cc2de66a88acf0d83fcd40208ace95
---
 CMakeLists.txt                                     |  2 -
 .../armnn/backends/profiling/IBackendProfiling.hpp |  4 +-
 .../armnn/profiling/IProfilingGuidGenerator.hpp    | 32 -----------
 .../common/include/IProfilingGuidGenerator.hpp     | 32 +++++++++++
 .../common/include/ProfilingGuidGenerator.hpp      | 62 +++++++++++++++++++++
 src/profiling/IProfilingService.hpp                |  3 +-
 src/profiling/LabelsAndEventClasses.hpp            |  4 +-
 src/profiling/ProfilingGuidGenerator.hpp           | 63 ----------------------
 src/profiling/ProfilingService.hpp                 |  3 +-
 src/profiling/test/ProfilingGuidTest.cpp           |  6 +--
 src/profiling/test/ProfilingMocks.hpp              |  3 +-
 11 files changed, 106 insertions(+), 108 deletions(-)
 delete mode 100644 include/armnn/profiling/IProfilingGuidGenerator.hpp
 create mode 100644 profiling/common/include/IProfilingGuidGenerator.hpp
 create mode 100644 profiling/common/include/ProfilingGuidGenerator.hpp
 delete mode 100644 src/profiling/ProfilingGuidGenerator.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 790c192db5..5bfc1b01d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,6 @@ list(APPEND armnn_sources
     include/armnn/TypesUtils.hpp
     include/armnn/Utils.hpp
     include/armnn/Version.hpp
-    include/armnn/profiling/IProfilingGuidGenerator.hpp
     include/armnn/profiling/ISendTimelinePacket.hpp
     include/armnn/utility/Assert.hpp
     include/armnn/utility/IgnoreUnused.hpp
@@ -430,7 +429,6 @@ list(APPEND armnn_sources
     src/profiling/ProfilingConnectionDumpToFileDecorator.hpp
     src/profiling/ProfilingConnectionFactory.cpp
     src/profiling/ProfilingConnectionFactory.hpp
-    src/profiling/ProfilingGuidGenerator.hpp
     src/profiling/ProfilingService.cpp
     src/profiling/ProfilingService.hpp
     src/profiling/ProfilingStateMachine.cpp
diff --git a/include/armnn/backends/profiling/IBackendProfiling.hpp b/include/armnn/backends/profiling/IBackendProfiling.hpp
index 3352d37a80..beb7755741 100644
--- a/include/armnn/backends/profiling/IBackendProfiling.hpp
+++ b/include/armnn/backends/profiling/IBackendProfiling.hpp
@@ -5,8 +5,10 @@
 #pragma once
 
 #include <armnn/IRuntime.hpp>
-#include <armnn/profiling/IProfilingGuidGenerator.hpp>
 #include <armnn/profiling/ISendTimelinePacket.hpp>
+
+#include <common/include/IProfilingGuidGenerator.hpp>
+
 #include <memory>
 #include <vector>
 
diff --git a/include/armnn/profiling/IProfilingGuidGenerator.hpp b/include/armnn/profiling/IProfilingGuidGenerator.hpp
deleted file mode 100644
index 95a210604e..0000000000
--- a/include/armnn/profiling/IProfilingGuidGenerator.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <common/include/ProfilingGuid.hpp>
-
-#include <string>
-
-namespace armnn
-{
-
-namespace profiling
-{
-
-class IProfilingGuidGenerator
-{
-public:
-    /// Return the next random Guid in the sequence
-    virtual ProfilingDynamicGuid NextGuid() = 0;
-
-    /// Create a ProfilingStaticGuid based on a hash of the string
-    virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0;
-
-    virtual ~IProfilingGuidGenerator() {}
-};
-
-} // namespace profiling
-
-} // namespace armnn
diff --git a/profiling/common/include/IProfilingGuidGenerator.hpp b/profiling/common/include/IProfilingGuidGenerator.hpp
new file mode 100644
index 0000000000..34ee9673b5
--- /dev/null
+++ b/profiling/common/include/IProfilingGuidGenerator.hpp
@@ -0,0 +1,32 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include "ProfilingGuid.hpp"
+
+#include <string>
+
+namespace armnn
+{
+
+namespace profiling
+{
+
+class IProfilingGuidGenerator
+{
+public:
+    /// Return the next random Guid in the sequence
+    virtual ProfilingDynamicGuid NextGuid() = 0;
+
+    /// Create a ProfilingStaticGuid based on a hash of the string
+    virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0;
+
+    virtual ~IProfilingGuidGenerator() {}
+};
+
+} // namespace profiling
+
+} // namespace armnn
diff --git a/profiling/common/include/ProfilingGuidGenerator.hpp b/profiling/common/include/ProfilingGuidGenerator.hpp
new file mode 100644
index 0000000000..2b7302bd61
--- /dev/null
+++ b/profiling/common/include/ProfilingGuidGenerator.hpp
@@ -0,0 +1,62 @@
+//
+// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include "IProfilingGuidGenerator.hpp"
+#include "ProfilingGuid.hpp"
+
+#include <functional>
+#include <mutex>
+
+namespace armnn
+{
+
+namespace profiling
+{
+
+class ProfilingGuidGenerator : public IProfilingGuidGenerator
+{
+public:
+    /// Construct a generator with the default address space static/dynamic partitioning
+    ProfilingGuidGenerator() : m_Sequence(0) {}
+
+    /// Return the next random Guid in the sequence
+    inline ProfilingDynamicGuid NextGuid() override
+    {
+        std::lock_guard<std::mutex> sequencelock(m_SequenceMutex);
+        ProfilingDynamicGuid guid(m_Sequence);
+        m_Sequence++;
+        if (m_Sequence >= MIN_STATIC_GUID)
+        {
+            // Reset the sequence to 0 when it reaches the upper bound of dynamic guid
+            m_Sequence = 0;
+        }
+        return guid;
+    }
+
+    /// Create a ProfilingStaticGuid based on a hash of the string
+    inline ProfilingStaticGuid GenerateStaticId(const std::string& str) override
+    {
+        uint64_t staticHash = m_Hash(str) | MIN_STATIC_GUID;
+        return ProfilingStaticGuid(staticHash);
+    }
+
+    /// Reset the generator back to zero. Used mainly for test.
+    inline void Reset()
+    {
+        std::lock_guard<std::mutex> sequencelock(m_SequenceMutex);
+        m_Sequence = 0;
+    }
+
+private:
+    std::hash<std::string> m_Hash;
+    uint64_t m_Sequence;
+    std::mutex m_SequenceMutex;
+};
+
+} // namespace profiling
+
+} // namespace armnn
diff --git a/src/profiling/IProfilingService.hpp b/src/profiling/IProfilingService.hpp
index 760f2433bd..ebdfb39c63 100644
--- a/src/profiling/IProfilingService.hpp
+++ b/src/profiling/IProfilingService.hpp
@@ -9,7 +9,8 @@
 #include "Holder.hpp"
 #include "IProfilingServiceStatus.hpp"
 #include "ISendCounterPacket.hpp"
-#include "ProfilingGuidGenerator.hpp"
+
+#include <common/include/ProfilingGuidGenerator.hpp>
 
 namespace armnn
 {
diff --git a/src/profiling/LabelsAndEventClasses.hpp b/src/profiling/LabelsAndEventClasses.hpp
index dad27e1aed..779b432d4a 100644
--- a/src/profiling/LabelsAndEventClasses.hpp
+++ b/src/profiling/LabelsAndEventClasses.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "ProfilingGuidGenerator.hpp"
-#include <common/include/ProfilingGuid.hpp>
+#include <common/include/ProfilingGuidGenerator.hpp>
+
 #include <DllExport.hpp>
 
 namespace armnn
diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/src/profiling/ProfilingGuidGenerator.hpp
deleted file mode 100644
index 3798e0cc2d..0000000000
--- a/src/profiling/ProfilingGuidGenerator.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include "armnn/profiling/IProfilingGuidGenerator.hpp"
-
-#include <common/include/ProfilingGuid.hpp>
-
-#include <functional>
-#include <mutex>
-
-namespace armnn
-{
-
-namespace profiling
-{
-
-class ProfilingGuidGenerator : public IProfilingGuidGenerator
-{
-public:
-    /// Construct a generator with the default address space static/dynamic partitioning
-    ProfilingGuidGenerator() : m_Sequence(0) {}
-
-    /// Return the next random Guid in the sequence
-    inline ProfilingDynamicGuid NextGuid() override
-    {
-        std::lock_guard<std::mutex> sequencelock(m_SequenceMutex);
-        ProfilingDynamicGuid guid(m_Sequence);
-        m_Sequence++;
-        if (m_Sequence >= MIN_STATIC_GUID)
-        {
-            // Reset the sequence to 0 when it reaches the upper bound of dynamic guid
-            m_Sequence = 0;
-        }
-        return guid;
-    }
-
-    /// Create a ProfilingStaticGuid based on a hash of the string
-    inline ProfilingStaticGuid GenerateStaticId(const std::string& str) override
-    {
-        uint64_t staticHash = m_Hash(str) | MIN_STATIC_GUID;
-        return ProfilingStaticGuid(staticHash);
-    }
-
-    /// Reset the generator back to zero. Used mainly for test.
-    inline void Reset()
-    {
-        std::lock_guard<std::mutex> sequencelock(m_SequenceMutex);
-        m_Sequence = 0;
-    }
-
-private:
-    std::hash<std::string> m_Hash;
-    uint64_t m_Sequence;
-    std::mutex m_SequenceMutex;
-};
-
-} // namespace profiling
-
-} // namespace armnn
diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp
index 1bc7c59808..c705a49313 100644
--- a/src/profiling/ProfilingService.hpp
+++ b/src/profiling/ProfilingService.hpp
@@ -21,7 +21,6 @@
 #include "PeriodicCounterSelectionCommandHandler.hpp"
 #include "PerJobCounterSelectionCommandHandler.hpp"
 #include "ProfilingConnectionFactory.hpp"
-#include "ProfilingGuidGenerator.hpp"
 #include "ProfilingStateMachine.hpp"
 #include "RequestCounterDirectoryCommandHandler.hpp"
 #include "SendCounterPacket.hpp"
@@ -31,6 +30,8 @@
 #include "INotifyBackends.hpp"
 #include <armnn/backends/profiling/IBackendProfilingContext.hpp>
 
+#include <common/include/ProfilingGuidGenerator.hpp>
+
 #include <list>
 
 namespace armnn
diff --git a/src/profiling/test/ProfilingGuidTest.cpp b/src/profiling/test/ProfilingGuidTest.cpp
index f89699cb99..d70e0d5547 100644
--- a/src/profiling/test/ProfilingGuidTest.cpp
+++ b/src/profiling/test/ProfilingGuidTest.cpp
@@ -3,13 +3,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <armnn/Types.hpp>
-
 #include "LabelsAndEventClasses.hpp"
-#include "ProfilingGuidGenerator.hpp"
 
-#include <set>
+#include <armnn/Types.hpp>
 
+#include <set>
 #include <boost/test/unit_test.hpp>
 #include <fmt/format.h>
 #include <thread>
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp
index a34c849302..e0acfbdd32 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -9,7 +9,6 @@
 #include <IProfilingConnectionFactory.hpp>
 #include <IProfilingServiceStatus.hpp>
 #include <ProfilingService.hpp>
-#include <ProfilingGuidGenerator.hpp>
 #include <ProfilingUtils.hpp>
 #include <SendCounterPacket.hpp>
 #include <SendThread.hpp>
@@ -21,7 +20,7 @@
 #include <armnn/utility/IgnoreUnused.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
-#include <common/include/ProfilingGuid.hpp>
+#include <common/include/ProfilingGuidGenerator.hpp>
 
 #include <atomic>
 #include <condition_variable>
-- 
cgit v1.2.1