IVGCVSW-6843 replace armnn::Logging with arm::pipe::Logging in profiling code
Change-Id: I9c3af46ca02c5685e06657b8af0e4658d71891d4
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
diff --git a/src/profiling/CommandHandler.cpp b/src/profiling/CommandHandler.cpp
index ff7b5a5..6ba49c2 100644
--- a/src/profiling/CommandHandler.cpp
+++ b/src/profiling/CommandHandler.cpp
@@ -6,7 +6,7 @@
#include "CommandHandler.hpp"
#include "ProfilingService.hpp"
-#include <armnn/Logging.hpp>
+#include <common/include/Logging.hpp>
namespace arm
{
@@ -75,7 +75,7 @@
catch (const arm::pipe::ProfilingException& e)
{
// Log the error and continue
- ARMNN_LOG(warning) << "An error has occurred when handling a command: " << e.what();
+ ARM_PIPE_LOG(warning) << "An error has occurred when handling a command: " << e.what();
// Did we get here because the socket failed?
if ( !profilingConnection.IsOpen() )
{
@@ -88,7 +88,7 @@
catch (...)
{
// Log the error and continue
- ARMNN_LOG(warning) << "An unknown error has occurred when handling a command";
+ ARM_PIPE_LOG(warning) << "An unknown error has occurred when handling a command";
// Did we get here because the socket failed?
if ( !profilingConnection.IsOpen() )
{
diff --git a/src/profiling/PeriodicCounterCapture.cpp b/src/profiling/PeriodicCounterCapture.cpp
index 650043d..490173c 100644
--- a/src/profiling/PeriodicCounterCapture.cpp
+++ b/src/profiling/PeriodicCounterCapture.cpp
@@ -5,7 +5,7 @@
#include "PeriodicCounterCapture.hpp"
-#include <armnn/Logging.hpp>
+#include <common/include/Logging.hpp>
#include <iostream>
@@ -108,7 +108,7 @@
catch (const arm::pipe::ProfilingException& e)
{
// Report the error and continue
- ARMNN_LOG(warning) << "An error has occurred when getting a counter value: "
+ ARM_PIPE_LOG(warning) << "An error has occurred when getting a counter value: "
<< e.what();
continue;
}
diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
index 4d94ba1..98a8ee0 100644
--- a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
+++ b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
@@ -13,10 +13,10 @@
#include "ICounterValues.hpp"
#include "armnn/backends/profiling/IBackendProfilingContext.hpp"
-#include "armnn/Logging.hpp"
#include "armnn/BackendRegistry.hpp"
#include <common/include/CommandHandlerFunctor.hpp>
+#include <common/include/Logging.hpp>
#include <common/include/Packet.hpp>
#include <set>
@@ -86,7 +86,7 @@
if(errorMsg.has_value())
{
- ARMNN_LOG(warning) << "An error has occurred when activating counters of " << backendId << ": "
+ ARM_PIPE_LOG(warning) << "An error has occurred when activating counters of " << backendId << ": "
<< errorMsg.value();
}
}
@@ -100,4 +100,3 @@
} // namespace pipe
} // namespace arm
-
diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp
index 677158e..b5f398d 100644
--- a/src/profiling/ProfilingService.cpp
+++ b/src/profiling/ProfilingService.cpp
@@ -5,11 +5,9 @@
#include "ProfilingService.hpp"
-#include <armnn/Logging.hpp>
-
+#include <common/include/Logging.hpp>
#include <common/include/NumericCast.hpp>
#include <common/include/ProfilingGuid.hpp>
-
#include <common/include/SocketConnectionException.hpp>
#include <fmt/format.h>
@@ -131,12 +129,12 @@
}
catch (const arm::pipe::ProfilingException& e)
{
- ARMNN_LOG(warning) << "An error has occurred when creating the profiling connection: "
+ ARM_PIPE_LOG(warning) << "An error has occurred when creating the profiling connection: "
<< e.what();
}
catch (const arm::pipe::SocketConnectionException& e)
{
- ARMNN_LOG(warning) << "An error has occurred when creating the profiling connection ["
+ ARM_PIPE_LOG(warning) << "An error has occurred when creating the profiling connection ["
<< e.what() << "] on socket [" << e.GetSocketFd() << "].";
}
@@ -425,7 +423,7 @@
std::chrono::duration<double, std::milli> elapsed = finish - start;
std::stringstream ss;
ss << "Timed out waiting on profiling service activation for " << elapsed.count() << " ms";
- ARMNN_LOG(warning) << ss.str();
+ ARM_PIPE_LOG(warning) << ss.str();
}
return;
}
diff --git a/src/profiling/test/ProfilingTestUtils.hpp b/src/profiling/test/ProfilingTestUtils.hpp
index 323a762..32db72a 100644
--- a/src/profiling/test/ProfilingTestUtils.hpp
+++ b/src/profiling/test/ProfilingTestUtils.hpp
@@ -89,6 +89,46 @@
}
};
+struct LogLevelSwapper
+{
+public:
+ LogLevelSwapper(arm::pipe::LogSeverity severity)
+ {
+ // Set the new log level
+ arm::pipe::ConfigureLogging(true, true, severity);
+ }
+ ~LogLevelSwapper()
+ {
+ // The default log level for unit tests is "Fatal"
+ arm::pipe::ConfigureLogging(true, true, arm::pipe::LogSeverity::Fatal);
+ }
+};
+
+struct StreamRedirector
+{
+public:
+ StreamRedirector(std::ostream& stream, std::streambuf* newStreamBuffer)
+ : m_Stream(stream)
+ , m_BackupBuffer(m_Stream.rdbuf(newStreamBuffer))
+ {}
+
+ ~StreamRedirector() { CancelRedirect(); }
+
+ void CancelRedirect()
+ {
+ // Only cancel the redirect once.
+ if (m_BackupBuffer != nullptr )
+ {
+ m_Stream.rdbuf(m_BackupBuffer);
+ m_BackupBuffer = nullptr;
+ }
+ }
+
+private:
+ std::ostream& m_Stream;
+ std::streambuf* m_BackupBuffer;
+};
+
} // namespace pipe
} // namespace arm
diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp
index 43938cf..9c3007b 100644
--- a/src/profiling/test/ProfilingTests.cpp
+++ b/src/profiling/test/ProfilingTests.cpp
@@ -139,6 +139,8 @@
TEST_CASE("CheckCommandHandler")
{
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Fatal);
+
arm::pipe::PacketVersionResolver packetVersionResolver;
ProfilingStateMachine profilingStateMachine;
@@ -3153,7 +3155,12 @@
TEST_CASE("CheckProfilingServiceEnabled")
{
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
+
+ // Redirect the output to a local stream so that we can parse the warning message
+ std::stringstream ss;
+ StreamRedirector streamRedirector(std::cout, ss.rdbuf());
+
ProfilingOptions options;
options.m_EnableProfiling = true;
armnn::ArmNNProfilingServiceInitialiser initialiser;
@@ -3163,9 +3170,6 @@
profilingService.Update();
CHECK(profilingService.GetCurrentState() == ProfilingState::NotConnected);
- // Redirect the output to a local stream so that we can parse the warning message
- std::stringstream ss;
- StreamRedirector streamRedirector(std::cout, ss.rdbuf());
profilingService.Update();
// Reset the profiling service to stop any running thread
@@ -3185,7 +3189,12 @@
TEST_CASE("CheckProfilingServiceEnabledRuntime")
{
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
+
+ // Redirect the output to a local stream so that we can parse the warning message
+ std::stringstream ss;
+ StreamRedirector streamRedirector(std::cout, ss.rdbuf());
+
ProfilingOptions options;
armnn::ArmNNProfilingServiceInitialiser initialiser;
ProfilingService profilingService(arm::pipe::MAX_ARMNN_COUNTER, initialiser);
@@ -3199,9 +3208,6 @@
profilingService.Update();
CHECK(profilingService.GetCurrentState() == ProfilingState::NotConnected);
- // Redirect the output to a local stream so that we can parse the warning message
- std::stringstream ss;
- StreamRedirector streamRedirector(std::cout, ss.rdbuf());
profilingService.Update();
// Reset the profiling service to stop any running thread
@@ -3221,8 +3227,7 @@
TEST_CASE("CheckProfilingServiceBadConnectionAcknowledgedPacket")
{
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
-
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
// Redirect the standard output to a local stream so that we can parse the warning message
std::stringstream ss;
@@ -3285,7 +3290,7 @@
TEST_CASE("CheckProfilingServiceBadRequestCounterDirectoryPacket")
{
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
// Redirect the standard output to a local stream so that we can parse the warning message
std::stringstream ss;
@@ -3350,7 +3355,7 @@
TEST_CASE("CheckProfilingServiceBadPeriodicCounterSelectionPacket")
{
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
// Redirect the standard output to a local stream so that we can parse the warning message
std::stringstream ss;
@@ -3707,7 +3712,11 @@
TEST_CASE("CheckFileFormat") {
// Locally reduce log level to "Warning", as this test needs to parse a warning message from the standard output
- LogLevelSwapper logLevelSwapper(armnn::LogSeverity::Warning);
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Warning);
+
+ // Redirect the output to a local stream so that we can parse the warning message
+ std::stringstream ss;
+ StreamRedirector streamRedirector(std::cout, ss.rdbuf());
// Create profiling options.
ProfilingOptions options;
@@ -3725,10 +3734,6 @@
profilingService.Update();
CHECK(profilingService.GetCurrentState()==ProfilingState::NotConnected);
- // Redirect the output to a local stream so that we can parse the warning message
- std::stringstream ss;
- StreamRedirector streamRedirector(std::cout, ss.rdbuf());
-
// When Update is called and the current state is ProfilingState::NotConnected
// an exception will be raised from GetProfilingConnection and displayed as warning in the output local stream
profilingService.Update();
diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp
index 70bf613..e55117b 100644
--- a/src/profiling/test/ProfilingTests.hpp
+++ b/src/profiling/test/ProfilingTests.hpp
@@ -7,14 +7,13 @@
#include "ProfilingMocks.hpp"
-#include <armnn/Logging.hpp>
#include <armnn/utility/PolymorphicDowncast.hpp>
#include <IProfilingConnection.hpp>
#include <ProfilingService.hpp>
#include <common/include/CommandHandlerFunctor.hpp>
-
+#include <common/include/Logging.hpp>
#include <doctest/doctest.h>
@@ -27,46 +26,6 @@
namespace pipe
{
-struct LogLevelSwapper
-{
-public:
- LogLevelSwapper(armnn::LogSeverity severity)
- {
- // Set the new log level
- armnn::ConfigureLogging(true, true, severity);
- }
- ~LogLevelSwapper()
- {
- // The default log level for unit tests is "Fatal"
- armnn::ConfigureLogging(true, true, armnn::LogSeverity::Fatal);
- }
-};
-
-struct StreamRedirector
-{
-public:
- StreamRedirector(std::ostream& stream, std::streambuf* newStreamBuffer)
- : m_Stream(stream)
- , m_BackupBuffer(m_Stream.rdbuf(newStreamBuffer))
- {}
-
- ~StreamRedirector() { CancelRedirect(); }
-
- void CancelRedirect()
- {
- // Only cancel the redirect once.
- if (m_BackupBuffer != nullptr )
- {
- m_Stream.rdbuf(m_BackupBuffer);
- m_BackupBuffer = nullptr;
- }
- }
-
-private:
- std::ostream& m_Stream;
- std::streambuf* m_BackupBuffer;
-};
-
class TestProfilingConnectionBase : public IProfilingConnection
{
public:
diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp
index eb6a262..7f2421d 100644
--- a/src/profiling/test/SendTimelinePacketTests.cpp
+++ b/src/profiling/test/SendTimelinePacketTests.cpp
@@ -4,6 +4,7 @@
//
#include "ProfilingMocks.hpp"
+#include "ProfilingTestUtils.hpp"
#include <ArmNNProfilingServiceInitialiser.hpp>
#include <BufferManager.hpp>
@@ -428,6 +429,8 @@
TEST_CASE("GetGuidsFromProfilingService")
{
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Fatal);
+
armnn::IRuntime::CreationOptions options;
options.m_ProfilingOptions.m_EnableProfiling = true;
armnn::RuntimeImpl runtime(options);
@@ -451,6 +454,8 @@
TEST_CASE("GetTimelinePackerWriterFromProfilingService")
{
+ LogLevelSwapper logLevelSwapper(arm::pipe::LogSeverity::Fatal);
+
ProfilingOptions options;
options.m_EnableProfiling = true;
armnn::ArmNNProfilingServiceInitialiser initialiser;