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/CMakeLists.txt b/CMakeLists.txt
index 790c192..5bfc1b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,6 @@
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 @@
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 3352d37..beb7755 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/profiling/common/include/IProfilingGuidGenerator.hpp
similarity index 92%
rename from include/armnn/profiling/IProfilingGuidGenerator.hpp
rename to profiling/common/include/IProfilingGuidGenerator.hpp
index 95a2106..34ee967 100644
--- a/include/armnn/profiling/IProfilingGuidGenerator.hpp
+++ b/profiling/common/include/IProfilingGuidGenerator.hpp
@@ -5,7 +5,7 @@
#pragma once
-#include <common/include/ProfilingGuid.hpp>
+#include "ProfilingGuid.hpp"
#include <string>
diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/profiling/common/include/ProfilingGuidGenerator.hpp
similarity index 93%
rename from src/profiling/ProfilingGuidGenerator.hpp
rename to profiling/common/include/ProfilingGuidGenerator.hpp
index 3798e0c..2b7302b 100644
--- a/src/profiling/ProfilingGuidGenerator.hpp
+++ b/profiling/common/include/ProfilingGuidGenerator.hpp
@@ -5,9 +5,8 @@
#pragma once
-#include "armnn/profiling/IProfilingGuidGenerator.hpp"
-
-#include <common/include/ProfilingGuid.hpp>
+#include "IProfilingGuidGenerator.hpp"
+#include "ProfilingGuid.hpp"
#include <functional>
#include <mutex>
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/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>