COMPMID-1478: Stop relying on static default OpenCL objects in cl2.hpp
This causes problems when ACL is used as a shared library on Android.
Fixes some problems related to creation / destruction order between the Graph's CL backend and core / runtime
Change-Id: I716d63fd42f4586df1ffbb6fa97e4db06d3a781b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143228
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
diff --git a/src/graph/GraphContext.cpp b/src/graph/GraphContext.cpp
index 3f31114..5f33ed3 100644
--- a/src/graph/GraphContext.cpp
+++ b/src/graph/GraphContext.cpp
@@ -22,7 +22,9 @@
* SOFTWARE.
*/
#include "arm_compute/graph/GraphContext.h"
-#include <arm_compute/graph.h>
+
+#include "arm_compute/graph.h"
+#include "arm_compute/graph/Utils.h"
namespace arm_compute
{
@@ -33,6 +35,12 @@
{
}
+GraphContext::~GraphContext()
+{
+ _memory_managers.clear();
+ release_default_graph_context(*this);
+}
+
const GraphConfig &GraphContext::config() const
{
return _config;
@@ -82,4 +90,4 @@
}
}
} // namespace graph
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute
diff --git a/src/graph/Utils.cpp b/src/graph/Utils.cpp
index d891262..4715694 100644
--- a/src/graph/Utils.cpp
+++ b/src/graph/Utils.cpp
@@ -89,6 +89,14 @@
return pm;
}
+void release_default_graph_context(GraphContext &ctx)
+{
+ for(const auto &backend : backends::BackendRegistry::get().backends())
+ {
+ backend.second->release_backend_context(ctx);
+ }
+}
+
void setup_default_graph_context(GraphContext &ctx)
{
for(const auto &backend : backends::BackendRegistry::get().backends())
@@ -132,4 +140,4 @@
}
}
} // namespace graph
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute
diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp
index 6717f9f..f35daf4 100644
--- a/src/graph/backends/CL/CLDeviceBackend.cpp
+++ b/src/graph/backends/CL/CLDeviceBackend.cpp
@@ -63,7 +63,7 @@
static detail::BackendRegistrar<CLDeviceBackend> CLDeviceBackend_registrar(Target::CL);
CLDeviceBackend::CLDeviceBackend()
- : _initialized(false), _tuner(), _allocator(nullptr), _tuner_file()
+ : _context_count(0), _tuner(), _allocator(nullptr), _tuner_file()
{
}
@@ -90,13 +90,23 @@
_allocator = support::cpp14::make_unique<CLBufferAllocator>();
}
+void CLDeviceBackend::release_backend_context(GraphContext &ctx)
+{
+ ARM_COMPUTE_UNUSED(ctx);
+ _context_count--;
+ if(_context_count == 0) // No more context using the backend: free resources
+ {
+ _allocator = nullptr;
+ }
+}
+
void CLDeviceBackend::setup_backend_context(GraphContext &ctx)
{
// Force backend initialization
- if(!_initialized)
+ _context_count++;
+ if(_context_count == 1)
{
initialize_backend();
- _initialized = true;
}
// Setup tuner
diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp
index bfac31a..ec3cf4f 100644
--- a/src/graph/backends/GLES/GCDeviceBackend.cpp
+++ b/src/graph/backends/GLES/GCDeviceBackend.cpp
@@ -63,6 +63,12 @@
GCScheduler::get().default_init();
}
+void GCDeviceBackend::release_backend_context(GraphContext &ctx)
+{
+ //Nothing to do
+ ARM_COMPUTE_UNUSED(ctx);
+}
+
void GCDeviceBackend::setup_backend_context(GraphContext &ctx)
{
// Force backend initialization
@@ -151,4 +157,4 @@
}
} // namespace backends
} // namespace graph
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute
diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp
index 7c2db40..5fc44d0 100644
--- a/src/graph/backends/NEON/NEDeviceBackend.cpp
+++ b/src/graph/backends/NEON/NEDeviceBackend.cpp
@@ -61,6 +61,13 @@
void NEDeviceBackend::initialize_backend()
{
+ //Nothing to do
+}
+
+void NEDeviceBackend::release_backend_context(GraphContext &ctx)
+{
+ //Nothing to do
+ ARM_COMPUTE_UNUSED(ctx);
}
void NEDeviceBackend::setup_backend_context(GraphContext &ctx)
@@ -155,4 +162,4 @@
}
} // namespace backends
} // namespace graph
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute
diff --git a/src/graph/frontend/Stream.cpp b/src/graph/frontend/Stream.cpp
index 96a166c..878d688 100644
--- a/src/graph/frontend/Stream.cpp
+++ b/src/graph/frontend/Stream.cpp
@@ -33,7 +33,7 @@
namespace frontend
{
Stream::Stream(size_t id, std::string name)
- : _manager(), _ctx(), _g(id, std::move(name))
+ : _ctx(), _manager(), _g(id, std::move(name))
{
}
@@ -66,4 +66,4 @@
}
} // namespace frontend
} // namespace graph
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute