#include "cpu_cas01.hpp"
#include "cpu_ti.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
#include "src/kernel/lmm/maxmin.hpp"
+#include "xbt/config.hpp"
#include "xbt/utility.hpp"
+
#include <algorithm>
-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<std::string>
+ cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
+
+ std::map<std::string, std::string>({
+ {"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 *
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");
- 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()
* Resource *
************/
CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<double>* 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)
{
}
return &speedPerPstate_;
}
-bool CpuCas01::isUsed()
+bool CpuCas01::is_used()
{
- return model()->getMaxminSystem()->constraint_used(constraint());
+ return model()->get_maxmin_system()->constraint_used(constraint());
}
/** @brief take into account changes of speed (either load or max) */
kernel::lmm::Variable* var = nullptr;
const_lmm_element_t elem = nullptr;
- model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak);
+ model()->get_maxmin_system()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak);
while ((var = constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
- model()->getMaxminSystem()->update_variable_bound(action->get_variable(),
- action->requestedCore() * speed_.scale * speed_.peak);
+ model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
+ action->requestedCore() * speed_.scale * speed_.peak);
}
Cpu::onSpeedChange();
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();
+ model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
+ if (model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap
+ 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);
+ model()->get_modified_set()->push_front(*action);
}
XBT_OUT();
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,