From 0a336dce464a822bbd9563b5dc021a37c6671515 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Mon, 11 May 2020 15:39:58 +0100 Subject: IVGCVSW-4734 Add an Attribute label guid to the relationship message to reduce traffic Signed-off-by: Finn Williams Change-Id: Ia55c52c12fe3d30eb47bc42c932a33c620dc9197 --- src/armnn/test/RuntimeTests.cpp | 221 +++++----------------------------------- 1 file changed, 24 insertions(+), 197 deletions(-) (limited to 'src/armnn/test') diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index c4a96263dd..ba921d326c 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -414,7 +414,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) BOOST_CHECK(readableBuffer != nullptr); unsigned int size = readableBuffer->GetSize(); - BOOST_CHECK(size == 1068); + BOOST_CHECK(size == 852); const unsigned char* readableData = readableBuffer->GetReadableData(); BOOST_CHECK(readableData != nullptr); @@ -422,7 +422,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) unsigned int offset = 0; // Verify Header - VerifyTimelineHeaderBinary(readableData, offset, 1060); + VerifyTimelineHeaderBinary(readableData, offset, 844); // Post-optimisation network // Network entity @@ -434,13 +434,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), optNetGuid, LabelsAndEventClasses::NETWORK_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -457,13 +450,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), input->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Name label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::NAME_GUID, readableData, offset); @@ -473,13 +459,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), input->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -489,6 +468,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), optNetGuid, input->GetGuid(), + EmptyOptional(), readableData, offset); @@ -504,13 +484,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), normalize->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Name label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::NAME_GUID, readableData, offset); @@ -520,13 +493,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), normalize->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -536,6 +502,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), optNetGuid, normalize->GetGuid(), + EmptyOptional(), readableData, offset); @@ -544,6 +511,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), input->GetGuid(), normalize->GetGuid(), + EmptyOptional(), readableData, offset); @@ -552,13 +520,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::CONNECTION_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -570,13 +531,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - Type relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, @@ -589,13 +543,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - BackendId relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // BackendId label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::BACKENDID_GUID, @@ -607,6 +554,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), normalize->GetGuid(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -622,13 +570,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), output->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Name label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::NAME_GUID, readableData, offset); @@ -638,13 +579,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), output->GetGuid(), EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -654,6 +588,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), optNetGuid, output->GetGuid(), + EmptyOptional(), readableData, offset); @@ -662,6 +597,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), normalize->GetGuid(), output->GetGuid(), + EmptyOptional(), readableData, offset); @@ -670,13 +606,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::CONNECTION_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -713,7 +642,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Validate input workload data size = inputReadableBuffer->GetSize(); - BOOST_CHECK(size == 204); + BOOST_CHECK(size == 164); readableData = inputReadableBuffer->GetReadableData(); BOOST_CHECK(readableData != nullptr); @@ -721,7 +650,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) offset = 0; // Verify Header - VerifyTimelineHeaderBinary(readableData, offset, 196); + VerifyTimelineHeaderBinary(readableData, offset, 156); // Input workload // Input workload entity @@ -730,13 +659,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - Type relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, @@ -749,13 +671,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - BackendId relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // BackendId label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::BACKENDID_GUID, @@ -767,6 +682,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), input->GetGuid(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -774,7 +690,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Validate output workload data size = outputReadableBuffer->GetSize(); - BOOST_CHECK(size == 204); + BOOST_CHECK(size == 164); readableData = outputReadableBuffer->GetReadableData(); BOOST_CHECK(readableData != nullptr); @@ -782,7 +698,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) offset = 0; // Verify Header - VerifyTimelineHeaderBinary(readableData, offset, 196); + VerifyTimelineHeaderBinary(readableData, offset, 156); // Output workload // Output workload entity @@ -791,13 +707,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - Type relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, @@ -810,13 +719,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Entity - BackendId relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // BackendId label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::BACKENDID_GUID, @@ -828,6 +730,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), output->GetGuid(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -835,7 +738,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Validate inference data size = inferenceReadableBuffer->GetSize(); - BOOST_CHECK(size == 1208 + 8 * ThreadIdSize); + BOOST_CHECK(size == 976 + 8 * ThreadIdSize); readableData = inferenceReadableBuffer->GetReadableData(); BOOST_CHECK(readableData != nullptr); @@ -843,7 +746,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) offset = 0; // Verify Header - VerifyTimelineHeaderBinary(readableData, offset, 1200 + 8 * ThreadIdSize); + VerifyTimelineHeaderBinary(readableData, offset, 968 + 8 * ThreadIdSize); // Inference timeline trace // Inference entity @@ -854,13 +757,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::INFERENCE_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -870,6 +766,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), optNetGuid, EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -880,13 +777,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Inference - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS, @@ -903,13 +793,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::WORKLOAD_EXECUTION_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -919,6 +802,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -927,6 +811,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -937,13 +822,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Input workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS, @@ -957,13 +835,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Input workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS, @@ -979,13 +850,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::WORKLOAD_EXECUTION_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -995,6 +859,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -1003,6 +868,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -1013,13 +879,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Normalize workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS, @@ -1033,13 +892,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Normalize workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS, @@ -1055,13 +907,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::WORKLOAD_EXECUTION_GUID, - readableData, - offset); - - // Type label relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -1071,6 +916,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -1079,6 +925,7 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) EmptyOptional(), EmptyOptional(), EmptyOptional(), + EmptyOptional(), readableData, offset); @@ -1089,19 +936,13 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Output workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS, readableData, offset); + // End of Normalize workload execution life // Event packet - timeline, threadId, eventGuid VerifyTimelineEventBinaryPacket(EmptyOptional(), EmptyOptional(), EmptyOptional(), readableData, offset); @@ -1109,13 +950,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Output workload execution - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS, @@ -1129,13 +963,6 @@ BOOST_AUTO_TEST_CASE(ProfilingEnableCpuRef) // Inference - event relationship VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, EmptyOptional(), - EmptyOptional(), - EmptyOptional(), - readableData, - offset); - - // Event - event class relationship - VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::DataLink, EmptyOptional(), EmptyOptional(), LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS, -- cgit v1.2.1