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, 10 insertions, 3 deletions

diff --git a/include/armnn/IProfiler.hpp b/include/armnn/IProfiler.hpp
index 1d350855f6..5ce42017d9 100644
--- a/include/armnn/IProfiler.hpp
+++ b/include/armnn/IProfiler.hpp
@@ -49,16 +49,23 @@ private:
     template<typename DescriptorType>
     void AddLayerDetails(const std::string& name,
                          const DescriptorType& desc,
-                         const WorkloadInfo& infos);
+                         const WorkloadInfo& infos,
+                         const profiling::ProfilingGuid guid);
 
     Event* BeginEvent(const BackendId& backendId,
                       const std::string& label,
-                      std::vector<InstrumentPtr>&& instruments);
+                      std::vector<InstrumentPtr>&& instruments,
+                      const Optional<profiling::ProfilingGuid>& guid);
 
     std::unique_ptr<ProfilerImpl> pProfilerImpl;
 
     friend class ScopedProfilingEvent;
-    friend class ScopedProfilingUpdateDescriptions;
+
+    template<typename DescriptorType>
+    friend inline void ProfilingUpdateDescriptions(const std::string& name,
+                                                   const DescriptorType& desc,
+                                                   const WorkloadInfo& infos,
+                                                   const profiling::ProfilingGuid guid);
 
     // Friend functions for unit testing, see ProfilerTests.cpp.
     friend size_t GetProfilerEventSequenceSize(armnn::IProfiler* profiler);