From 4a96211d72002d39df0444b6f2cb56917accb80a Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Sun, 13 Mar 2022 20:18:58 +0000 Subject: IVGCVSW-6850 Remove remaining BackendId refs in profiling code Change-Id: I463085a010bfae4d78fb043a88349b819df0e5be Signed-off-by: Jim Flynn --- src/profiling/ActivateTimelineReportingCommandHandler.cpp | 2 +- src/profiling/ActivateTimelineReportingCommandHandler.hpp | 2 +- src/profiling/CounterDirectory.cpp | 6 ++---- src/profiling/DirectoryCaptureCommandHandler.cpp | 5 ++--- src/profiling/DirectoryCaptureCommandHandler.hpp | 8 +++++++- src/profiling/FileOnlyProfilingConnection.hpp | 2 +- src/profiling/ProfilingService.hpp | 1 - src/profiling/test/RequestCountersPacketHandler.cpp | 2 +- tests/profiling/gatordmock/GatordMockService.hpp | 2 +- tests/profiling/gatordmock/tests/GatordMockTests.cpp | 1 - 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.cpp b/src/profiling/ActivateTimelineReportingCommandHandler.cpp index bc814f0278..aca750d5e8 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.cpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.cpp @@ -46,7 +46,7 @@ void ActivateTimelineReportingCommandHandler::operator()(const arm::pipe::Packet + " id = " + std::to_string(packet.GetPacketId())); } - if(!m_TimelineReporting) + if (!m_TimelineReporting) { m_SendTimelinePacket.SendTimelineMessageDirectoryPackage(); diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.hpp b/src/profiling/ActivateTimelineReportingCommandHandler.hpp index 2564b88bee..ecc7076810 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.hpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.hpp @@ -54,4 +54,4 @@ private: } // namespace pipe -} // namespace arm \ No newline at end of file +} // namespace arm diff --git a/src/profiling/CounterDirectory.cpp b/src/profiling/CounterDirectory.cpp index 87706996ad..b8eddb4140 100644 --- a/src/profiling/CounterDirectory.cpp +++ b/src/profiling/CounterDirectory.cpp @@ -6,8 +6,6 @@ #include "CounterDirectory.hpp" #include "ProfilingUtils.hpp" -#include - #include #include @@ -178,7 +176,7 @@ const CounterSet* CounterDirectory::RegisterCounterSet(const std::string& counte return counterSetPtr; } -const Counter* CounterDirectory::RegisterCounter(const std::string& /*backendId*/, +const Counter* CounterDirectory::RegisterCounter(const std::string& applicationName, const uint16_t uid, const std::string& parentCategoryName, uint16_t counterClass, @@ -294,7 +292,7 @@ const Counter* CounterDirectory::RegisterCounter(const std::string& /*backendId* const std::string unitsValue = units.has_value() ? units.value() : ""; // Create the counter - CounterPtr counter = std::make_shared(armnn::profiling::BACKEND_ID, + CounterPtr counter = std::make_shared(applicationName, counterUids.front(), maxCounterUid, counterClass, diff --git a/src/profiling/DirectoryCaptureCommandHandler.cpp b/src/profiling/DirectoryCaptureCommandHandler.cpp index 75e1aebeb7..ac11f68bd5 100644 --- a/src/profiling/DirectoryCaptureCommandHandler.cpp +++ b/src/profiling/DirectoryCaptureCommandHandler.cpp @@ -5,7 +5,6 @@ #include "DirectoryCaptureCommandHandler.hpp" -#include #include "ProfilingUtils.hpp" #include @@ -192,7 +191,7 @@ void DirectoryCaptureCommandHandler::ReadCategoryRecords(const unsigned char* co GetStringNameFromBuffer(data, offset + categoryOffsets[categoryIndex] + nameOffset + uint32_t_size)); for (auto& counter : eventRecords) { - const Counter* registeredCounter = m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, + const Counter* registeredCounter = m_CounterDirectory.RegisterCounter(m_ApplicationName, counter.m_CounterUid, category->m_Name, counter.m_CounterClass, @@ -339,4 +338,4 @@ std::string DirectoryCaptureCommandHandler::GetStringNameFromBuffer(const unsign } // namespace pipe -} // namespace arm \ No newline at end of file +} // namespace arm diff --git a/src/profiling/DirectoryCaptureCommandHandler.hpp b/src/profiling/DirectoryCaptureCommandHandler.hpp index 8a5241ff84..751eae3c99 100644 --- a/src/profiling/DirectoryCaptureCommandHandler.hpp +++ b/src/profiling/DirectoryCaptureCommandHandler.hpp @@ -35,8 +35,13 @@ class DirectoryCaptureCommandHandler : public arm::pipe::CommandHandlerFunctor { public: - DirectoryCaptureCommandHandler(uint32_t familyId, uint32_t packetId, uint32_t version, bool quietOperation = true) + DirectoryCaptureCommandHandler(const std::string& applicationName, + uint32_t familyId, + uint32_t packetId, + uint32_t version, + bool quietOperation = true) : CommandHandlerFunctor(familyId, packetId, version) + , m_ApplicationName(applicationName) , m_QuietOperation(quietOperation) , m_AlreadyParsed(false) {} @@ -72,6 +77,7 @@ private: std::string GetStringNameFromBuffer(const unsigned char* data, uint32_t offset); bool IsValidChar(unsigned char c); + std::string m_ApplicationName; CounterDirectory m_CounterDirectory; std::unordered_map m_UidTranslation; bool m_QuietOperation; diff --git a/src/profiling/FileOnlyProfilingConnection.hpp b/src/profiling/FileOnlyProfilingConnection.hpp index 9f992d080e..190803f811 100644 --- a/src/profiling/FileOnlyProfilingConnection.hpp +++ b/src/profiling/FileOnlyProfilingConnection.hpp @@ -6,11 +6,11 @@ #pragma once #include -#include "DirectoryCaptureCommandHandler.hpp" #include "IProfilingConnection.hpp" #include "ProfilingUtils.hpp" #include "Runtime.hpp" +#include #include #include diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp index e0083dc9a8..22349d0808 100644 --- a/src/profiling/ProfilingService.hpp +++ b/src/profiling/ProfilingService.hpp @@ -55,7 +55,6 @@ public: armnn::Optional reportStructure = armnn::EmptyOptional()) : m_Options() , m_TimelineReporting(false) - , m_CounterDirectory() , m_ProfilingConnectionFactory(new ProfilingConnectionFactory()) , m_ProfilingConnection() , m_StateMachine() diff --git a/src/profiling/test/RequestCountersPacketHandler.cpp b/src/profiling/test/RequestCountersPacketHandler.cpp index b688b2d0c3..0a71d3cd62 100644 --- a/src/profiling/test/RequestCountersPacketHandler.cpp +++ b/src/profiling/test/RequestCountersPacketHandler.cpp @@ -32,7 +32,7 @@ void RequestCountersPacketHandler::HandlePacket(const arm::pipe::Packet& packet) } arm::pipe::PacketVersionResolver packetVersionResolver; DirectoryCaptureCommandHandler directoryCaptureCommandHandler( - 0, 2, packetVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue()); + "ARMNN", 0, 2, packetVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue()); directoryCaptureCommandHandler.operator()(packet); const ICounterDirectory& counterDirectory = directoryCaptureCommandHandler.GetCounterDirectory(); for (auto& category : counterDirectory.GetCategories()) diff --git a/tests/profiling/gatordmock/GatordMockService.hpp b/tests/profiling/gatordmock/GatordMockService.hpp index d8623bba16..cc9cdd1d8e 100644 --- a/tests/profiling/gatordmock/GatordMockService.hpp +++ b/tests/profiling/gatordmock/GatordMockService.hpp @@ -54,7 +54,7 @@ public: // This stub lets us ignore any counter capture packets we receive without throwing an error , m_StubCommandHandler(3, 0, m_PacketVersionResolver.ResolvePacketVersion(0, 3).GetEncodedValue()) , m_DirectoryCaptureCommandHandler( - 0, 2, m_PacketVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue(), !echoPackets) + "ARMNN", 0, 2, m_PacketVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue(), !echoPackets) , m_TimelineCaptureCommandHandler( 1, 1, m_PacketVersionResolver.ResolvePacketVersion(1, 1).GetEncodedValue(), m_TimelineDecoder) , m_TimelineDirectoryCaptureCommandHandler( diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index 549bb44656..d4fbeb3151 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -4,7 +4,6 @@ // #include -#include #include #include #include -- cgit v1.2.1