IVGCVSW-5835 Move the src/profiling/LabelsAndEventClasses class to profiling/common

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

8 files changed, 15 insertions, 9 deletions

diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
index 5827c0db9b..8085fd9d01 100644
--- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
+++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
@@ -4,7 +4,6 @@
 //
 
 #include <Filesystem.hpp>
-#include <LabelsAndEventClasses.hpp>
 #include <ProfilingService.hpp>
 #include "ProfilingTestUtils.hpp"
 #include "PrintPacketHeaderHandler.hpp"
@@ -13,6 +12,8 @@
 
 #include <doctest/doctest.h>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <cstdio>
 #include <sstream>
 #include <sys/stat.h>
diff --git a/src/profiling/test/ProfilingGuidTest.cpp b/src/profiling/test/ProfilingGuidTest.cpp
index 07a0985591..caec210150 100644
--- a/src/profiling/test/ProfilingGuidTest.cpp
+++ b/src/profiling/test/ProfilingGuidTest.cpp
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "LabelsAndEventClasses.hpp"
-
 #include <armnn/Types.hpp>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <set>
 #include <doctest/doctest.h>
 #include <fmt/format.h>
diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp
index 0d8e9ef7bc..b9035b44e9 100644
--- a/src/profiling/test/ProfilingTestUtils.cpp
+++ b/src/profiling/test/ProfilingTestUtils.cpp
@@ -10,11 +10,12 @@
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
-#include <LabelsAndEventClasses.hpp>
 #include <Processes.hpp>
 #include <ProfilingService.hpp>
 #include <Threads.hpp>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <test/TestUtils.hpp>
 
 #include <doctest/doctest.h>
diff --git a/src/profiling/test/ProfilingTestUtils.hpp b/src/profiling/test/ProfilingTestUtils.hpp
index 4daf9d5f4a..6be35a96be 100644
--- a/src/profiling/test/ProfilingTestUtils.hpp
+++ b/src/profiling/test/ProfilingTestUtils.hpp
@@ -10,10 +10,11 @@
 
 #include <armnn/BackendId.hpp>
 #include <armnn/Optional.hpp>
-#include <armnn/Types.hpp>
 #include <BufferManager.hpp>
 #include <ProfilingService.hpp>
 
+#include <common/include/ProfilingGuid.hpp>
+
 using namespace armnn;
 using namespace armnn::profiling;
 
diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp
index dd856d8590..e475f320e2 100644
--- a/src/profiling/test/SendTimelinePacketTests.cpp
+++ b/src/profiling/test/SendTimelinePacketTests.cpp
@@ -6,7 +6,6 @@
 #include "ProfilingMocks.hpp"
 
 #include <BufferManager.hpp>
-#include <LabelsAndEventClasses.hpp>
 #include <ProfilingService.hpp>
 #include <ProfilingUtils.hpp>
 #include <SendTimelinePacket.hpp>
@@ -14,6 +13,7 @@
 #include <TimelinePacketWriterFactory.hpp>
 
 #include <common/include/SwTrace.hpp>
+#include <common/include/LabelsAndEventClasses.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/src/profiling/test/TestTimelinePacketHandler.cpp b/src/profiling/test/TestTimelinePacketHandler.cpp
index df847d4c7c..a2b5286728 100644
--- a/src/profiling/test/TestTimelinePacketHandler.cpp
+++ b/src/profiling/test/TestTimelinePacketHandler.cpp
@@ -5,7 +5,8 @@
 
 #include "TestTimelinePacketHandler.hpp"
 #include "IProfilingConnection.hpp"
-#include <LabelsAndEventClasses.hpp>
+
+#include <common/include/LabelsAndEventClasses.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/src/profiling/test/TimelineModel.cpp b/src/profiling/test/TimelineModel.cpp
index 1f02addcf9..a80ad11e24 100644
--- a/src/profiling/test/TimelineModel.cpp
+++ b/src/profiling/test/TimelineModel.cpp
@@ -4,7 +4,8 @@
 //
 
 #include "TimelineModel.hpp"
-#include <LabelsAndEventClasses.hpp>
+
+#include <common/include/LabelsAndEventClasses.hpp>
 
 #include <algorithm>
 
diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp
index 1e733df405..47e1182a3d 100644
--- a/src/profiling/test/TimelineUtilityMethodsTests.cpp
+++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp
@@ -8,9 +8,10 @@
 
 #include <SendTimelinePacket.hpp>
 #include <TimelineUtilityMethods.hpp>
-#include <LabelsAndEventClasses.hpp>
 #include <ProfilingService.hpp>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <memory>
 
 #include <doctest/doctest.h>