Added input-sanity checks for the OverrideParameters function

3 files changed, 22 insertions, 0 deletions

diff --git a/src/clblast.cpp b/src/clblast.cpp
index 885b849e..871a4804 100644
--- a/src/clblast.cpp
+++ b/src/clblast.cpp
@@ -2264,6 +2264,16 @@ StatusCode OverrideParameters(const cl_device_id device, const std::string &kern
     const auto device_cpp = Device(device);
     const auto device_name = device_cpp.Name();
 
+    // Retrieves the current database values to verify whether the new ones are complete
+    auto in_cache = false;
+    const auto current_database = DatabaseCache::Instance().Get(DatabaseKeyRef{ precision, device_name, kernel_name }, &in_cache);
+    if (!in_cache) { return StatusCode::kInvalidOverrideKernel; }
+    for (const auto &current_param : current_database.GetParameterNames()) {
+      if (parameters.find(current_param) == parameters.end()) {
+        return StatusCode::kMissingOverrideParameter;
+      }
+    }
+
     // Clears the existing program & binary cache for routines with the target kernel
     const auto routine_names = Routine::routines_by_kernel.at(kernel_name);
     for (const auto &routine_name : routine_names) {
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 8019d558..02d0b139 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -103,6 +103,15 @@ std::string Database::GetDefines() const {
   return defines;
 }
 
+// Retrieves the names of all the parameters
+std::vector<std::string> Database::GetParameterNames() const {
+  auto parameter_names = std::vector<std::string>();
+  for (auto &parameter: *parameters_) {
+    parameter_names.push_back(parameter.first);
+  }
+  return parameter_names;
+}
+
 // =================================================================================================
 
 // Searches a particular database for the right kernel and precision
diff --git a/src/database/database.hpp b/src/database/database.hpp
index b6760ec3..b34e0d8a 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -85,6 +85,9 @@ class Database {
   // Obtain a list of OpenCL pre-processor defines based on the parameters
   std::string GetDefines() const;
 
+  // Retrieves the names of all the parameters
+  std::vector<std::string> GetParameterNames() const;
+
  private:
   // Search method for a specified database, returning pointer (possibly a nullptr)
   ParametersPtr Search(const std::string &this_kernel, const std::string &this_type,