IVGCVSW-5834 Move the IProfilingGuidGenerator and ProfilingGuidGenerator into profiling common
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I0d672cc782cc2de66a88acf0d83fcd40208ace95
diff --git a/src/profiling/IProfilingService.hpp b/src/profiling/IProfilingService.hpp
index 760f243..ebdfb39 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 dad27e1..779b432 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 3798e0c..0000000
--- 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 1bc7c59..c705a49 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 f89699c..d70e0d5 100644
--- a/src/profiling/test/ProfilingGuidTest.cpp
+++ b/src/profiling/test/ProfilingGuidTest.cpp
@@ -3,13 +3,11 @@
// SPDX-License-Identifier: MIT
//
+#include "LabelsAndEventClasses.hpp"
+
#include <armnn/Types.hpp>
-#include "LabelsAndEventClasses.hpp"
-#include "ProfilingGuidGenerator.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 a34c849..e0acfbd 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>