From c0d1c86b1bb1b4e129c292549845e00dfd8abfee Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 23 Mar 2018 15:13:15 +0000 Subject: COMPMID-734: CLTuner rework Change-Id: I8f20d6ea8a09869d71003e7b08e0d33775282f6c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125802 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- arm_compute/core/CL/CLTypes.h | 13 ++- arm_compute/core/CL/ICLKernel.h | 9 ++ .../CL/kernels/CLDirectConvolutionLayerKernel.h | 4 +- arm_compute/core/utils/misc/Signal.h | 99 ++++++++++++++++++++++ arm_compute/runtime/CL/CLScheduler.h | 18 ++-- arm_compute/runtime/CL/CLTuner.h | 3 +- arm_compute/runtime/CL/ICLTuner.h | 16 +++- arm_compute/runtime/CL/tuners/BifrostTuner.h | 43 ++++++++++ 8 files changed, 190 insertions(+), 15 deletions(-) create mode 100644 arm_compute/core/utils/misc/Signal.h create mode 100644 arm_compute/runtime/CL/tuners/BifrostTuner.h (limited to 'arm_compute') diff --git a/arm_compute/core/CL/CLTypes.h b/arm_compute/core/CL/CLTypes.h index a9d5fdd063..14c31fa396 100644 --- a/arm_compute/core/CL/CLTypes.h +++ b/arm_compute/core/CL/CLTypes.h @@ -60,5 +60,16 @@ enum class CLVersion CL20, /* the OpenCL 2.0 and above */ UNKNOWN /* unkown version */ }; -} + +/** OpenCL device options */ +struct CLDeviceOptions +{ + std::string name; /**< Device name */ + std::string extensions; /**< List of supported extensions */ + std::string ddk_version; /**< DDK version */ + GPUTarget gpu_target; /**< GPU target architecture/instance */ + size_t num_cores; /**< Number of cores */ + size_t cache_size; /**< Cache size */ +}; +} // namespace arm_compute #endif /* __ARM_COMPUTE_CL_TYPES_H__ */ diff --git a/arm_compute/core/CL/ICLKernel.h b/arm_compute/core/CL/ICLKernel.h index c7d0c2156b..e6700cd61e 100644 --- a/arm_compute/core/CL/ICLKernel.h +++ b/arm_compute/core/CL/ICLKernel.h @@ -198,6 +198,15 @@ public: _lws_hint = lws_hint; } + /** Return the Local-Workgroup-Size hint + * + * @return Current lws hint + */ + cl::NDRange lws_hint() const + { + return _lws_hint; + } + /** Get the configuration ID * * @note The configuration ID can be used by the caller to distinguish different calls of the same OpenCL kernel diff --git a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h index d47b7da213..eb1bf58b1b 100644 --- a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -88,7 +88,7 @@ public: void run(const Window &window, cl::CommandQueue &queue) override; BorderSize border_size() const override; -private: +public: const ICLTensor *_input; const ICLTensor *_biases; const ICLTensor *_weights; diff --git a/arm_compute/core/utils/misc/Signal.h b/arm_compute/core/utils/misc/Signal.h new file mode 100644 index 0000000000..71f13951b9 --- /dev/null +++ b/arm_compute/core/utils/misc/Signal.h @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2018 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_MISC_SIGNAL_H__ +#define __ARM_COMPUTE_MISC_SIGNAL_H__ + +#include + +namespace arm_compute +{ +namespace utils +{ +namespace signal +{ +namespace detail +{ +/** Base signal class */ +template +class SignalImpl; + +/** Signal class function specialization */ +template +class SignalImpl +{ +public: + using Callback = std::function; + +public: + /** Default Constructor */ + SignalImpl() = default; + + /** Connects signal + * + * @param[in] cb Callback to connect the signal with + */ + void connect(const Callback &cb) + { + _cb = cb; + } + + /** Disconnects the signal */ + void disconnect() + { + _cb = nullptr; + } + + /** Checks if the signal is connected + * + * @return True if there is a connection else false + */ + bool connected() const + { + return (_cb != nullptr); + } + + /** Calls the connected callback + * + * @param[in] args Callback arguments + */ + void operator()(Args &&... args) + { + if(_cb) + { + _cb(std::forward(args)...); + } + } + +private: + Callback _cb{}; /**< Signal callback */ +}; +} // namespace detail + +/** Signal alias */ +template +using Signal = detail::SignalImpl; +} // namespace signal +} // namespace utils +} // namespace arm_compute +#endif /* __ARM_COMPUTE_MISC_SIGNAL_H__ */ diff --git a/arm_compute/runtime/CL/CLScheduler.h b/arm_compute/runtime/CL/CLScheduler.h index 89c3bc1553..e1e7ff637f 100644 --- a/arm_compute/runtime/CL/CLScheduler.h +++ b/arm_compute/runtime/CL/CLScheduler.h @@ -30,7 +30,7 @@ #include "arm_compute/core/CL/OpenCL.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/CLTuner.h" +#include "arm_compute/runtime/CL/ICLTuner.h" #if defined(ARM_COMPUTE_DEBUG_ENABLED) namespace @@ -194,17 +194,19 @@ public: return event; } -private: - /** Tune OpenCL kernel - * - * @note This method uses a brute force approach to find the optimal LWS + /** Tunes OpenCL kernel * * @param[in] kernel Kernel to tune - * - * @return The optimal LWS for the specified kernel */ - cl::NDRange tune_kernel(ICLKernel &kernel); + void tune_kernel_static(ICLKernel &kernel) + { + if(_cl_tuner != nullptr) + { + _cl_tuner->tune_kernel_static(kernel); + } + } +private: /** Flag to ensure symbols initialisation is happening before Scheduler creation */ static std::once_flag _initialize_symbols; diff --git a/arm_compute/runtime/CL/CLTuner.h b/arm_compute/runtime/CL/CLTuner.h index c1fbfd249c..f789500de3 100644 --- a/arm_compute/runtime/CL/CLTuner.h +++ b/arm_compute/runtime/CL/CLTuner.h @@ -99,7 +99,8 @@ public: void save_to_file(const std::string &filename) const; // Inherited methods overridden: - void tune_kernel(ICLKernel &kernel) override; + void tune_kernel_static(ICLKernel &kernel) override; + void tune_kernel_dynamic(ICLKernel &kernel) override; /** Is the kernel_event set ? * diff --git a/arm_compute/runtime/CL/ICLTuner.h b/arm_compute/runtime/CL/ICLTuner.h index c71835c0aa..95b22b5b7e 100644 --- a/arm_compute/runtime/CL/ICLTuner.h +++ b/arm_compute/runtime/CL/ICLTuner.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -34,11 +34,21 @@ class ICLTuner public: /** Virtual destructor */ virtual ~ICLTuner() = default; - /** Tune OpenCL kernel + /** Tune OpenCL kernel statically + * + * @note Tuning is performed using only kernel and tensor metadata, + * thus can be performed when memory is not available + * + * @param[in] kernel Kernel to tune + */ + virtual void tune_kernel_static(ICLKernel &kernel) = 0; + /** Tune OpenCL kernel dynamically + * + * @note Tuning requires memory to be available on all kernel tensors and objects in order to be performed * * @param[in] kernel Kernel to tune */ - virtual void tune_kernel(ICLKernel &kernel) = 0; + virtual void tune_kernel_dynamic(ICLKernel &kernel) = 0; }; } #endif /*__ARM_COMPUTE_ICLTUNER_H__ */ diff --git a/arm_compute/runtime/CL/tuners/BifrostTuner.h b/arm_compute/runtime/CL/tuners/BifrostTuner.h new file mode 100644 index 0000000000..080a37c152 --- /dev/null +++ b/arm_compute/runtime/CL/tuners/BifrostTuner.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018 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_TUNERS_BIFROST_TUNER_H__ +#define __ARM_COMPUTE_TUNERS_BIFROST_TUNER_H__ + +#include "arm_compute/runtime/CL/ICLTuner.h" + +namespace arm_compute +{ +namespace tuners +{ +/** Bifrost based OpenCL tuner implementation */ +class BifrostTuner final : public ICLTuner +{ +public: + // Inherited overriden methods + void tune_kernel_static(ICLKernel &kernel) override; + void tune_kernel_dynamic(ICLKernel &kernel) override; +}; +} // namespace tuners +} // namespace arm_compute +#endif /*__ARM_COMPUTE_TUNERS_BIFROST_TUNER_H__ */ -- cgit v1.2.1