1 files changed, 79 insertions, 6 deletions

diff --git a/arm_compute/runtime/CL/CLTuningParams.h b/arm_compute/runtime/CL/CLTuningParams.h
index 99a386638d..b50481336b 100644
--- a/arm_compute/runtime/CL/CLTuningParams.h
+++ b/arm_compute/runtime/CL/CLTuningParams.h
@@ -25,6 +25,10 @@
 #define ARM_COMPUTE_CLTUNING_PARAMS_H
 
 #include "arm_compute/core/CL/OpenCL.h"
+#include "arm_compute/runtime/CL/CLTunerTypes.h"
+#include "support/StringSupport.h"
+
+#include <ostream>
 
 namespace arm_compute
 {
@@ -34,26 +38,95 @@ class CLTuningParams
 public:
     CLTuningParams(const CLTuningParams &) = default;
 
-    CLTuningParams(unsigned int lws_x = 0, unsigned int lws_y = 0, unsigned int lws_z = 0)
-        : _lws(lws_x, lws_y, lws_z)
+    CLTuningParams(unsigned int lws_x = 0, unsigned int lws_y = 0, unsigned int lws_z = 0, int wbsm = 0)
+        : _lws(lws_x, lws_y, lws_z), _wbsm(wbsm)
     {
     }
-    CLTuningParams(cl::NDRange lws)
-        : _lws(lws)
+    CLTuningParams(cl::NDRange lws, cl_int wbsm = 0)
+        : _lws(lws), _wbsm(wbsm)
     {
     }
-    void set_lws(cl::NDRange &lws)
+
+    CLTuningParams(cl_int wbsm)
+        : CLTuningParams(cl::NullRange, wbsm)
+    {
+    }
+
+    void set_lws(cl::NDRange lws)
     {
         _lws = lws;
     }
 
-    cl::NDRange get_lws()
+    cl::NDRange get_lws() const
     {
         return _lws;
     }
 
+    void set_wbsm(cl_int wbsm)
+    {
+        _wbsm = wbsm;
+    }
+
+    cl_int get_wbsm() const
+    {
+        return _wbsm;
+    }
+
+    std::string to_string(CLTuningInfo tuning_info)
+    {
+        std::string tuning_params_string = "";
+        tuning_params_string += ";" + support::cpp11::to_string(_lws[0]) + ";" + support::cpp11::to_string(_lws[1]) + ";" + support::cpp11::to_string(_lws[2]);
+        if(tuning_info.tune_wbsm)
+        {
+            tuning_params_string += ";" + support::cpp11::to_string(_wbsm);
+        }
+        return tuning_params_string;
+    }
+
+    bool from_string(CLTuningInfo tuning_info, std::string tuning_params_string)
+    {
+        std::replace(tuning_params_string.begin(), tuning_params_string.end(), ';', ' ');
+        std::vector<std::string> array;
+        std::stringstream        ss(tuning_params_string);
+        std::string              temp;
+        while(ss >> temp)
+        {
+            array.push_back(temp);
+        }
+        // Read 3 values for lws
+        if(array.size() < 3)
+        {
+            return false;
+        }
+        const unsigned int lws_0 = support::cpp11::stoi(array[0]);
+        const unsigned int lws_1 = support::cpp11::stoi(array[1]);
+        const unsigned int lws_2 = support::cpp11::stoi(array[2]);
+        if(lws_0 == 0 && lws_1 == 0 && lws_2 == 0)
+        {
+            // If lws values are 0, cl::NullRange has to be used
+            // otherwise the lws object will be badly created
+            _lws = cl::NullRange;
+        }
+        else
+        {
+            _lws = cl::NDRange(lws_0, lws_1, lws_2);
+        }
+        array.erase(array.begin(), array.begin() + 3);
+        if(tuning_info.tune_wbsm)
+        {
+            if(array.size() < 1)
+            {
+                return false;
+            }
+            _wbsm = support::cpp11::stoi(array[0]);
+            array.erase(array.begin());
+        }
+        return true;
+    }
+
 private:
     cl::NDRange _lws;
+    cl_int      _wbsm;
 };
 } // namespace arm_compute
 #endif /*ARM_COMPUTE_CLTUNING_PARAMS_H */