diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-06-04 19:27:13 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:52:54 +0000 |
commit | 17812ba9f7cf2c8f5121c11760ac45fbbdb7aeaf (patch) | |
tree | 28c7bb65a8306e82de91a644fdcc1c0947c6f6d7 /arm_compute | |
parent | f8d8f3aff04faf731f20411ecb91027eab4365c5 (diff) | |
download | ComputeLibrary-17812ba9f7cf2c8f5121c11760ac45fbbdb7aeaf.tar.gz |
COMPMID-817: Tuner: Port kernels to new design.
Change-Id: Iaabb1153c2abe0400ec79d51a21347debe92d642
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/134062
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute')
-rw-r--r-- | arm_compute/core/CL/kernels/CLCol2ImKernel.h | 2 | ||||
-rw-r--r-- | arm_compute/core/CL/kernels/CLGEMMMatrixMultiplyKernel.h | 2 | ||||
-rw-r--r-- | arm_compute/core/CL/kernels/CLIm2ColKernel.h | 3 | ||||
-rw-r--r-- | arm_compute/core/CL/kernels/CLPoolingLayerKernel.h | 4 | ||||
-rw-r--r-- | arm_compute/runtime/CL/tuners/MIdgardTuner.h | 43 |
5 files changed, 49 insertions, 5 deletions
diff --git a/arm_compute/core/CL/kernels/CLCol2ImKernel.h b/arm_compute/core/CL/kernels/CLCol2ImKernel.h index 24d0fdd914..3779325efe 100644 --- a/arm_compute/core/CL/kernels/CLCol2ImKernel.h +++ b/arm_compute/core/CL/kernels/CLCol2ImKernel.h @@ -86,7 +86,7 @@ public: // Inherited methods overridden: void run(const Window &window, cl::CommandQueue &queue) override; -private: +public: const ICLTensor *_input; ICLTensor *_output; std::pair<unsigned int, unsigned int> _convolved_dims; diff --git a/arm_compute/core/CL/kernels/CLGEMMMatrixMultiplyKernel.h b/arm_compute/core/CL/kernels/CLGEMMMatrixMultiplyKernel.h index ee7e7c0e97..13802b97ad 100644 --- a/arm_compute/core/CL/kernels/CLGEMMMatrixMultiplyKernel.h +++ b/arm_compute/core/CL/kernels/CLGEMMMatrixMultiplyKernel.h @@ -80,7 +80,7 @@ public: // Inherited methods overridden: void run(const Window &window, cl::CommandQueue &queue) override; -private: +public: const ICLTensor *_input0; const ICLTensor *_input1; ICLTensor *_output; diff --git a/arm_compute/core/CL/kernels/CLIm2ColKernel.h b/arm_compute/core/CL/kernels/CLIm2ColKernel.h index 43812e42a3..45111fcedd 100644 --- a/arm_compute/core/CL/kernels/CLIm2ColKernel.h +++ b/arm_compute/core/CL/kernels/CLIm2ColKernel.h @@ -113,9 +113,10 @@ private: /** Common signature for the kernel to run */ using Im2ColFunction = void (CLIm2ColKernel::*)(const Window &, cl::CommandQueue &); -private: +public: const ICLTensor *_input; ICLTensor *_output; + PadStrideInfo _conv_info; std::pair<unsigned int, unsigned int> _convolved_dims; unsigned int _num_elems_processed_per_iteration; Im2ColFunction _run_func; diff --git a/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h b/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h index e9ce28b3f9..c13507785b 100644 --- a/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -72,7 +72,7 @@ public: void run(const Window &window, cl::CommandQueue &queue) override; BorderSize border_size() const override; -private: +public: const ICLTensor *_input; ICLTensor *_output; PoolingLayerInfo _pool_info; diff --git a/arm_compute/runtime/CL/tuners/MIdgardTuner.h b/arm_compute/runtime/CL/tuners/MIdgardTuner.h new file mode 100644 index 0000000000..4aa58f41f7 --- /dev/null +++ b/arm_compute/runtime/CL/tuners/MIdgardTuner.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_MIDGARD_TUNER_H__ +#define __ARM_COMPUTE_TUNERS_MIDGARD_TUNER_H__ + +#include "arm_compute/runtime/CL/ICLTuner.h" + +namespace arm_compute +{ +namespace tuners +{ +/** Midgard based OpenCL tuner implementation */ +class MidgardTuner 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_MIDGARD_TUNER_H__ */ |