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

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

22 files changed, 55 insertions, 32 deletions

diff --git a/Android.mk b/Android.mk
index 168b32a400..69c6ee4352 100644
--- a/Android.mk
+++ b/Android.mk
@@ -105,6 +105,7 @@ LOCAL_SRC_FILES := \
         profiling/common/src/NetworkSockets.cpp \
         profiling/common/src/PacketVersionResolver.cpp \
         profiling/common/src/SwTrace.cpp \
+        profiling/common/src/LabelsAndEventClasses.cpp \
         profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
         profiling/server/src/timelineDecoder/TimelineDecoder.cpp \
         profiling/server/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.cpp \
@@ -226,7 +227,6 @@ LOCAL_SRC_FILES := \
         src/profiling/DirectoryCaptureCommandHandler.cpp \
         src/profiling/FileOnlyProfilingConnection.cpp \
         src/profiling/Holder.cpp \
-        src/profiling/LabelsAndEventClasses.cpp \
         src/profiling/PacketBuffer.cpp \
         src/profiling/PeriodicCounterCapture.cpp \
         src/profiling/PeriodicCounterSelectionCommandHandler.cpp \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f8ae2c1a3..ad4c17fc6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,8 +414,6 @@ list(APPEND armnn_sources
     src/profiling/IPeriodicCounterCapture.hpp
     src/profiling/IProfilingConnection.hpp
     src/profiling/IProfilingConnectionFactory.hpp
-    src/profiling/LabelsAndEventClasses.cpp
-    src/profiling/LabelsAndEventClasses.hpp
     src/profiling/NullProfilingConnection.hpp
     src/profiling/PacketBuffer.cpp
     src/profiling/PacketBuffer.hpp
diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index 0dc1ba471f..8d94ed77f6 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -12,7 +12,6 @@
 #include <armnn/NetworkFwd.hpp>
 #include <armnn/Optional.hpp>
 #include <armnn/TensorFwd.hpp>
-#include <armnn/Types.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/profiling/common/include/DllExport.hpp b/profiling/common/include/DllExport.hpp
new file mode 100644
index 0000000000..8e01d43bca
--- /dev/null
+++ b/profiling/common/include/DllExport.hpp
@@ -0,0 +1,19 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+#pragma once
+
+#if defined (_MSC_VER)
+
+#ifdef ARMNN_COMPILING_DLL
+#define ARMNN_DLLEXPORT __declspec(dllexport)
+#else
+#define ARMNN_DLLEXPORT __declspec(dllimport)
+#endif
+
+#else
+
+#define ARMNN_DLLEXPORT
+
+#endif
\ No newline at end of file
diff --git a/src/profiling/LabelsAndEventClasses.hpp b/profiling/common/include/LabelsAndEventClasses.hpp
index 779b432d4a..8e3e0b0c67 100644
--- a/src/profiling/LabelsAndEventClasses.hpp
+++ b/profiling/common/include/LabelsAndEventClasses.hpp
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <common/include/ProfilingGuidGenerator.hpp>
+#include "ProfilingGuidGenerator.hpp"
 
-#include <DllExport.hpp>
+#include "DllExport.hpp"
 
 namespace armnn
 {
diff --git a/profiling/common/src/CMakeLists.txt b/profiling/common/src/CMakeLists.txt
index 3a27a53f8e..6979275c49 100644
--- a/profiling/common/src/CMakeLists.txt
+++ b/profiling/common/src/CMakeLists.txt
@@ -12,7 +12,8 @@ if(BUILD_TIMELINE_DECODER)
         CommonProfilingUtils.cpp
         NetworkSockets.cpp
         PacketVersionResolver.cpp
-        SwTrace.cpp)
+        SwTrace.cpp
+        LabelsAndEventClasses.cpp)
 
     include_directories(${PROJECT_SOURCE_DIR}/profiling/common/include)
     include_directories(${PROJECT_SOURCE_DIR}/common/include)
