diff options
Diffstat (limited to 'src/profiling/test')
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 4 | ||||
-rw-r--r-- | src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp | 12 | ||||
-rw-r--r-- | src/profiling/test/ProfilingMocks.hpp | 2 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.cpp | 4 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 72 | ||||
-rw-r--r-- | src/profiling/test/RequestCountersPacketHandler.hpp | 6 | ||||
-rw-r--r-- | src/profiling/test/SendTimelinePacketTests.cpp | 6 |
7 files changed, 56 insertions, 50 deletions
diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index a96de66ecd..03767c0a2a 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -6,6 +6,7 @@ #include <armnnUtils/Filesystem.hpp> #include <ProfilingService.hpp> #include "ProfilingTestUtils.hpp" +#include "ProfilingOptionsConverter.hpp" #include "PrintPacketHeaderHandler.hpp" #include <Runtime.hpp> #include "TestTimelinePacketHandler.hpp" @@ -233,7 +234,8 @@ TEST_CASE("DumpOutgoingValidFileEndToEnd") // In order to flush the files we need to gracefully close the profiling service. options.m_ProfilingOptions.m_EnableProfiling = false; - GetProfilingService(&runtime).ResetExternalProfilingOptions(options.m_ProfilingOptions, true); + GetProfilingService(&runtime).ResetExternalProfilingOptions( + ConvertExternalProfilingOptions(options.m_ProfilingOptions), true); // The output file size should be greater than 0. CHECK(fs::file_size(tempPath) > 0); diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index 2da3f2d729..a851e940b4 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -78,7 +78,7 @@ TEST_SUITE("ProfilingConnectionDumpToFileDecoratorTests") { TEST_CASE("DumpIncomingInvalidFile") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = "/"; options.m_OutgoingCaptureFile = ""; ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false); @@ -87,7 +87,7 @@ TEST_CASE("DumpIncomingInvalidFile") TEST_CASE("DumpIncomingInvalidFileIgnoreErrors") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = "/"; options.m_OutgoingCaptureFile = ""; ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, true); @@ -98,7 +98,7 @@ TEST_CASE("DumpIncomingValidFile") { fs::path fileName = armnnUtils::Filesystem::NamedTempFile("Armnn-DumpIncomingValidFileTest-TempFile"); - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = fileName.string(); options.m_OutgoingCaptureFile = ""; @@ -122,7 +122,7 @@ TEST_CASE("DumpIncomingValidFile") TEST_CASE("DumpOutgoingInvalidFile") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = ""; options.m_OutgoingCaptureFile = "/"; ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false); @@ -131,7 +131,7 @@ TEST_CASE("DumpOutgoingInvalidFile") TEST_CASE("DumpOutgoingInvalidFileIgnoreErrors") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = ""; options.m_OutgoingCaptureFile = "/"; @@ -146,7 +146,7 @@ TEST_CASE("DumpOutgoingValidFile") { fs::path fileName = armnnUtils::Filesystem::NamedTempFile("Armnn-DumpOutgoingValidFileTest-TempFile"); - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_IncomingCaptureFile = ""; options.m_OutgoingCaptureFile = fileName.string(); diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index e0acfbdd32..491f057599 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -163,7 +163,7 @@ private: class MockProfilingConnectionFactory : public IProfilingConnectionFactory { public: - IProfilingConnectionPtr GetProfilingConnection(const ExternalProfilingOptions& options) const override + IProfilingConnectionPtr GetProfilingConnection(const ProfilingOptions& options) const override { IgnoreUnused(options); return std::make_unique<MockProfilingConnection>(); diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 51f27d4387..a03a3ba28a 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT // +#include "ProfilingOptionsConverter.hpp" #include "ProfilingTestUtils.hpp" #include "ProfilingUtils.hpp" @@ -369,7 +370,8 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) options.m_ProfilingOptions.m_EnableProfiling = true; options.m_ProfilingOptions.m_TimelineEnabled = true; armnn::RuntimeImpl runtime(options); - GetProfilingService(&runtime).ResetExternalProfilingOptions(options.m_ProfilingOptions, false); + GetProfilingService(&runtime).ResetExternalProfilingOptions( + ConvertExternalProfilingOptions(options.m_ProfilingOptions), false); profiling::ProfilingServiceRuntimeHelper profilingServiceHelper(GetProfilingService(&runtime)); profilingServiceHelper.ForceTransitionToState(ProfilingState::NotConnected); diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 5e9a5e7e8d..12a0105563 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -18,6 +18,7 @@ #include <ICounterValues.hpp> #include <PeriodicCounterCapture.hpp> #include <PeriodicCounterSelectionCommandHandler.hpp> +#include <armnn/profiling/ProfilingOptions.hpp> #include <ProfilingStateMachine.hpp> #include <ProfilingUtils.hpp> #include <RegisterBackendCounters.hpp> @@ -29,7 +30,6 @@ #include <SendTimelinePacket.hpp> #include <armnn/Conversion.hpp> -#include <armnn/Types.hpp> #include <armnn/Utils.hpp> #include <armnn/utility/IgnoreUnused.hpp> @@ -656,7 +656,7 @@ TEST_CASE("CaptureDataMethods") TEST_CASE("CheckProfilingServiceDisabled") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); CHECK(profilingService.GetCurrentState() == ProfilingState::Uninitialised); @@ -666,7 +666,7 @@ TEST_CASE("CheckProfilingServiceDisabled") TEST_CASE("CheckProfilingServiceCounterDirectory") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -689,7 +689,7 @@ TEST_CASE("CheckProfilingServiceCounterDirectory") TEST_CASE("CheckProfilingServiceCounterValues") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -1800,7 +1800,7 @@ TEST_CASE("CounterSelectionCommandHandlerParseData") uint32_t sizeOfUint16 = armnn::numeric_cast<uint32_t>(sizeof(uint16_t)); // Data with period and counters - uint32_t period1 = armnn::LOWEST_CAPTURE_PERIOD; + uint32_t period1 = arm::pipe::LOWEST_CAPTURE_PERIOD; uint32_t dataLength1 = 8; uint32_t offset = 0; @@ -1848,7 +1848,7 @@ TEST_CASE("CounterSelectionCommandHandlerParseData") CHECK(((headerWord0 >> 26) & 0x3F) == 0); // packet family CHECK(((headerWord0 >> 16) & 0x3FF) == 4); // packet id CHECK(headerWord1 == 8); // data length - CHECK(period == armnn::LOWEST_CAPTURE_PERIOD); // capture period + CHECK(period == arm::pipe::LOWEST_CAPTURE_PERIOD); // capture period uint16_t counterId = 0; offset += sizeOfUint32; @@ -1875,7 +1875,7 @@ TEST_CASE("CounterSelectionCommandHandlerParseData") const std::vector<uint16_t> counterIdsB = holder.GetCaptureData().GetCounterIds(); // Value should have been pulled up from 9000 to LOWEST_CAPTURE_PERIOD. - CHECK(holder.GetCaptureData().GetCapturePeriod() == armnn::LOWEST_CAPTURE_PERIOD); + CHECK(holder.GetCaptureData().GetCapturePeriod() == arm::pipe::LOWEST_CAPTURE_PERIOD); CHECK(counterIdsB.size() == 0); readBuffer = mockBuffer.GetReadableBuffer(); @@ -1888,10 +1888,10 @@ TEST_CASE("CounterSelectionCommandHandlerParseData") offset += sizeOfUint32; period = ReadUint32(readBuffer, offset); - CHECK(((headerWord0 >> 26) & 0x3F) == 0); // packet family - CHECK(((headerWord0 >> 16) & 0x3FF) == 4); // packet id - CHECK(headerWord1 == 4); // data length - CHECK(period == armnn::LOWEST_CAPTURE_PERIOD); // capture period + CHECK(((headerWord0 >> 26) & 0x3F) == 0); // packet family + CHECK(((headerWord0 >> 16) & 0x3FF) == 4); // packet id + CHECK(headerWord1 == 4); // data length + CHECK(period == arm::pipe::LOWEST_CAPTURE_PERIOD); // capture period } TEST_CASE("CheckTimelineActivationAndDeactivation") @@ -2549,7 +2549,7 @@ TEST_CASE("CheckProfilingServiceGoodConnectionAcknowledgedPacket") unsigned int streamMetadataPacketsize = GetStreamMetaDataPacketSize(); // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2609,7 +2609,7 @@ TEST_CASE("CheckProfilingServiceGoodConnectionAcknowledgedPacket") TEST_CASE("CheckProfilingServiceGoodRequestCounterDirectoryPacket") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2667,7 +2667,7 @@ TEST_CASE("CheckProfilingServiceGoodRequestCounterDirectoryPacket") TEST_CASE("CheckProfilingServiceBadPeriodicCounterSelectionPacketInvalidCounterUid") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2746,7 +2746,7 @@ TEST_CASE("CheckProfilingServiceBadPeriodicCounterSelectionPacketInvalidCounterU TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketNoCounters") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2811,7 +2811,7 @@ TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketNoCounters") TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketSingleCounter") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2888,7 +2888,7 @@ TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketSingleCounter" TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketMultipleCounters") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -2967,7 +2967,7 @@ TEST_CASE("CheckProfilingServiceGoodPeriodicCounterSelectionPacketMultipleCounte TEST_CASE("CheckProfilingServiceDisconnect") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3025,7 +3025,7 @@ TEST_CASE("CheckProfilingServiceDisconnect") TEST_CASE("CheckProfilingServiceGoodPerJobCounterSelectionPacket") { // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3092,7 +3092,7 @@ TEST_CASE("CheckProfilingServiceGoodPerJobCounterSelectionPacket") TEST_CASE("CheckConfigureProfilingServiceOn") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; CHECK(profilingService.GetCurrentState() == ProfilingState::Uninitialised); @@ -3106,7 +3106,7 @@ TEST_CASE("CheckConfigureProfilingServiceOn") TEST_CASE("CheckConfigureProfilingServiceOff") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; armnn::profiling::ProfilingService profilingService; CHECK(profilingService.GetCurrentState() == ProfilingState::Uninitialised); profilingService.ConfigureProfilingService(options); @@ -3121,7 +3121,7 @@ TEST_CASE("CheckProfilingServiceEnabled") { // Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning); - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3152,7 +3152,7 @@ TEST_CASE("CheckProfilingServiceEnabledRuntime") { // Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning); - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); CHECK(profilingService.GetCurrentState() == ProfilingState::Uninitialised); @@ -3194,7 +3194,7 @@ TEST_CASE("CheckProfilingServiceBadConnectionAcknowledgedPacket") StreamRedirector streamRedirector(std::cout, ss.rdbuf()); // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3256,7 +3256,7 @@ TEST_CASE("CheckProfilingServiceBadRequestCounterDirectoryPacket") StreamRedirector streamRedirector(std::cout, ss.rdbuf()); // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3320,7 +3320,7 @@ TEST_CASE("CheckProfilingServiceBadPeriodicCounterSelectionPacket") StreamRedirector streamRedirector(std::cout, ss.rdbuf()); // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3421,7 +3421,7 @@ TEST_CASE("CheckRegisterBackendCounters") armnn::BackendId cpuRefId(armnn::Compute::CpuRef); // Reset the profiling service to the uninitialized state - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); @@ -3468,12 +3468,12 @@ TEST_CASE("CheckRegisterBackendCounters") TEST_CASE("CheckCounterStatusQuery") { - armnn::IRuntime::CreationOptions options; - options.m_ProfilingOptions.m_EnableProfiling = true; + ProfilingOptions options; + options.m_EnableProfiling = true; // Reset the profiling service to the uninitialized state ProfilingService profilingService; - profilingService.ResetExternalProfilingOptions(options.m_ProfilingOptions, true); + profilingService.ResetExternalProfilingOptions(options, true); const armnn::BackendId cpuRefId(armnn::Compute::CpuRef); const armnn::BackendId cpuAccId(armnn::Compute::CpuAcc); @@ -3599,18 +3599,18 @@ TEST_CASE("CheckCounterStatusQuery") CHECK_EQ(inactiveCpuRefCounter.m_Enabled, false); // Reset the profiling service to stop any running thread - options.m_ProfilingOptions.m_EnableProfiling = false; - profilingService.ResetExternalProfilingOptions(options.m_ProfilingOptions, true); + options.m_EnableProfiling = false; + profilingService.ResetExternalProfilingOptions(options, true); } TEST_CASE("CheckRegisterCounters") { - armnn::IRuntime::CreationOptions options; - options.m_ProfilingOptions.m_EnableProfiling = true; + ProfilingOptions options; + options.m_EnableProfiling = true; MockBufferManager mockBuffer(1024); CaptureData captureData; - MockProfilingService mockProfilingService(mockBuffer, options.m_ProfilingOptions.m_EnableProfiling, captureData); + MockProfilingService mockProfilingService(mockBuffer, options.m_EnableProfiling, captureData); armnn::BackendId cpuRefId(armnn::Compute::CpuRef); mockProfilingService.RegisterMapping(6, 0, cpuRefId); @@ -3667,7 +3667,7 @@ TEST_CASE("CheckFileFormat") { LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning); // Create profiling options. - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; // Check the default value set to binary CHECK(options.m_FileFormat == "binary"); diff --git a/src/profiling/test/RequestCountersPacketHandler.hpp b/src/profiling/test/RequestCountersPacketHandler.hpp index b5e48626a7..82bd313b85 100644 --- a/src/profiling/test/RequestCountersPacketHandler.hpp +++ b/src/profiling/test/RequestCountersPacketHandler.hpp @@ -5,8 +5,8 @@ #pragma once -#include <armnn/Types.hpp> #include <armnn/profiling/ILocalPacketHandler.hpp> +#include <armnn/profiling/ProfilingOptions.hpp> #include "ProfilingUtils.hpp" #include <common/include/Packet.hpp> @@ -20,7 +20,7 @@ namespace profiling class RequestCountersPacketHandler : public ILocalPacketHandler { public: - explicit RequestCountersPacketHandler(uint32_t capturePeriod = LOWEST_CAPTURE_PERIOD) : + explicit RequestCountersPacketHandler(uint32_t capturePeriod = arm::pipe::LOWEST_CAPTURE_PERIOD) : m_CapturePeriod(capturePeriod), m_Connection(nullptr), m_CounterDirectoryMessageHeader(ConstructHeader(0, 2)) {} @@ -45,4 +45,4 @@ private: } // namespace profiling -} // namespace armnn
\ No newline at end of file +} // namespace armnn diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index 02c92af465..a2076b87c5 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -7,6 +7,7 @@ #include <BufferManager.hpp> #include <ProfilingService.hpp> +#include "ProfilingOptionsConverter.hpp" #include <ProfilingUtils.hpp> #include <SendTimelinePacket.hpp> #include <armnnUtils/Threads.hpp> @@ -430,7 +431,8 @@ TEST_CASE("GetGuidsFromProfilingService") armnn::RuntimeImpl runtime(options); armnn::profiling::ProfilingService profilingService(runtime); - profilingService.ResetExternalProfilingOptions(options.m_ProfilingOptions, true); + profilingService.ResetExternalProfilingOptions( + ConvertExternalProfilingOptions(options.m_ProfilingOptions), true); ProfilingStaticGuid staticGuid = profilingService.GetStaticId("dummy"); std::hash<std::string> hasher; uint64_t hash = static_cast<uint64_t>(hasher("dummy")); @@ -446,7 +448,7 @@ TEST_CASE("GetGuidsFromProfilingService") TEST_CASE("GetTimelinePackerWriterFromProfilingService") { - armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; + ProfilingOptions options; options.m_EnableProfiling = true; armnn::profiling::ProfilingService profilingService; profilingService.ResetExternalProfilingOptions(options, true); |