diff options
Diffstat (limited to 'src/profiling/test')
-rw-r--r-- | src/profiling/test/ProfilingMocks.hpp | 1 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 1 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 14 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.hpp | 1 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 4af2b6064e..4da167a7ec 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -14,7 +14,6 @@ #include <SendThread.hpp> #include <armnn/Optional.hpp> -#include <armnn/Conversion.hpp> #include <common/include/Assert.hpp> #include <common/include/IgnoreUnused.hpp> diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 9c3007b017..08513182b5 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -25,7 +25,6 @@ #include <SendThread.hpp> #include <SendTimelinePacket.hpp> -#include <armnn/Conversion.hpp> #include <armnn/Utils.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index e94687119d..4ae2c5562b 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -13,10 +13,10 @@ #include <SendCounterPacket.hpp> #include <Processes.hpp> -#include <armnn/Conversion.hpp> #include <armnn/Utils.hpp> #include <common/include/Assert.hpp> +#include <common/include/Conversion.hpp> #include <common/include/Constants.hpp> #include <common/include/EncodeVersion.hpp> #include <common/include/NumericCast.hpp> @@ -605,7 +605,7 @@ TEST_CASE("CreateEventRecordTest") CHECK(eventRecordWord2[1] == counterInterpolation); // interpolation CHECK(std::memcmp(eventRecordWord34, &counterMultiplier, sizeof(counterMultiplier)) == 0); // multiplier - ARMNN_NO_CONVERSION_WARN_BEGIN + ARM_PIPE_NO_CONVERSION_WARN_BEGIN uint32_t eventRecordBlockSize = 8u * sizeof(uint32_t); uint32_t counterNameOffset = eventRecordBlockSize; // The name is the first item in pool uint32_t counterDescriptionOffset = counterNameOffset + // Counter name offset @@ -620,7 +620,7 @@ TEST_CASE("CreateEventRecordTest") 1u + // Null-terminator 2u; // Rounding to the next word - ARMNN_NO_CONVERSION_WARN_END + ARM_PIPE_NO_CONVERSION_WARN_END CHECK(eventRecord[5] == counterNameOffset); // name_offset CHECK(eventRecord[6] == counterDescriptionOffset); // description_offset @@ -729,7 +729,7 @@ TEST_CASE("CreateEventRecordNoUnitsTest") CHECK(eventRecordWord2[1] == counterInterpolation); // interpolation CHECK(std::memcmp(eventRecordWord34, &counterMultiplier, sizeof(counterMultiplier)) == 0); // multiplier - ARMNN_NO_CONVERSION_WARN_BEGIN + ARM_PIPE_NO_CONVERSION_WARN_BEGIN uint32_t eventRecordBlockSize = 8u * sizeof(uint32_t); uint32_t counterNameOffset = eventRecordBlockSize; // The name is the first item in pool uint32_t counterDescriptionOffset = counterNameOffset + // Counter name offset @@ -737,7 +737,7 @@ TEST_CASE("CreateEventRecordNoUnitsTest") counterName.size() + // 18u 1u + // Null-terminator 1u; // Rounding to the next word - ARMNN_NO_CONVERSION_WARN_END + ARM_PIPE_NO_CONVERSION_WARN_END CHECK(eventRecord[5] == counterNameOffset); // name_offset CHECK(eventRecord[6] == counterDescriptionOffset); // description_offset @@ -964,12 +964,12 @@ TEST_CASE("CreateCategoryRecordTest") size_t uint32_t_size = sizeof(uint32_t); - ARMNN_NO_CONVERSION_WARN_BEGIN + ARM_PIPE_NO_CONVERSION_WARN_BEGIN uint32_t categoryRecordBlockSize = 3u * uint32_t_size; uint32_t eventPointerTableOffset = categoryRecordBlockSize; // The event pointer table is the first item in pool uint32_t categoryNameOffset = eventPointerTableOffset + // Event pointer table offset categoryEventCount * uint32_t_size; // The size of the event pointer table - ARMNN_NO_CONVERSION_WARN_END + ARM_PIPE_NO_CONVERSION_WARN_END CHECK(categoryRecord[1] == eventPointerTableOffset); // event_pointer_table_offset CHECK(categoryRecord[2] == categoryNameOffset); // name_offset diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp index de731c8d7b..1f1c3f0b27 100644 --- a/src/profiling/test/SendCounterPacketTests.hpp +++ b/src/profiling/test/SendCounterPacketTests.hpp @@ -11,7 +11,6 @@ #include <IProfilingConnectionFactory.hpp> #include <armnn/Optional.hpp> -#include <armnn/Conversion.hpp> #include <common/include/IgnoreUnused.hpp> #include <common/include/NumericCast.hpp> |