From 397043fa3d900430e9e0f6d328b76898f9613388 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Thu, 17 Oct 2019 17:37:10 +0100 Subject: IVGCVSW-4002 Add FamilyId to CommandHandlerKey Change-Id: I0bb0bf77da2bcd7f4746078c4ccee9acc98638a7 Signed-off-by: Jim Flynn --- src/profiling/CommandHandlerKey.cpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/profiling/CommandHandlerKey.cpp') diff --git a/src/profiling/CommandHandlerKey.cpp b/src/profiling/CommandHandlerKey.cpp index 66b20c57cc..4d7e11a7e0 100644 --- a/src/profiling/CommandHandlerKey.cpp +++ b/src/profiling/CommandHandlerKey.cpp @@ -11,6 +11,11 @@ namespace armnn namespace profiling { +uint32_t CommandHandlerKey::GetFamilyId() const +{ + return m_FamilyId; +} + uint32_t CommandHandlerKey::GetPacketId() const { return m_PacketId; @@ -24,16 +29,21 @@ uint32_t CommandHandlerKey::GetVersion() const bool CommandHandlerKey::operator<(const CommandHandlerKey& rhs) const { bool result = true; - - if (m_PacketId == rhs.m_PacketId) + if (m_FamilyId == rhs.m_FamilyId) { - result = m_Version < rhs.m_Version; + if (m_PacketId == rhs.m_PacketId) + { + result = m_Version < rhs.m_Version; + } + else if (m_PacketId > rhs.m_PacketId) + { + result = false; + } } - else if (m_PacketId > rhs.m_PacketId) + else if (m_FamilyId > rhs.m_FamilyId) { result = false; } - return result; } @@ -54,7 +64,7 @@ bool CommandHandlerKey::operator>=(const CommandHandlerKey& rhs) const bool CommandHandlerKey::operator==(const CommandHandlerKey& rhs) const { - return m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version; + return m_FamilyId == rhs.m_FamilyId && m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version; } bool CommandHandlerKey::operator!=(const CommandHandlerKey& rhs) const -- cgit v1.2.1