IVGCVSW-5835 Move the src/profiling/LabelsAndEventClasses class to profiling/common
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I83de0fe9c83ec7e698817095ce5cfe3319c36ea6
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 71075d0..17cc8dc 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 b5474db..c85e82b 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 2c14136..5807d17 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 e04cf5d..374064e 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 3db9544..29d258f 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/LabelsAndEventClasses.cpp b/src/profiling/LabelsAndEventClasses.cpp
deleted file mode 100644
index fe6d119..0000000
--- a/src/profiling/LabelsAndEventClasses.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "LabelsAndEventClasses.hpp"
-
-namespace armnn
-{
-
-namespace profiling
-{
-
-ProfilingGuidGenerator LabelsAndEventClasses::m_GuidGenerator;
-
-// Labels (string value + GUID)
-std::string LabelsAndEventClasses::EMPTY_LABEL("");
-std::string LabelsAndEventClasses::NAME_LABEL("name");
-std::string LabelsAndEventClasses::TYPE_LABEL("type");
-std::string LabelsAndEventClasses::INDEX_LABEL("index");
-std::string LabelsAndEventClasses::BACKENDID_LABEL("backendId");
-std::string LabelsAndEventClasses::CHILD_LABEL("child");
-std::string LabelsAndEventClasses::EXECUTION_OF_LABEL("execution_of");
-std::string LabelsAndEventClasses::PROCESS_ID_LABEL("processId");
-
-ProfilingStaticGuid LabelsAndEventClasses::EMPTY_GUID(0);
-ProfilingStaticGuid LabelsAndEventClasses::NAME_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::NAME_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::TYPE_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::TYPE_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::INDEX_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::INDEX_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::BACKENDID_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::BACKENDID_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::CHILD_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::CHILD_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::EXECUTION_OF_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::EXECUTION_OF_LABEL));
-ProfilingStaticGuid LabelsAndEventClasses::PROCESS_ID_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::PROCESS_ID_LABEL));
-
-// Common types
-std::string LabelsAndEventClasses::LAYER("layer");
-std::string LabelsAndEventClasses::WORKLOAD("workload");
-std::string LabelsAndEventClasses::NETWORK("network");
-std::string LabelsAndEventClasses::CONNECTION("connection");
-std::string LabelsAndEventClasses::INFERENCE("inference");
-std::string LabelsAndEventClasses::WORKLOAD_EXECUTION("workload_execution");
-
-ProfilingStaticGuid LabelsAndEventClasses::LAYER_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::LAYER));
-ProfilingStaticGuid LabelsAndEventClasses::WORKLOAD_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::WORKLOAD));
-ProfilingStaticGuid LabelsAndEventClasses::NETWORK_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::NETWORK));
-ProfilingStaticGuid LabelsAndEventClasses::CONNECTION_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::CONNECTION));
-ProfilingStaticGuid LabelsAndEventClasses::INFERENCE_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::INFERENCE));
-ProfilingStaticGuid LabelsAndEventClasses::WORKLOAD_EXECUTION_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::WORKLOAD_EXECUTION));
-
-// Event Class GUIDs
-// Start of Life (SOL)
-std::string LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS_NAME("start_of_life");
-ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS_NAME_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS_NAME));
-ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS(
- m_GuidGenerator.GenerateStaticId("ARMNN_PROFILING_SOL"));
-// End of Life (EOL)
-std::string LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS_NAME("end_of_life");
-ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS_NAME_GUID(
- m_GuidGenerator.GenerateStaticId(LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS_NAME));
-ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS(
- m_GuidGenerator.GenerateStaticId("ARMNN_PROFILING_EOL"));
-
-} // namespace profiling
-
-} // namespace armnn
diff --git a/src/profiling/LabelsAndEventClasses.hpp b/src/profiling/LabelsAndEventClasses.hpp
deleted file mode 100644
index 779b432..0000000
--- a/src/profiling/LabelsAndEventClasses.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <common/include/ProfilingGuidGenerator.hpp>
-
-#include <DllExport.hpp>
-
-namespace armnn
-{
-
-namespace profiling
-{
-
-class LabelsAndEventClasses
-{
-public:
- // Labels (string value + GUID)
- ARMNN_DLLEXPORT static std::string EMPTY_LABEL;
- ARMNN_DLLEXPORT static std::string NAME_LABEL;
- ARMNN_DLLEXPORT static std::string TYPE_LABEL;
- ARMNN_DLLEXPORT static std::string INDEX_LABEL;
- ARMNN_DLLEXPORT static std::string BACKENDID_LABEL;
- ARMNN_DLLEXPORT static std::string CHILD_LABEL;
- ARMNN_DLLEXPORT static std::string EXECUTION_OF_LABEL;
- ARMNN_DLLEXPORT static std::string PROCESS_ID_LABEL;
- ARMNN_DLLEXPORT static ProfilingStaticGuid EMPTY_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid NAME_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid TYPE_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid INDEX_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid BACKENDID_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid CHILD_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid EXECUTION_OF_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid PROCESS_ID_GUID;
-
- // Common types
- ARMNN_DLLEXPORT static std::string LAYER;
- ARMNN_DLLEXPORT static std::string WORKLOAD;
- ARMNN_DLLEXPORT static std::string NETWORK;
- ARMNN_DLLEXPORT static std::string CONNECTION;
- ARMNN_DLLEXPORT static std::string INFERENCE;
- ARMNN_DLLEXPORT static std::string WORKLOAD_EXECUTION;
- ARMNN_DLLEXPORT static ProfilingStaticGuid LAYER_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid WORKLOAD_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid NETWORK_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid CONNECTION_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid INFERENCE_GUID;
- ARMNN_DLLEXPORT static ProfilingStaticGuid WORKLOAD_EXECUTION_GUID;
-
- // Event Class GUIDs
- // Start of Life (SOL)
- ARMNN_DLLEXPORT static ProfilingStaticGuid ARMNN_PROFILING_SOL_EVENT_CLASS;
- ARMNN_DLLEXPORT static std::string ARMNN_PROFILING_SOL_EVENT_CLASS_NAME;
- ARMNN_DLLEXPORT static ProfilingStaticGuid ARMNN_PROFILING_SOL_EVENT_CLASS_NAME_GUID;
- // End of Life (EOL)
- ARMNN_DLLEXPORT static ProfilingStaticGuid ARMNN_PROFILING_EOL_EVENT_CLASS;
- ARMNN_DLLEXPORT static std::string ARMNN_PROFILING_EOL_EVENT_CLASS_NAME;
- ARMNN_DLLEXPORT static ProfilingStaticGuid ARMNN_PROFILING_EOL_EVENT_CLASS_NAME_GUID;
-
-private:
- static ProfilingGuidGenerator m_GuidGenerator;
-};
-
-} // namespace profiling
-
-} // namespace armnn
diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp
index f49801b..0a24775 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 5827c0d..8085fd9 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 07a0985..caec210 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 0d8e9ef..b9035b4 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 4daf9d5..6be35a9 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 dd856d8..e475f32 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 df847d4..a2b5286 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 1f02add..a80ad11 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 1e733df..47e1182 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>