From 6b1bf1a40bebf4cc108d39f8b8e0c29bdfc51ce1 Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Wed, 22 Jan 2020 15:18:49 +0000
Subject: IVGCVSW-4156 Remove backend dependency on ProfilingService.hpp

Change-Id: I3b18ede85408bdfbc5147396e183e87bdabd3754
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 CMakeLists.txt                            |  2 +-
 include/armnn/IProfilingGuidGenerator.hpp | 34 +++++++++++++++++++++++++++++++
 src/backends/backendsCommon/Workload.hpp  |  4 ++--
 src/profiling/IProfilingGuidGenerator.hpp | 32 -----------------------------
 src/profiling/ProfilingGuidGenerator.hpp  |  2 +-
 src/profiling/ProfilingService.cpp        |  5 +++++
 6 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 include/armnn/IProfilingGuidGenerator.hpp
 delete mode 100644 src/profiling/IProfilingGuidGenerator.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21d1336578..88f6396f02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,6 +224,7 @@ list(APPEND armnn_sources
     include/armnn/ILayerVisitor.hpp
     include/armnn/INetwork.hpp
     include/armnn/IProfiler.hpp
+    include/armnn/IProfilingGuidGenerator.hpp
     include/armnn/IRuntime.hpp
     include/armnn/LayerSupport.hpp
     include/armnn/LayerVisitorBase.hpp
@@ -467,7 +468,6 @@ list(APPEND armnn_sources
     src/profiling/IPeriodicCounterCapture.hpp
     src/profiling/IProfilingConnection.hpp
     src/profiling/IProfilingConnectionFactory.hpp
-    src/profiling/IProfilingGuidGenerator.hpp
     src/profiling/LabelsAndEventClasses.cpp
     src/profiling/LabelsAndEventClasses.hpp
     src/profiling/Packet.hpp
diff --git a/include/armnn/IProfilingGuidGenerator.hpp b/include/armnn/IProfilingGuidGenerator.hpp
new file mode 100644
index 0000000000..4dcc6cddc0
--- /dev/null
+++ b/include/armnn/IProfilingGuidGenerator.hpp
@@ -0,0 +1,34 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/Types.hpp>
+
+#include <string>
+
+namespace armnn
+{
+
+namespace profiling
+{
+
+class IProfilingGuidGenerator
+{
+public:
+    /// Return the next random Guid in the sequence
+    virtual ProfilingDynamicGuid NextGuid() = 0;
+
+    /// Create a ProfilingStaticGuid based on a hash of the string
+    virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0;
+
+    virtual ~IProfilingGuidGenerator() {}
+
+    static IProfilingGuidGenerator& Instance();
+};
+
+} // namespace profiling
+
+} // namespace armnn
diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp
index b5851ad7b9..e3905804a8 100644
--- a/src/backends/backendsCommon/Workload.hpp
+++ b/src/backends/backendsCommon/Workload.hpp
@@ -8,8 +8,8 @@
 #include "WorkloadInfo.hpp"
 
 #include <armnn/Types.hpp>
+#include <armnn/IProfilingGuidGenerator.hpp>
 #include <Profiling.hpp>
-#include <ProfilingService.hpp>
 
 #include <algorithm>
 
@@ -45,7 +45,7 @@ public:
 
     BaseWorkload(const QueueDescriptor& descriptor, const WorkloadInfo& info)
         : m_Data(descriptor),
-          m_Guid(profiling::ProfilingService::Instance().NextGuid())
+          m_Guid(profiling::IProfilingGuidGenerator::Instance().NextGuid())
     {
         m_Data.Validate(info);
     }
diff --git a/src/profiling/IProfilingGuidGenerator.hpp b/src/profiling/IProfilingGuidGenerator.hpp
deleted file mode 100644
index fb9f7401fb..0000000000
--- a/src/profiling/IProfilingGuidGenerator.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <armnn/Types.hpp>
-
-#include <string>
-
-namespace armnn
-{
-
-namespace profiling
-{
-
-class IProfilingGuidGenerator
-{
-public:
-    /// Return the next random Guid in the sequence
-    virtual ProfilingDynamicGuid NextGuid() = 0;
-
-    /// Create a ProfilingStaticGuid based on a hash of the string
-    virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0;
-
-    virtual ~IProfilingGuidGenerator() {}
-};
-
-} // namespace profiling
-
-} // namespace armnn
diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/src/profiling/ProfilingGuidGenerator.hpp
index 97de4a88e5..45f523c980 100644
--- a/src/profiling/ProfilingGuidGenerator.hpp
+++ b/src/profiling/ProfilingGuidGenerator.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "IProfilingGuidGenerator.hpp"
+#include "armnn/IProfilingGuidGenerator.hpp"
 
 #include <functional>
 
diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp
index c4063a583c..cbd8d6bde8 100644
--- a/src/profiling/ProfilingService.cpp
+++ b/src/profiling/ProfilingService.cpp
@@ -14,6 +14,11 @@ namespace armnn
 namespace profiling
 {
 
+IProfilingGuidGenerator& IProfilingGuidGenerator::Instance()
+{
+    return ProfilingService::Instance();
+}
+
 void ProfilingService::ResetExternalProfilingOptions(const ExternalProfilingOptions& options,
                                                      bool resetProfilingService)
 {
-- 
cgit v1.2.1