From 77fe76bfa8cb798943821d1f3e432c228e1cdee3 Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Wed, 9 Jun 2021 14:55:32 +0100 Subject: IVGCVSW-5835 Move the src/profiling/LabelsAndEventClasses class to profiling/common Signed-off-by: Nikhil Raj Change-Id: I83de0fe9c83ec7e698817095ce5cfe3319c36ea6 --- src/armnn/LoadedNetwork.cpp | 2 - src/armnn/LoadedNetwork.hpp | 6 +- src/armnn/Network.cpp | 2 + src/armnn/Runtime.cpp | 3 +- src/armnn/test/RuntimeTests.cpp | 2 +- src/profiling/LabelsAndEventClasses.cpp | 79 ---------------------- src/profiling/LabelsAndEventClasses.hpp | 69 ------------------- src/profiling/TimelineUtilityMethods.cpp | 4 +- .../test/FileOnlyProfilingDecoratorTests.cpp | 3 +- src/profiling/test/ProfilingGuidTest.cpp | 4 +- src/profiling/test/ProfilingTestUtils.cpp | 3 +- src/profiling/test/ProfilingTestUtils.hpp | 3 +- src/profiling/test/SendTimelinePacketTests.cpp | 2 +- src/profiling/test/TestTimelinePacketHandler.cpp | 3 +- src/profiling/test/TimelineModel.cpp | 3 +- src/profiling/test/TimelineUtilityMethodsTests.cpp | 3 +- 16 files changed, 25 insertions(+), 166 deletions(-) delete mode 100644 src/profiling/LabelsAndEventClasses.cpp delete mode 100644 src/profiling/LabelsAndEventClasses.hpp (limited to 'src') 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 #include -#include - #include #include 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 -#include - #include "Network.hpp" #include "LayerFwd.hpp" #include "Profiling.hpp" +#include #include #include #include @@ -18,6 +16,8 @@ #include #include +#include + #include #include #include 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 +#include + #include #include #include 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 #include -#include #include #include @@ -14,6 +13,8 @@ #include #include +#include + #include #include 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 #include -#include +#include #include #include diff --git a/src/profiling/LabelsAndEventClasses.cpp b/src/profiling/LabelsAndEventClasses.cpp deleted file mode 100644 index fe6d119c2f..0000000000 --- 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 779b432d4a..0000000000 --- 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 - -#include - -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 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 +#include + #include 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 -#include #include #include "ProfilingTestUtils.hpp" #include "PrintPacketHeaderHandler.hpp" @@ -13,6 +12,8 @@ #include +#include + #include #include #include 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 +#include + #include #include #include 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 #include -#include #include #include #include +#include + #include #include 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 #include -#include #include #include +#include + 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 -#include #include #include #include @@ -14,6 +13,7 @@ #include #include +#include #include 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 + +#include #include #include 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 + +#include #include 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 #include -#include #include +#include + #include #include -- cgit v1.2.1