diff options
Diffstat (limited to 'arm_compute/runtime/GLES_COMPUTE')
5 files changed, 143 insertions, 23 deletions
diff --git a/arm_compute/runtime/GLES_COMPUTE/GCHelpers.h b/arm_compute/runtime/GLES_COMPUTE/GCHelpers.h new file mode 100644 index 0000000000..efc95e786d --- /dev/null +++ b/arm_compute/runtime/GLES_COMPUTE/GCHelpers.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_GC_HELPERS_H__ +#define __ARM_COMPUTE_GC_HELPERS_H__ + +#include "arm_compute/core/GLES_COMPUTE/OpenGLES.h" + +namespace arm_compute +{ +/** This function creates an OpenGL-ES context and a display. + * + * @return A std::tuple where the first element is the opengl display, the second element is the opengl context + * and the third one an error code. The error code will be EGL_TRUE upon successful creation, otherwise + * a value telling why the function failed. + */ +std::tuple<EGLDisplay, EGLContext, EGLBoolean> create_opengl_display_and_context(); +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GC_HELPERS_H__ */ diff --git a/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h b/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h new file mode 100644 index 0000000000..353e9ec0c5 --- /dev/null +++ b/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_GCRUNTIME_CONTEXT_H__ +#define __ARM_COMPUTE_GCRUNTIME_CONTEXT_H__ + +#include "arm_compute/core/GLES_COMPUTE/GCCoreRuntimeContext.h" +#include "arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h" +#include "arm_compute/core/GLES_COMPUTE/OpenGLES.h" +#include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" +#include "arm_compute/runtime/IScheduler.h" +#include "arm_compute/runtime/RuntimeContext.h" + +namespace arm_compute +{ +/** Runtime context */ +class GCRuntimeContext : public RuntimeContext +{ +public: + /** Default Constructor */ + GCRuntimeContext(); + /** Destructor */ + ~GCRuntimeContext() = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + GCRuntimeContext(const GCRuntimeContext &) = delete; + /** Default move constructor */ + GCRuntimeContext(GCRuntimeContext &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + GCRuntimeContext &operator=(const GCRuntimeContext &) = delete; + /** Default move assignment operator */ + GCRuntimeContext &operator=(GCRuntimeContext &&) = default; + /** CPU Scheduler setter */ + void set_gpu_scheduler(GCScheduler *scheduler); + + // Inherited overridden methods + GCScheduler *gpu_scheduler(); + GCKernelLibrary &kernel_library(); + GCCoreRuntimeContext *core_runtime_context(); + +private: + std::unique_ptr<GCScheduler> _gpu_owned_scheduler{ nullptr }; + GCScheduler *_gpu_scheduler{ nullptr }; + GCKernelLibrary _kernel_lib{}; + GCCoreRuntimeContext _core_context{}; +}; +} // namespace arm_compute +#endif /*__ARM_COMPUTE_GCRUNTIME_CONTEXT_H__ */ diff --git a/arm_compute/runtime/GLES_COMPUTE/GCScheduler.h b/arm_compute/runtime/GLES_COMPUTE/GCScheduler.h index 1cf2af47d7..e26e3112fc 100644 --- a/arm_compute/runtime/GLES_COMPUTE/GCScheduler.h +++ b/arm_compute/runtime/GLES_COMPUTE/GCScheduler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -30,40 +30,50 @@ namespace arm_compute { +// Forward declarations class IGCKernel; /** Provides global access to a OpenGL ES context and command queue. */ -class GCScheduler +class GCScheduler final { public: + /** Constructor */ + GCScheduler(); + /** Destructor */ + ~GCScheduler(); + /** Prevent instances of this class from being copied */ + GCScheduler(const GCScheduler &) = delete; + /** Prevent instances of this class from being copied */ + GCScheduler &operator=(const GCScheduler &) = delete; /** Access the scheduler singleton. * * @return The scheduler */ static GCScheduler &get(); - /** Initialises the context and command queue used by the scheduler to default values * and sets a default device and kernel path for the @ref GCKernelLibrary. */ void default_init(); - + /** Initializes the context and display used by the Scheduler. + * + * @param[in] display Display to use + * @param[in] ctx Context to use + */ + void default_init_with_context(EGLDisplay display, EGLContext ctx); /** Schedule the execution of the passed kernel if possible. * * @param[in] kernel Kernel to execute. * @param[in] flush (Optional) Specifies if the command queue will be flushed after running the kernel. */ void dispatch(IGCKernel &kernel, bool flush = true); - /** Initialises the display and context to be used by the scheduler. * * @param[in] dpy The EGL display connection * @param[in] ctx The EGL rendering context */ void init(EGLDisplay dpy, EGLContext ctx); - /** Defines a barrier ordering memory transactions. */ void memory_barrier(); - /** Get the target GPU. * * @return The target GPU. @@ -72,7 +82,6 @@ public: { return _target; } - /** Accessor to set target GPU to be used by the scheduler. * * @param[in] target The target GPU. @@ -83,15 +92,6 @@ public: } private: - /** Constructor */ - GCScheduler(); - /** Destructor */ - ~GCScheduler(); - /** Prevent instances of this class from being copied */ - GCScheduler(const GCScheduler &) = delete; - /** Prevent instances of this class from being copied */ - GCScheduler &operator=(const GCScheduler &) = delete; - /** Set up EGL context */ void setup_context(); diff --git a/arm_compute/runtime/GLES_COMPUTE/IGCSimpleFunction.h b/arm_compute/runtime/GLES_COMPUTE/IGCSimpleFunction.h index 15bbfffe95..c3bd463d24 100644 --- a/arm_compute/runtime/GLES_COMPUTE/IGCSimpleFunction.h +++ b/arm_compute/runtime/GLES_COMPUTE/IGCSimpleFunction.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,6 +26,7 @@ #include "arm_compute/core/GLES_COMPUTE/IGCKernel.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCFillBorderKernel.h" +#include "arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h" #include "arm_compute/runtime/IFunction.h" #include <memory> @@ -36,8 +37,19 @@ namespace arm_compute class IGCSimpleFunction : public IFunction { public: - /** Default constructor */ - IGCSimpleFunction(); + /** Default Constructor + * + * @param[in] ctx Runtime context to be used by the function + */ + IGCSimpleFunction(GCRuntimeContext *ctx = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + IGCSimpleFunction(const IGCSimpleFunction &) = delete; + /** Default move constructor */ + IGCSimpleFunction(IGCSimpleFunction &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + IGCSimpleFunction &operator=(const IGCSimpleFunction &) = delete; + /** Default move assignment operator */ + IGCSimpleFunction &operator=(IGCSimpleFunction &&) = default; // Inherited methods overridden: void run() override final; @@ -45,6 +57,7 @@ public: protected: std::unique_ptr<IGCKernel> _kernel; /**< Kernel to run */ GCFillBorderKernel _border_handler; /**< Kernel to handle borders */ + GCRuntimeContext *_ctx; /**< Context to use */ }; -} +} // namespace arm_compute #endif /*__ARM_COMPUTE_IGCSIMPLEFUNCTION_H__ */ diff --git a/arm_compute/runtime/GLES_COMPUTE/functions/GCActivationLayer.h b/arm_compute/runtime/GLES_COMPUTE/functions/GCActivationLayer.h index 5e0effe902..a046d1b38c 100644 --- a/arm_compute/runtime/GLES_COMPUTE/functions/GCActivationLayer.h +++ b/arm_compute/runtime/GLES_COMPUTE/functions/GCActivationLayer.h @@ -29,6 +29,7 @@ namespace arm_compute { +// Forward declarations class IGCTensor; /** Basic function to run @ref GCActivationLayerKernel @@ -40,9 +41,9 @@ class GCActivationLayer : public IGCSimpleFunction public: /** Constructor * - * @param[in] ctx Runtime context to be used by the function + * @param[in, out] ctx Runtime context to be used by the function */ - GCActivationLayer(void *ctx = nullptr); + explicit GCActivationLayer(GCRuntimeContext *ctx = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ GCActivationLayer(const GCActivationLayer &) = delete; /** Default move constructor */ |