aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk23
-rw-r--r--src/armnn/Runtime.cpp5
-rw-r--r--src/profiling/CommandHandlerFunctor.hpp2
3 files changed, 29 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 6bf9a50270..fcbab689ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -169,7 +169,28 @@ LOCAL_SRC_FILES := \
src/armnn/layers/StridedSliceLayer.cpp \
src/armnn/layers/SubtractionLayer.cpp \
src/armnn/layers/SwitchLayer.cpp \
- src/armnn/layers/TransposeConvolution2dLayer.cpp
+ src/armnn/layers/TransposeConvolution2dLayer.cpp \
+ src/profiling/BufferManager.cpp \
+ src/profiling/CommandHandler.cpp \
+ src/profiling/CommandHandlerFunctor.cpp \
+ src/profiling/CommandHandlerKey.cpp \
+ src/profiling/CommandHandlerRegistry.cpp \
+ src/profiling/ConnectionAcknowledgedCommandHandler.cpp \
+ src/profiling/CounterDirectory.cpp \
+ src/profiling/Holder.cpp \
+ src/profiling/PacketBuffer.cpp \
+ src/profiling/Packet.cpp \
+ src/profiling/PacketVersionResolver.cpp \
+ src/profiling/PeriodicCounterCapture.cpp \
+ src/profiling/PeriodicCounterSelectionCommandHandler.cpp \
+ src/profiling/ProfilingConnectionDumpToFileDecorator.cpp \
+ src/profiling/ProfilingConnectionFactory.cpp \
+ src/profiling/ProfilingService.cpp \
+ src/profiling/ProfilingStateMachine.cpp \
+ src/profiling/ProfilingUtils.cpp \
+ src/profiling/RequestCounterDirectoryCommandHandler.cpp \
+ src/profiling/SendCounterPacket.cpp \
+ src/profiling/SocketProfilingConnection.cpp
LOCAL_STATIC_LIBRARIES := \
armnn-arm_compute \
diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp
index e47835687d..dd46708508 100644
--- a/src/armnn/Runtime.cpp
+++ b/src/armnn/Runtime.cpp
@@ -10,6 +10,8 @@
#include <backendsCommon/IBackendContext.hpp>
#include <backendsCommon/DynamicBackendUtils.hpp>
+#include "../profiling/ProfilingService.hpp"
+
#include <iostream>
#include <boost/log/trivial.hpp>
@@ -146,6 +148,9 @@ Runtime::Runtime(const CreationOptions& options)
{
BOOST_LOG_TRIVIAL(info) << "ArmNN v" << ARMNN_VERSION << "\n";
+ // pass configuration info to the profiling service
+ armnn::profiling::ProfilingService::Instance().ResetExternalProfilingOptions(options.m_ProfilingOptions);
+
// Load any available/compatible dynamic backend before the runtime
// goes through the backend registry
LoadDynamicBackends(options.m_DynamicBackendsPath);
diff --git a/src/profiling/CommandHandlerFunctor.hpp b/src/profiling/CommandHandlerFunctor.hpp
index 2e1e05fd32..7aaab58d15 100644
--- a/src/profiling/CommandHandlerFunctor.hpp
+++ b/src/profiling/CommandHandlerFunctor.hpp
@@ -28,6 +28,8 @@ public:
virtual void operator()(const Packet& packet) {}
+ virtual ~CommandHandlerFunctor() {}
+
private:
uint32_t m_PacketId;
uint32_t m_Version;