From decd08b89565b18067d229c8c25b6f3a3333c653 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Sun, 13 Mar 2022 22:35:46 +0000 Subject: IVGCVSW-6847 replace armnn:Optional with arm::pipe::Optional in profiling code Change-Id: I048c538d4f8c21770aec2b2751c934d9fa15a4dc Signed-off-by: Jim Flynn --- src/profiling/test/TimelineUtilityMethodsTests.cpp | 51 +++++++++++----------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'src/profiling/test/TimelineUtilityMethodsTests.cpp') diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp index 422bc1389d..7e95df1c14 100644 --- a/src/profiling/test/TimelineUtilityMethodsTests.cpp +++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp @@ -60,13 +60,13 @@ TEST_CASE("CreateTypedLabelTest") VerifyTimelineHeaderBinary(readableData, offset, 68); // First dataset sent: TimelineLabelBinaryPacket - VerifyTimelineLabelBinaryPacketData(EmptyOptional(), entityName, readableData, offset); + VerifyTimelineLabelBinaryPacketData(arm::pipe::EmptyOptional(), entityName, readableData, offset); // Second dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), + arm::pipe::EmptyOptional(), entityGuid, - EmptyOptional(), + arm::pipe::EmptyOptional(), labelTypeGuid, readableData, offset); @@ -251,28 +251,28 @@ TEST_CASE("CreateNamedTypedChildEntityTest") VerifyTimelineHeaderBinary(readableData, offset, 188); // First dataset sent: TimelineEntityBinaryPacket - VerifyTimelineEntityBinaryPacketData(EmptyOptional(), readableData, offset); + VerifyTimelineEntityBinaryPacketData(arm::pipe::EmptyOptional(), readableData, offset); // Second dataset sent: TimelineLabelBinaryPacket - VerifyTimelineLabelBinaryPacketData(EmptyOptional(), entityName, readableData, offset); + VerifyTimelineLabelBinaryPacketData(arm::pipe::EmptyOptional(), entityName, readableData, offset); // Third dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), - EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), LabelsAndEventClasses::NAME_GUID, readableData, offset); // Fifth dataset sent: TimelineLabelBinaryPacket - VerifyTimelineLabelBinaryPacketData(EmptyOptional(), entityType, readableData, offset); + VerifyTimelineLabelBinaryPacketData(arm::pipe::EmptyOptional(), entityType, readableData, offset); // Sixth dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), - EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -280,10 +280,10 @@ TEST_CASE("CreateNamedTypedChildEntityTest") // Eighth dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::RetentionLink, - EmptyOptional(), + arm::pipe::EmptyOptional(), parentEntityGuid, - EmptyOptional(), - EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), readableData, offset); @@ -386,26 +386,26 @@ TEST_CASE("CreateNameTypeEntityTest") // Packets for Name Entity // First dataset sent: TimelineLabelBinaryPacket - VerifyTimelineLabelBinaryPacketData(EmptyOptional(), entityName, readableData, offset); + VerifyTimelineLabelBinaryPacketData(arm::pipe::EmptyOptional(), entityName, readableData, offset); // Second dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), - EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), LabelsAndEventClasses::NAME_GUID, readableData, offset); // Packets for Type Entity // First dataset sent: TimelineLabelBinaryPacket - VerifyTimelineLabelBinaryPacketData(EmptyOptional(), entityType, readableData, offset); + VerifyTimelineLabelBinaryPacketData(arm::pipe::EmptyOptional(), entityType, readableData, offset); // Second dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::LabelLink, - EmptyOptional(), - EmptyOptional(), - EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), + arm::pipe::EmptyOptional(), LabelsAndEventClasses::TYPE_GUID, readableData, offset); @@ -451,11 +451,12 @@ TEST_CASE("RecordEventTest") VerifyTimelineHeaderBinary(readableData, offset, 60 + ThreadIdSize); // First dataset sent: TimelineEntityBinaryPacket - VerifyTimelineEventBinaryPacket(EmptyOptional(), EmptyOptional(), EmptyOptional(), readableData, offset); + VerifyTimelineEventBinaryPacket( + arm::pipe::EmptyOptional(), arm::pipe::EmptyOptional(), arm::pipe::EmptyOptional(), readableData, offset); // Second dataset sent: TimelineRelationshipBinaryPacket VerifyTimelineRelationshipBinaryPacketData(ProfilingRelationshipType::ExecutionLink, - EmptyOptional(), + arm::pipe::EmptyOptional(), entityGuid, eventGuid, eventClassGuid, -- cgit v1.2.1