1 files changed, 21 insertions, 15 deletions

diff --git a/src/routine.cpp b/src/routine.cpp
index 4fe04a60..854c7046 100644
--- a/src/routine.cpp
+++ b/src/routine.cpp
@@ -23,34 +23,37 @@ namespace clblast {
 
 // The constructor does all heavy work, errors are returned as exceptions
 Routine::Routine(Queue &queue, EventPointer event, const std::string &name,
-                 const std::vector<std::string> &routines, const Precision precision,
+                 const std::vector<std::string> &kernel_names, const Precision precision,
                  const std::vector<const Database::DatabaseEntry*> &userDatabase,
                  std::initializer_list<const char *> source):
     precision_(precision),
     routine_name_(name),
+    kernel_names_(kernel_names),
     queue_(queue),
     event_(event),
     context_(queue_.GetContext()),
     device_(queue_.GetDevice()),
-    device_name_(device_.Name()) {
+    device_name_(device_.Name()),
+    db_(kernel_names) {
 
-  InitDatabase(routines, userDatabase);
+  InitDatabase(userDatabase);
   InitProgram(source);
 }
 
-void Routine::InitDatabase(const std::vector<std::string> &routines,
-                           const std::vector<const Database::DatabaseEntry*> &userDatabase) {
+void Routine::InitDatabase(const std::vector<const Database::DatabaseEntry*> &userDatabase) {
+  for (const auto &kernel_name : kernel_names_) {
 
-  // Queries the cache to see whether or not the kernel parameter database is already there
-  bool has_db;
-  db_ = DatabaseCache::Instance().Get(DatabaseKeyRef{ precision_, device_name_, routines },
-                                      &has_db);
-  if (has_db) { return; }
+    // Queries the cache to see whether or not the kernel parameter database is already there
+    bool has_db;
+    db_(kernel_name) = DatabaseCache::Instance().Get(DatabaseKeyRef{ precision_, device_name_, kernel_name },
+                                                     &has_db);
+    if (has_db) { continue; }
 
-  // Builds the parameter database for this device and routine set and stores it in the cache
-  db_ = Database(device_, routines, precision_, userDatabase);
-  DatabaseCache::Instance().Store(DatabaseKey{ precision_, device_name_, routines },
-                                  Database{ db_ });
+    // Builds the parameter database for this device and routine set and stores it in the cache
+    db_(kernel_name) = Database(device_, kernel_name, precision_, userDatabase);
+    DatabaseCache::Instance().Store(DatabaseKey{ precision_, device_name_, kernel_name },
+                                    Database{ db_(kernel_name) });
+  }
 }
 
 void Routine::InitProgram(std::initializer_list<const char *> source) {
@@ -96,7 +99,10 @@ void Routine::InitProgram(std::initializer_list<const char *> source) {
   }
 
   // Collects the parameters for this device in the form of defines, and adds the precision
-  auto source_string = db_.GetDefines();
+  auto source_string = std::string{""};
+  for (const auto &kernel_name : kernel_names_) {
+    source_string += db_(kernel_name).GetDefines();
+  }
   source_string += "#define PRECISION "+ToString(static_cast<int>(precision_))+"\n";
 
   // Adds the name of the routine as a define