IVGCVSW-5980 Add Descriptor, TensorInfo and Convolution algorithm to JSON

 * Add GUID as field to layer details and profiling events
 * Add Optional GUID param to existing tests
 * Improve Details macro to be inline function
 * Fix some formatting

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I66f192a90a7642b3ee8e7dda0d3f428cce002581

1 files changed, 11 insertions, 2 deletions

diff --git a/src/armnn/ProfilingEvent.cpp b/src/armnn/ProfilingEvent.cpp
index 1ba9789034..31d4b91d23 100644
--- a/src/armnn/ProfilingEvent.cpp
+++ b/src/armnn/ProfilingEvent.cpp
@@ -12,12 +12,14 @@ Event::Event(const std::string& eventName,
              IProfiler* profiler,
              Event* parent,
              const BackendId backendId,
-             std::vector<InstrumentPtr>&& instruments)
+             std::vector<InstrumentPtr>&& instruments,
+             const Optional<profiling::ProfilingGuid> guid)
     : m_EventName(eventName)
     , m_Profiler(profiler)
     , m_Parent(parent)
     , m_BackendId(backendId)
     , m_Instruments(std::move(instruments))
+    , m_ProfilingGuid(guid)
 {
 }
 
@@ -27,7 +29,7 @@ Event::Event(Event&& other) noexcept
     , m_Parent(other.m_Parent)
     , m_BackendId(other.m_BackendId)
     , m_Instruments(std::move(other.m_Instruments))
-
+    , m_ProfilingGuid(other.m_ProfilingGuid)
 {
 }
 
@@ -84,6 +86,12 @@ BackendId Event::GetBackendId() const
     return m_BackendId;
 }
 
+Optional<profiling::ProfilingGuid> Event::GetProfilingGuid() const
+{
+    return m_ProfilingGuid;
+}
+
+
 Event& Event::operator=(Event&& other) noexcept
 {
     if (this == &other)
@@ -95,6 +103,7 @@ Event& Event::operator=(Event&& other) noexcept
     m_Profiler = other.m_Profiler;
     m_Parent = other.m_Parent;
     m_BackendId = other.m_BackendId;
+    m_ProfilingGuid = other.m_ProfilingGuid;
     other.m_Profiler = nullptr;
     other.m_Parent = nullptr;
     return *this;