diff options
author | Jim Flynn <jim.flynn@arm.com> | 2022-03-23 23:01:26 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-23 23:43:35 +0000 |
commit | 3e9bc19ad523361e6b18057849e30c0c48183915 (patch) | |
tree | b7b012a9734ce39d054fc5d92302780fd838e5c8 /src/profiling/test | |
parent | 277618302d0f131eac0b6ac2015dd3eb09aa6ff9 (diff) | |
download | armnn-3e9bc19ad523361e6b18057849e30c0c48183915.tar.gz |
IVGCVSW-6706 Create the libpipeClient library
Change-Id: I2368aade38ad3808fab55d8a86cd659d4e95d91e
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/profiling/test')
-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 |
16 files changed, 63 insertions, 57 deletions
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> |