aboutsummaryrefslogtreecommitdiff
path: root/src/profiling/test
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2022-03-10 22:05:42 +0000
committerJim Flynn <jim.flynn@arm.com>2022-03-10 22:43:11 +0000
commit75c14f4241b0225640ee6011a41ed0102f4e742c (patch)
tree1c19b0974e7dd58ef1b266a3022494158675dfda /src/profiling/test
parentdc8f9d9fa46c009eca1bd936b29c9968c9c712bd (diff)
downloadarmnn-75c14f4241b0225640ee6011a41ed0102f4e742c.tar.gz
IVGCVSW-6841 Replace armnn::numeric_cast with arm::pipe::numeric_cast in profiling code
Change-Id: Ib3115694608dee59ced8dc31077e16fe19d0dfea Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/profiling/test')
-rw-r--r--src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp10
-rw-r--r--src/profiling/test/ProfilingMocks.hpp10
-rw-r--r--src/profiling/test/ProfilingTestUtils.cpp12
-rw-r--r--src/profiling/test/ProfilingTests.cpp39
-rw-r--r--src/profiling/test/RequestCountersPacketHandler.cpp7
-rw-r--r--src/profiling/test/SendCounterPacketTests.cpp17
-rw-r--r--src/profiling/test/SendCounterPacketTests.hpp1
-rw-r--r--src/profiling/test/TimelinePacketTests.cpp45
8 files changed, 73 insertions, 68 deletions
diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
index fb8c97265b..f1f1d2410f 100644
--- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
+++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
@@ -4,10 +4,14 @@
//
#include "../ProfilingConnectionDumpToFileDecorator.hpp"
-#include <armnnUtils/Filesystem.hpp>
+
#include <Runtime.hpp>
+
+#include <armnnUtils/Filesystem.hpp>
+
#include <armnn/utility/IgnoreUnused.hpp>
-#include <armnn/utility/NumericCast.hpp>
+
+#include <common/include/NumericCast.hpp>
#include <fstream>
#include <sstream>
@@ -20,7 +24,7 @@ namespace
{
const std::vector<char> g_Data = { 'd', 'u', 'm', 'm', 'y' };
-const uint32_t g_DataLength = armnn::numeric_cast<uint32_t>(g_Data.size());
+const uint32_t g_DataLength = arm::pipe::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 b9ba9315ee..1985a3a3b8 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -17,8 +17,8 @@
#include <armnn/Conversion.hpp>
#include <armnn/utility/Assert.hpp>
#include <armnn/utility/IgnoreUnused.hpp>
-#include <armnn/utility/NumericCast.hpp>
+#include <common/include/NumericCast.hpp>
#include <common/include/ProfilingException.hpp>
#include <common/include/ProfilingGuidGenerator.hpp>
@@ -571,10 +571,10 @@ public:
}
// Getters for counts
- 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()); }
+ uint16_t GetCategoryCount() const override { return arm::pipe::numeric_cast<uint16_t>(m_Categories.size()); }
+ uint16_t GetDeviceCount() const override { return arm::pipe::numeric_cast<uint16_t>(m_Devices.size()); }
+ uint16_t GetCounterSetCount() const override { return arm::pipe::numeric_cast<uint16_t>(m_CounterSets.size()); }
+ uint16_t GetCounterCount() const override { return arm::pipe::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 0d8988c17a..ca322868fc 100644
--- a/src/profiling/test/ProfilingTestUtils.cpp
+++ b/src/profiling/test/ProfilingTestUtils.cpp
@@ -11,13 +11,13 @@
#include <armnn/Descriptors.hpp>
#include <armnn/profiling/ArmNNProfiling.hpp>
#include <armnn/utility/Assert.hpp>
-#include <armnn/utility/NumericCast.hpp>
#include <Processes.hpp>
#include <ProfilingService.hpp>
#include <armnnUtils/Threads.hpp>
#include <common/include/LabelsAndEventClasses.hpp>
+#include <common/include/NumericCast.hpp>
#include <TestUtils.hpp>
@@ -27,10 +27,10 @@ uint32_t GetStreamMetaDataPacketSize()
{
uint32_t sizeUint32 = sizeof(uint32_t);
uint32_t payloadSize = 0;
- 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;
+ payloadSize += arm::pipe::numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1;
+ payloadSize += arm::pipe::numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1;
+ payloadSize += arm::pipe::numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1;
+ payloadSize += arm::pipe::numeric_cast<uint32_t>(GetProcessName().size()) + 1;
// Add packetVersionEntries
payloadSize += 13 * 2 * sizeUint32;
@@ -112,7 +112,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 = armnn::numeric_cast<unsigned int>(label.size());
+ unsigned int label_size = arm::pipe::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 0389377fe5..26130ef403 100644
--- a/src/profiling/test/ProfilingTests.cpp
+++ b/src/profiling/test/ProfilingTests.cpp
@@ -3,15 +3,10 @@
// SPDX-License-Identifier: MIT
//
-#include <ArmNNProfilingServiceInitialiser.hpp>
-
#include "ProfilingTests.hpp"
#include "ProfilingTestUtils.hpp"
-#include <backends/BackendProfiling.hpp>
-#include <common/include/EncodeVersion.hpp>
-#include <common/include/PacketVersionResolver.hpp>
-#include <common/include/SwTrace.hpp>
+#include <ArmNNProfilingServiceInitialiser.hpp>
#include <CommandHandler.hpp>
#include <ConnectionAcknowledgedCommandHandler.hpp>
#include <CounterDirectory.hpp>
@@ -20,8 +15,6 @@
#include <ICounterValues.hpp>
#include <PeriodicCounterCapture.hpp>
#include <PeriodicCounterSelectionCommandHandler.hpp>
-#include <armnn/profiling/ArmNNProfiling.hpp>
-#include <armnn/profiling/ProfilingOptions.hpp>
#include <ProfilingStateMachine.hpp>
#include <ProfilingUtils.hpp>
#include <RegisterBackendCounters.hpp>
@@ -33,15 +26,23 @@
#include <SendTimelinePacket.hpp>
#include <armnn/Conversion.hpp>
-
#include <armnn/Utils.hpp>
+
+#include <armnn/profiling/ArmNNProfiling.hpp>
+#include <armnn/profiling/ProfilingOptions.hpp>
+
#include <armnn/utility/IgnoreUnused.hpp>
-#include <armnn/utility/NumericCast.hpp>
+
+#include <backends/BackendProfiling.hpp>
#include <common/include/CommandHandlerKey.hpp>
#include <common/include/CommandHandlerRegistry.hpp>
-#include <common/include/SocketConnectionException.hpp>
+#include <common/include/EncodeVersion.hpp>
+#include <common/include/NumericCast.hpp>
#include <common/include/Packet.hpp>
+#include <common/include/PacketVersionResolver.hpp>
+#include <common/include/SocketConnectionException.hpp>
+#include <common/include/SwTrace.hpp>
#include <doctest/doctest.h>
@@ -1808,8 +1809,8 @@ TEST_CASE("CounterSelectionCommandHandlerParseData")
SendCounterPacket sendCounterPacket(mockBuffer);
SendThread sendThread(profilingStateMachine, mockBuffer, sendCounterPacket);
- uint32_t sizeOfUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t));
- uint32_t sizeOfUint16 = armnn::numeric_cast<uint32_t>(sizeof(uint16_t));
+ uint32_t sizeOfUint32 = arm::pipe::numeric_cast<uint32_t>(sizeof(uint32_t));
+ uint32_t sizeOfUint16 = arm::pipe::numeric_cast<uint32_t>(sizeof(uint16_t));
// Data with period and counters
uint32_t period1 = arm::pipe::LOWEST_CAPTURE_PERIOD;
@@ -2045,8 +2046,8 @@ TEST_CASE("CheckConnectionAcknowledged")
const uint32_t connectionPacketId = 0x10000;
const uint32_t version = 1;
- uint32_t sizeOfUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t));
- uint32_t sizeOfUint16 = armnn::numeric_cast<uint32_t>(sizeof(uint16_t));
+ uint32_t sizeOfUint32 = arm::pipe::numeric_cast<uint32_t>(sizeof(uint32_t));
+ uint32_t sizeOfUint16 = arm::pipe::numeric_cast<uint32_t>(sizeof(uint16_t));
// Data with period and counters
uint32_t period1 = 10;
@@ -2470,7 +2471,7 @@ TEST_CASE("RequestCounterDirectoryCommandHandlerTest1")
CHECK(header1Word1 == 24); // data length
uint32_t bodyHeader1Word0 = ReadUint32(readBuffer1, 8);
- uint16_t deviceRecordCount = armnn::numeric_cast<uint16_t>(bodyHeader1Word0 >> 16);
+ uint16_t deviceRecordCount = arm::pipe::numeric_cast<uint16_t>(bodyHeader1Word0 >> 16);
CHECK(deviceRecordCount == 0); // device_records_count
auto readBuffer2 = mockBuffer2.GetReadableBuffer();
@@ -2537,9 +2538,9 @@ 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 = 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);
+ const uint16_t deviceRecordCount = arm::pipe::numeric_cast<uint16_t>(bodyHeader1Word0 >> 16);
+ const uint16_t counterSetRecordCount = arm::pipe::numeric_cast<uint16_t>(bodyHeader1Word2 >> 16);
+ const uint16_t categoryRecordCount = arm::pipe::numeric_cast<uint16_t>(bodyHeader1Word4 >> 16);
CHECK(deviceRecordCount == 1); // device_records_count
CHECK(bodyHeader1Word1 == 0 + bodyHeaderSizeBytes); // device_records_pointer_table_offset
CHECK(counterSetRecordCount == 1); // counter_set_count
diff --git a/src/profiling/test/RequestCountersPacketHandler.cpp b/src/profiling/test/RequestCountersPacketHandler.cpp
index fb3eee8f20..b688b2d0c3 100644
--- a/src/profiling/test/RequestCountersPacketHandler.cpp
+++ b/src/profiling/test/RequestCountersPacketHandler.cpp
@@ -7,8 +7,7 @@
#include "DirectoryCaptureCommandHandler.hpp"
-#include <armnn/utility/NumericCast.hpp>
-
+#include <common/include/NumericCast.hpp>
#include <common/include/PacketVersionResolver.hpp>
#include <common/include/ProfilingException.hpp>
@@ -55,7 +54,7 @@ void RequestCountersPacketHandler::SendCounterSelectionPacket()
uint32_t uint32_t_size = sizeof(uint32_t);
uint32_t offset = 0;
- uint32_t bodySize = uint32_t_size + armnn::numeric_cast<uint32_t>(m_IdList.size()) * uint16_t_size;
+ uint32_t bodySize = uint32_t_size + arm::pipe::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());
@@ -77,4 +76,4 @@ void RequestCountersPacketHandler::SendCounterSelectionPacket()
} // namespace pipe
-} // namespace arm \ No newline at end of file
+} // namespace arm
diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp
index cfcd64b98f..17931cc79b 100644
--- a/src/profiling/test/SendCounterPacketTests.cpp
+++ b/src/profiling/test/SendCounterPacketTests.cpp
@@ -18,6 +18,7 @@
#include <armnn/Utils.hpp>
#include <common/include/Constants.hpp>
+#include <common/include/NumericCast.hpp>
#include <common/include/ProfilingException.hpp>
#include <armnn/utility/Assert.hpp>
@@ -289,7 +290,7 @@ TEST_CASE("SendPeriodicCounterCapturePacketTest")
TEST_CASE("SendStreamMetaDataPacketTest")
{
- uint32_t sizeUint32 = armnn::numeric_cast<uint32_t>(sizeof(uint32_t));
+ uint32_t sizeUint32 = arm::pipe::numeric_cast<uint32_t>(sizeof(uint32_t));
// Error no space left in buffer
MockBufferManager mockBuffer1(10);
@@ -300,10 +301,10 @@ TEST_CASE("SendStreamMetaDataPacketTest")
std::string processName = GetProcessName().substr(0, 60);
- 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;
+ uint32_t infoSize = arm::pipe::numeric_cast<uint32_t>(GetSoftwareInfo().size()) + 1;
+ uint32_t hardwareVersionSize = arm::pipe::numeric_cast<uint32_t>(GetHardwareVersion().size()) + 1;
+ uint32_t softwareVersionSize = arm::pipe::numeric_cast<uint32_t>(GetSoftwareVersion().size()) + 1;
+ uint32_t processNameSize = arm::pipe::numeric_cast<uint32_t>(processName.size()) + 1;
// Supported Packets
// Packet Encoding version 1.0.0
@@ -350,7 +351,7 @@ TEST_CASE("SendStreamMetaDataPacketTest")
CHECK(((headerWord0 >> 26) & 0x3F) == 0); // packet family
CHECK(((headerWord0 >> 16) & 0x3FF) == 0); // packet id
- uint32_t totalLength = armnn::numeric_cast<uint32_t>(2 * sizeUint32 +
+ uint32_t totalLength = arm::pipe::numeric_cast<uint32_t>(2 * sizeUint32 +
10 * sizeUint32 + infoSize +
hardwareVersionSize + softwareVersionSize +
processNameSize + sizeUint32 +
@@ -366,7 +367,7 @@ TEST_CASE("SendStreamMetaDataPacketTest")
CHECK(ReadUint32(readBuffer2, offset) == MAX_METADATA_PACKET_LENGTH); // max_data_len
offset += sizeUint32;
int pid = armnnUtils::Processes::GetCurrentId();
- CHECK(ReadUint32(readBuffer2, offset) == armnn::numeric_cast<uint32_t>(pid));
+ CHECK(ReadUint32(readBuffer2, offset) == arm::pipe::numeric_cast<uint32_t>(pid));
offset += sizeUint32;
uint32_t poolOffset = 10 * sizeUint32;
CHECK(ReadUint32(readBuffer2, offset) == poolOffset); // offset_info
@@ -942,7 +943,7 @@ TEST_CASE("CreateCategoryRecordTest")
ARMNN_ASSERT(counter1);
ARMNN_ASSERT(counter2);
ARMNN_ASSERT(counter3);
- uint16_t categoryEventCount = armnn::numeric_cast<uint16_t>(counters.size());
+ uint16_t categoryEventCount = arm::pipe::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 bae08b231e..cfd03f86c7 100644
--- a/src/profiling/test/SendCounterPacketTests.hpp
+++ b/src/profiling/test/SendCounterPacketTests.hpp
@@ -14,7 +14,6 @@
#include <armnn/Conversion.hpp>
#include <armnn/utility/Assert.hpp>
#include <armnn/utility/IgnoreUnused.hpp>
-#include <armnn/utility/NumericCast.hpp>
#include <atomic>
diff --git a/src/profiling/test/TimelinePacketTests.cpp b/src/profiling/test/TimelinePacketTests.cpp
index de791c1da0..f1a038555c 100644
--- a/src/profiling/test/TimelinePacketTests.cpp
+++ b/src/profiling/test/TimelinePacketTests.cpp
@@ -3,11 +3,11 @@
// SPDX-License-Identifier: MIT
//
-#include <armnnUtils/Threads.hpp>
#include <ProfilingUtils.hpp>
-#include <armnn/utility/NumericCast.hpp>
+#include <armnnUtils/Threads.hpp>
+#include <common/include/NumericCast.hpp>
#include <common/include/SwTrace.hpp>
#include <doctest/doctest.h>
@@ -56,7 +56,7 @@ TEST_CASE("TimelineLabelPacketTestBufferExhaustionFixedValue")
TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid,
label,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::BufferExhaustion);
CHECK(numberOfBytesWritten == 0);
@@ -72,7 +72,7 @@ TEST_CASE("TimelineLabelPacketTestInvalidLabel")
TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid,
label,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Error);
CHECK(numberOfBytesWritten == 0);
@@ -88,7 +88,7 @@ TEST_CASE("TimelineLabelPacketTestSingleConstructionOfData")
TimelinePacketStatus result = WriteTimelineLabelBinaryPacket(profilingGuid,
label,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 28);
@@ -179,7 +179,7 @@ TEST_CASE("TimelineRelationshipPacketSmallBufferSizeTest")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::BufferExhaustion);
CHECK(numberOfBytesWritten == 0);
@@ -202,7 +202,7 @@ TEST_CASE("TimelineRelationshipPacketInvalidRelationTest")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten),
arm::pipe::InvalidArgumentException);
@@ -226,7 +226,7 @@ TEST_CASE("TimelineRelationshipPacketTestDataConstruction")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 40);
@@ -283,7 +283,7 @@ TEST_CASE("TimelineRelationshipPacketExecutionLinkTestDataConstruction")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 40);
@@ -339,7 +339,7 @@ TEST_CASE("TimelineRelationshipPacketDataLinkTestDataConstruction")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 40);
@@ -395,7 +395,7 @@ TEST_CASE("TimelineRelationshipPacketLabelLinkTestDataConstruction")
tailGuid,
attributeGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 40);
@@ -461,7 +461,8 @@ TEST_CASE("TimelineMessageDirectoryPacketTestFullConstruction")
std::vector<unsigned char> buffer(512, 0);
unsigned int numberOfBytesWritten = 789u;
TimelinePacketStatus result = WriteTimelineMessageDirectoryPackage(buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(
+ buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
@@ -528,7 +529,7 @@ TEST_CASE("TimelineMessageDirectoryPacketTestFullConstruction")
// Check the ui_name
std::vector<uint32_t> swTraceString;
StringToSwTraceString<SwTraceCharPolicy>(label, swTraceString);
- offset += (armnn::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
+ offset += (arm::pipe::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
uint32_t swTraceUINameLength = ReadUint32(buffer.data(), offset);
CHECK(swTraceUINameLength == 14); // ui_name length including the null-terminator
@@ -540,7 +541,7 @@ TEST_CASE("TimelineMessageDirectoryPacketTestFullConstruction")
// Check arg_types
StringToSwTraceString<SwTraceCharPolicy>(label, swTraceString);
- offset += (armnn::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
+ offset += (arm::pipe::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
uint32_t swTraceArgTypesLength = ReadUint32(buffer.data(), offset);
CHECK(swTraceArgTypesLength == 3); // arg_types length including the null-terminator
@@ -552,7 +553,7 @@ TEST_CASE("TimelineMessageDirectoryPacketTestFullConstruction")
// Check arg_names
StringToSwTraceString<SwTraceCharPolicy>(label, swTraceString);
- offset += (armnn::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
+ offset += (arm::pipe::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
uint32_t swTraceArgNamesLength = ReadUint32(buffer.data(), offset);
CHECK(swTraceArgNamesLength == 11); // arg_names length including the null-terminator
@@ -564,7 +565,7 @@ TEST_CASE("TimelineMessageDirectoryPacketTestFullConstruction")
// Check second message decl_id
StringToSwTraceString<SwTraceCharPolicy>(label, swTraceString);
- offset += (armnn::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
+ offset += (arm::pipe::numeric_cast<unsigned int>(swTraceString.size()) - 1) * uint32_t_size;
readDeclId = ReadUint32(buffer.data(), offset);
CHECK(readDeclId == 1);
@@ -614,7 +615,7 @@ TEST_CASE("TimelineEntityPacketTestBufferExhaustedWithFixedBufferSize")
unsigned int numberOfBytesWritten = 789u;
TimelinePacketStatus result = WriteTimelineEntityBinary(profilingGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::BufferExhaustion);
CHECK(numberOfBytesWritten == 0);
@@ -628,7 +629,7 @@ TEST_CASE("TimelineEntityPacketTestFullConstructionOfData")
unsigned int numberOfBytesWritten = 789u;
TimelinePacketStatus result = WriteTimelineEntityBinary(profilingGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 12);
@@ -686,7 +687,7 @@ TEST_CASE("TimelineEventClassTestBufferExhaustionFixedValue")
TimelinePacketStatus result = WriteTimelineEventClassBinary(profilingGuid,
profilingNameGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::BufferExhaustion);
CHECK(numberOfBytesWritten == 0);
@@ -702,7 +703,7 @@ TEST_CASE("TimelineEventClassTestFullConstructionOfData")
TimelinePacketStatus result = WriteTimelineEventClassBinary(profilingGuid,
profilingNameGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);
CHECK(numberOfBytesWritten == 20);
@@ -771,7 +772,7 @@ TEST_CASE("TimelineEventPacketTestBufferExhaustionFixedValue")
threadId,
profilingGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::BufferExhaustion);
CHECK(numberOfBytesWritten == 0);
@@ -789,7 +790,7 @@ TEST_CASE("TimelineEventPacketTestFullConstructionOfData")
threadId,
profilingGuid,
buffer.data(),
- armnn::numeric_cast<unsigned int>(buffer.size()),
+ arm::pipe::numeric_cast<unsigned int>(buffer.size()),
numberOfBytesWritten);
CHECK(result == TimelinePacketStatus::Ok);