From 1b61be517387a20cd869e30587de2140b6d2252d Mon Sep 17 00:00:00 2001 From: David Beck Date: Thu, 8 Nov 2018 09:19:14 +0000 Subject: IVGCVSW-2056+IVGCVSW-2064 : move ClContextControl to the ClBackend * add IBackendContext interface * add ClBackendContext implementation Change-Id: I13e4d12b73d4c7775069587675276f7cee7d630b --- src/backends/backendsCommon/BackendRegistry.hpp | 7 +- src/backends/backendsCommon/CMakeLists.txt | 1 + src/backends/backendsCommon/IBackendContext.hpp | 32 ++++++ src/backends/backendsCommon/IBackendInternal.hpp | 5 + .../backendsCommon/test/BackendRegistryTests.cpp | 1 + src/backends/cl/CMakeLists.txt | 2 + src/backends/cl/ClBackend.cpp | 8 ++ src/backends/cl/ClBackend.hpp | 4 +- src/backends/cl/ClBackendContext.cpp | 113 +++++++++++++++++++++ src/backends/cl/ClBackendContext.hpp | 36 +++++++ src/backends/cl/backend.mk | 1 + src/backends/neon/NeonBackend.hpp | 6 ++ src/backends/reference/RefBackend.hpp | 8 +- 13 files changed, 218 insertions(+), 6 deletions(-) create mode 100644 src/backends/backendsCommon/IBackendContext.hpp create mode 100644 src/backends/cl/ClBackendContext.cpp create mode 100644 src/backends/cl/ClBackendContext.hpp (limited to 'src/backends') diff --git a/src/backends/backendsCommon/BackendRegistry.hpp b/src/backends/backendsCommon/BackendRegistry.hpp index 145da8819c..4b20cacbe0 100644 --- a/src/backends/backendsCommon/BackendRegistry.hpp +++ b/src/backends/backendsCommon/BackendRegistry.hpp @@ -4,14 +4,13 @@ // #pragma once -#include "IBackendInternal.hpp" #include "RegistryCommon.hpp" - #include namespace armnn { - +class IBackendInternal; +using IBackendInternalUniquePtr = std::unique_ptr; using BackendRegistry = RegistryCommon; BackendRegistry& BackendRegistryInstance(); @@ -22,4 +21,4 @@ struct RegisteredTypeName static const char * Name() { return "IBackend"; } }; -} // namespace armnn +} // namespace armnn \ No newline at end of file diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index 9dd9b92fe3..f4ab45f8b4 100644 --- a/src/backends/backendsCommon/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND armnnBackendsCommon_sources CpuTensorHandleFwd.hpp CpuTensorHandle.hpp IBackendInternal.hpp + IBackendContext.hpp ILayerSupport.cpp ITensorHandle.hpp LayerSupportRegistry.cpp diff --git a/src/backends/backendsCommon/IBackendContext.hpp b/src/backends/backendsCommon/IBackendContext.hpp new file mode 100644 index 0000000000..de9824956f --- /dev/null +++ b/src/backends/backendsCommon/IBackendContext.hpp @@ -0,0 +1,32 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include +#include + +namespace armnn +{ + +class IBackendContext +{ +protected: + IBackendContext(const IRuntime::CreationOptions&) {} + +public: + // Before and after Load network events + virtual bool BeforeLoadNetwork(NetworkId networkId) = 0; + virtual bool AfterLoadNetwork(NetworkId networkId) = 0; + + // Before and after Unload network events + virtual bool BeforeUnloadNetwork(NetworkId networkId) = 0; + virtual bool AfterUnloadNetwork(NetworkId networkId) = 0; + + virtual ~IBackendContext() {} +}; + +using IBackendContextUniquePtr = std::unique_ptr; + +} // namespace armnn \ No newline at end of file diff --git a/src/backends/backendsCommon/IBackendInternal.hpp b/src/backends/backendsCommon/IBackendInternal.hpp index 7e44dbd676..fede366475 100644 --- a/src/backends/backendsCommon/IBackendInternal.hpp +++ b/src/backends/backendsCommon/IBackendInternal.hpp @@ -5,10 +5,12 @@ #pragma once #include +#include namespace armnn { class IWorkloadFactory; +class IBackendContext; class IBackendInternal : public IBackend { @@ -23,7 +25,10 @@ public: ~IBackendInternal() override = default; using IWorkloadFactoryPtr = std::unique_ptr; + using IBackendContextPtr = std::unique_ptr; + virtual IWorkloadFactoryPtr CreateWorkloadFactory() const = 0; + virtual IBackendContextPtr CreateBackendContext(const IRuntime::CreationOptions&) const = 0; }; using IBackendInternalUniquePtr = std::unique_ptr; diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp index 0bc655be09..26175e015f 100644 --- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp +++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp @@ -6,6 +6,7 @@ #include #include +#include #include diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index d751854c92..dd2a4a12b1 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -7,6 +7,8 @@ if(ARMCOMPUTECL) list(APPEND armnnClBackend_sources ClBackend.cpp ClBackend.hpp + ClBackendContext.cpp + ClBackendContext.hpp ClBackendId.hpp ClContextControl.cpp ClContextControl.hpp diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index b1857a3678..c07fa66457 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -6,6 +6,7 @@ #include "ClBackend.hpp" #include "ClBackendId.hpp" #include "ClWorkloadFactory.hpp" +#include "ClBackendContext.hpp" #include @@ -38,4 +39,11 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory() const return std::make_unique(); } +IBackendInternal::IBackendContextPtr +ClBackend::CreateBackendContext(const IRuntime::CreationOptions& options) const +{ + return IBackendContextPtr{new ClBackendContext{options}}; +} + + } // namespace armnn diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index 223aeb3095..f8a6253c22 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -4,6 +4,7 @@ // #pragma once +#include #include namespace armnn @@ -18,7 +19,8 @@ public: static const BackendId& GetIdStatic(); const BackendId& GetId() const override { return GetIdStatic(); } - IWorkloadFactoryPtr CreateWorkloadFactory() const override; + IBackendInternal::IWorkloadFactoryPtr CreateWorkloadFactory() const override; + IBackendInternal::IBackendContextPtr CreateBackendContext(const IRuntime::CreationOptions&) const override; }; } // namespace armnn \ No newline at end of file diff --git a/src/backends/cl/ClBackendContext.cpp b/src/backends/cl/ClBackendContext.cpp new file mode 100644 index 0000000000..a2c1b87359 --- /dev/null +++ b/src/backends/cl/ClBackendContext.cpp @@ -0,0 +1,113 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ClBackendContext.hpp" +#include "ClContextControl.hpp" + +#include + +#ifdef ARMCOMPUTECL_ENABLED +#include +#include +#include +#endif + +namespace armnn +{ + +struct ClBackendContext::ClContextControlWrapper +{ + ClContextControlWrapper(IGpuAccTunedParameters* clTunedParameters, + bool profilingEnabled) + : m_ClContextControl(clTunedParameters, profilingEnabled) + {} + + bool Sync() + { +#ifdef ARMCOMPUTECL_ENABLED + if (arm_compute::CLScheduler::get().context()() != NULL) + { + // Waits for all queued CL requests to finish before unloading the network they may be using. + try + { + // Coverity fix: arm_compute::CLScheduler::sync() may throw an exception of type cl::Error. + arm_compute::CLScheduler::get().sync(); + } + catch (const cl::Error&) + { + BOOST_LOG_TRIVIAL(warning) << "WARNING: Runtime::UnloadNetwork(): an error occurred while waiting for " + "the queued CL requests to finish"; + return false; + } + } +#endif + return true; + } + + void ClearClCache() + { +#ifdef ARMCOMPUTECL_ENABLED + if (arm_compute::CLScheduler::get().context()() != NULL) + { + // There are no loaded networks left, so clear the CL cache to free up memory + m_ClContextControl.ClearClCache(); + } +#endif + } + + + ClContextControl m_ClContextControl; +}; + + +ClBackendContext::ClBackendContext(const IRuntime::CreationOptions& options) + : IBackendContext(options) + , m_ClContextControlWrapper( + std::make_unique(options.m_GpuAccTunedParameters.get(), + options.m_EnableGpuProfiling)) +{ +} + +bool ClBackendContext::BeforeLoadNetwork(NetworkId) +{ + return true; +} + +bool ClBackendContext::AfterLoadNetwork(NetworkId networkId) +{ + { + std::lock_guard lockGuard(m_Mutex); + m_NetworkIds.insert(networkId); + } + return true; +} + +bool ClBackendContext::BeforeUnloadNetwork(NetworkId) +{ + return m_ClContextControlWrapper->Sync(); +} + +bool ClBackendContext::AfterUnloadNetwork(NetworkId networkId) +{ + bool clearCache = false; + { + std::lock_guard lockGuard(m_Mutex); + m_NetworkIds.erase(networkId); + clearCache = m_NetworkIds.empty(); + } + + if (clearCache) + { + m_ClContextControlWrapper->ClearClCache(); + } + + return true; +} + +ClBackendContext::~ClBackendContext() +{ +} + +} // namespace armnn \ No newline at end of file diff --git a/src/backends/cl/ClBackendContext.hpp b/src/backends/cl/ClBackendContext.hpp new file mode 100644 index 0000000000..24497c2249 --- /dev/null +++ b/src/backends/cl/ClBackendContext.hpp @@ -0,0 +1,36 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include +#include +#include + +namespace armnn +{ + +class ClBackendContext : public IBackendContext +{ +public: + ClBackendContext(const IRuntime::CreationOptions& options); + + bool BeforeLoadNetwork(NetworkId networkId) override; + bool AfterLoadNetwork(NetworkId networkId) override; + + bool BeforeUnloadNetwork(NetworkId networkId) override; + bool AfterUnloadNetwork(NetworkId networkId) override; + + ~ClBackendContext() override; + +private: + std::mutex m_Mutex; + struct ClContextControlWrapper; + std::unique_ptr m_ClContextControlWrapper; + + std::unordered_set m_NetworkIds; + +}; + +} // namespace armnn \ No newline at end of file diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 97df8e4903..fd7ea80f33 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -9,6 +9,7 @@ BACKEND_SOURCES := \ ClBackend.cpp \ + ClBackendContext.cpp \ ClContextControl.cpp \ ClLayerSupport.cpp \ ClWorkloadFactory.cpp \ diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp index b8bbd781a4..9ee8b238b3 100644 --- a/src/backends/neon/NeonBackend.hpp +++ b/src/backends/neon/NeonBackend.hpp @@ -4,6 +4,7 @@ // #pragma once +#include #include namespace armnn @@ -19,6 +20,11 @@ public: const BackendId& GetId() const override { return GetIdStatic(); } IWorkloadFactoryPtr CreateWorkloadFactory() const override; + + IBackendInternal::IBackendContextPtr CreateBackendContext(const IRuntime::CreationOptions&) const override + { + return IBackendContextPtr{}; + } }; } // namespace armnn \ No newline at end of file diff --git a/src/backends/reference/RefBackend.hpp b/src/backends/reference/RefBackend.hpp index 48a9d529d5..025a4826b2 100644 --- a/src/backends/reference/RefBackend.hpp +++ b/src/backends/reference/RefBackend.hpp @@ -4,6 +4,7 @@ // #pragma once +#include #include namespace armnn @@ -18,7 +19,12 @@ public: static const BackendId& GetIdStatic(); const BackendId& GetId() const override { return GetIdStatic(); } - IWorkloadFactoryPtr CreateWorkloadFactory() const override; + IBackendInternal::IWorkloadFactoryPtr CreateWorkloadFactory() const override; + + IBackendInternal::IBackendContextPtr CreateBackendContext(const IRuntime::CreationOptions&) const override + { + return IBackendContextPtr{}; + } }; } // namespace armnn \ No newline at end of file -- cgit v1.2.1