commit 083a069a75278fd0312aaecff8c9c73dfe4010c5
author Michalis Spyrou <michalis.spyrou@arm.com> Mon May 13 15:35:50 2019 +0100
committer Michalis Spyrou <michalis.spyrou@arm.com> Mon May 13 16:40:25 2019 +0000
tree 6f8218e4dc5c102d7a3bb8884ef994b63b773082
parent 613bf43a181fba83ef794cf20c63ad2e5d2a3bfa

COMPMID-1995: Change CLTuner default mode to NORMAL

Change-Id: I96a5fc460d5e403fcc4b64002ed4c71606c732f0
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1118
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/runtime/CL/CLTuner.cpp

diff --git a/src/runtime/CL/CLTuner.cpp b/src/runtime/CL/CLTuner.cpp
index 929def2..f2de78d 100644
--- a/src/runtime/CL/CLTuner.cpp
+++ b/src/runtime/CL/CLTuner.cpp
@@ -38,7 +38,7 @@
 namespace arm_compute
 {
 CLTuner::CLTuner(bool tune_new_kernels)
-    : real_clEnqueueNDRangeKernel(nullptr), _lws_table(), _kernel_event(), _tune_new_kernels(tune_new_kernels), _tuner_mode(CLTunerMode::EXHAUSTIVE)
+    : real_clEnqueueNDRangeKernel(nullptr), _lws_table(), _kernel_event(), _tune_new_kernels(tune_new_kernels), _tuner_mode(CLTunerMode::NORMAL)
 {
 }
 

tests/main.cpp

diff --git a/tests/main.cpp b/tests/main.cpp
index bb35d0a..75045ad 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -146,7 +146,7 @@
         CLTunerMode::NORMAL,
         CLTunerMode::RAPID
     };
-    auto tuner_mode = parser.add_option<utils::EnumOption<CLTunerMode>>("tuner-mode", supported_tuner_modes, CLTunerMode::EXHAUSTIVE);
+    auto tuner_mode = parser.add_option<utils::EnumOption<CLTunerMode>>("tuner-mode", supported_tuner_modes, CLTunerMode::NORMAL);
     tuner_mode->set_help("Configures the time taken by the tuner to tune. Slow tuner produces the most performant LWS configuration");
 
     auto tuner_file = parser.add_option<utils::SimpleOption<std::string>>("tuner-file", "");

utils/CommonGraphOptions.cpp

diff --git a/utils/CommonGraphOptions.cpp b/utils/CommonGraphOptions.cpp
index 7334d03..e2ca98a 100644
--- a/utils/CommonGraphOptions.cpp
+++ b/utils/CommonGraphOptions.cpp
@@ -158,7 +158,7 @@
     target      = parser.add_option<EnumOption<Target>>("target", supported_targets, Target::NEON);
     data_type   = parser.add_option<EnumOption<DataType>>("type", supported_data_types, DataType::F32);
     data_layout = parser.add_option<EnumOption<DataLayout>>("layout", supported_data_layouts);
-    tuner_mode  = parser.add_option<EnumOption<CLTunerMode>>("tuner-mode", supported_tuner_modes, CLTunerMode::EXHAUSTIVE);
+    tuner_mode  = parser.add_option<EnumOption<CLTunerMode>>("tuner-mode", supported_tuner_modes, CLTunerMode::NORMAL);
 
     help->set_help("Show this help message");
     threads->set_help("Number of threads to use");

utils/CommonGraphOptions.h

diff --git a/utils/CommonGraphOptions.h b/utils/CommonGraphOptions.h
index d81cd8f..826cca1 100644
--- a/utils/CommonGraphOptions.h
+++ b/utils/CommonGraphOptions.h
@@ -94,7 +94,7 @@
     arm_compute::DataType            data_type{ DataType::F32 };
     arm_compute::DataLayout          data_layout{ DataLayout::NHWC };
     bool                             enable_tuner{ false };
-    arm_compute::CLTunerMode         tuner_mode{ CLTunerMode::EXHAUSTIVE };
+    arm_compute::CLTunerMode         tuner_mode{ CLTunerMode::NORMAL };
     arm_compute::graph::FastMathHint fast_math_hint{ arm_compute::graph::FastMathHint::Disabled };
     std::string                      data_path{};
     std::string                      image{};