From b6eb35371d222c6b7f61210d97ebd7dd9e197458 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Wed, 8 Aug 2018 13:20:04 +0100 Subject: 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 Reviewed-by: Michele DiGiorgio Reviewed-by: Gian Marco Iodice --- arm_compute/graph/GraphContext.h | 1 + arm_compute/graph/IDeviceBackend.h | 7 ++++++- arm_compute/graph/Utils.h | 7 ++++++- arm_compute/graph/backends/CL/CLDeviceBackend.h | 9 +++++---- arm_compute/graph/backends/GLES/GCDeviceBackend.h | 1 + arm_compute/graph/backends/NEON/NEDeviceBackend.h | 1 + arm_compute/graph/frontend/Stream.h | 6 ++++-- 7 files changed, 24 insertions(+), 8 deletions(-) (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/GraphContext.h b/arm_compute/graph/GraphContext.h index 1831cc2c8b..ce6f86f611 100644 --- a/arm_compute/graph/GraphContext.h +++ b/arm_compute/graph/GraphContext.h @@ -50,6 +50,7 @@ class GraphContext final public: /** Constructor */ GraphContext(); + ~GraphContext(); /** Prevent instances of this class from being copied (As this class contains pointers) */ GraphContext(const GraphContext &) = delete; /** Default move constructor */ diff --git a/arm_compute/graph/IDeviceBackend.h b/arm_compute/graph/IDeviceBackend.h index f28cb1ab42..358d26af81 100644 --- a/arm_compute/graph/IDeviceBackend.h +++ b/arm_compute/graph/IDeviceBackend.h @@ -53,9 +53,14 @@ public: virtual void initialize_backend() = 0; /** Setups the given graph context * - * @param[in] ctx Graph context + * @param[in,out] ctx Graph context */ virtual void setup_backend_context(GraphContext &ctx) = 0; + /** Release the backend specific resources associated to a given graph context + * + * @param[in,out] ctx Graph context + */ + virtual void release_backend_context(GraphContext &ctx) = 0; /** Checks if an instantiated backend is actually supported * * @return True if the backend is supported else false diff --git a/arm_compute/graph/Utils.h b/arm_compute/graph/Utils.h index 582d47e406..3604bad4af 100644 --- a/arm_compute/graph/Utils.h +++ b/arm_compute/graph/Utils.h @@ -91,9 +91,14 @@ void force_target_to_graph(Graph &g, Target target); PassManager create_default_pass_manager(Target target); /** Default setups the graph context if not done manually * - * @param[in] ctx Graph Context + * @param[in,out] ctx Graph Context */ void setup_default_graph_context(GraphContext &ctx); +/** Default releases the graph context if not done manually + * + * @param[in,out] ctx Graph Context + */ +void release_default_graph_context(GraphContext &ctx); /** Get size of a tensor's given dimension depending on its layout * * @param[in] descriptor Descriptor diff --git a/arm_compute/graph/backends/CL/CLDeviceBackend.h b/arm_compute/graph/backends/CL/CLDeviceBackend.h index c1a6a28e6c..cc8d55239e 100644 --- a/arm_compute/graph/backends/CL/CLDeviceBackend.h +++ b/arm_compute/graph/backends/CL/CLDeviceBackend.h @@ -54,6 +54,7 @@ public: // Inherited overridden methods void initialize_backend() override; void setup_backend_context(GraphContext &ctx) override; + void release_backend_context(GraphContext &ctx) override; bool is_backend_supported() override; IAllocator *backend_allocator() override; std::unique_ptr create_tensor(const Tensor &tensor) override; @@ -63,10 +64,10 @@ public: std::shared_ptr create_memory_manager(MemoryManagerAffinity affinity) override; private: - bool _initialized; /**< Flag that specifies if the backend has been default initialized */ - CLTuner _tuner; /**< CL kernel tuner */ - std::unique_ptr _allocator; /**< CL buffer affinity allocator */ - std::string _tuner_file; /** Filename to load/store the tuner's values from */ + int _context_count; /**< Counts how many contexts are currently using the backend */ + CLTuner _tuner; /**< CL kernel tuner */ + std::unique_ptr _allocator; /**< CL buffer affinity allocator */ + std::string _tuner_file; /** Filename to load/store the tuner's values from */ }; } // namespace backends } // namespace graph diff --git a/arm_compute/graph/backends/GLES/GCDeviceBackend.h b/arm_compute/graph/backends/GLES/GCDeviceBackend.h index ba789221e3..ca2d3734eb 100644 --- a/arm_compute/graph/backends/GLES/GCDeviceBackend.h +++ b/arm_compute/graph/backends/GLES/GCDeviceBackend.h @@ -44,6 +44,7 @@ public: // Inherited overridden methods void initialize_backend() override; void setup_backend_context(GraphContext &ctx) override; + void release_backend_context(GraphContext &ctx) override; bool is_backend_supported() override; IAllocator *backend_allocator() override; std::unique_ptr create_tensor(const Tensor &tensor) override; diff --git a/arm_compute/graph/backends/NEON/NEDeviceBackend.h b/arm_compute/graph/backends/NEON/NEDeviceBackend.h index c1e2e0c078..abc17d9e83 100644 --- a/arm_compute/graph/backends/NEON/NEDeviceBackend.h +++ b/arm_compute/graph/backends/NEON/NEDeviceBackend.h @@ -43,6 +43,7 @@ public: // Inherited overridden methods void initialize_backend() override; void setup_backend_context(GraphContext &ctx) override; + void release_backend_context(GraphContext &ctx) override; bool is_backend_supported() override; IAllocator *backend_allocator() override; std::unique_ptr create_tensor(const Tensor &tensor) override; diff --git a/arm_compute/graph/frontend/Stream.h b/arm_compute/graph/frontend/Stream.h index 244d18e753..c8e24eeae2 100644 --- a/arm_compute/graph/frontend/Stream.h +++ b/arm_compute/graph/frontend/Stream.h @@ -74,11 +74,13 @@ public: const Graph &graph() const override; private: - GraphManager _manager; /**< Graph manager */ + //Important: GraphContext must be declared *before* the GraphManager because the GraphManager + //allocates resources from the context and therefore needs to be destroyed before the context during clean up). GraphContext _ctx; /**< Graph context to use */ + GraphManager _manager; /**< Graph manager */ Graph _g; /**< Internal graph representation of the stream */ }; } // namespace frontend } // namespace graph } // namespace arm_compute -#endif /* __ARM_COMPUTE_GRAPH_STREAM_H__ */ \ No newline at end of file +#endif /* __ARM_COMPUTE_GRAPH_STREAM_H__ */ -- cgit v1.2.1