diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2020-09-11 10:14:57 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2020-09-29 08:01:57 +0000 |
commit | 371b70e39390618cbd791b441adcf3923964b8df (patch) | |
tree | b869b0b3e5064e9c5abab8a02b111a497a6326d2 /src/profiling/test | |
parent | 1f0e2f9dbf14a719aef09649b19a656a6b03c7ce (diff) | |
download | armnn-371b70e39390618cbd791b441adcf3923964b8df.tar.gz |
IVGCVSW-5301 Remove all boost::numeric_cast from armnn/src/profiling
* Replaced with armnn/utility/NumericCast.hpp
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: I14e89c00cd1dd607315113d5b8ca56c2e9f6c363
Diffstat (limited to 'src/profiling/test')
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 1 | ||||
-rw-r--r-- | src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp | 4 | ||||
-rw-r--r-- | src/profiling/test/ProfilingMocks.hpp | 11 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.cpp | 12 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 27 | ||||
-rw-r--r-- | src/profiling/test/RequestCountersPacketHandler.cpp | 6 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 26 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.hpp | 3 | ||||
-rw-r--r-- | src/profiling/test/TimelinePacketTests.cpp | 43 |
9 files changed, 62 insertions, 71 deletions
diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index f9df633a1c..943650a8f1 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -11,7 +11,6 @@ #include <Runtime.hpp> #include "TestTimelinePacketHandler.hpp" -#include <boost/numeric/conversion/cast.hpp> #include <boost/test/unit_test.hpp> #include <cstdio> diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index d6700bc41a..0feed4138f 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -7,11 +7,11 @@ #include <Filesystem.hpp> #include <Runtime.hpp> #include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/utility/NumericCast.hpp> #include <fstream> #include <sstream> -#include <boost/numeric/conversion/cast.hpp> #include <boost/test/unit_test.hpp> using namespace armnn::profiling; @@ -20,7 +20,7 @@ namespace { const std::vector<char> g_Data = { 'd', 'u', 'm', 'm', 'y' }; -const uint32_t g_DataLength = boost::numeric_cast<uint32_t>(g_Data.size()); +const uint32_t g_DataLength = armnn::numeric_cast<uint32_t>(g_Data.size()); const unsigned char* g_DataPtr = reinterpret_cast<const unsigned char*>(g_Data.data()); class DummyProfilingConnection : public IProfilingConnection diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 8bcf27a8d1..19d79e25e7 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -19,8 +19,7 @@ #include <armnn/Conversion.hpp> #include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> - -#include <boost/numeric/conversion/cast.hpp> +#include <armnn/utility/NumericCast.hpp> #include <atomic> #include <condition_variable> @@ -571,10 +570,10 @@ public: } // Getters for counts - uint16_t GetCategoryCount() const override { return boost::numeric_cast<uint16_t>(m_Categories.size()); } - uint16_t GetDeviceCount() const override { return boost::numeric_cast<uint16_t>(m_Devices.size()); } - uint16_t GetCounterSetCount() const override { return boost::numeric_cast<uint16_t>(m_CounterSets.size()); } - uint16_t GetCounterCount() const override { return boost::numeric_cast<uint16_t>(m_Counters.size()); } + uint16_t GetCategoryCount() const override { return armnn::numeric_cast<uint16_t>(m_Categories.size()); } + uint16_t GetDeviceCount() const override { return armnn::numeric_cast<uint16_t>(m_Devices.size()); } + uint16_t GetCounterSetCount() const override { return armnn::numeric_cast<uint16_t>(m_CounterSets.size()); } + uint16_t GetCounterCount() const override { return armnn::numeric_cast<uint16_t>(m_Counters.size()); } // Getters for collections const Categories& GetCategories() const override { return m_Categories; } diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 8050eaa508..09639bfae7 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -7,6 +7,8 @@ #include "ProfilingUtils.hpp" #include <armnn/Descriptors.hpp> +#include <armnn/utility/NumericCast.hpp> + #include <LabelsAndEventClasses.hpp> #include <Processes.hpp> #include <ProfilingService.hpp> @@ -20,10 +22,10 @@ uint32_t GetStreamMetaDataPacketSize() { uint32_t sizeUint32 = sizeof(uint32_t); uint32_t payloadSize = 0; - payloadSize += boost::numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1; - payloadSize += boost::numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1; - payloadSize += boost::numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1; - payloadSize += boost::numeric_cast<uint32_t>(GetProcessName().size()) + 1; + payloadSize += armnn::numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1; + payloadSize += armnn::numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1; + payloadSize += armnn::numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1; + payloadSize += armnn::numeric_cast<uint32_t>(GetProcessName().size()) + 1; // Add packetVersionEntries payloadSize += 13 * 2 * sizeUint32; @@ -105,7 +107,7 @@ ProfilingGuid VerifyTimelineLabelBinaryPacketData(Optional<ProfilingGuid> guid, // Utils unsigned int uint32_t_size = sizeof(uint32_t); unsigned int uint64_t_size = sizeof(uint64_t); - unsigned int label_size = boost::numeric_cast<unsigned int>(label.size()); + unsigned int label_size = armnn::numeric_cast<unsigned int>(label.size()); // Check the decl id uint32_t eventClassDeclId = ReadUint32(readableData, offset); diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index f616442df0..b06d3b0bc6 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -33,14 +33,13 @@ #include <armnn/Utils.hpp> #include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/utility/NumericCast.hpp> #include <common/include/CommandHandlerKey.hpp> #include <common/include/CommandHandlerRegistry.hpp> #include <common/include/SocketConnectionException.hpp> #include <common/include/Packet.hpp> -#include <boost/numeric/conversion/cast.hpp> - #include <cstdint> #include <cstring> #include <iostream> @@ -1750,8 +1749,6 @@ BOOST_AUTO_TEST_CASE(CheckCounterDirectoryRegisterCounter) BOOST_AUTO_TEST_CASE(CounterSelectionCommandHandlerParseData) { - using boost::numeric_cast; - ProfilingStateMachine profilingStateMachine; class TestCaptureThread : public IPeriodicCounterCapture @@ -1798,8 +1795,8 @@ BOOST_AUTO_TEST_CASE(CounterSelectionCommandHandlerParseData) SendCounterPacket sendCounterPacket(mockBuffer); SendThread sendThread(profilingStateMachine, mockBuffer, sendCounterPacket); - uint32_t sizeOfUint32 = numeric_cast<uint32_t>(sizeof(uint32_t)); - uint32_t sizeOfUint16 = numeric_cast<uint32_t>(sizeof(uint16_t)); + uint32_t sizeOfUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t)); + uint32_t sizeOfUint16 = armnn::numeric_cast<uint32_t>(sizeof(uint16_t)); // Data with period and counters uint32_t period1 = armnn::LOWEST_CAPTURE_PERIOD; @@ -2024,14 +2021,12 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceNotActive) BOOST_AUTO_TEST_CASE(CheckConnectionAcknowledged) { - using boost::numeric_cast; - const uint32_t packetFamilyId = 0; const uint32_t connectionPacketId = 0x10000; const uint32_t version = 1; - uint32_t sizeOfUint32 = numeric_cast<uint32_t>(sizeof(uint32_t)); - uint32_t sizeOfUint16 = numeric_cast<uint32_t>(sizeof(uint16_t)); + uint32_t sizeOfUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t)); + uint32_t sizeOfUint16 = armnn::numeric_cast<uint32_t>(sizeof(uint16_t)); // Data with period and counters uint32_t period1 = 10; @@ -2407,8 +2402,6 @@ BOOST_AUTO_TEST_CASE(CheckPeriodicCounterCaptureThread) BOOST_AUTO_TEST_CASE(RequestCounterDirectoryCommandHandlerTest1) { - using boost::numeric_cast; - const uint32_t familyId = 0; const uint32_t packetId = 3; const uint32_t version = 1; @@ -2453,7 +2446,7 @@ BOOST_AUTO_TEST_CASE(RequestCounterDirectoryCommandHandlerTest1) BOOST_TEST(header1Word1 == 24); // data length uint32_t bodyHeader1Word0 = ReadUint32(readBuffer1, 8); - uint16_t deviceRecordCount = numeric_cast<uint16_t>(bodyHeader1Word0 >> 16); + uint16_t deviceRecordCount = armnn::numeric_cast<uint16_t>(bodyHeader1Word0 >> 16); BOOST_TEST(deviceRecordCount == 0); // device_records_count auto readBuffer2 = mockBuffer2.GetReadableBuffer(); @@ -2469,8 +2462,6 @@ BOOST_AUTO_TEST_CASE(RequestCounterDirectoryCommandHandlerTest1) BOOST_AUTO_TEST_CASE(RequestCounterDirectoryCommandHandlerTest2) { - using boost::numeric_cast; - const uint32_t familyId = 0; const uint32_t packetId = 3; const uint32_t version = 1; @@ -2522,9 +2513,9 @@ BOOST_AUTO_TEST_CASE(RequestCounterDirectoryCommandHandlerTest2) const uint32_t bodyHeader1Word3 = ReadUint32(readBuffer1, 20); const uint32_t bodyHeader1Word4 = ReadUint32(readBuffer1, 24); const uint32_t bodyHeader1Word5 = ReadUint32(readBuffer1, 28); - const uint16_t deviceRecordCount = numeric_cast<uint16_t>(bodyHeader1Word0 >> 16); - const uint16_t counterSetRecordCount = numeric_cast<uint16_t>(bodyHeader1Word2 >> 16); - const uint16_t categoryRecordCount = numeric_cast<uint16_t>(bodyHeader1Word4 >> 16); + const uint16_t deviceRecordCount = armnn::numeric_cast<uint16_t>(bodyHeader1Word0 >> 16); + const uint16_t counterSetRecordCount = armnn::numeric_cast<uint16_t>(bodyHeader1Word2 >> 16); + const uint16_t categoryRecordCount = armnn::numeric_cast<uint16_t>(bodyHeader1Word4 >> 16); BOOST_TEST(deviceRecordCount == 1); // device_records_count BOOST_TEST(bodyHeader1Word1 == 0 + bodyHeaderSizeBytes); // device_records_pointer_table_offset BOOST_TEST(counterSetRecordCount == 1); // counter_set_count diff --git a/src/profiling/test/RequestCountersPacketHandler.cpp b/src/profiling/test/RequestCountersPacketHandler.cpp index 230c38857f..3ba50503a1 100644 --- a/src/profiling/test/RequestCountersPacketHandler.cpp +++ b/src/profiling/test/RequestCountersPacketHandler.cpp @@ -6,8 +6,10 @@ #include "RequestCountersPacketHandler.hpp" #include "DirectoryCaptureCommandHandler.hpp" -#include <common/include/PacketVersionResolver.hpp> +#include <armnn/utility/NumericCast.hpp> + +#include <common/include/PacketVersionResolver.hpp> #include <common/include/ProfilingException.hpp> namespace armnn @@ -53,7 +55,7 @@ void RequestCountersPacketHandler::SendCounterSelectionPacket() uint32_t uint32_t_size = sizeof(uint32_t); uint32_t offset = 0; - uint32_t bodySize = uint32_t_size + boost::numeric_cast<uint32_t>(m_IdList.size()) * uint16_t_size; + uint32_t bodySize = uint32_t_size + armnn::numeric_cast<uint32_t>(m_IdList.size()) * uint16_t_size; auto uniqueData = std::make_unique<unsigned char[]>(bodySize); auto data = reinterpret_cast<unsigned char*>(uniqueData.get()); diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index 87cfb5bf58..950f8ffad0 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -20,9 +20,7 @@ #include <common/include/Constants.hpp> - #include <boost/test/unit_test.hpp> -#include <boost/numeric/conversion/cast.hpp> #include <chrono> @@ -289,9 +287,7 @@ BOOST_AUTO_TEST_CASE(SendPeriodicCounterCapturePacketTest) BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) { - using boost::numeric_cast; - - uint32_t sizeUint32 = numeric_cast<uint32_t>(sizeof(uint32_t)); + uint32_t sizeUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t)); // Error no space left in buffer MockBufferManager mockBuffer1(10); @@ -302,10 +298,10 @@ BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) std::string processName = GetProcessName().substr(0, 60); - uint32_t infoSize = numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1; - uint32_t hardwareVersionSize = numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1; - uint32_t softwareVersionSize = numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1; - uint32_t processNameSize = numeric_cast<uint32_t>(processName.size()) + 1; + uint32_t infoSize = armnn::numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1; + uint32_t hardwareVersionSize = armnn::numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1; + uint32_t softwareVersionSize = armnn::numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1; + uint32_t processNameSize = armnn::numeric_cast<uint32_t>(processName.size()) + 1; // Supported Packets // Packet Encoding version 1.0.0 @@ -352,9 +348,11 @@ BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) BOOST_TEST(((headerWord0 >> 26) & 0x3F) == 0); // packet family BOOST_TEST(((headerWord0 >> 16) & 0x3FF) == 0); // packet id - uint32_t totalLength = numeric_cast<uint32_t>(2 * sizeUint32 + 10 * sizeUint32 + infoSize + hardwareVersionSize + - softwareVersionSize + processNameSize + sizeUint32 + - 2 * packetEntries * sizeUint32); + uint32_t totalLength = armnn::numeric_cast<uint32_t>(2 * sizeUint32 + + 10 * sizeUint32 + infoSize + + hardwareVersionSize + softwareVersionSize + + processNameSize + sizeUint32 + + 2 * packetEntries * sizeUint32); BOOST_TEST(headerWord1 == totalLength - (2 * sizeUint32)); // data length @@ -366,7 +364,7 @@ BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) BOOST_TEST(ReadUint32(readBuffer2, offset) == MAX_METADATA_PACKET_LENGTH); // max_data_len offset += sizeUint32; int pid = armnnUtils::Processes::GetCurrentId(); - BOOST_TEST(ReadUint32(readBuffer2, offset) == numeric_cast<uint32_t>(pid)); + BOOST_TEST(ReadUint32(readBuffer2, offset) == armnn::numeric_cast<uint32_t>(pid)); offset += sizeUint32; uint32_t poolOffset = 10 * sizeUint32; BOOST_TEST(ReadUint32(readBuffer2, offset) == poolOffset); // offset_info @@ -942,7 +940,7 @@ BOOST_AUTO_TEST_CASE(CreateCategoryRecordTest) ARMNN_ASSERT(counter1); ARMNN_ASSERT(counter2); ARMNN_ASSERT(counter3); - uint16_t categoryEventCount = boost::numeric_cast<uint16_t>(counters.size()); + uint16_t categoryEventCount = armnn::numeric_cast<uint16_t>(counters.size()); // Create a category record SendCounterPacket::CategoryRecord categoryRecord; diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp index ef8f63de0f..2eac395ecf 100644 --- a/src/profiling/test/SendCounterPacketTests.hpp +++ b/src/profiling/test/SendCounterPacketTests.hpp @@ -15,8 +15,7 @@ #include <armnn/Conversion.hpp> #include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> - -#include <boost/numeric/conversion/cast.hpp> +#include <armnn/utility/NumericCast.hpp> #include <atomic> #include <condition_variable> 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 <Threads.hpp> #include <ProfilingUtils.hpp> +#include <armnn/utility/NumericCast.hpp> + #include <common/include/SwTrace.hpp> #include <boost/test/unit_test.hpp> -#include <boost/numeric/conversion/cast.hpp> using namespace armnn::profiling; @@ -55,7 +56,7 @@ BOOST_AUTO_TEST_CASE(TimelineLabelPacketTestBufferExhaustionFixedValue) TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid, label, buffer.data(), - boost::numeric_cast<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(buffer.size()), numberOfBytesWritten), armnn::InvalidArgumentException); @@ -225,7 +226,7 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketTestDataConstruction) tailGuid, attributeGuid, buffer.data(), - boost::numeric_cast<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); BOOST_CHECK(numberOfBytesWritten == 40); @@ -460,7 +461,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) std::vector<unsigned char> buffer(512, 0); unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineMessageDirectoryPackage(buffer.data(), - boost::numeric_cast<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); @@ -527,7 +528,7 @@ BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestFullConstruction) // Check the ui_name std::vector<uint32_t> swTraceString; arm::pipe::StringToSwTraceString<arm::pipe::SwTraceCharPolicy>(label, swTraceString); - offset += (boost::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast<unsigned int>(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<arm::pipe::SwTraceCharPolicy>(label, swTraceString); - offset += (boost::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast<unsigned int>(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<arm::pipe::SwTraceCharPolicy>(label, swTraceString); - offset += (boost::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast<unsigned int>(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<arm::pipe::SwTraceCharPolicy>(label, swTraceString); - offset += (boost::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size; + offset += (armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(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<unsigned int>(buffer.size()), + armnn::numeric_cast<unsigned int>(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); |