aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2020-01-22 15:18:49 +0000
committerTeresaARM <teresa.charlinreyes@arm.com>2020-01-23 15:55:02 +0000
commit6b1bf1a40bebf4cc108d39f8b8e0c29bdfc51ce1 (patch)
treebd3ed8cfa0f04ea619beb5e4380051f8c051a6e9
parent2210a5334bbd7d09f11db08a2a7a941a088a0f61 (diff)
downloadarmnn-branches/armnn_19_11.tar.gz
IVGCVSW-4156 Remove backend dependency on ProfilingService.hppv19.11.1branches/armnn_19_11
Change-Id: I3b18ede85408bdfbc5147396e183e87bdabd3754 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
-rw-r--r--CMakeLists.txt2
-rw-r--r--include/armnn/IProfilingGuidGenerator.hpp (renamed from src/profiling/IProfilingGuidGenerator.hpp)2
-rw-r--r--src/backends/backendsCommon/Workload.hpp4
-rw-r--r--src/profiling/ProfilingGuidGenerator.hpp2
-rw-r--r--src/profiling/ProfilingService.cpp5
5 files changed, 11 insertions, 4 deletions
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/src/profiling/IProfilingGuidGenerator.hpp b/include/armnn/IProfilingGuidGenerator.hpp
index fb9f7401fb..4dcc6cddc0 100644
--- a/src/profiling/IProfilingGuidGenerator.hpp
+++ b/include/armnn/IProfilingGuidGenerator.hpp
@@ -25,6 +25,8 @@ public:
virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0;
virtual ~IProfilingGuidGenerator() {}
+
+ static IProfilingGuidGenerator& Instance();
};
} // namespace profiling
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/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)
{