diff --git a/src/profiling/LabelsAndEventClasses.cpp b/profiling/common/src/LabelsAndEventClasses.cpp
index fe6d119c2f..fe6d119c2f 100644
--- a/src/profiling/LabelsAndEventClasses.cpp
+++ b/profiling/common/src/LabelsAndEventClasses.cpp
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 71075d0396..17cc8dcc23 100644
--- a/src/armnn/LoadedNetwork.cpp
+++ b/src/armnn/LoadedNetwork.cpp
@@ -21,8 +21,6 @@
 #include <backendsCommon/MemCopyWorkload.hpp>
 #include <backendsCommon/MemSyncWorkload.hpp>
 
-#include <LabelsAndEventClasses.hpp>
-
 #include <fmt/format.h>
 #include <armnn/utility/Timer.hpp>
 
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp
index b5474db294..c85e82bbdd 100644
--- a/src/armnn/LoadedNetwork.hpp
+++ b/src/armnn/LoadedNetwork.hpp
@@ -4,13 +4,11 @@
 //
 #pragma once
 
-#include <armnn/Tensor.hpp>
-#include <armnn/Types.hpp>
-
 #include "Network.hpp"
 #include "LayerFwd.hpp"
 #include "Profiling.hpp"
 
+#include <armnn/Tensor.hpp>
 #include <armnn/backends/IBackendInternal.hpp>
 #include <backendsCommon/TensorHandleFactoryRegistry.hpp>
 #include <backendsCommon/Workload.hpp>
@@ -18,6 +16,8 @@
 #include <ProfilingService.hpp>
 #include <TimelineUtilityMethods.hpp>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <mutex>
 #include <condition_variable>
 #include <unordered_map>
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 2c14136080..5807d1705a 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -28,6 +28,8 @@
 
 #include <ProfilingService.hpp>
 
+#include <common/include/ProfilingGuid.hpp>
+
 #include <fcntl.h>
 #include <algorithm>
 #include <fstream>
diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp
index e04cf5ddaf..374064e408 100644
--- a/src/armnn/Runtime.cpp
+++ b/src/armnn/Runtime.cpp
@@ -6,7 +6,6 @@
 
 #include <armnn/Version.hpp>
 #include <armnn/BackendRegistry.hpp>
-#include <LabelsAndEventClasses.hpp>
 #include <armnn/Logging.hpp>
 #include <armnn/utility/Timer.hpp>
 
@@ -14,6 +13,8 @@
 #include <backendsCommon/DynamicBackendUtils.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
 
+#include <common/include/LabelsAndEventClasses.hpp>
+
 #include <iostream>
 
 #include <backends/BackendProfiling.hpp>
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 3db95445b4..29d258f6ab 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -10,7 +10,7 @@
 #include <Runtime.hpp>
 #include <armnn/TypesUtils.hpp>
 
-#include <LabelsAndEventClasses.hpp>
+#include <common/include/LabelsAndEventClasses.hpp>
 #include <test/ProfilingTestUtils.hpp>
 
 #include <HeapProfiling.hpp>
diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp
index f49801b0a8..0a24775268 100644
--- a/src/profiling/TimelineUtilityMethods.cpp
+++ b/src/profiling/TimelineUtilityMethods.cpp
@@ -2,10 +2,10 @@
 // Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
-#include "LabelsAndEventClasses.hpp"
 #include "TimelineUtilityMethods.hpp"
 
-#include <common/include/ProfilingGuid.hpp>
+#include <common/include/LabelsAndEventClasses.hpp>
+
 
 #include <Threads.hpp>
 
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>
diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
index 66e468cb5d..a206f658b4 100644
--- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp
+++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
@@ -3,23 +3,22 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <common/include/CommandHandlerRegistry.hpp>
-#include <server/include/basePipeServer/ConnectionHandler.hpp>
 #include <DirectoryCaptureCommandHandler.hpp>
 #include <GatordMockService.hpp>
-#include <LabelsAndEventClasses.hpp>
 #include <ProfilingService.hpp>
 #include <TimelinePacketWriterFactory.hpp>
+#include <Runtime.hpp>
+#include <MockBackend.hpp>
+
+#include <common/include/LabelsAndEventClasses.hpp>
+#include <common/include/CommandHandlerRegistry.hpp>
 
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
 #include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp>
 #include <server/include/timelineDecoder/TimelineDecoder.hpp>
-
-#include <Runtime.hpp>
-
-#include <MockBackend.hpp>
+#include <server/include/basePipeServer/ConnectionHandler.hpp>
 
 #include <doctest/doctest.h>