IVGCVSW-5833 Move the ProfilingGuid out of Types.hpp to its own header in profiling common

!android-nn-driver:5691


Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ib71af0831e324ac6bd27b1a36f4a6ec1a703b14a

8 files changed, 18 insertions, 7 deletions

diff --git a/src/profiling/FileOnlyProfilingConnection.cpp b/src/profiling/FileOnlyProfilingConnection.cpp
index a21ec2ff02..3b3d7a8284 100644
--- a/src/profiling/FileOnlyProfilingConnection.cpp
+++ b/src/profiling/FileOnlyProfilingConnection.cpp
@@ -4,11 +4,11 @@
 //
 
 #include "FileOnlyProfilingConnection.hpp"
-#include "PacketVersionResolver.hpp"
 
 #include <armnn/Exceptions.hpp>
 #include <common/include/Constants.hpp>
 #include <common/include/ProfilingException.hpp>
+#include <common/include/PacketVersionResolver.hpp>
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/profiling/IProfilingServiceStatus.hpp b/src/profiling/IProfilingServiceStatus.hpp
index 45d4aac088..1d272463ae 100644
--- a/src/profiling/IProfilingServiceStatus.hpp
+++ b/src/profiling/IProfilingServiceStatus.hpp
@@ -5,9 +5,10 @@
 
 #pragma once
 
-#include <Packet.hpp>
 #include <armnn/profiling/ILocalPacketHandler.hpp>
 
+#include <common/include/Packet.hpp>
+
 #include <cstdint>
 
 namespace armnn
diff --git a/src/profiling/LabelsAndEventClasses.hpp b/src/profiling/LabelsAndEventClasses.hpp
index b06b9a1488..dad27e1aed 100644
--- a/src/profiling/LabelsAndEventClasses.hpp
+++ b/src/profiling/LabelsAndEventClasses.hpp
@@ -6,8 +6,7 @@
 #pragma once
 
 #include "ProfilingGuidGenerator.hpp"
-
-#include <armnn/Types.hpp>
+#include <common/include/ProfilingGuid.hpp>
 #include <DllExport.hpp>
 
 namespace armnn
diff --git a/src/profiling/PeriodicCounterCapture.hpp b/src/profiling/PeriodicCounterCapture.hpp
index ac084af3dc..b7b1a20e1c 100644
--- a/src/profiling/PeriodicCounterCapture.hpp
+++ b/src/profiling/PeriodicCounterCapture.hpp
@@ -7,15 +7,17 @@
 
 #include "IPeriodicCounterCapture.hpp"
 #include "Holder.hpp"
-#include <Packet.hpp>
 #include "SendCounterPacket.hpp"
 #include "ICounterValues.hpp"
 #include "CounterIdMap.hpp"
 
+#include <armnn/backends/profiling/IBackendProfilingContext.hpp>
+
+#include <common/include/Packet.hpp>
+
 #include <atomic>
 #include <mutex>
 #include <thread>
-#include <armnn/backends/profiling/IBackendProfilingContext.hpp>
 
 namespace armnn
 {
diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/src/profiling/ProfilingGuidGenerator.hpp
index 86f9ce09de..3798e0cc2d 100644
--- a/src/profiling/ProfilingGuidGenerator.hpp
+++ b/src/profiling/ProfilingGuidGenerator.hpp
@@ -7,6 +7,8 @@
 
 #include "armnn/profiling/IProfilingGuidGenerator.hpp"
 
+#include <common/include/ProfilingGuid.hpp>
+
 #include <functional>
 #include <mutex>
 
diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp
index 6fe52f845e..fe407e478a 100644
--- a/src/profiling/ProfilingService.cpp
+++ b/src/profiling/ProfilingService.cpp
@@ -9,6 +9,8 @@
 #include <armnn/Logging.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
+#include <common/include/ProfilingGuid.hpp>
+
 #include <common/include/SocketConnectionException.hpp>
 
 #include <fmt/format.h>
diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp
index e72894a6ab..f49801b0a8 100644
--- a/src/profiling/TimelineUtilityMethods.cpp
+++ b/src/profiling/TimelineUtilityMethods.cpp
@@ -3,9 +3,12 @@
 // SPDX-License-Identifier: MIT
 //
 #include "LabelsAndEventClasses.hpp"
-#include <Threads.hpp>
 #include "TimelineUtilityMethods.hpp"
 
+#include <common/include/ProfilingGuid.hpp>
+
+#include <Threads.hpp>
+
 namespace armnn
 {
 
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp
index 19d79e25e7..a34c849302 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -21,6 +21,8 @@
 #include <armnn/utility/IgnoreUnused.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
+#include <common/include/ProfilingGuid.hpp>
+
 #include <atomic>
 #include <condition_variable>
 #include <mutex>