diff options
author | Finn Williams <Finn.Williams@arm.com> | 2020-04-23 17:55:18 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2020-04-27 09:06:24 +0000 |
commit | d7fcafaaaa917db458be362060e1b7855cad8083 (patch) | |
tree | 534e2898f2a7dd39a22bca8a073b085d8a7b7f80 /tests/profiling/gatordmock | |
parent | 8e84398b8eb4b2a2a558803f4c6359f6b255d49f (diff) | |
download | armnn-d7fcafaaaa917db458be362060e1b7855cad8083.tar.gz |
IVGCVSW-4722 Add missing m_TimelineEnabled bool to ConnectionAcknowledgedCommandHandler
* Added timeline bool to ConnectionAcknowledgedCommandHandler
* Added option to enable timeline profiling in ExecuteNetwork
* Added CommandHandler stub to allow gatordMock to ignore packets
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I314f9411e0079cba8f103d3b8a89f2bf38bb21ab
Diffstat (limited to 'tests/profiling/gatordmock')
4 files changed, 56 insertions, 7 deletions
diff --git a/tests/profiling/gatordmock/GatordMockService.hpp b/tests/profiling/gatordmock/GatordMockService.hpp index 9b72f72feb..232d2565e3 100644 --- a/tests/profiling/gatordmock/GatordMockService.hpp +++ b/tests/profiling/gatordmock/GatordMockService.hpp @@ -21,6 +21,7 @@ #include "StreamMetadataCommandHandler.hpp" #include "PacketVersionResolver.hpp" +#include "StubCommandHandler.hpp" namespace armnn { @@ -56,10 +57,12 @@ public: , m_PacketVersionResolver() , m_HandlerRegistry() , m_TimelineDecoder() - , m_StreamMetadataCommandHandler( - 0, 0, m_PacketVersionResolver.ResolvePacketVersion(0, 0).GetEncodedValue(), !echoPackets) , m_CounterCaptureCommandHandler( 0, 4, m_PacketVersionResolver.ResolvePacketVersion(0, 4).GetEncodedValue(), !echoPackets) + , m_StreamMetadataCommandHandler( + 0, 0, m_PacketVersionResolver.ResolvePacketVersion(0, 0).GetEncodedValue(), !echoPackets) + // This stub lets us ignore any counter capture packets we receive without throwing an error + , m_StubCommandHandler(3, 0, m_PacketVersionResolver.ResolvePacketVersion(0, 3).GetEncodedValue()) , m_DirectoryCaptureCommandHandler( 0, 2, m_PacketVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue(), !echoPackets) , m_TimelineCaptureCommandHandler( @@ -70,8 +73,9 @@ public: { m_TimelineDecoder.SetDefaultCallbacks(); - m_HandlerRegistry.RegisterFunctor(&m_StreamMetadataCommandHandler); m_HandlerRegistry.RegisterFunctor(&m_CounterCaptureCommandHandler); + m_HandlerRegistry.RegisterFunctor(&m_StreamMetadataCommandHandler); + m_HandlerRegistry.RegisterFunctor(&m_StubCommandHandler); m_HandlerRegistry.RegisterFunctor(&m_DirectoryCaptureCommandHandler); m_HandlerRegistry.RegisterFunctor(&m_TimelineDirectoryCaptureCommandHandler); m_HandlerRegistry.RegisterFunctor(&m_TimelineCaptureCommandHandler); @@ -207,8 +211,9 @@ private: timelinedecoder::TimelineDecoder m_TimelineDecoder; - gatordmock::StreamMetadataCommandHandler m_StreamMetadataCommandHandler; gatordmock::PeriodicCounterCaptureCommandHandler m_CounterCaptureCommandHandler; + gatordmock::StreamMetadataCommandHandler m_StreamMetadataCommandHandler; + gatordmock::StubCommandHandler m_StubCommandHandler; profiling::DirectoryCaptureCommandHandler m_DirectoryCaptureCommandHandler; diff --git a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp index 6b82280e81..c075857816 100644 --- a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp +++ b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp @@ -2,6 +2,7 @@ // Copyright © 2019 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // +#pragma once #include <CommandHandlerFunctor.hpp> #include <Packet.hpp> @@ -14,8 +15,6 @@ namespace armnn namespace gatordmock { -#pragma once - class PeriodicCounterSelectionResponseHandler : public profiling::CommandHandlerFunctor { diff --git a/tests/profiling/gatordmock/StubCommandHandler.hpp b/tests/profiling/gatordmock/StubCommandHandler.hpp new file mode 100644 index 0000000000..450f90fd2b --- /dev/null +++ b/tests/profiling/gatordmock/StubCommandHandler.hpp @@ -0,0 +1,42 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include <CommandHandlerFunctor.hpp> +#include <armnn/utility/IgnoreUnused.hpp> + +#include <vector> + +namespace armnn +{ + +namespace gatordmock +{ + +class StubCommandHandler : public profiling::CommandHandlerFunctor +{ + +public: + /** + * + * @param packetId The id of packets this handler will process. + * @param version The version of that id. + */ + StubCommandHandler(uint32_t familyId, + uint32_t packetId, + uint32_t version) + : CommandHandlerFunctor(familyId, packetId, version) + {} + + void operator()(const armnn::profiling::Packet& packet) override + { + //No op + IgnoreUnused(packet); + } + +}; + +} // namespace gatordmock +} // namespace armnn diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index 11a96fdd7d..1929c7aeef 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -239,7 +239,9 @@ BOOST_AUTO_TEST_CASE(GatorDMockEndToEnd) // Enable the profiling service. armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; - options.m_EnableProfiling = true; + options.m_EnableProfiling = true; + options.m_TimelineEnabled = true; + armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -396,6 +398,7 @@ BOOST_AUTO_TEST_CASE(GatorDMockTimeLineActivation) armnn::IRuntime::CreationOptions options; options.m_ProfilingOptions.m_EnableProfiling = true; + options.m_ProfilingOptions.m_TimelineEnabled = true; armnn::Runtime runtime(options); armnnUtils::Sockets::Socket clientConnection; |