X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55a08c7439db5b0335a5b26e40b3a46e1e03d3e8..b59417738c8cf11f1804269c65a4738bbf43c150:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 9aae097fd2..47b539702a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,16 +1,20 @@ -/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "cpu_cas01.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" + #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/profile/Event.hpp" +#include "src/surf/cpu_cas01.hpp" #include "src/surf/cpu_ti.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 module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)"); /*********** * Options * @@ -19,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the static simgrid::config::Flag cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy", - std::map({ + 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)."}, @@ -36,31 +40,25 @@ static simgrid::config::Flag *********/ void surf_cpu_model_init_Cas01() { - xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen."); - xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen."); - if (cpu_optim_opt == "TI") { - simgrid::kernel::resource::CpuTiModel::create_pm_vm_models(); + simgrid::kernel::resource::CpuTiModel::create_pm_models(); return; } - 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::kernel::resource::CpuCas01Model(algo); - surf_cpu_model_vm = new simgrid::kernel::resource::CpuCas01Model(algo); + auto cpu_model_pm = std::make_shared("Cpu_Cas01"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(cpu_model_pm); + engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm); } namespace simgrid { namespace kernel { namespace resource { -CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo) +CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name) { - all_existing_models.push_back(this); + if (config::get_value("cpu/optim") == "Lazy") + set_update_algorithm(Model::UpdateAlgo::LAZY); bool select = config::get_value("cpu/maxmin-selective-update"); @@ -73,28 +71,15 @@ CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo) set_maxmin_system(new lmm::System(select)); } -CpuCas01Model::~CpuCas01Model() +CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { - surf_cpu_model_pm = nullptr; -} - -Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) -{ - return new CpuCas01(this, host, speed_per_pstate, core); + return (new CpuCas01(host, speed_per_pstate))->set_model(this); } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core) - : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()), - speed_per_pstate, core) -{ -} - -CpuCas01::~CpuCas01() = default; - -bool CpuCas01::is_used() +bool CpuCas01::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } @@ -102,49 +87,44 @@ bool CpuCas01::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::on_speed_change() { - const lmm::Variable* var; const lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_core_count() * speed_.scale * speed_.peak); - while ((var = get_constraint()->get_variable(&elem))) { - const CpuCas01Action* action = static_cast(var->get_id()); - get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), - action->requested_core() * speed_.scale * speed_.peak); + while (const auto* var = get_constraint()->get_variable(&elem)) { + const auto* action = static_cast(var->get_id()); + double bound = action->requested_core() * speed_.scale * speed_.peak; + if (action->get_user_bound() > 0) { + bound = std::min(bound, action->get_user_bound()); + } + + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), bound); } - Cpu::on_speed_change(); + CpuImpl::on_speed_change(); } void CpuCas01::apply_event(profile::Event* event, double value) { if (event == speed_.event) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(get_core_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]"); - speed_.scale = value; on_speed_change(); tmgr_trace_event_unref(&speed_.event); } else if (event == state_event_) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]"); - if (value > 0) { if (not is_on()) { - XBT_VERB("Restart actors on host %s", get_host()->get_cname()); - get_host()->turn_on(); + XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); + get_iface()->turn_on(); } } else { - const lmm::Constraint* cnst = get_constraint(); - const lmm::Variable* var; const lmm::Element* elem = nullptr; double date = surf_get_clock(); - get_host()->turn_off(); + get_iface()->turn_off(); - while ((var = cnst->get_variable(&elem))) { + while (const auto* var = get_constraint()->get_variable(&elem)) { Action* action = var->get_id(); if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED || @@ -162,15 +142,24 @@ void CpuCas01::apply_event(profile::Event* 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) +CpuAction* CpuCas01::execution_start(double size, double user_bound) { - return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint()); + return execution_start(size, 1, user_bound); } -CpuAction* CpuCas01::execution_start(double size, int requested_cores) +CpuAction* CpuCas01::execution_start(double size, int requested_cores, double user_bound) { - return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(), - requested_cores); + auto* action = + new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(), requested_cores); + action->set_user_bound(user_bound); + if (user_bound > 0 && user_bound < action->get_bound()) { + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), user_bound); + } + if (factor_cb_) { + action->set_rate_factor(factor_cb_(size)); + } + + return action; } CpuAction* CpuCas01::sleep(double duration) @@ -179,7 +168,7 @@ CpuAction* CpuCas01::sleep(double duration) duration = std::max(duration, sg_surf_precision); XBT_IN("(%s,%g)", get_cname(), duration); - auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint()); + auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint(), 1); // FIXME: sleep variables should not consume 1.0 in System::expand() action->set_max_duration(duration); @@ -199,6 +188,12 @@ CpuAction* CpuCas01::sleep(double duration) return action; } +void CpuCas01::set_factor_cb(const std::function& cb) +{ + xbt_assert(not is_sealed(), "Cannot set CPU factor callback in an already sealed CPU(%s)", get_cname()); + factor_cb_ = cb; +} + /********** * Action * **********/ @@ -213,18 +208,11 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } -CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint) - : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) -{ -} - int CpuCas01Action::requested_core() const { return requested_core_; } -CpuCas01Action::~CpuCas01Action()=default; - } // namespace resource } // namespace kernel } // namespace simgrid