From f7713212f080771e0c6d53d939da59a9ea2e7da0 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Tue, 14 Jul 2020 09:50:59 +0100 Subject: IVGCVSW-5101 Add a SOL/EOL and a process ID label to Network Change-Id: I6261f46404a3aab5c069bca40586994d31d26fe8 Signed-off-by: Jim Flynn --- src/profiling/test/ProfilingTestUtils.cpp | 45 +++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 5 deletions(-) (limited to 'src/profiling/test/ProfilingTestUtils.cpp') diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 2dae5cf52e..8050eaa508 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -8,8 +8,9 @@ #include #include -#include +#include #include +#include #include @@ -438,11 +439,9 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) profiling::BufferManager& bufferManager = profilingServiceHelper.GetProfilingBufferManager(); auto readableBuffer = bufferManager.GetReadableBuffer(); - // Profiling is enable, the post-optimisation structure should be created + // Profiling is enabled, the post-optimisation structure should be created BOOST_CHECK(readableBuffer != nullptr); - unsigned int size = readableBuffer->GetSize(); - BOOST_CHECK(size == 1124); const unsigned char* readableData = readableBuffer->GetReadableData(); BOOST_CHECK(readableData != nullptr); @@ -450,7 +449,7 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) unsigned int offset = 0; // Verify Header - VerifyTimelineHeaderBinary(readableData, offset, 1116); + VerifyTimelineHeaderBinary(readableData, offset, size - 8); BOOST_TEST_MESSAGE("HEADER OK"); // Post-optimisation network @@ -468,6 +467,42 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) offset); BOOST_TEST_MESSAGE("NETWORK TYPE RELATIONSHIP OK"); + // Network - START OF LIFE + ProfilingGuid networkSolEventGuid = VerifyTimelineEventBinaryPacket(EmptyOptional(), + EmptyOptional(), + EmptyOptional(), + readableData, + offset); + BOOST_TEST_MESSAGE("NETWORK START OF LIFE EVENT OK"); + + // Network - START OF LIFE event relationship + VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, + EmptyOptional(), + optNetGuid, + networkSolEventGuid, + LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS, + readableData, + offset); + BOOST_TEST_MESSAGE("NETWORK START OF LIFE RELATIONSHIP OK"); + + // Process ID Label + int processID = armnnUtils::Processes::GetCurrentId(); + std::stringstream ss; + ss << processID; + std::string processIdLabel = ss.str(); + VerifyTimelineLabelBinaryPacketData(EmptyOptional(), processIdLabel, readableData, offset); + BOOST_TEST_MESSAGE("PROCESS ID LABEL OK"); + + // Entity - Process ID relationship + VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, + EmptyOptional(), + optNetGuid, + EmptyOptional(), + LabelsAndEventClasses::PROCESS_ID_GUID, + readableData, + offset); + BOOST_TEST_MESSAGE("NETWORK PROCESS ID RELATIONSHIP OK"); + // Input layer // Input layer entity VerifyTimelineEntityBinaryPacketData(input->GetGuid(), readableData, offset); -- cgit v1.2.1