commit deaed2d5dd1b92796ba49f66989b59d7891e312b
author Gian Marco Iodice <gianmarco.iodice@arm.com> Tue May 14 17:11:53 2019 +0100
committer Gian Marco Iodice <gianmarco.iodice@arm.com> Wed May 15 11:12:22 2019 +0000
tree f3f115107c5c38d8fc920a273405abce80f935c2
parent 81e671ef4f2a8fb3128fba402610b9de28b57891

COMPMID-2334: Extend search space for the EXHAUSTIVE OpenCL tuner

Change-Id Ic71d875542f19d5a4f717f397e1e6ce9ce2536f

Change-Id: I7f9cc86b149aa392acffed602b431451499704d7
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1133
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: 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 f2de78d..2c3f9ce 100644
--- a/src/runtime/CL/CLTuner.cpp
+++ b/src/runtime/CL/CLTuner.cpp
@@ -185,9 +185,7 @@
         auto        x           = lws_test[0];
         auto        y           = lws_test[1];
         auto        z           = lws_test[2];
-        bool        invalid_lws = (x * y * z > kernel.get_max_workgroup_size()) || (x == 1 && y == 1 && z == 1);
-
-        invalid_lws = invalid_lws || (x > gws[0]) || (y > gws[1]) || (z > gws[2]);
+        const bool  invalid_lws = (x * y * z > kernel.get_max_workgroup_size()) || (x == 1 && y == 1 && z == 1);
 
         if(invalid_lws)
         {
@@ -206,6 +204,7 @@
         const cl_ulong end   = _kernel_event.getProfilingInfo<CL_PROFILING_COMMAND_END>();
         const cl_ulong diff  = end - start;
         _kernel_event        = nullptr;
+
         // Check the execution time
         if(diff < min_exec_time)
         {

src/runtime/CL/tuners/CLLWSList.cpp

diff --git a/src/runtime/CL/tuners/CLLWSList.cpp b/src/runtime/CL/tuners/CLLWSList.cpp
index 6eb2514..30fd558 100644
--- a/src/runtime/CL/tuners/CLLWSList.cpp
+++ b/src/runtime/CL/tuners/CLLWSList.cpp
@@ -41,8 +41,10 @@
 
 CLLWSListExhaustive::CLLWSListExhaustive(const cl::NDRange &gws)
 {
-    search_space_shape = TensorShape(std::min(static_cast<unsigned int>(gws[0]), max_lws_supported_x), std::min(static_cast<unsigned int>(gws[1]), max_lws_supported_y),
-                                     std::min(static_cast<unsigned int>(gws[2]), max_lws_supported_z));
+    ARM_COMPUTE_UNUSED(gws);
+    search_space_shape = TensorShape(max_lws_supported_x,
+                                     max_lws_supported_y,
+                                     max_lws_supported_z);
 }
 
 cl::NDRange CLLWSListNormal::operator[](size_t index)