From 371b70e39390618cbd791b441adcf3923964b8df Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Fri, 11 Sep 2020 10:14:57 +0100 Subject: IVGCVSW-5301 Remove all boost::numeric_cast from armnn/src/profiling * Replaced with armnn/utility/NumericCast.hpp Signed-off-by: Matthew Sloyan Change-Id: I14e89c00cd1dd607315113d5b8ca56c2e9f6c363 --- src/profiling/test/TimelinePacketTests.cpp | 43 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'src/profiling/test/TimelinePacketTests.cpp') diff --git a/src/profiling/test/TimelinePacketTests.cpp b/src/profiling/test/TimelinePacketTests.cpp index 4f056ce761..811918a3e3 100644 --- a/src/profiling/test/TimelinePacketTests.cpp +++ b/src/profiling/test/TimelinePacketTests.cpp @@ -6,10 +6,11 @@ #include #include +#include + #include #include -#include using namespace armnn::profiling; @@ -55,7 +56,7 @@ BOOST_AUTO_TEST_CASE(TimelineLabelPacketTestBufferExhaustionFixedValue) TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid, label, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::BufferExhaustion); BOOST_CHECK(numberOfBytesWritten == 0); @@ -71,7 +72,7 @@ BOOST_AUTO_TEST_CASE(TimelineLabelPacketTestInvalidLabel) TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid, label, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Error); BOOST_CHECK(numberOfBytesWritten == 0); @@ -87,7 +88,7 @@ BOOST_AUTO_TEST_CASE(TimelineLabelPacketTestSingleConstructionOfData) TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid, label, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 28); @@ -178,7 +179,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketSmallBufferSizeTest) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::BufferExhaustion); BOOST_CHECK(numberOfBytesWritten == 0); @@ -201,7 +202,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketInvalidRelationTest) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten), armnn::InvalidArgumentException); @@ -225,7 +226,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketTestDataConstruction) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 40); @@ -282,7 +283,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketExecutionLinkTestDataConstruction tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 40); @@ -338,7 +339,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketDataLinkTestDataConstruction) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 40); @@ -394,7 +395,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketLabelLinkTestDataConstruction) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 40); @@ -460,7 +461,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) std::vector buffer(512, 0); unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineMessageDirectoryPackage(buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); @@ -527,7 +528,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) // Check the ui_name std::vector swTraceString; arm::pipe::StringToSwTraceString(label, swTraceString); - offset += (boost::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; uint32_t swTraceUINameLength = ReadUint32(buffer.data(), offset); BOOST_CHECK(swTraceUINameLength == 14); // ui_name length including the null-terminator @@ -539,7 +540,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) // Check arg_types arm::pipe::StringToSwTraceString(label, swTraceString); - offset += (boost::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; uint32_t swTraceArgTypesLength = ReadUint32(buffer.data(), offset); BOOST_CHECK(swTraceArgTypesLength == 3); // arg_types length including the null-terminator @@ -551,7 +552,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) // Check arg_names arm::pipe::StringToSwTraceString(label, swTraceString); - offset += (boost::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; uint32_t swTraceArgNamesLength = ReadUint32(buffer.data(), offset); BOOST_CHECK(swTraceArgNamesLength == 11); // arg_names length including the null-terminator @@ -563,7 +564,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) // Check second message decl_id arm::pipe::StringToSwTraceString(label, swTraceString); - offset += (boost::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast(swTraceString.size()) - 1) * uint32_t_size; readDeclId = ReadUint32(buffer.data(), offset); BOOST_CHECK(readDeclId == 1); @@ -613,7 +614,7 @@ BOOST_AUTO_TEST_CASE(TimelineEntityPacketTestBufferExhaustedWithFixedBufferSize) unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineEntityBinary(profilingGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::BufferExhaustion); BOOST_CHECK(numberOfBytesWritten == 0); @@ -627,7 +628,7 @@ BOOST_AUTO_TEST_CASE(TimelineEntityPacketTestFullConstructionOfData) unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineEntityBinary(profilingGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 12); @@ -685,7 +686,7 @@ BOOST_AUTO_TEST_CASE(TimelineEventClassTestBufferExhaustionFixedValue) TimelinePacketStatus result = WriteTimelineEventClassBinary(profilingGuid, profilingNameGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::BufferExhaustion); BOOST_CHECK(numberOfBytesWritten == 0); @@ -701,7 +702,7 @@ BOOST_AUTO_TEST_CASE(TimelineEventClassTestFullConstructionOfData) TimelinePacketStatus result = WriteTimelineEventClassBinary(profilingGuid, profilingNameGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 20); @@ -770,7 +771,7 @@ BOOST_AUTO_TEST_CASE(TimelineEventPacketTestBufferExhaustionFixedValue) threadId, profilingGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::BufferExhaustion); BOOST_CHECK(numberOfBytesWritten == 0); @@ -788,7 +789,7 @@ BOOST_AUTO_TEST_CASE(TimelineEventPacketTestFullConstructionOfData) threadId, profilingGuid, buffer.data(), - boost::numeric_cast(buffer.size()), + armnn::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); -- cgit v1.2.1