gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kernels: Bugfix with large temporary sizes

Browse Source
This commit is contained in:
Philippe Tillet
2015-08-17 16:30:21 -07:00
parent 470ae7f4be
commit a23e976ca7
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/kernels/templates/base.cpp
View File

@@ -12,6 +12,7 @@
#include "isaac/kernels/templates/base.h" #include "isaac/kernels/templates/base.h"
#include "isaac/kernels/parse.h" #include "isaac/kernels/parse.h"
#include "isaac/exception/unknown_datatype.h" #include "isaac/exception/unknown_datatype.h"
#include "isaac/exception/operation_not_supported.h"
#include "isaac/symbolic/io.h" #include "isaac/symbolic/io.h"
#include "tools/map.hpp" #include "tools/map.hpp"
@@ -83,6 +84,10 @@ std::string base::generate(std::string const & suffix, expressions_tuple const &
expressions_tuple::data_type::const_iterator sit; expressions_tuple::data_type::const_iterator sit;
std::vector<mapping_type>::iterator mit; std::vector<mapping_type>::iterator mit;
int err = is_invalid(expressions, device);
if(err != 0)
throw operation_not_supported_exception("The supplied parameters for this template are invalid : err " + tools::to_string(err));
//Create mapping //Create mapping
std::vector<mapping_type> mappings(expressions.data().size()); std::vector<mapping_type> mappings(expressions.data().size());
std::unique_ptr<symbolic_binder> binder; std::unique_ptr<symbolic_binder> binder;
@@ -141,10 +146,6 @@ int base_impl<TType, PType>::is_invalid(expressions_tuple const & expressions, d
if (p_.simd_width!=1 && p_.simd_width!=2 && p_.simd_width!=3 && p_.simd_width!=4) if (p_.simd_width!=1 && p_.simd_width!=2 && p_.simd_width!=3 && p_.simd_width!=4)
return TEMPLATE_INVALID_SIMD_WIDTH; return TEMPLATE_INVALID_SIMD_WIDTH;
//Temporary workspace
if(temporary_workspace(expressions) > 2e6)
return TEMPLATE_TEMPORARY_TOO_LARGE;
return is_invalid_impl(device, expressions); return is_invalid_impl(device, expressions);
} }

10
lib/profiles/profiles.cpp
View File

@@ -109,6 +109,8 @@ void profiles::value_type::execute(controller<expressions_tuple> const & expr)
} }
//Prediction //Prediction
static const int MAX_TEMPORARY_WORKSPACE = 1e6;
int label = 0; int label = 0;
if(expr.dispatcher_options().label>=0) if(expr.dispatcher_options().label>=0)
label = expr.dispatcher_options().label; label = expr.dispatcher_options().label;
@@ -120,13 +122,13 @@ void profiles::value_type::execute(controller<expressions_tuple> const & expr)
do{ do{
label = std::distance(predictions.begin(),std::max_element(predictions.begin(), predictions.end())); label = std::distance(predictions.begin(),std::max_element(predictions.begin(), predictions.end()));
predictions[label] = 0; predictions[label] = 0;
}while(templates_[label]->is_invalid(expr.x(),queue_.device())); }while(templates_[label]->temporary_workspace(expr.x()) > MAX_TEMPORARY_WORKSPACE);
} }
//Execution //Execution
int err = templates_[label]->is_invalid(expr.x(), queue_.device()); if(templates_[label]->temporary_workspace(expr.x()) > MAX_TEMPORARY_WORKSPACE)
if(err != 0) throw operation_not_supported_exception("Running this operation would require an overly large temporary.");
throw operation_not_supported_exception("The supplied parameters for this template are invalid : err " + tools::to_string(err));
return templates_[label]->enqueue(queue_, program, tools::to_string(label), *fallback_, expr); return templates_[label]->enqueue(queue_, program, tools::to_string(label), *fallback_, expr);
} }