commit 9efb57d62197aeb7d868c289bb34166c132f0287
author David Beck <david.beck@arm.com> Mon Nov 05 13:40:33 2018 +0000
committer Matthew Bentham <matthew.bentham@arm.com> Mon Nov 05 17:26:57 2018 +0000
tree 047fe9ac08ad90145d4e2d5bf1c6acc24eaad16c
parent 9c6f3afdf7686d9804fd5bc04ea68fca4c49a0a8

Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc

src/armnn/Runtime.cpp

diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp
index 7691364..37e25a7 100644
--- a/src/armnn/Runtime.cpp
+++ b/src/armnn/Runtime.cpp
@@ -6,10 +6,15 @@
 
 #include <armnn/Version.hpp>
 #include <backendsCommon/BackendRegistry.hpp>
-#include <backendsCommon/BackendContextRegistry.hpp>
 
 #include <iostream>
 
+#ifdef ARMCOMPUTECL_ENABLED
+#include <arm_compute/core/CL/OpenCL.h>
+#include <arm_compute/core/CL/CLKernelLibrary.h>
+#include <arm_compute/runtime/CL/CLScheduler.h>
+#endif
+
 #include <boost/log/trivial.hpp>
 #include <boost/polymorphic_cast.hpp>
 
@@ -52,7 +57,6 @@
     IOptimizedNetwork* rawNetwork = inNetwork.release();
     unique_ptr<LoadedNetwork> loadedNetwork = LoadedNetwork::MakeLoadedNetwork(
         std::unique_ptr<OptimizedNetwork>(boost::polymorphic_downcast<OptimizedNetwork*>(rawNetwork)),
-        m_Options,
         errorMessage);
 
     if (!loadedNetwork)
@@ -74,6 +78,24 @@
 
 Status Runtime::UnloadNetwork(NetworkId networkId)
 {
+#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 Status::Failure;
+        }
+    }
+#endif
+
     {
         std::lock_guard<std::mutex> lockGuard(m_Mutex);
 
@@ -82,6 +104,14 @@
             BOOST_LOG_TRIVIAL(warning) << "WARNING: Runtime::UnloadNetwork(): " << networkId << " not found!";
             return Status::Failure;
         }
+
+#ifdef ARMCOMPUTECL_ENABLED
+        if (arm_compute::CLScheduler::get().context()() != NULL && m_LoadedNetworks.empty())
+        {
+            // There are no loaded networks left, so clear the CL cache to free up memory
+            m_ClContextControl.ClearClCache();
+        }
+#endif
     }
 
     BOOST_LOG_TRIVIAL(debug) << "Runtime::UnloadNetwork(): Unloaded network with ID: " << networkId;
@@ -101,26 +131,12 @@
 }
 
 Runtime::Runtime(const CreationOptions& options)
-    : m_Options{options}
+    : m_ClContextControl(options.m_GpuAccTunedParameters.get(),
+                         options.m_EnableGpuProfiling)
     , m_NetworkIdCounter(0)
     , m_DeviceSpec{BackendRegistryInstance().GetBackendIds()}
 {
     BOOST_LOG_TRIVIAL(info) << "ArmNN v" << ARMNN_VERSION << "\n";
-
-    for (const auto& id : BackendContextRegistryInstance().GetBackendIds())
-    {
-        // Store backend contexts for the supported ones
-        if (m_DeviceSpec.GetSupportedBackends().count(id) > 0)
-        {
-            // Don't throw an exception, rather return a dummy factory if not
-            // found.
-            auto factoryFun = BackendContextRegistryInstance().GetFactory(
-                id, [](const CreationOptions&) { return IBackendContextUniquePtr(); }
-            );
-
-            m_BackendContexts.emplace(std::make_pair(id, factoryFun(options)));
-        }
-    }
 }
 
 Runtime::~Runtime()