commit 0a013a779b2697ac0a4c9d3e91cb2d627dfb342d
author Jim Flynn <jim.flynn@arm.com> Sun Mar 13 16:57:04 2022 +0000
committer Jim Flynn <jim.flynn@arm.com> Sun Mar 13 16:57:04 2022 +0000
tree 20cea444df28e9aad62f591f8218188fe788bd2a
parent 6c9f17dc5fe58e23db0ba591302168766b38ab2a

IVGCVSW-6849 Change ARMNN_NO_CONVERSION_WARN_BEGIN/END to ARM_PIPE_NO_CONVERSION_WARN_BEGIN/END in the profiling code

Change-Id: Id5571f9847289692f968ad30ceab064e96693cac
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/profiling/SendCounterPacket.cpp

diff --git a/src/profiling/SendCounterPacket.cpp b/src/profiling/SendCounterPacket.cpp
index 6a30c65..4586d9a 100644
--- a/src/profiling/SendCounterPacket.cpp
+++ b/src/profiling/SendCounterPacket.cpp
@@ -6,16 +6,14 @@
 #include "SendCounterPacket.hpp"
 
 #include <common/include/Assert.hpp>
+#include <common/include/Conversion.hpp>
 #include <common/include/Constants.hpp>
 #include <common/include/EncodeVersion.hpp>
 #include <common/include/ProfilingException.hpp>
 #include <common/include/SwTrace.hpp>
 
-#include <armnn/Conversion.hpp>
 #include <Processes.hpp>
 
-#include <armnn/utility/NumericCast.hpp>
-
 #include <fmt/format.h>
 
 #include <cstring>
@@ -275,7 +273,7 @@
     // Allocate the necessary space for the category record
     categoryRecord.resize(categoryRecordSize);
 
-    ARMNN_NO_CONVERSION_WARN_BEGIN
+    ARM_PIPE_NO_CONVERSION_WARN_BEGIN
     // Create the category record
     categoryRecord[0] = categoryRecordWord1; // event_count + reserved
     categoryRecord[1] = categoryRecordWord2; // event_pointer_table_offset
@@ -290,7 +288,7 @@
         std::copy(eventRecord.begin(), eventRecord.end(), offset); // event_record
         offset += eventRecord.size();
     }
-    ARMNN_NO_CONVERSION_WARN_END
+    ARM_PIPE_NO_CONVERSION_WARN_END
 
     return true;
 }
@@ -523,7 +521,7 @@
     // Allocate the space for the event record
     eventRecord.resize(eventRecordSize);
 
-    ARMNN_NO_CONVERSION_WARN_BEGIN
+    ARM_PIPE_NO_CONVERSION_WARN_BEGIN
     // Create the event record
     eventRecord[0] = eventRecordWord0; // max_counter_uid + counter_uid
     eventRecord[1] = eventRecordWord1; // device + counter_set
@@ -542,7 +540,7 @@
         offset += counterDescriptionBuffer.size();
         std::copy(counterUnitsBuffer.begin(), counterUnitsBuffer.end(), offset); // units
     }
-    ARMNN_NO_CONVERSION_WARN_END
+    ARM_PIPE_NO_CONVERSION_WARN_END
 
     return true;
 }
@@ -762,7 +760,7 @@
         bodyHeaderWord5  // categories_pointer_table_offset
     };
 
-    ARMNN_NO_CONVERSION_WARN_BEGIN
+    ARM_PIPE_NO_CONVERSION_WARN_BEGIN
     // Create the counter directory packet
     auto counterDirectoryPacketOffset = counterDirectoryPacket.begin();
     // packet_header
@@ -798,7 +796,7 @@
         std::copy(categoryRecord.begin(), categoryRecord.end(), counterDirectoryPacketOffset); // category_record
         counterDirectoryPacketOffset += categoryRecord.size();
     }
-    ARMNN_NO_CONVERSION_WARN_END
+    ARM_PIPE_NO_CONVERSION_WARN_END
 
     // Calculate the total size in bytes of the counter directory packet
     uint32_t totalSize = arm::pipe::numeric_cast<uint32_t>(counterDirectoryPacketSize * uint32_t_size);