From 7777b1aa865d3c17dcef31573d44fae421176109 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 11 Jul 2018 18:16:20 +0100 Subject: COMPMID-1388: Change default CLTuner to the one for the detected GPU Sets a default tuner for the detected target if no tuner is specified in default_init() Change-Id: I27f1b9bbc0df91c1940315c6cc9042720cd1d3fe Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139630 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- src/runtime/CL/CLScheduler.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/runtime/CL/CLScheduler.cpp') diff --git a/src/runtime/CL/CLScheduler.cpp b/src/runtime/CL/CLScheduler.cpp index c348dfab80..f524a918e6 100644 --- a/src/runtime/CL/CLScheduler.cpp +++ b/src/runtime/CL/CLScheduler.cpp @@ -25,6 +25,7 @@ #include "arm_compute/core/CL/ICLKernel.h" #include "arm_compute/runtime/CL/CLTuner.h" +#include "arm_compute/runtime/CL/tuners/Tuners.h" using namespace arm_compute; @@ -41,7 +42,7 @@ void printf_callback(const char *buffer, unsigned int len, size_t complete, void std::once_flag CLScheduler::_initialize_symbols; CLScheduler::CLScheduler() - : _queue(), _target(GPUTarget::MIDGARD), _is_initialised(false), _cl_tuner() + : _queue(), _target(GPUTarget::MIDGARD), _is_initialised(false), _cl_tuner(nullptr), _cl_default_static_tuner(nullptr) { } @@ -83,11 +84,13 @@ void CLScheduler::default_init(ICLTuner *cl_tuner) cl::CommandQueue queue = cl::CommandQueue(ctx, cl::Device::getDefault(), queue_properties); CLKernelLibrary::get().init("./cl_kernels/", ctx, cl::Device::getDefault()); init(ctx, queue, cl::Device::getDefault(), cl_tuner); + + // Create a default static tuner and set if none was provided + _cl_default_static_tuner = tuners::TunerFactory::create_tuner(_target); } - else - { - _cl_tuner = cl_tuner; - } + + // Set CL tuner + _cl_tuner = (cl_tuner == nullptr) ? _cl_default_static_tuner.get() : cl_tuner; } void CLScheduler::enqueue(ICLKernel &kernel, bool flush) -- cgit v1.2.1