IVGCVSW-6844 replace armnn:IgnoreUnused with arm::pipe::IgnoreUnused in profiling code
Change-Id: Ifbdfb034deda2f792ac1069dac808917606ccc9e
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index afe4bc7..9cf322c 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -429,8 +429,8 @@
// These are needed because VALGRIND_COUNT_LEAKS is a macro that assigns to the parameters
// so they are assigned to, but still considered unused, causing a warning.
- IgnoreUnused(dubious);
- IgnoreUnused(suppressed);
+ armnn::IgnoreUnused(dubious);
+ armnn::IgnoreUnused(suppressed);
}
#endif // WITH_VALGRIND
diff --git a/src/profiling/NullProfilingConnection.hpp b/src/profiling/NullProfilingConnection.hpp
index ef09794..a5f8dae 100644
--- a/src/profiling/NullProfilingConnection.hpp
+++ b/src/profiling/NullProfilingConnection.hpp
@@ -7,7 +7,7 @@
#include "IProfilingConnection.hpp"
-#include <armnn/utility/IgnoreUnused.hpp>
+#include <common/include/IgnoreUnused.hpp>
namespace arm
{
@@ -23,14 +23,14 @@
virtual bool WritePacket(const unsigned char* buffer, uint32_t length) override
{
- armnn::IgnoreUnused(buffer);
- armnn::IgnoreUnused(length);
+ arm::pipe::IgnoreUnused(buffer);
+ arm::pipe::IgnoreUnused(length);
return true;
};
virtual Packet ReadPacket(uint32_t timeout) override
{
- armnn::IgnoreUnused(timeout);
+ arm::pipe::IgnoreUnused(timeout);
return Packet(0);
}
@@ -38,4 +38,4 @@
} // namespace pipe
-} // namespace arm
\ No newline at end of file
+} // namespace arm
diff --git a/src/profiling/ProfilingStateMachine.hpp b/src/profiling/ProfilingStateMachine.hpp
index 2648bca..1f6e358 100644
--- a/src/profiling/ProfilingStateMachine.hpp
+++ b/src/profiling/ProfilingStateMachine.hpp
@@ -9,7 +9,7 @@
#include <atomic>
-#include <armnn/utility/IgnoreUnused.hpp>
+#include <common/include/IgnoreUnused.hpp>
namespace arm
{
@@ -29,7 +29,7 @@
bool IsOneOfStates(ProfilingState state1)
{
- armnn::IgnoreUnused(state1);
+ arm::pipe::IgnoreUnused(state1);
return false;
}
diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
index f1f1d24..5d99fee 100644
--- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
+++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
@@ -9,10 +9,10 @@
#include <armnnUtils/Filesystem.hpp>
-#include <armnn/utility/IgnoreUnused.hpp>
-
+#include <common/include/IgnoreUnused.hpp>
#include <common/include/NumericCast.hpp>
+
#include <fstream>
#include <sstream>
@@ -53,14 +53,14 @@
bool WritePacket(const unsigned char* buffer, uint32_t length) override
{
- armnn::IgnoreUnused(buffer);
- armnn::IgnoreUnused(length);
+ arm::pipe::IgnoreUnused(buffer);
+ arm::pipe::IgnoreUnused(length);
return true;
}
Packet ReadPacket(uint32_t timeout) override
{
- armnn::IgnoreUnused(timeout);
+ arm::pipe::IgnoreUnused(timeout);
return std::move(*m_Packet);
}
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp
index 1985a3a..962912e 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -16,8 +16,8 @@
#include <armnn/Optional.hpp>
#include <armnn/Conversion.hpp>
#include <armnn/utility/Assert.hpp>
-#include <armnn/utility/IgnoreUnused.hpp>
+#include <common/include/IgnoreUnused.hpp>
#include <common/include/NumericCast.hpp>
#include <common/include/ProfilingException.hpp>
#include <common/include/ProfilingGuidGenerator.hpp>
@@ -131,7 +131,7 @@
arm::pipe::Packet ReadPacket(uint32_t timeout) override
{
- armnn::IgnoreUnused(timeout);
+ arm::pipe::IgnoreUnused(timeout);
// Simulate a delay in the reading process. The default timeout is way too long.
std::this_thread::sleep_for(std::chrono::milliseconds(5));
@@ -165,7 +165,7 @@
public:
IProfilingConnectionPtr GetProfilingConnection(const ProfilingOptions& options) const override
{
- armnn::IgnoreUnused(options);
+ arm::pipe::IgnoreUnused(options);
return std::make_unique<MockProfilingConnection>();
}
};
@@ -404,7 +404,7 @@
void SendCounterDirectoryPacket(const ICounterDirectory& counterDirectory) override
{
- armnn::IgnoreUnused(counterDirectory);
+ arm::pipe::IgnoreUnused(counterDirectory);
std::string message("SendCounterDirectoryPacket");
unsigned int reserved = 0;
@@ -416,7 +416,7 @@
void SendPeriodicCounterCapturePacket(uint64_t timestamp,
const std::vector<CounterValue>& values) override
{
- armnn::IgnoreUnused(timestamp, values);
+ arm::pipe::IgnoreUnused(timestamp, values);
std::string message("SendPeriodicCounterCapturePacket");
unsigned int reserved = 0;
@@ -428,7 +428,7 @@
void SendPeriodicCounterSelectionPacket(uint32_t capturePeriod,
const std::vector<uint16_t>& selectedCounterIds) override
{
- armnn::IgnoreUnused(capturePeriod, selectedCounterIds);
+ arm::pipe::IgnoreUnused(capturePeriod, selectedCounterIds);
std::string message("SendPeriodicCounterSelectionPacket");
unsigned int reserved = 0;
@@ -518,7 +518,7 @@
const armnn::Optional<uint16_t>& deviceUid = armnn::EmptyOptional(),
const armnn::Optional<uint16_t>& counterSetUid = armnn::EmptyOptional())
{
- armnn::IgnoreUnused(backendId);
+ arm::pipe::IgnoreUnused(backendId);
// Get the number of cores from the argument only
uint16_t deviceCores = numberOfCores.has_value() ? numberOfCores.value() : 0;
@@ -602,19 +602,19 @@
const Device* GetDevice(uint16_t uid) const override
{
- armnn::IgnoreUnused(uid);
+ arm::pipe::IgnoreUnused(uid);
return nullptr; // Not used by the unit tests
}
const CounterSet* GetCounterSet(uint16_t uid) const override
{
- armnn::IgnoreUnused(uid);
+ arm::pipe::IgnoreUnused(uid);
return nullptr; // Not used by the unit tests
}
const Counter* GetCounter(uint16_t uid) const override
{
- armnn::IgnoreUnused(uid);
+ arm::pipe::IgnoreUnused(uid);
return nullptr; // Not used by the unit tests
}
@@ -701,7 +701,7 @@
{
public:
void NotifyProfilingServiceActive() override {}
- void WaitForProfilingServiceActivation(unsigned int timeout) override { armnn::IgnoreUnused(timeout); }
+ void WaitForProfilingServiceActivation(unsigned int timeout) override { arm::pipe::IgnoreUnused(timeout); }
};
} // namespace pipe
diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp
index 9873527..43938cf 100644
--- a/src/profiling/test/ProfilingTests.cpp
+++ b/src/profiling/test/ProfilingTests.cpp
@@ -31,13 +31,12 @@
#include <armnn/profiling/ArmNNProfiling.hpp>
#include <armnn/profiling/ProfilingOptions.hpp>
-#include <armnn/utility/IgnoreUnused.hpp>
-
#include <backends/BackendProfiling.hpp>
#include <common/include/CommandHandlerKey.hpp>
#include <common/include/CommandHandlerRegistry.hpp>
#include <common/include/EncodeVersion.hpp>
+#include <common/include/IgnoreUnused.hpp>
#include <common/include/NumericCast.hpp>
#include <common/include/Packet.hpp>
#include <common/include/PacketVersionResolver.hpp>
@@ -1772,12 +1771,12 @@
{
bool IsCounterRegistered(uint16_t counterUid) const override
{
- armnn::IgnoreUnused(counterUid);
+ arm::pipe::IgnoreUnused(counterUid);
return true;
}
bool IsCounterRegistered(const std::string& counterName) const override
{
- armnn::IgnoreUnused(counterName);
+ arm::pipe::IgnoreUnused(counterName);
return true;
}
uint16_t GetCounterCount() const override
@@ -1786,12 +1785,12 @@
}
uint32_t GetAbsoluteCounterValue(uint16_t counterUid) const override
{
- armnn::IgnoreUnused(counterUid);
+ arm::pipe::IgnoreUnused(counterUid);
return 0;
}
uint32_t GetDeltaCounterValue(uint16_t counterUid) override
{
- armnn::IgnoreUnused(counterUid);
+ arm::pipe::IgnoreUnused(counterUid);
return 0;
}
};
@@ -2320,12 +2319,12 @@
//not used
bool IsCounterRegistered(uint16_t counterUid) const override
{
- armnn::IgnoreUnused(counterUid);
+ arm::pipe::IgnoreUnused(counterUid);
return false;
}
bool IsCounterRegistered(const std::string& counterName) const override
{
- armnn::IgnoreUnused(counterName);
+ arm::pipe::IgnoreUnused(counterName);
return false;
}
uint16_t GetCounterCount() const override
diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp
index ed3e03d..70bf613 100644
--- a/src/profiling/test/ProfilingTests.hpp
+++ b/src/profiling/test/ProfilingTests.hpp
@@ -79,7 +79,7 @@
bool WritePacket(const unsigned char* buffer, uint32_t length) override
{
- armnn::IgnoreUnused(buffer, length);
+ arm::pipe::IgnoreUnused(buffer, length);
return false;
}
@@ -141,7 +141,7 @@
arm::pipe::Packet ReadPacket(uint32_t timeout) override
{
- armnn::IgnoreUnused(timeout);
+ arm::pipe::IgnoreUnused(timeout);
++m_ReadRequests;
throw arm::pipe::ProfilingException("Simulate a non-timeout error");
}
@@ -160,7 +160,7 @@
public:
arm::pipe::Packet ReadPacket(uint32_t timeout) override
{
- armnn::IgnoreUnused(timeout);
+ arm::pipe::IgnoreUnused(timeout);
// Connection Acknowledged Packet header (word 0, word 1 is always zero):
// 26:31 [6] packet_family: Control Packet Family, value 0b000000
// 16:25 [10] packet_id: Packet identifier, value 0b0000000001
@@ -183,7 +183,7 @@
void operator()(const arm::pipe::Packet& packet) override
{
- armnn::IgnoreUnused(packet);
+ arm::pipe::IgnoreUnused(packet);
m_Count++;
}
diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp
index cfd03f8..2584a65 100644
--- a/src/profiling/test/SendCounterPacketTests.hpp
+++ b/src/profiling/test/SendCounterPacketTests.hpp
@@ -13,8 +13,9 @@
#include <armnn/Optional.hpp>
#include <armnn/Conversion.hpp>
#include <armnn/utility/Assert.hpp>
-#include <armnn/utility/IgnoreUnused.hpp>
+#include <common/include/IgnoreUnused.hpp>
+#include <common/include/NumericCast.hpp>
#include <atomic>
#include <condition_variable>