From 7a2371213bb900c8c726c346f85920199f424d82 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Wed, 21 Mar 2018 22:58:37 +0100 Subject: Re-added support for local memory size constraint checking in the tuner --- src/tuning/configurations.cpp | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'src/tuning/configurations.cpp') diff --git a/src/tuning/configurations.cpp b/src/tuning/configurations.cpp index 459d66b1..1fe232cf 100644 --- a/src/tuning/configurations.cpp +++ b/src/tuning/configurations.cpp @@ -21,11 +21,15 @@ namespace clblast { // ================================================================================================= // Finds all configurations. It also applies the user-defined constraints within. -std::vector SetConfigurations(const std::vector parameters, - const Constraints& constraints) { +std::vector SetConfigurations(const Device& device, + const std::vector parameters, + const Constraints& constraints, + const LocalMemSizeInfo& local_mem_size_info) { + const auto local_mem_max = device.LocalMemSize(); auto config = Configuration(); auto configurations = std::vector(); - PopulateConfigurations(parameters, 0, config, configurations, constraints); + PopulateConfigurations(parameters, 0, config, configurations, + local_mem_max, constraints, local_mem_size_info); return configurations; } @@ -33,12 +37,14 @@ std::vector SetConfigurations(const std::vector parame void PopulateConfigurations(const std::vector ¶meters, const size_t index, const Configuration &config, std::vector &configuration, - const Constraints& constraints) { + const size_t local_mem_max, + const Constraints& constraints, + const LocalMemSizeInfo& local_mem_size_info) { // End of the chain: all parameters are considered, store the resulting configuration if it is a // valid one according to the constraints if (index == parameters.size()) { - if (ValidConfiguration(config, constraints)) { + if (ValidConfiguration(config, local_mem_max, constraints, local_mem_size_info)) { configuration.push_back(config); } return; @@ -49,13 +55,16 @@ void PopulateConfigurations(const std::vector ¶meters, for (auto &value: parameter.second) { auto config_copy = config; config_copy[parameter.first] = value; - PopulateConfigurations(parameters, index+1, config_copy, configuration, constraints); + PopulateConfigurations(parameters, index+1, config_copy, configuration, + local_mem_max, constraints, local_mem_size_info); } } // Loops over all user-defined constraints to check whether or not the configuration is valid bool ValidConfiguration(const Configuration &config, - const Constraints& constraints) { + const size_t local_mem_max, + const Constraints& constraints, + const LocalMemSizeInfo& local_mem_size_info) { // Iterates over all constraints for (auto &constraint: constraints) { @@ -72,6 +81,17 @@ bool ValidConfiguration(const Configuration &config, } } + // Finds the values of the local memory parameters + auto local_mem_values = std::vector(local_mem_size_info.parameters.size()); + for (auto i=size_t{0}; i local_mem_max) { + return false; + } + // Everything was OK: this configuration is valid return true; } -- cgit v1.2.3