X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1aaf3e3fc120f9434c692f1c49d03a00b24e55a1..63c929772caa353d0bf4370b6e7bd29ad6d25899:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index b19c922120..315520c4ae 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -4,13 +4,30 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "cpu_cas01.hpp" -#include "cpu_ti.hpp" -#include "simgrid/sg_config.h" -#include "src/kernel/lmm/maxmin.hpp" -#include "xbt/utility.hpp" -#include +#include "simgrid/sg_config.hpp" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module"); + +/*********** + * Options * + ***********/ + +static simgrid::config::Flag + cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy", + + std::map({ + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."}, + {"TI", "Trace integration. Highly optimized mode when using availability traces (only available " + "for the Cas01 CPU model for now)."}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging."}, + }), + + [](std::string const& val) { + xbt_assert(_sg_cfg_init_status < 2, + "Cannot change the optimization algorithm after the initialization"); + }); /********* * Model * @@ -20,41 +37,38 @@ void surf_cpu_model_init_Cas01() xbt_assert(not surf_cpu_model_pm); xbt_assert(not surf_cpu_model_vm); - if (xbt_cfg_get_string("cpu/optim") == "TI") { + if (cpu_optim_opt == "TI") { surf_cpu_model_init_ti(); return; } - surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); + simgrid::kernel::resource::Model::UpdateAlgo algo; + if (cpu_optim_opt == "Lazy") + algo = simgrid::kernel::resource::Model::UpdateAlgo::Lazy; + else + algo = simgrid::kernel::resource::Model::UpdateAlgo::Full; + + surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo); all_existing_models->push_back(surf_cpu_model_pm); - surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(algo); all_existing_models->push_back(surf_cpu_model_vm); } namespace simgrid { namespace surf { -CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() +CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { - std::string optim = xbt_cfg_get_string("cpu/optim"); - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); - if (optim == "Full") { - setUpdateMechanism(UM_FULL); - } else if (optim == "Lazy") { - setUpdateMechanism(UM_LAZY); + if (algo == Model::UpdateAlgo::Lazy) { + xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"), + "You cannot disable cpu selective update when using the lazy update mechanism"); select = true; - xbt_assert(select || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); - } else { - xbt_die("Unsupported optimization (%s) for this model", optim.c_str()); } - maxmin_system_ = new simgrid::kernel::lmm::System(select); - - if (getUpdateMechanism() == UM_LAZY) - maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet(); + set_maxmin_system(new simgrid::kernel::lmm::System(select)); } CpuCas01Model::~CpuCas01Model() @@ -71,14 +85,14 @@ Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *spe * Resource * ************/ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, + : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, core) { } CpuCas01::~CpuCas01() { - if (model() == surf_cpu_model_pm) + if (get_model() == surf_cpu_model_pm) speedPerPstate_.clear(); } @@ -86,22 +100,23 @@ std::vector * CpuCas01::getSpeedPeakList(){ return &speedPerPstate_; } -bool CpuCas01::isUsed() +bool CpuCas01::is_used() { - return model()->getMaxminSystem()->constraint_used(constraint()); + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; - model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak); - while ((var = constraint()->get_variable(&elem))) { + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), + coresAmount_ * speed_.scale * speed_.peak); + while ((var = get_constraint()->get_variable(&elem))) { CpuCas01Action* action = static_cast(var->get_id()); - model()->getMaxminSystem()->update_variable_bound(action->get_variable(), - action->requestedCore() * speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), + action->requestedCore() * speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -122,16 +137,16 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { - if(isOff()) + if (is_off()) host_that_restart.push_back(getHost()); - turnOn(); + turn_on(); } else { - kernel::lmm::Constraint* cnst = constraint(); + kernel::lmm::Constraint* cnst = get_constraint(); kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; double date = surf_get_clock(); - turnOff(); + turn_off(); while ((var = cnst->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); @@ -154,12 +169,12 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) /** @brief Start a new execution on this CPU lasting @param size flops and using one core */ CpuAction* CpuCas01::execution_start(double size) { - return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint()); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint()); } CpuAction* CpuCas01::execution_start(double size, int requestedCores) { - return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requestedCores); } CpuAction *CpuCas01::sleep(double duration) @@ -167,8 +182,8 @@ CpuAction *CpuCas01::sleep(double duration) if (duration > 0) duration = std::max(duration, sg_surf_precision); - XBT_IN("(%s,%g)", getCname(), duration); - CpuCas01Action* action = new CpuCas01Action(model(), 1.0, isOff(), speed_.scale * speed_.peak, constraint()); + XBT_IN("(%s,%g)", get_cname(), duration); + CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off(), speed_.scale * speed_.peak, get_constraint()); // FIXME: sleep variables should not consume 1.0 in System::expand() action->set_max_duration(duration); @@ -176,16 +191,16 @@ CpuAction *CpuCas01::sleep(double duration) if (duration < 0) { // NO_MAX_DURATION /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */ simgrid::xbt::intrusive_erase(*action->get_state_set(), *action); - action->state_set_ = &static_cast(model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_; + action->state_set_ = &static_cast(get_model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_; action->get_state_set()->push_back(*action); } - model()->getMaxminSystem()->update_variable_weight(action->get_variable(), 0.0); - if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap - action->heapRemove(); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); + if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap + get_model()->get_action_heap().remove(action); // this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its // max_duration correctly at the next call to share_resources - model()->getModifiedSet()->push_front(*action); + get_model()->get_modified_set()->push_front(*action); } XBT_OUT(); @@ -198,14 +213,14 @@ CpuAction *CpuCas01::sleep(double duration) CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint, int requestedCore) : CpuAction(model, cost, failed, - model->getMaxminSystem()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1)) + model->get_maxmin_system()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1)) , requestedCore_(requestedCore) { - if (model->getUpdateMechanism() == UM_LAZY) { + if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { set_last_update(); set_last_value(0.0); } - model->getMaxminSystem()->expand(constraint, get_variable(), 1.0); + model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,