From de691f055ac255c798a766483eef63465ac90c75 Mon Sep 17 00:00:00 2001 From: Gian Marco Date: Fri, 8 Sep 2017 16:13:11 +0100 Subject: COMPMID-524 - Implemented CLTuner object Change-Id: Idbdbecca1fc299ed042936119d90e2bed8db0938 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87101 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- src/runtime/CL/CLScheduler.cpp | 13 ++++- src/runtime/CL/CLTuner.cpp | 118 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 src/runtime/CL/CLTuner.cpp (limited to 'src/runtime') diff --git a/src/runtime/CL/CLScheduler.cpp b/src/runtime/CL/CLScheduler.cpp index f413f626eb..71a749fe52 100644 --- a/src/runtime/CL/CLScheduler.cpp +++ b/src/runtime/CL/CLScheduler.cpp @@ -24,11 +24,12 @@ #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/core/CL/ICLKernel.h" +#include "arm_compute/runtime/CL/CLTuner.h" using namespace arm_compute; CLScheduler::CLScheduler() - : _context(), _queue(), _target(GPUTarget::MIDGARD), _is_initialised(false) + : _context(), _queue(), _target(GPUTarget::MIDGARD), _is_initialised(false), _cl_tuner() { } @@ -44,10 +45,18 @@ void CLScheduler::enqueue(ICLKernel &kernel, bool flush) "The CLScheduler is not initialised yet! Please call the CLScheduler::get().default_init(), \ or CLScheduler::get()::init() and CLKernelLibrary::get()::init() function before running functions!"); + // Tune the kernel if the CLTuner has been provided + if(_cl_tuner != nullptr) + { + // Tune the OpenCL kernel + _cl_tuner->tune_kernel(kernel); + } + + // Run kernel kernel.run(kernel.window(), _queue); if(flush) { _queue.flush(); } -} +} \ No newline at end of file diff --git a/src/runtime/CL/CLTuner.cpp b/src/runtime/CL/CLTuner.cpp new file mode 100644 index 0000000000..f3300d3f83 --- /dev/null +++ b/src/runtime/CL/CLTuner.cpp @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2017 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. + */ +#include "arm_compute/runtime/CL/CLTuner.h" + +#include "arm_compute/core/CL/ICLKernel.h" +#include "arm_compute/runtime/CL/CLScheduler.h" + +#include +#include +#include + +using namespace arm_compute; + +CLTuner::CLTuner() + : _lws_table() +{ +} + +void CLTuner::tune_kernel(ICLKernel &kernel) +{ + // Get the configuration ID from the kernel + const std::string &config_id = kernel.config_id(); + + // Check if we need to find the Optimal LWS. If config_id is empty, the kernel does not require to be tuned + if(config_id != "") + { + auto p = _lws_table.find(config_id); + + if(p == _lws_table.end()) + { + // Find the optimal LWS for the kernel + cl::NDRange opt_lws = find_optimal_lws(kernel); + + // Insert the optimal LWS in the table + _lws_table.emplace(config_id, opt_lws); + + // Set Local-Workgroup-Size + kernel.set_lws_hint(opt_lws); + } + else + { + // Set Local-Workgroup-Size + kernel.set_lws_hint(p->second); + } + } +} + +cl::NDRange CLTuner::find_optimal_lws(ICLKernel &kernel) +{ + cl::CommandQueue q = CLScheduler::get().queue(); + + double min_exec_time = std::numeric_limits::max(); + + cl::NDRange opt_lws = cl::NDRange(1, 1); + + for(int y = 1; y <= 16; ++y) + { + for(int x = 1; x <= 16; ++x) + { + cl::NDRange lws_test = cl::NDRange(x, y); + + //Set the Local-Workgroup-Size + kernel.set_lws_hint(lws_test); + + auto t_start = std::chrono::high_resolution_clock::now(); + + // Run + kernel.run(kernel.window(), q); + + CLScheduler::get().sync(); + + auto t_stop = std::chrono::high_resolution_clock::now(); + + std::chrono::duration fp_nano = t_stop - t_start; + + // Check the execution time + if(fp_nano.count() < min_exec_time) + { + min_exec_time = fp_nano.count(); + opt_lws = cl::NDRange(x, y); + } + } + } + + return opt_lws; +} + +void CLTuner::import_lws_table(const std::unordered_map &lws_table) +{ + _lws_table.clear(); + _lws_table = lws_table; +} + +const std::unordered_map &CLTuner::export_lws_table() +{ + return _lws_table; +} \ No newline at end of file -- cgit v1.2.1