diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2022-03-10 22:57:47 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-12 12:43:35 +0000 |
| commit | 6730fe9cbc195f054d697b25daba8516d70658e0 (patch) | |
| tree | 712edb5d7dfbb1b1b2d91b70d4009c56164ef069 /src/profiling/test/SendCounterPacketTests.cpp | |
| parent | 9265a88c0064dbcf5ad4694bbdcce1b335a394e6 (diff) | |
| download | armnn-6730fe9cbc195f054d697b25daba8516d70658e0.tar.gz | |
IVGCVSW-6842 Replace ARMNN_ASSERT with ARM_PIPE_ASSERT in profiling code
Change-Id: Ie982ae603b7fb2793baf921232d32ce43f46d444
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/profiling/test/SendCounterPacketTests.cpp')
| -rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index 17931cc79b..e94687119d 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -9,7 +9,6 @@ #include <BufferManager.hpp> #include <CounterDirectory.hpp> -#include <common/include/EncodeVersion.hpp> #include <ProfilingUtils.hpp> #include <SendCounterPacket.hpp> #include <Processes.hpp> @@ -17,12 +16,12 @@ #include <armnn/Conversion.hpp> #include <armnn/Utils.hpp> +#include <common/include/Assert.hpp> #include <common/include/Constants.hpp> +#include <common/include/EncodeVersion.hpp> #include <common/include/NumericCast.hpp> #include <common/include/ProfilingException.hpp> -#include <armnn/utility/Assert.hpp> - #include <doctest/doctest.h> #include <chrono> @@ -565,7 +564,7 @@ TEST_CASE("CreateEventRecordTest") counterUnits, deviceUid, counterSetUid); - ARMNN_ASSERT(counter); + ARM_PIPE_ASSERT(counter); // Create an event record SendCounterPacket::EventRecord eventRecord; @@ -691,7 +690,7 @@ TEST_CASE("CreateEventRecordNoUnitsTest") "", deviceUid, counterSetUid); - ARMNN_ASSERT(counter); + ARM_PIPE_ASSERT(counter); // Create an event record SendCounterPacket::EventRecord eventRecord; @@ -798,7 +797,7 @@ TEST_CASE("CreateInvalidEventRecordTest1") counterUnits, deviceUid, counterSetUid); - ARMNN_ASSERT(counter); + ARM_PIPE_ASSERT(counter); // Create an event record SendCounterPacket::EventRecord eventRecord; @@ -837,7 +836,7 @@ TEST_CASE("CreateInvalidEventRecordTest2") counterUnits, deviceUid, counterSetUid); - ARMNN_ASSERT(counter); + ARM_PIPE_ASSERT(counter); // Create an event record SendCounterPacket::EventRecord eventRecord; @@ -876,7 +875,7 @@ TEST_CASE("CreateInvalidEventRecordTest3") counterUnits, deviceUid, counterSetUid); - ARMNN_ASSERT(counter); + ARM_PIPE_ASSERT(counter); // Create an event record SendCounterPacket::EventRecord eventRecord; @@ -896,7 +895,7 @@ TEST_CASE("CreateCategoryRecordTest") // Create a category for testing const std::string categoryName = "some_category"; const CategoryPtr category = std::make_unique<Category>(categoryName); - ARMNN_ASSERT(category); + ARM_PIPE_ASSERT(category); category->m_Counters = { 11u, 23u, 5670u }; // Create a collection of counters @@ -940,10 +939,10 @@ TEST_CASE("CreateCategoryRecordTest") Counter* counter1 = counters.find(11)->second.get(); Counter* counter2 = counters.find(23)->second.get(); Counter* counter3 = counters.find(5670)->second.get(); - ARMNN_ASSERT(counter1); - ARMNN_ASSERT(counter2); - ARMNN_ASSERT(counter3); - uint16_t categoryEventCount = arm::pipe::numeric_cast<uint16_t>(counters.size()); + ARM_PIPE_ASSERT(counter1); + ARM_PIPE_ASSERT(counter2); + ARM_PIPE_ASSERT(counter3); + uint16_t categoryEventCount = armnn::numeric_cast<uint16_t>(counters.size()); // Create a category record SendCounterPacket::CategoryRecord categoryRecord; |