diff options
-rw-r--r-- | Android.mk | 55 | ||||
-rw-r--r-- | CMakeLists.txt | 100 | ||||
-rw-r--r-- | profiling/client/include/CounterStatus.hpp | 34 | ||||
-rw-r--r-- | profiling/client/include/CounterValue.hpp | 24 | ||||
-rw-r--r-- | profiling/client/include/IProfilingService.hpp | 6 | ||||
-rw-r--r-- | profiling/client/include/ISendCounterPacket.hpp | 2 | ||||
-rw-r--r-- | profiling/client/include/Timestamp.hpp | 24 | ||||
-rw-r--r-- | profiling/client/include/backends/IBackendProfiling.hpp | 40 | ||||
-rw-r--r-- | profiling/client/include/backends/IBackendProfilingContext.hpp | 5 | ||||
-rw-r--r-- | profiling/client/src/ActivateTimelineReportingCommandHandler.cpp (renamed from src/profiling/ActivateTimelineReportingCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ActivateTimelineReportingCommandHandler.hpp (renamed from src/profiling/ActivateTimelineReportingCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/BufferManager.cpp (renamed from src/profiling/BufferManager.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/BufferManager.hpp (renamed from src/profiling/BufferManager.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/CMakeLists.txt | 88 | ||||
-rw-r--r-- | profiling/client/src/CommandHandler.cpp (renamed from src/profiling/CommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/CommandHandler.hpp (renamed from src/profiling/CommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ConnectionAcknowledgedCommandHandler.cpp (renamed from src/profiling/ConnectionAcknowledgedCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ConnectionAcknowledgedCommandHandler.hpp (renamed from src/profiling/ConnectionAcknowledgedCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/CounterIdMap.cpp (renamed from src/profiling/CounterIdMap.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/DeactivateTimelineReportingCommandHandler.cpp (renamed from src/profiling/DeactivateTimelineReportingCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/DeactivateTimelineReportingCommandHandler.hpp (renamed from src/profiling/DeactivateTimelineReportingCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/FileOnlyProfilingConnection.cpp (renamed from src/profiling/FileOnlyProfilingConnection.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/FileOnlyProfilingConnection.hpp (renamed from src/profiling/FileOnlyProfilingConnection.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/Holder.cpp (renamed from src/profiling/Holder.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IBufferManager.hpp (renamed from src/profiling/IBufferManager.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IConsumer.hpp (renamed from src/profiling/IConsumer.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/INotifyBackends.hpp (renamed from src/profiling/INotifyBackends.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IPacketBuffer.hpp (renamed from src/profiling/IPacketBuffer.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IPeriodicCounterCapture.hpp (renamed from src/profiling/IPeriodicCounterCapture.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IProfilingConnection.hpp (renamed from src/profiling/IProfilingConnection.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IProfilingConnectionFactory.hpp (renamed from src/profiling/IProfilingConnectionFactory.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/IProfilingService.cpp (renamed from src/profiling/IProfilingService.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ISendThread.hpp (renamed from src/profiling/ISendThread.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/NullProfilingConnection.hpp (renamed from src/profiling/NullProfilingConnection.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PacketBuffer.cpp (renamed from src/profiling/PacketBuffer.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PacketBuffer.hpp (renamed from src/profiling/PacketBuffer.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PerJobCounterSelectionCommandHandler.cpp (renamed from src/profiling/PerJobCounterSelectionCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PerJobCounterSelectionCommandHandler.hpp (renamed from src/profiling/PerJobCounterSelectionCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PeriodicCounterCapture.cpp (renamed from src/profiling/PeriodicCounterCapture.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PeriodicCounterCapture.hpp (renamed from src/profiling/PeriodicCounterCapture.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PeriodicCounterSelectionCommandHandler.cpp (renamed from src/profiling/PeriodicCounterSelectionCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/PeriodicCounterSelectionCommandHandler.hpp (renamed from src/profiling/PeriodicCounterSelectionCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingConnectionDumpToFileDecorator.cpp (renamed from src/profiling/ProfilingConnectionDumpToFileDecorator.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingConnectionDumpToFileDecorator.hpp (renamed from src/profiling/ProfilingConnectionDumpToFileDecorator.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingConnectionFactory.cpp (renamed from src/profiling/ProfilingConnectionFactory.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingConnectionFactory.hpp (renamed from src/profiling/ProfilingConnectionFactory.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingService.cpp (renamed from src/profiling/ProfilingService.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingService.hpp (renamed from src/profiling/ProfilingService.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingStateMachine.cpp (renamed from src/profiling/ProfilingStateMachine.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingStateMachine.hpp (renamed from src/profiling/ProfilingStateMachine.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingUtils.cpp (renamed from src/profiling/ProfilingUtils.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/ProfilingUtils.hpp (renamed from src/profiling/ProfilingUtils.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/RegisterBackendCounters.cpp (renamed from src/profiling/RegisterBackendCounters.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/RegisterBackendCounters.hpp (renamed from src/profiling/RegisterBackendCounters.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/RequestCounterDirectoryCommandHandler.cpp (renamed from src/profiling/RequestCounterDirectoryCommandHandler.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/RequestCounterDirectoryCommandHandler.hpp (renamed from src/profiling/RequestCounterDirectoryCommandHandler.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendCounterPacket.cpp (renamed from src/profiling/SendCounterPacket.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendCounterPacket.hpp (renamed from src/profiling/SendCounterPacket.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendThread.cpp (renamed from src/profiling/SendThread.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendThread.hpp (renamed from src/profiling/SendThread.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendTimelinePacket.cpp (renamed from src/profiling/SendTimelinePacket.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SendTimelinePacket.hpp (renamed from src/profiling/SendTimelinePacket.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SocketProfilingConnection.cpp (renamed from src/profiling/SocketProfilingConnection.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/SocketProfilingConnection.hpp (renamed from src/profiling/SocketProfilingConnection.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/TimelinePacketWriterFactory.cpp (renamed from src/profiling/TimelinePacketWriterFactory.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/TimelinePacketWriterFactory.hpp (renamed from src/profiling/TimelinePacketWriterFactory.hpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/TimelineUtilityMethods.cpp (renamed from src/profiling/TimelineUtilityMethods.cpp) | 0 | ||||
-rw-r--r-- | profiling/client/src/backends/BackendProfiling.cpp (renamed from src/profiling/backends/BackendProfiling.cpp) | 2 | ||||
-rw-r--r-- | profiling/client/src/backends/BackendProfiling.hpp (renamed from src/profiling/backends/BackendProfiling.hpp) | 3 | ||||
-rw-r--r-- | profiling/client/src/backends/IBackendProfiling.cpp | 24 | ||||
-rw-r--r-- | profiling/common/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp | 7 | ||||
-rw-r--r-- | profiling/server/src/timelineDecoder/tests/TimelineTests.cpp | 8 | ||||
-rw-r--r-- | src/armnn/Runtime.cpp | 10 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/BackendProfilingTests.cpp | 16 | ||||
-rw-r--r-- | src/profiling/test/BufferTests.cpp | 6 | ||||
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 10 | ||||
-rw-r--r-- | src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp | 2 | ||||
-rw-r--r-- | src/profiling/test/ProfilingMocks.hpp | 10 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.cpp | 4 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.hpp | 7 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 31 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.hpp | 4 | ||||
-rw-r--r-- | src/profiling/test/RequestCountersPacketHandler.hpp | 2 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 6 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.hpp | 8 | ||||
-rw-r--r-- | src/profiling/test/SendTimelinePacketTests.cpp | 17 | ||||
-rw-r--r-- | src/profiling/test/TestTimelinePacketHandler.cpp | 3 | ||||
-rw-r--r-- | src/profiling/test/TestTimelinePacketHandler.hpp | 3 | ||||
-rw-r--r-- | src/profiling/test/TimelinePacketTests.cpp | 2 | ||||
-rw-r--r-- | src/profiling/test/TimelineUtilityMethodsTests.cpp | 5 | ||||
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.cpp | 3 | ||||
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.hpp | 3 | ||||
-rw-r--r-- | tests/profiling/gatordmock/tests/GatordMockTests.cpp | 5 |
94 files changed, 350 insertions, 231 deletions
diff --git a/Android.mk b/Android.mk index 2d38182a22..b91fd9c9d3 100644 --- a/Android.mk +++ b/Android.mk @@ -121,6 +121,34 @@ LOCAL_SRC_FILES := \ profiling/common/src/Processes.cpp \ profiling/common/src/SwTrace.cpp \ profiling/common/src/Threads.cpp \ + profiling/client/src/ActivateTimelineReportingCommandHandler.cpp \ + profiling/client/src/BufferManager.cpp \ + profiling/client/src/CommandHandler.cpp \ + profiling/client/src/ConnectionAcknowledgedCommandHandler.cpp \ + profiling/client/src/CounterIdMap.cpp \ + profiling/client/src/DeactivateTimelineReportingCommandHandler.cpp \ + profiling/client/src/FileOnlyProfilingConnection.cpp \ + profiling/client/src/Holder.cpp \ + profiling/client/src/IProfilingService.cpp \ + profiling/client/src/PacketBuffer.cpp \ + profiling/client/src/PeriodicCounterCapture.cpp \ + profiling/client/src/PeriodicCounterSelectionCommandHandler.cpp \ + profiling/client/src/PerJobCounterSelectionCommandHandler.cpp \ + profiling/client/src/ProfilingConnectionDumpToFileDecorator.cpp \ + profiling/client/src/ProfilingConnectionFactory.cpp \ + profiling/client/src/ProfilingService.cpp \ + profiling/client/src/ProfilingStateMachine.cpp \ + profiling/client/src/ProfilingUtils.cpp \ + profiling/client/src/RegisterBackendCounters.cpp \ + profiling/client/src/RequestCounterDirectoryCommandHandler.cpp \ + profiling/client/src/SendCounterPacket.cpp \ + profiling/client/src/SendThread.cpp \ + profiling/client/src/SendTimelinePacket.cpp \ + profiling/client/src/SocketProfilingConnection.cpp \ + profiling/client/src/TimelinePacketWriterFactory.cpp \ + profiling/client/src/TimelineUtilityMethods.cpp \ + profiling/client/src/backends/BackendProfiling.cpp \ + profiling/client/src/backends/IBackendProfiling.cpp \ profiling/server/src/timelineDecoder/DirectoryCaptureCommandHandler.cpp \ profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \ profiling/server/src/timelineDecoder/TimelineDecoder.cpp \ @@ -240,33 +268,6 @@ LOCAL_SRC_FILES := \ src/armnn/layers/TransposeLayer.cpp \ src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp \ src/armnn/layers/UnmapLayer.cpp \ - src/profiling/ActivateTimelineReportingCommandHandler.cpp \ - src/profiling/BufferManager.cpp \ - src/profiling/CommandHandler.cpp \ - src/profiling/ConnectionAcknowledgedCommandHandler.cpp \ - src/profiling/CounterIdMap.cpp \ - src/profiling/DeactivateTimelineReportingCommandHandler.cpp \ - src/profiling/FileOnlyProfilingConnection.cpp \ - src/profiling/Holder.cpp \ - src/profiling/IProfilingService.cpp \ - src/profiling/PacketBuffer.cpp \ - src/profiling/PeriodicCounterCapture.cpp \ - src/profiling/PeriodicCounterSelectionCommandHandler.cpp \ - src/profiling/PerJobCounterSelectionCommandHandler.cpp \ - src/profiling/ProfilingConnectionDumpToFileDecorator.cpp \ - src/profiling/ProfilingConnectionFactory.cpp \ - src/profiling/ProfilingService.cpp \ - src/profiling/ProfilingStateMachine.cpp \ - src/profiling/ProfilingUtils.cpp \ - src/profiling/RegisterBackendCounters.cpp \ - src/profiling/RequestCounterDirectoryCommandHandler.cpp \ - src/profiling/SendCounterPacket.cpp \ - src/profiling/SendThread.cpp \ - src/profiling/SendTimelinePacket.cpp \ - src/profiling/SocketProfilingConnection.cpp \ - src/profiling/TimelinePacketWriterFactory.cpp \ - src/profiling/TimelineUtilityMethods.cpp \ - src/profiling/backends/BackendProfiling.cpp \ src/armnnSerializer/Serializer.cpp \ src/armnnSerializer/SerializerUtils.cpp \ src/armnnDeserializer/Deserializer.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e31c6ba0a..b460b16829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,8 +176,6 @@ list(APPEND armnn_sources include/armnn/TypesUtils.hpp include/armnn/Utils.hpp include/armnn/Version.hpp - profiling/client/include/ISendTimelinePacket.hpp - profiling/client/include/ProfilingOptions.hpp include/armnn/utility/Assert.hpp include/armnn/utility/IgnoreUnused.hpp include/armnn/utility/NumericCast.hpp @@ -414,74 +412,6 @@ list(APPEND armnn_sources src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp src/armnn/optimizations/PermuteAsReshape.hpp src/armnn/optimizations/SquashEqualSiblings.hpp - src/profiling/ActivateTimelineReportingCommandHandler.cpp - src/profiling/ActivateTimelineReportingCommandHandler.hpp - src/profiling/BufferManager.cpp - src/profiling/BufferManager.hpp - src/profiling/CommandHandler.cpp - src/profiling/CommandHandler.hpp - src/profiling/ConnectionAcknowledgedCommandHandler.cpp - src/profiling/ConnectionAcknowledgedCommandHandler.hpp - src/profiling/CounterIdMap.cpp - profiling/client/include/CounterIdMap.hpp - src/profiling/DeactivateTimelineReportingCommandHandler.cpp - src/profiling/DeactivateTimelineReportingCommandHandler.hpp - src/profiling/FileOnlyProfilingConnection.cpp - src/profiling/FileOnlyProfilingConnection.hpp - src/profiling/Holder.cpp - profiling/client/include/Holder.hpp - src/profiling/IBufferManager.hpp - src/profiling/IConsumer.hpp - profiling/client/include/ICounterValues.hpp - profiling/client/include/IInitialiseProfilingService.hpp - src/profiling/INotifyBackends.hpp - profiling/client/include/IReportStructure.hpp - profiling/client/include/ISendCounterPacket.hpp - src/profiling/ISendThread.hpp - src/profiling/IPacketBuffer.hpp - src/profiling/IPeriodicCounterCapture.hpp - src/profiling/IProfilingConnection.hpp - src/profiling/IProfilingService.cpp - profiling/client/include/IProfilingService.hpp - src/profiling/IProfilingConnectionFactory.hpp - src/profiling/NullProfilingConnection.hpp - src/profiling/PacketBuffer.cpp - src/profiling/PacketBuffer.hpp - src/profiling/PeriodicCounterCapture.hpp - src/profiling/PeriodicCounterCapture.cpp - src/profiling/PeriodicCounterSelectionCommandHandler.cpp - src/profiling/PeriodicCounterSelectionCommandHandler.hpp - src/profiling/PerJobCounterSelectionCommandHandler.cpp - src/profiling/PerJobCounterSelectionCommandHandler.hpp - src/profiling/ProfilingConnectionDumpToFileDecorator.cpp - src/profiling/ProfilingConnectionDumpToFileDecorator.hpp - src/profiling/ProfilingConnectionFactory.cpp - src/profiling/ProfilingConnectionFactory.hpp - src/profiling/ProfilingService.cpp - src/profiling/ProfilingService.hpp - profiling/client/include/ProfilingState.hpp - src/profiling/ProfilingStateMachine.cpp - src/profiling/ProfilingStateMachine.hpp - src/profiling/ProfilingUtils.cpp - src/profiling/ProfilingUtils.hpp - src/profiling/RegisterBackendCounters.cpp - src/profiling/RegisterBackendCounters.hpp - src/profiling/RequestCounterDirectoryCommandHandler.cpp - src/profiling/RequestCounterDirectoryCommandHandler.hpp - src/profiling/SendCounterPacket.cpp - src/profiling/SendCounterPacket.hpp - src/profiling/SendThread.cpp - src/profiling/SendThread.hpp - src/profiling/SendTimelinePacket.cpp - src/profiling/SendTimelinePacket.hpp - src/profiling/SocketProfilingConnection.cpp - src/profiling/SocketProfilingConnection.hpp - src/profiling/TimelinePacketWriterFactory.cpp - src/profiling/TimelinePacketWriterFactory.hpp - src/profiling/TimelineUtilityMethods.cpp - profiling/client/include/TimelineUtilityMethods.hpp - src/profiling/backends/BackendProfiling.cpp - src/profiling/backends/BackendProfiling.hpp third-party/cxxopts/cxxopts.hpp third-party/ghc/filesystem.hpp third-party/half/half.hpp @@ -521,24 +451,23 @@ target_include_directories(armnn src/armnnUtils src/backends src/profiling - profiling/client/include profiling/common/include + profiling/client/include ) -target_link_libraries(armnn armnnUtils) -# only link pipeCommon if it has been built -if(BUILD_TIMELINE_DECODER) - target_link_libraries(armnn pipeCommon) -endif() +# Link fmt third-party library +add_subdirectory(third-party/fmt) +target_link_libraries(armnn PUBLIC fmt) + +target_link_libraries(armnn PUBLIC armnnUtils) +target_link_libraries(armnn PUBLIC pipeCommon) +target_link_libraries(armnn PUBLIC pipeClient) -target_link_libraries(armnn ${CMAKE_DL_LIBS}) +target_link_libraries(armnn PUBLIC ${CMAKE_DL_LIBS}) if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows) - target_link_libraries(armnn Ws2_32.lib) + target_link_libraries(armnn PUBLIC Ws2_32.lib) endif() -# Link fmt third-party library -add_subdirectory(third-party/fmt) -target_link_libraries(armnn fmt) if(BUILD_ONNX_PARSER) install(TARGETS armnnOnnxParser @@ -549,11 +478,11 @@ endif() install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) if(ARMCOMPUTENEON OR ARMCOMPUTECL) - target_link_libraries(armnn ${ARMCOMPUTE_LIBRARIES}) + target_link_libraries(armnn PUBLIC ${ARMCOMPUTE_LIBRARIES}) endif() if(PROFILING_BACKEND_STREAMLINE AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))) - target_link_libraries(armnn ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(armnn PUBLIC ${CMAKE_THREAD_LIBS_INIT}) endif() set_target_properties(armnn PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) @@ -931,6 +860,7 @@ endif() if(BUILD_TIMELINE_DECODER) add_subdirectory(profiling/server/src/timelineDecoder) add_subdirectory(profiling/common/src) + add_subdirectory(profiling/client/src) add_subdirectory(src/timelineDecoder) endif() @@ -983,14 +913,14 @@ if(BUILD_GATORD_MOCK) src/profiling src/timelineDecoder) - target_link_libraries(GatordMock + target_link_libraries(GatordMock PUBLIC armnn armnnBasePipeServer timelineDecoder gatordMockService) if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))) - target_link_libraries(GatordMock ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(GatordMock PUBLIC ${CMAKE_THREAD_LIBS_INIT}) endif() endif() diff --git a/profiling/client/include/CounterStatus.hpp b/profiling/client/include/CounterStatus.hpp new file mode 100644 index 0000000000..d497226055 --- /dev/null +++ b/profiling/client/include/CounterStatus.hpp @@ -0,0 +1,34 @@ +// +// Copyright © 2022 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <cstdint> + +namespace arm +{ + +namespace pipe +{ + +struct CounterStatus +{ + CounterStatus(uint16_t backendCounterId, + uint16_t globalCounterId, + bool enabled, + uint32_t samplingRateInMicroseconds) + : m_BackendCounterId(backendCounterId), + m_GlobalCounterId(globalCounterId), + m_Enabled(enabled), + m_SamplingRateInMicroseconds(samplingRateInMicroseconds) {} + uint16_t m_BackendCounterId; + uint16_t m_GlobalCounterId; + bool m_Enabled; + uint32_t m_SamplingRateInMicroseconds; +}; + +} // namespace pipe + +} // namespace arm diff --git a/profiling/client/include/CounterValue.hpp b/profiling/client/include/CounterValue.hpp new file mode 100644 index 0000000000..79de33b9b9 --- /dev/null +++ b/profiling/client/include/CounterValue.hpp @@ -0,0 +1,24 @@ +// +// Copyright © 2022 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +namespace arm +{ + +namespace pipe +{ + +struct CounterValue +{ + CounterValue(uint16_t id, uint32_t value) : + counterId(id), counterValue(value) {} + uint16_t counterId; + uint32_t counterValue; +}; + +} // namespace pipe + +} // namespace arm diff --git a/profiling/client/include/IProfilingService.hpp b/profiling/client/include/IProfilingService.hpp index 21d5c9ce77..778bdb772d 100644 --- a/profiling/client/include/IProfilingService.hpp +++ b/profiling/client/include/IProfilingService.hpp @@ -11,12 +11,11 @@ #include "IInitialiseProfilingService.hpp" #include "IProfilingServiceStatus.hpp" #include "ISendCounterPacket.hpp" +#include "ISendTimelinePacket.hpp" #include "IReportStructure.hpp" #include "ProfilingOptions.hpp" #include "ProfilingState.hpp" -#include <client/include/backends/IBackendProfilingContext.hpp> - #include <common/include/ICounterRegistry.hpp> #include <common/include/Optional.hpp> #include <common/include/ProfilingGuidGenerator.hpp> @@ -28,6 +27,9 @@ namespace arm namespace pipe { +// forward declaration +class IBackendProfilingContext; + class IProfilingService : public IProfilingGuidGenerator, public IProfilingServiceStatus, public IReadWriteCounterValues diff --git a/profiling/client/include/ISendCounterPacket.hpp b/profiling/client/include/ISendCounterPacket.hpp index c76150fc58..80951288a9 100644 --- a/profiling/client/include/ISendCounterPacket.hpp +++ b/profiling/client/include/ISendCounterPacket.hpp @@ -5,7 +5,7 @@ #pragma once -#include <client/include/backends/IBackendProfiling.hpp> +#include "CounterValue.hpp" #include <common/include/ICounterDirectory.hpp> diff --git a/profiling/client/include/Timestamp.hpp b/profiling/client/include/Timestamp.hpp new file mode 100644 index 0000000000..4961551396 --- /dev/null +++ b/profiling/client/include/Timestamp.hpp @@ -0,0 +1,24 @@ +// +// Copyright © 2022 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "CounterValue.hpp" + +namespace arm +{ + +namespace pipe +{ + +struct Timestamp +{ + uint64_t timestamp; + std::vector<CounterValue> counterValues; +}; + +} // namespace pipe + +} // namespace arm diff --git a/profiling/client/include/backends/IBackendProfiling.hpp b/profiling/client/include/backends/IBackendProfiling.hpp index 347d2ddf03..a9d29c504f 100644 --- a/profiling/client/include/backends/IBackendProfiling.hpp +++ b/profiling/client/include/backends/IBackendProfiling.hpp @@ -2,9 +2,16 @@ // Copyright © 2020 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once +#include <client/include/CounterStatus.hpp> +#include <client/include/CounterValue.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/ISendCounterPacket.hpp> #include <client/include/ISendTimelinePacket.hpp> +#include <client/include/ProfilingOptions.hpp> +#include <client/include/Timestamp.hpp> #include <common/include/IProfilingGuidGenerator.hpp> #include <common/include/Optional.hpp> @@ -18,36 +25,6 @@ namespace arm namespace pipe { -struct CounterValue -{ - CounterValue(uint16_t id, uint32_t value) : - counterId(id), counterValue(value) {} - uint16_t counterId; - uint32_t counterValue; -}; - -struct Timestamp -{ - uint64_t timestamp; - std::vector<CounterValue> counterValues; -}; - -struct CounterStatus -{ - CounterStatus(uint16_t backendCounterId, - uint16_t globalCounterId, - bool enabled, - uint32_t samplingRateInMicroseconds) - : m_BackendCounterId(backendCounterId), - m_GlobalCounterId(globalCounterId), - m_Enabled(enabled), - m_SamplingRateInMicroseconds(samplingRateInMicroseconds) {} - uint16_t m_BackendCounterId; - uint16_t m_GlobalCounterId; - bool m_Enabled; - uint32_t m_SamplingRateInMicroseconds; -}; - class IRegisterBackendCounters { public: @@ -81,6 +58,9 @@ public: class IBackendProfiling { public: + static std::unique_ptr<IBackendProfiling> CreateBackendProfiling(const ProfilingOptions& options, + IProfilingService& profilingService, + const std::string& backendId); virtual ~IBackendProfiling() {} diff --git a/profiling/client/include/backends/IBackendProfilingContext.hpp b/profiling/client/include/backends/IBackendProfilingContext.hpp index a1ed05e43d..a2e0a3b9d1 100644 --- a/profiling/client/include/backends/IBackendProfilingContext.hpp +++ b/profiling/client/include/backends/IBackendProfilingContext.hpp @@ -5,6 +5,9 @@ #pragma once #include "IBackendProfiling.hpp" + +#include <common/include/Optional.hpp> + #include <vector> namespace arm @@ -20,7 +23,7 @@ public: virtual uint16_t RegisterCounters(uint16_t currentMaxGlobalCounterID) = 0; virtual arm::pipe::Optional<std::string> ActivateCounters( uint32_t capturePeriod, const std::vector<uint16_t>& counterIds) = 0; - virtual std::vector<Timestamp> ReportCounterValues() = 0; + virtual std::vector<arm::pipe::Timestamp> ReportCounterValues() = 0; virtual bool EnableProfiling(bool flag) = 0; virtual bool EnableTimelineReporting(bool flag) = 0; }; diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.cpp b/profiling/client/src/ActivateTimelineReportingCommandHandler.cpp index 9589dd808b..9589dd808b 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.cpp +++ b/profiling/client/src/ActivateTimelineReportingCommandHandler.cpp diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.hpp b/profiling/client/src/ActivateTimelineReportingCommandHandler.hpp index c9fed73594..c9fed73594 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.hpp +++ b/profiling/client/src/ActivateTimelineReportingCommandHandler.hpp diff --git a/src/profiling/BufferManager.cpp b/profiling/client/src/BufferManager.cpp index 42e32009e4..42e32009e4 100644 --- a/src/profiling/BufferManager.cpp +++ b/profiling/client/src/BufferManager.cpp diff --git a/src/profiling/BufferManager.hpp b/profiling/client/src/BufferManager.hpp index 0ab3e0e534..0ab3e0e534 100644 --- a/src/profiling/BufferManager.hpp +++ b/profiling/client/src/BufferManager.hpp diff --git a/profiling/client/src/CMakeLists.txt b/profiling/client/src/CMakeLists.txt new file mode 100644 index 0000000000..eb6c67a79f --- /dev/null +++ b/profiling/client/src/CMakeLists.txt @@ -0,0 +1,88 @@ +# +# Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +# SPDX-License-Identifier: MIT +# + + set(pipeClient_sources) + list(APPEND pipeClient_sources + ActivateTimelineReportingCommandHandler.cpp + ActivateTimelineReportingCommandHandler.hpp + backends/BackendProfiling.cpp + backends/BackendProfiling.hpp + backends/IBackendProfiling.cpp + BufferManager.cpp + BufferManager.hpp + CommandHandler.cpp + CommandHandler.hpp + ConnectionAcknowledgedCommandHandler.cpp + ConnectionAcknowledgedCommandHandler.hpp + CounterIdMap.cpp + DeactivateTimelineReportingCommandHandler.cpp + DeactivateTimelineReportingCommandHandler.hpp + FileOnlyProfilingConnection.cpp + FileOnlyProfilingConnection.hpp + Holder.cpp + IBufferManager.hpp + IConsumer.hpp + INotifyBackends.hpp + IPacketBuffer.hpp + IPeriodicCounterCapture.hpp + IProfilingConnectionFactory.hpp + IProfilingConnection.hpp + IProfilingService.cpp + ISendThread.hpp + NullProfilingConnection.hpp + PacketBuffer.cpp + PacketBuffer.hpp + PeriodicCounterCapture.cpp + PeriodicCounterCapture.hpp + PeriodicCounterSelectionCommandHandler.cpp + PeriodicCounterSelectionCommandHandler.hpp + PerJobCounterSelectionCommandHandler.cpp + PerJobCounterSelectionCommandHandler.hpp + ProfilingConnectionDumpToFileDecorator.cpp + ProfilingConnectionDumpToFileDecorator.hpp + ProfilingConnectionFactory.cpp + ProfilingConnectionFactory.hpp + ProfilingService.cpp + ProfilingService.hpp + ProfilingStateMachine.cpp + ProfilingStateMachine.hpp + ProfilingUtils.cpp + ProfilingUtils.hpp + RegisterBackendCounters.cpp + RegisterBackendCounters.hpp + RequestCounterDirectoryCommandHandler.cpp + RequestCounterDirectoryCommandHandler.hpp + SendCounterPacket.cpp + SendCounterPacket.hpp + SendThread.cpp + SendThread.hpp + SendTimelinePacket.cpp + SendTimelinePacket.hpp + SocketProfilingConnection.cpp + SocketProfilingConnection.hpp + TimelinePacketWriterFactory.cpp + TimelinePacketWriterFactory.hpp + TimelineUtilityMethods.cpp) + + include_directories(${PROJECT_SOURCE_DIR}/profiling/common/include) + include_directories(${PROJECT_SOURCE_DIR}/common/include) + include_directories(${PROJECT_SOURCE_DIR}/profiling/client/include) + include_directories(${PROJECT_SOURCE_DIR}/client/include) + + # for the moment will only build a static version of this common code + # to simplify the build. No extra .so file to deploy to boards etc. + add_library_ex(pipeClient STATIC ${pipeClient_sources}) + + target_link_libraries(pipeClient pipeCommon) + + target_compile_definitions(pipeClient PRIVATE "ARMNN_COMPILING_DLL") + + # install the target + install( + TARGETS pipeClient + EXPORT armnn-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) diff --git a/src/profiling/CommandHandler.cpp b/profiling/client/src/CommandHandler.cpp index 6ba49c227d..6ba49c227d 100644 --- a/src/profiling/CommandHandler.cpp +++ b/profiling/client/src/CommandHandler.cpp diff --git a/src/profiling/CommandHandler.hpp b/profiling/client/src/CommandHandler.hpp index b097f9ef20..b097f9ef20 100644 --- a/src/profiling/CommandHandler.hpp +++ b/profiling/client/src/CommandHandler.hpp diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp b/profiling/client/src/ConnectionAcknowledgedCommandHandler.cpp index 9f20b9cb80..9f20b9cb80 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp +++ b/profiling/client/src/ConnectionAcknowledgedCommandHandler.cpp diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp b/profiling/client/src/ConnectionAcknowledgedCommandHandler.hpp index e409ee62f2..e409ee62f2 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp +++ b/profiling/client/src/ConnectionAcknowledgedCommandHandler.hpp diff --git a/src/profiling/CounterIdMap.cpp b/profiling/client/src/CounterIdMap.cpp index cb637c3974..cb637c3974 100644 --- a/src/profiling/CounterIdMap.cpp +++ b/profiling/client/src/CounterIdMap.cpp diff --git a/src/profiling/DeactivateTimelineReportingCommandHandler.cpp b/profiling/client/src/DeactivateTimelineReportingCommandHandler.cpp index 6c6a0451db..6c6a0451db 100644 --- a/src/profiling/DeactivateTimelineReportingCommandHandler.cpp +++ b/profiling/client/src/DeactivateTimelineReportingCommandHandler.cpp diff --git a/src/profiling/DeactivateTimelineReportingCommandHandler.hpp b/profiling/client/src/DeactivateTimelineReportingCommandHandler.hpp index 4d0473ff78..4d0473ff78 100644 --- a/src/profiling/DeactivateTimelineReportingCommandHandler.hpp +++ b/profiling/client/src/DeactivateTimelineReportingCommandHandler.hpp diff --git a/src/profiling/FileOnlyProfilingConnection.cpp b/profiling/client/src/FileOnlyProfilingConnection.cpp index bee2c62de0..bee2c62de0 100644 --- a/src/profiling/FileOnlyProfilingConnection.cpp +++ b/profiling/client/src/FileOnlyProfilingConnection.cpp diff --git a/src/profiling/FileOnlyProfilingConnection.hpp b/profiling/client/src/FileOnlyProfilingConnection.hpp index c7e60f564e..c7e60f564e 100644 --- a/src/profiling/FileOnlyProfilingConnection.hpp +++ b/profiling/client/src/FileOnlyProfilingConnection.hpp diff --git a/src/profiling/Holder.cpp b/profiling/client/src/Holder.cpp index d144e244d9..d144e244d9 100644 --- a/src/profiling/Holder.cpp +++ b/profiling/client/src/Holder.cpp diff --git a/src/profiling/IBufferManager.hpp b/profiling/client/src/IBufferManager.hpp index 6aec43f643..6aec43f643 100644 --- a/src/profiling/IBufferManager.hpp +++ b/profiling/client/src/IBufferManager.hpp diff --git a/src/profiling/IConsumer.hpp b/profiling/client/src/IConsumer.hpp index 7a7e5efc64..7a7e5efc64 100644 --- a/src/profiling/IConsumer.hpp +++ b/profiling/client/src/IConsumer.hpp diff --git a/src/profiling/INotifyBackends.hpp b/profiling/client/src/INotifyBackends.hpp index 4fa25b70b3..4fa25b70b3 100644 --- a/src/profiling/INotifyBackends.hpp +++ b/profiling/client/src/INotifyBackends.hpp diff --git a/src/profiling/IPacketBuffer.hpp b/profiling/client/src/IPacketBuffer.hpp index 02c40e4ab1..02c40e4ab1 100644 --- a/src/profiling/IPacketBuffer.hpp +++ b/profiling/client/src/IPacketBuffer.hpp diff --git a/src/profiling/IPeriodicCounterCapture.hpp b/profiling/client/src/IPeriodicCounterCapture.hpp index f96d01496e..f96d01496e 100644 --- a/src/profiling/IPeriodicCounterCapture.hpp +++ b/profiling/client/src/IPeriodicCounterCapture.hpp diff --git a/src/profiling/IProfilingConnection.hpp b/profiling/client/src/IProfilingConnection.hpp index 9a25854b7f..9a25854b7f 100644 --- a/src/profiling/IProfilingConnection.hpp +++ b/profiling/client/src/IProfilingConnection.hpp diff --git a/src/profiling/IProfilingConnectionFactory.hpp b/profiling/client/src/IProfilingConnectionFactory.hpp index 8676077878..8676077878 100644 --- a/src/profiling/IProfilingConnectionFactory.hpp +++ b/profiling/client/src/IProfilingConnectionFactory.hpp diff --git a/src/profiling/IProfilingService.cpp b/profiling/client/src/IProfilingService.cpp index d147871e47..d147871e47 100644 --- a/src/profiling/IProfilingService.cpp +++ b/profiling/client/src/IProfilingService.cpp diff --git a/src/profiling/ISendThread.hpp b/profiling/client/src/ISendThread.hpp index af76a25c56..af76a25c56 100644 --- a/src/profiling/ISendThread.hpp +++ b/profiling/client/src/ISendThread.hpp diff --git a/src/profiling/NullProfilingConnection.hpp b/profiling/client/src/NullProfilingConnection.hpp index a5f8dae90d..a5f8dae90d 100644 --- a/src/profiling/NullProfilingConnection.hpp +++ b/profiling/client/src/NullProfilingConnection.hpp diff --git a/src/profiling/PacketBuffer.cpp b/profiling/client/src/PacketBuffer.cpp index 3b5fd3570b..3b5fd3570b 100644 --- a/src/profiling/PacketBuffer.cpp +++ b/profiling/client/src/PacketBuffer.cpp diff --git a/src/profiling/PacketBuffer.hpp b/profiling/client/src/PacketBuffer.hpp index 3fa5c608fe..3fa5c608fe 100644 --- a/src/profiling/PacketBuffer.hpp +++ b/profiling/client/src/PacketBuffer.hpp diff --git a/src/profiling/PerJobCounterSelectionCommandHandler.cpp b/profiling/client/src/PerJobCounterSelectionCommandHandler.cpp index 2d2d2bd80d..2d2d2bd80d 100644 --- a/src/profiling/PerJobCounterSelectionCommandHandler.cpp +++ b/profiling/client/src/PerJobCounterSelectionCommandHandler.cpp diff --git a/src/profiling/PerJobCounterSelectionCommandHandler.hpp b/profiling/client/src/PerJobCounterSelectionCommandHandler.hpp index 1d088e495f..1d088e495f 100644 --- a/src/profiling/PerJobCounterSelectionCommandHandler.hpp +++ b/profiling/client/src/PerJobCounterSelectionCommandHandler.hpp diff --git a/src/profiling/PeriodicCounterCapture.cpp b/profiling/client/src/PeriodicCounterCapture.cpp index 490173c7e0..490173c7e0 100644 --- a/src/profiling/PeriodicCounterCapture.cpp +++ b/profiling/client/src/PeriodicCounterCapture.cpp diff --git a/src/profiling/PeriodicCounterCapture.hpp b/profiling/client/src/PeriodicCounterCapture.hpp index 88084172ca..88084172ca 100644 --- a/src/profiling/PeriodicCounterCapture.hpp +++ b/profiling/client/src/PeriodicCounterCapture.hpp diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp b/profiling/client/src/PeriodicCounterSelectionCommandHandler.cpp index 06f2c6588b..06f2c6588b 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp +++ b/profiling/client/src/PeriodicCounterSelectionCommandHandler.cpp diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp b/profiling/client/src/PeriodicCounterSelectionCommandHandler.hpp index 6e544c9097..6e544c9097 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp +++ b/profiling/client/src/PeriodicCounterSelectionCommandHandler.hpp diff --git a/src/profiling/ProfilingConnectionDumpToFileDecorator.cpp b/profiling/client/src/ProfilingConnectionDumpToFileDecorator.cpp index 7f13b08ae1..7f13b08ae1 100644 --- a/src/profiling/ProfilingConnectionDumpToFileDecorator.cpp +++ b/profiling/client/src/ProfilingConnectionDumpToFileDecorator.cpp diff --git a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp b/profiling/client/src/ProfilingConnectionDumpToFileDecorator.hpp index 8f4812e9dd..8f4812e9dd 100644 --- a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp +++ b/profiling/client/src/ProfilingConnectionDumpToFileDecorator.hpp diff --git a/src/profiling/ProfilingConnectionFactory.cpp b/profiling/client/src/ProfilingConnectionFactory.cpp index 0b34a02ae2..0b34a02ae2 100644 --- a/src/profiling/ProfilingConnectionFactory.cpp +++ b/profiling/client/src/ProfilingConnectionFactory.cpp diff --git a/src/profiling/ProfilingConnectionFactory.hpp b/profiling/client/src/ProfilingConnectionFactory.hpp index 441a31a0b8..441a31a0b8 100644 --- a/src/profiling/ProfilingConnectionFactory.hpp +++ b/profiling/client/src/ProfilingConnectionFactory.hpp diff --git a/src/profiling/ProfilingService.cpp b/profiling/client/src/ProfilingService.cpp index 7acddf1129..7acddf1129 100644 --- a/src/profiling/ProfilingService.cpp +++ b/profiling/client/src/ProfilingService.cpp diff --git a/src/profiling/ProfilingService.hpp b/profiling/client/src/ProfilingService.hpp index b84b39d0df..b84b39d0df 100644 --- a/src/profiling/ProfilingService.hpp +++ b/profiling/client/src/ProfilingService.hpp diff --git a/src/profiling/ProfilingStateMachine.cpp b/profiling/client/src/ProfilingStateMachine.cpp index e002c052b9..e002c052b9 100644 --- a/src/profiling/ProfilingStateMachine.cpp +++ b/profiling/client/src/ProfilingStateMachine.cpp diff --git a/src/profiling/ProfilingStateMachine.hpp b/profiling/client/src/ProfilingStateMachine.hpp index b507f1a50b..b507f1a50b 100644 --- a/src/profiling/ProfilingStateMachine.hpp +++ b/profiling/client/src/ProfilingStateMachine.hpp diff --git a/src/profiling/ProfilingUtils.cpp b/profiling/client/src/ProfilingUtils.cpp index 2963a98621..2963a98621 100644 --- a/src/profiling/ProfilingUtils.cpp +++ b/profiling/client/src/ProfilingUtils.cpp diff --git a/src/profiling/ProfilingUtils.hpp b/profiling/client/src/ProfilingUtils.hpp index cd5167c094..cd5167c094 100644 --- a/src/profiling/ProfilingUtils.hpp +++ b/profiling/client/src/ProfilingUtils.hpp diff --git a/src/profiling/RegisterBackendCounters.cpp b/profiling/client/src/RegisterBackendCounters.cpp index 79ffa20981..79ffa20981 100644 --- a/src/profiling/RegisterBackendCounters.cpp +++ b/profiling/client/src/RegisterBackendCounters.cpp diff --git a/src/profiling/RegisterBackendCounters.hpp b/profiling/client/src/RegisterBackendCounters.hpp index f48f1ca8f0..f48f1ca8f0 100644 --- a/src/profiling/RegisterBackendCounters.hpp +++ b/profiling/client/src/RegisterBackendCounters.hpp diff --git a/src/profiling/RequestCounterDirectoryCommandHandler.cpp b/profiling/client/src/RequestCounterDirectoryCommandHandler.cpp index cf07c45030..cf07c45030 100644 --- a/src/profiling/RequestCounterDirectoryCommandHandler.cpp +++ b/profiling/client/src/RequestCounterDirectoryCommandHandler.cpp diff --git a/src/profiling/RequestCounterDirectoryCommandHandler.hpp b/profiling/client/src/RequestCounterDirectoryCommandHandler.hpp index 2582fb2e0a..2582fb2e0a 100644 --- a/src/profiling/RequestCounterDirectoryCommandHandler.hpp +++ b/profiling/client/src/RequestCounterDirectoryCommandHandler.hpp diff --git a/src/profiling/SendCounterPacket.cpp b/profiling/client/src/SendCounterPacket.cpp index 96adb953be..96adb953be 100644 --- a/src/profiling/SendCounterPacket.cpp +++ b/profiling/client/src/SendCounterPacket.cpp diff --git a/src/profiling/SendCounterPacket.hpp b/profiling/client/src/SendCounterPacket.hpp index ace7ed1485..ace7ed1485 100644 --- a/src/profiling/SendCounterPacket.hpp +++ b/profiling/client/src/SendCounterPacket.hpp diff --git a/src/profiling/SendThread.cpp b/profiling/client/src/SendThread.cpp index 7fb8e659f5..7fb8e659f5 100644 --- a/src/profiling/SendThread.cpp +++ b/profiling/client/src/SendThread.cpp diff --git a/src/profiling/SendThread.hpp b/profiling/client/src/SendThread.hpp index b96a6d54f3..b96a6d54f3 100644 --- a/src/profiling/SendThread.hpp +++ b/profiling/client/src/SendThread.hpp diff --git a/src/profiling/SendTimelinePacket.cpp b/profiling/client/src/SendTimelinePacket.cpp index 62d1530490..62d1530490 100644 --- a/src/profiling/SendTimelinePacket.cpp +++ b/profiling/client/src/SendTimelinePacket.cpp diff --git a/src/profiling/SendTimelinePacket.hpp b/profiling/client/src/SendTimelinePacket.hpp index f20671fe35..f20671fe35 100644 --- a/src/profiling/SendTimelinePacket.hpp +++ b/profiling/client/src/SendTimelinePacket.hpp diff --git a/src/profiling/SocketProfilingConnection.cpp b/profiling/client/src/SocketProfilingConnection.cpp index a211567f7f..a211567f7f 100644 --- a/src/profiling/SocketProfilingConnection.cpp +++ b/profiling/client/src/SocketProfilingConnection.cpp diff --git a/src/profiling/SocketProfilingConnection.hpp b/profiling/client/src/SocketProfilingConnection.hpp index 52616c9a27..52616c9a27 100644 --- a/src/profiling/SocketProfilingConnection.hpp +++ b/profiling/client/src/SocketProfilingConnection.hpp diff --git a/src/profiling/TimelinePacketWriterFactory.cpp b/profiling/client/src/TimelinePacketWriterFactory.cpp index 78eda79ef0..78eda79ef0 100644 --- a/src/profiling/TimelinePacketWriterFactory.cpp +++ b/profiling/client/src/TimelinePacketWriterFactory.cpp diff --git a/src/profiling/TimelinePacketWriterFactory.hpp b/profiling/client/src/TimelinePacketWriterFactory.hpp index 607770f723..607770f723 100644 --- a/src/profiling/TimelinePacketWriterFactory.hpp +++ b/profiling/client/src/TimelinePacketWriterFactory.hpp diff --git a/src/profiling/TimelineUtilityMethods.cpp b/profiling/client/src/TimelineUtilityMethods.cpp index 27c13caef2..27c13caef2 100644 --- a/src/profiling/TimelineUtilityMethods.cpp +++ b/profiling/client/src/TimelineUtilityMethods.cpp diff --git a/src/profiling/backends/BackendProfiling.cpp b/profiling/client/src/backends/BackendProfiling.cpp index e29316ee3b..c33d5a738a 100644 --- a/src/profiling/backends/BackendProfiling.cpp +++ b/profiling/client/src/backends/BackendProfiling.cpp @@ -4,7 +4,7 @@ // #include "BackendProfiling.hpp" -#include "RegisterBackendCounters.hpp" +#include <client/src/RegisterBackendCounters.hpp> namespace arm { diff --git a/src/profiling/backends/BackendProfiling.hpp b/profiling/client/src/backends/BackendProfiling.hpp index 8ca88d2012..4db02f9573 100644 --- a/src/profiling/backends/BackendProfiling.hpp +++ b/profiling/client/src/backends/BackendProfiling.hpp @@ -5,9 +5,8 @@ #pragma once -#include "ProfilingService.hpp" - #include <client/include/backends/IBackendProfiling.hpp> +#include <client/include/IProfilingService.hpp> namespace arm { diff --git a/profiling/client/src/backends/IBackendProfiling.cpp b/profiling/client/src/backends/IBackendProfiling.cpp new file mode 100644 index 0000000000..f172be9f51 --- /dev/null +++ b/profiling/client/src/backends/IBackendProfiling.cpp @@ -0,0 +1,24 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "BackendProfiling.hpp" + +#include <client/include/backends/IBackendProfiling.hpp> + +namespace arm +{ + +namespace pipe +{ + +std::unique_ptr<IBackendProfiling> IBackendProfiling::CreateBackendProfiling(const ProfilingOptions& options, + IProfilingService& profilingService, + const std::string& backendId) +{ + return std::make_unique<BackendProfiling>(options, profilingService, backendId); +} + +} // namespace pipe +} // namespace arm diff --git a/profiling/common/src/CMakeLists.txt b/profiling/common/src/CMakeLists.txt index 264902c0dc..94aec874f8 100644 --- a/profiling/common/src/CMakeLists.txt +++ b/profiling/common/src/CMakeLists.txt @@ -3,7 +3,6 @@ # SPDX-License-Identifier: MIT # -if(BUILD_TIMELINE_DECODER) set(pipeCommon_sources) list(APPEND pipeCommon_sources CommandHandlerFunctor.cpp @@ -41,4 +40,3 @@ if(BUILD_TIMELINE_DECODER) LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -endif() diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp index ebf408ef7f..8374102033 100644 --- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp +++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp @@ -5,9 +5,10 @@ #include <server/include/basePipeServer/ConnectionHandler.hpp> -#include <BufferManager.hpp> -#include <SendCounterPacket.hpp> -#include <SocketProfilingConnection.hpp> +#include <client/src/BufferManager.hpp> +#include <client/src/SendCounterPacket.hpp> +#include <client/src/SocketProfilingConnection.hpp> + #include <common/include/Processes.hpp> #include <doctest/doctest.h> diff --git a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp index e865c79edc..2852e5cd4a 100644 --- a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp +++ b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp @@ -10,10 +10,10 @@ #include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> #include <server/include/timelineDecoder/TimelineDecoder.hpp> -#include <BufferManager.hpp> -#include <ProfilingService.hpp> -#include <PacketBuffer.hpp> -#include <TimelinePacketWriterFactory.hpp> +#include <client/src/BufferManager.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/PacketBuffer.hpp> +#include <client/src/TimelinePacketWriterFactory.hpp> #include <doctest/doctest.h> diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp index e7d8e482ab..657c90735c 100644 --- a/src/armnn/Runtime.cpp +++ b/src/armnn/Runtime.cpp @@ -20,11 +20,11 @@ #include <armnn/utility/PolymorphicDowncast.hpp> #include <armnn/utility/Timer.hpp> -#include <backends/BackendProfiling.hpp> - #include <backendsCommon/DynamicBackendUtils.hpp> #include <backendsCommon/memoryOptimizerStrategyLibrary/MemoryOptimizerStrategyLibrary.hpp> +#include <client/include/backends/IBackendProfiling.hpp> + #include <common/include/LabelsAndEventClasses.hpp> #include <iostream> @@ -498,10 +498,10 @@ RuntimeImpl::RuntimeImpl(const IRuntime::CreationOptions& options) supportedBackends.emplace(id); unique_ptr<arm::pipe::IBackendProfiling> profilingIface = - std::make_unique<arm::pipe::BackendProfiling>(arm::pipe::BackendProfiling( + arm::pipe::IBackendProfiling::CreateBackendProfiling( arm::pipe::ConvertExternalProfilingOptions(options.m_ProfilingOptions), - *m_ProfilingService.get(), - id)); + *m_ProfilingService.get(), + id.Get()); // Backends may also provide a profiling context. Ask for it now. auto profilingContext = backend->CreateBackendProfilingContext(options, profilingIface); diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 5227691664..916a5864ad 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -5,12 +5,7 @@ #include "ArmNNProfilingServiceInitialiser.hpp" #include "MockBackendId.hpp" -#include "PeriodicCounterCapture.hpp" -#include "PeriodicCounterSelectionCommandHandler.hpp" #include "ProfilingOptionsConverter.hpp" -#include "ProfilingStateMachine.hpp" -#include "ProfilingUtils.hpp" -#include "RequestCounterDirectoryCommandHandler.hpp" #include <TestUtils.hpp> @@ -23,14 +18,21 @@ #include <armnnTestUtils/MockBackend.hpp> -#include <backends/BackendProfiling.hpp> - #include <client/include/CounterIdMap.hpp> #include <client/include/Holder.hpp> #include <client/include/ISendTimelinePacket.hpp> #include <client/include/ProfilingOptions.hpp> +#include <client/src/PeriodicCounterCapture.hpp> +#include <client/src/PeriodicCounterSelectionCommandHandler.hpp> +#include <client/src/ProfilingStateMachine.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/RequestCounterDirectoryCommandHandler.hpp> + +#include <client/src/backends/BackendProfiling.hpp> + #include <common/include/CounterDirectory.hpp> +#include <common/include/PacketVersionResolver.hpp> #include <doctest/doctest.h> diff --git a/src/profiling/test/BufferTests.cpp b/src/profiling/test/BufferTests.cpp index 943cfd5f31..bfbd7edfd8 100644 --- a/src/profiling/test/BufferTests.cpp +++ b/src/profiling/test/BufferTests.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: MIT // -#include "BufferManager.hpp" -#include "PacketBuffer.hpp" -#include "ProfilingUtils.hpp" +#include <client/src/BufferManager.hpp> +#include <client/src/PacketBuffer.hpp> +#include <client/src/ProfilingUtils.hpp> #include <common/include/SwTrace.hpp> diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index 5c5ee8a0e4..7d49a7d92a 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -3,14 +3,16 @@ // SPDX-License-Identifier: MIT // -#include <armnnUtils/Filesystem.hpp> -#include <ProfilingService.hpp> -#include "ProfilingTestUtils.hpp" -#include "ProfilingOptionsConverter.hpp" #include "PrintPacketHeaderHandler.hpp" +#include "ProfilingOptionsConverter.hpp" +#include "ProfilingTestUtils.hpp" #include <Runtime.hpp> #include "TestTimelinePacketHandler.hpp" +#include <armnnUtils/Filesystem.hpp> + +#include <client/src/ProfilingService.hpp> + #include <doctest/doctest.h> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index 5d99feef95..147763f99c 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "../ProfilingConnectionDumpToFileDecorator.hpp" +#include <client/src/ProfilingConnectionDumpToFileDecorator.hpp> #include <Runtime.hpp> diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 6576a98521..fb829e5b31 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -5,11 +5,11 @@ #pragma once -#include <IProfilingConnectionFactory.hpp> -#include <ProfilingService.hpp> -#include <ProfilingUtils.hpp> -#include <SendCounterPacket.hpp> -#include <SendThread.hpp> +#include <client/src/IProfilingConnectionFactory.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/SendCounterPacket.hpp> +#include <client/src/SendThread.hpp> #include <armnn/BackendId.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 51aa07e163..0159f61140 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -6,12 +6,12 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include "ProfilingOptionsConverter.hpp" #include "ProfilingTestUtils.hpp" -#include "ProfilingUtils.hpp" #include <armnn/Descriptors.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <ProfilingService.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/ProfilingUtils.hpp> #include <common/include/Assert.hpp> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/profiling/test/ProfilingTestUtils.hpp b/src/profiling/test/ProfilingTestUtils.hpp index 4ff4221cab..bf2c08b45f 100644 --- a/src/profiling/test/ProfilingTestUtils.hpp +++ b/src/profiling/test/ProfilingTestUtils.hpp @@ -5,11 +5,12 @@ #pragma once -#include "ProfilingUtils.hpp" #include "Runtime.hpp" -#include <BufferManager.hpp> -#include <ProfilingService.hpp> +#include <client/src/BufferManager.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/ProfilingUtils.hpp> + #include <armnn/profiling/ArmNNProfiling.hpp> diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 6e1a5276ca..29d3d7d393 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -5,28 +5,27 @@ #include "ProfilingTests.hpp" #include "ProfilingTestUtils.hpp" - -#include <ArmNNProfilingServiceInitialiser.hpp> -#include <CommandHandler.hpp> -#include <ConnectionAcknowledgedCommandHandler.hpp> -#include <PeriodicCounterCapture.hpp> -#include <PeriodicCounterSelectionCommandHandler.hpp> -#include <ProfilingStateMachine.hpp> -#include <ProfilingUtils.hpp> -#include <RegisterBackendCounters.hpp> -#include <RequestCounterDirectoryCommandHandler.hpp> #include <Runtime.hpp> -#include <SocketProfilingConnection.hpp> -#include <SendCounterPacket.hpp> -#include <SendThread.hpp> -#include <SendTimelinePacket.hpp> +#include <ArmNNProfilingServiceInitialiser.hpp> + +#include <client/src/CommandHandler.hpp> +#include <client/src/ConnectionAcknowledgedCommandHandler.hpp> +#include <client/src/PeriodicCounterCapture.hpp> +#include <client/src/PeriodicCounterSelectionCommandHandler.hpp> +#include <client/src/ProfilingStateMachine.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/RegisterBackendCounters.hpp> +#include <client/src/RequestCounterDirectoryCommandHandler.hpp> +#include <client/src/SocketProfilingConnection.hpp> +#include <client/src/SendCounterPacket.hpp> +#include <client/src/SendThread.hpp> +#include <client/src/SendTimelinePacket.hpp> +#include <client/src/backends/BackendProfiling.hpp> #include <armnn/Utils.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <backends/BackendProfiling.hpp> - #include <client/include/CounterIdMap.hpp> #include <client/include/Holder.hpp> #include <client/include/ICounterValues.hpp> diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp index e9fe57d62e..eb1b15791c 100644 --- a/src/profiling/test/ProfilingTests.hpp +++ b/src/profiling/test/ProfilingTests.hpp @@ -9,8 +9,8 @@ #include <armnn/utility/PolymorphicDowncast.hpp> -#include <IProfilingConnection.hpp> -#include <ProfilingService.hpp> +#include <client/src/IProfilingConnection.hpp> +#include <client/src/ProfilingService.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> diff --git a/src/profiling/test/RequestCountersPacketHandler.hpp b/src/profiling/test/RequestCountersPacketHandler.hpp index 08aeb26053..4ab1c59c26 100644 --- a/src/profiling/test/RequestCountersPacketHandler.hpp +++ b/src/profiling/test/RequestCountersPacketHandler.hpp @@ -5,7 +5,7 @@ #pragma once -#include "ProfilingUtils.hpp" +#include <client/src/ProfilingUtils.hpp> #include <client/include/ILocalPacketHandler.hpp> #include <client/include/ProfilingOptions.hpp> diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index 4ba5eed6ac..f8ab0032fb 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -7,9 +7,9 @@ #include "ProfilingTestUtils.hpp" #include "SendCounterPacketTests.hpp" -#include <BufferManager.hpp> -#include <ProfilingUtils.hpp> -#include <SendCounterPacket.hpp> +#include <client/src/BufferManager.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/SendCounterPacket.hpp> #include <armnn/Utils.hpp> diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp index f9448aca53..1985bc802c 100644 --- a/src/profiling/test/SendCounterPacketTests.hpp +++ b/src/profiling/test/SendCounterPacketTests.hpp @@ -5,10 +5,10 @@ #pragma once -#include <SendCounterPacket.hpp> -#include <SendThread.hpp> -#include <ProfilingUtils.hpp> -#include <IProfilingConnectionFactory.hpp> +#include <client/src/SendCounterPacket.hpp> +#include <client/src/SendThread.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/IProfilingConnectionFactory.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index ad71f8fd22..ed2c862b54 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -5,15 +5,17 @@ #include "ProfilingMocks.hpp" #include "ProfilingTestUtils.hpp" - -#include <ArmNNProfilingServiceInitialiser.hpp> -#include <BufferManager.hpp> -#include <ProfilingService.hpp> #include "ProfilingOptionsConverter.hpp" -#include <ProfilingUtils.hpp> -#include <SendTimelinePacket.hpp> +#include <Runtime.hpp> +#include <ArmNNProfilingServiceInitialiser.hpp> + #include <armnn/profiling/ArmNNProfiling.hpp> -#include <TimelinePacketWriterFactory.hpp> + +#include <client/src/BufferManager.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/ProfilingUtils.hpp> +#include <client/src/SendTimelinePacket.hpp> +#include <client/src/TimelinePacketWriterFactory.hpp> #include <common/include/LabelsAndEventClasses.hpp> #include <common/include/SwTrace.hpp> @@ -22,7 +24,6 @@ #include <doctest/doctest.h> #include <functional> -#include <Runtime.hpp> using namespace arm::pipe; diff --git a/src/profiling/test/TestTimelinePacketHandler.cpp b/src/profiling/test/TestTimelinePacketHandler.cpp index 46f0549bba..7e94af9e7c 100644 --- a/src/profiling/test/TestTimelinePacketHandler.cpp +++ b/src/profiling/test/TestTimelinePacketHandler.cpp @@ -4,7 +4,8 @@ // #include "TestTimelinePacketHandler.hpp" -#include "IProfilingConnection.hpp" + +#include <client/src/IProfilingConnection.hpp> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/profiling/test/TestTimelinePacketHandler.hpp b/src/profiling/test/TestTimelinePacketHandler.hpp index 76d42f096f..fbed2287b1 100644 --- a/src/profiling/test/TestTimelinePacketHandler.hpp +++ b/src/profiling/test/TestTimelinePacketHandler.hpp @@ -5,11 +5,12 @@ #pragma once -#include "ProfilingUtils.hpp" #include "TimelineModel.hpp" #include <client/include/ILocalPacketHandler.hpp> +#include <client/src/ProfilingUtils.hpp> + #include <common/include/Packet.hpp> #include <server/include/timelineDecoder/ITimelineDecoder.hpp> diff --git a/src/profiling/test/TimelinePacketTests.cpp b/src/profiling/test/TimelinePacketTests.cpp index a64b3731ce..5deef8a65d 100644 --- a/src/profiling/test/TimelinePacketTests.cpp +++ b/src/profiling/test/TimelinePacketTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <ProfilingUtils.hpp> +#include <client/src/ProfilingUtils.hpp> #include <common/include/NumericCast.hpp> #include <common/include/SwTrace.hpp> diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp index c4aa0575d6..276210bc71 100644 --- a/src/profiling/test/TimelineUtilityMethodsTests.cpp +++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp @@ -7,13 +7,14 @@ #include "ProfilingTestUtils.hpp" #include <ArmNNProfilingServiceInitialiser.hpp> -#include <SendTimelinePacket.hpp> -#include <ProfilingService.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> #include <client/include/TimelineUtilityMethods.hpp> +#include <client/src/SendTimelinePacket.hpp> +#include <client/src/ProfilingService.hpp> + #include <common/include/LabelsAndEventClasses.hpp> #include <memory> diff --git a/src/timelineDecoder/JSONTimelineDecoder.cpp b/src/timelineDecoder/JSONTimelineDecoder.cpp index baf541b066..2f999791ad 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.cpp +++ b/src/timelineDecoder/JSONTimelineDecoder.cpp @@ -4,7 +4,8 @@ // #include "JSONTimelineDecoder.hpp" -#include "../profiling/ProfilingUtils.hpp" + +#include <client/src/ProfilingUtils.hpp> #include <string> diff --git a/src/timelineDecoder/JSONTimelineDecoder.hpp b/src/timelineDecoder/JSONTimelineDecoder.hpp index f3f78e85ba..f2b78d128f 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.hpp +++ b/src/timelineDecoder/JSONTimelineDecoder.hpp @@ -8,6 +8,7 @@ #include <server/include/timelineDecoder/ITimelineDecoder.hpp> #include <armnnUtils/Filesystem.hpp> + #include <map> #include <vector> @@ -78,4 +79,4 @@ private: }; } -}
\ No newline at end of file +} diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index 41f4d743a1..abe69a4f26 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -5,11 +5,12 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include <GatordMockService.hpp> -#include <ProfilingService.hpp> -#include <TimelinePacketWriterFactory.hpp> #include <Runtime.hpp> #include <armnnTestUtils/MockBackend.hpp> +#include <client/src/ProfilingService.hpp> +#include <client/src/TimelinePacketWriterFactory.hpp> + #include <armnn/profiling/ArmNNProfiling.hpp> #include <common/include/LabelsAndEventClasses.hpp> |