X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2aadff70152b2c1953b5776045da0ad05b5ac44d..1c3328f8047e2e5602ed3cd87044ce274e9ff978:/src/plugins/host_dvfs.cpp diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index a48bfc90fb..5becbc1b3f 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ @@ -21,34 +21,39 @@ SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init) -static simgrid::config::Flag cfg_sampling_rate("plugin/dvfs/sampling-rate", {"plugin/dvfs/sampling_rate"}, - "How often should the dvfs plugin check whether the frequency needs to be changed?", 0.1, - [](double val){if (val != 0.1) sg_host_dvfs_plugin_init();}); +static simgrid::config::Flag + cfg_sampling_rate("plugin/dvfs/sampling-rate", + "How often should the dvfs plugin check whether the frequency needs to be changed?", 0.1, + [](double val) { + if (val != 0.1) + sg_host_dvfs_plugin_init(); + }); static simgrid::config::Flag cfg_governor("plugin/dvfs/governor", - "Which Governor should be used that adapts the CPU frequency?", "performance", + "Which Governor should be used that adapts the CPU frequency?", + "performance", - std::map({ + std::map>({ #if HAVE_SMPI - {"adagio", "TODO: Doc"}, + {"adagio", "TODO: Doc"}, #endif - {"conservative", "TODO: Doc"}, - {"ondemand", "TODO: Doc"}, - {"performance", "TODO: Doc"}, - {"powersave", "TODO: Doc"}, - }), + {"conservative", "TODO: Doc"}, {"ondemand", "TODO: Doc"}, + {"performance", "TODO: Doc"}, {"powersave", "TODO: Doc"}, + }), - [](std::string val) { if (val != "performance") sg_host_dvfs_plugin_init(); }); + [](const std::string& val) { + if (val != "performance") + sg_host_dvfs_plugin_init(); + }); static simgrid::config::Flag - cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"}, - "Which pstate is the minimum (and hence fastest) pstate for this governor?", 0, [](int) {}); + cfg_min_pstate("plugin/dvfs/min-pstate", + "Which pstate is the minimum (and hence fastest) pstate for this governor?", 0); static const int max_pstate_not_limited = -1; static simgrid::config::Flag - cfg_max_pstate("plugin/dvfs/max-pstate", {"plugin/dvfs/max_pstate"}, - "Which pstate is the maximum (and hence slowest) pstate for this governor?", max_pstate_not_limited, - [](int) {}); + cfg_max_pstate("plugin/dvfs/max-pstate", + "Which pstate is the maximum (and hence slowest) pstate for this governor?", max_pstate_not_limited); /** @addtogroup SURF_plugin_load @@ -82,19 +87,17 @@ namespace dvfs { * global configuration */ class Governor { - -private: simgrid::s4u::Host* const host_; double sampling_rate_; - int min_pstate; //< Never use a pstate less than this one - int max_pstate; //< Never use a pstate larger than this one + int min_pstate = cfg_min_pstate; //< Never use a pstate less than this one + int max_pstate = cfg_max_pstate; //< Never use a pstate larger than this one public: explicit Governor(simgrid::s4u::Host* ptr) : host_(ptr) - , min_pstate(cfg_min_pstate) - , max_pstate(cfg_max_pstate == max_pstate_not_limited ? host_->get_pstate_count() - 1 : cfg_max_pstate) { + if (cfg_max_pstate == max_pstate_not_limited) + max_pstate = host_->get_pstate_count() - 1; init(); } virtual ~Governor() = default; @@ -118,7 +121,7 @@ public: const char* local_max_pstate_config = host_->get_property(cfg_max_pstate.get_name()); if (local_max_pstate_config != nullptr) { - max_pstate = std::stod(local_max_pstate_config); + max_pstate = std::stoi(local_max_pstate_config); } xbt_assert(max_pstate <= host_->get_pstate_count() - 1, "Value for max_pstate too large!"); xbt_assert(min_pstate <= max_pstate, "min_pstate is larger than max_pstate!"); @@ -141,7 +144,7 @@ public: */ class Performance : public Governor { public: - explicit Performance(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "Performance"; } void update() override { get_host()->set_pstate(get_min_pstate()); } @@ -159,7 +162,7 @@ public: */ class Powersave : public Governor { public: - explicit Powersave(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "Powersave"; } void update() override { get_host()->set_pstate(get_max_pstate()); } @@ -182,7 +185,7 @@ class OnDemand : public Governor { double freq_up_threshold_ = 0.80; public: - explicit OnDemand(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "OnDemand"; } void update() override @@ -203,7 +206,7 @@ public: */ // Load is now < freq_up_threshold; exclude pstate 0 (the fastest) // because pstate 0 can only be selected if load > freq_up_threshold_ - int new_pstate = get_max_pstate() - load * (get_max_pstate() + 1); + int new_pstate = static_cast(get_max_pstate() - load * (get_max_pstate() + 1)); if (new_pstate < get_min_pstate()) new_pstate = get_min_pstate(); get_host()->set_pstate(new_pstate); @@ -220,9 +223,9 @@ public: * * > The CPUfreq governor "conservative", much like the "ondemand" * > governor, sets the CPU frequency depending on the current usage. It - * > differs in behaviour in that it gracefully increases and decreases the + * > differs in behavior in that it gracefully increases and decreases the * > CPU speed rather than jumping to max speed the moment there is any load - * > on the CPU. This behaviour is more suitable in a battery powered + * > on the CPU. This behavior is more suitable in a battery powered * > environment. */ class Conservative : public Governor { @@ -230,10 +233,10 @@ class Conservative : public Governor { double freq_down_threshold_ = .2; public: - explicit Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {} - virtual std::string get_name() const override { return "Conservative"; } + using Governor::Governor; + std::string get_name() const override { return "Conservative"; } - virtual void update() override + void update() override { double load = get_host()->get_core_count() * sg_host_get_avg_load(get_host()); int pstate = get_host()->get_pstate(); @@ -277,43 +280,42 @@ public: explicit Adagio(simgrid::s4u::Host* ptr) : Governor(ptr), rates(100, std::vector(ptr->get_pstate_count(), 0.0)) { - simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::ActorPtr actor) { + simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::Actor const& actor) { // Every instance of this class subscribes to this event, so one per host // This means that for any actor, all 'hosts' are normally notified of these // changes, even those who don't currently run the actor 'proc_id'. // -> Let's check if this signal call is for us! - if (get_host() == actor->get_host()) { + if (get_host() == actor.get_host()) { iteration_running = true; } }); - simgrid::smpi::plugin::ampi::on_iteration_out.connect([this](simgrid::s4u::ActorPtr actor) { - if (get_host() == actor->get_host()) { + simgrid::smpi::plugin::ampi::on_iteration_out.connect([this](simgrid::s4u::Actor const& actor) { + if (get_host() == actor.get_host()) { iteration_running = false; task_id = 0; } }); - simgrid::kernel::activity::ExecImpl::on_creation.connect([this](simgrid::kernel::activity::ExecImplPtr activity) { - if (activity->host_ == get_host()) + simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Exec const& activity) { + if (activity.get_host() == get_host()) pre_task(); }); - simgrid::kernel::activity::ExecImpl::on_completion.connect([this](simgrid::kernel::activity::ExecImplPtr activity) { + simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Exec const& activity) { // For more than one host (not yet supported), we can access the host via - // simcalls_.front()->issuer->iface()->get_host() - if (activity->host_ == get_host() && iteration_running) { - comp_timer += activity->surf_action_->get_finish_time() - activity->surf_action_->get_start_time(); + // simcalls_.front()->issuer->get_iface()->get_host() + if (activity.get_host() == get_host() && iteration_running) { + comp_timer += activity.get_finish_time() - activity.get_start_time(); } }); // FIXME I think that this fires at the same time for all hosts, so when the src sends something, // the dst will be notified even though it didn't even arrive at the recv yet - simgrid::s4u::Link::on_communicate.connect( - [this](kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst) { - if ((get_host() == src || get_host() == dst) && iteration_running) { - post_task(); - } - }); + simgrid::s4u::Link::on_communicate.connect([this](const kernel::resource::NetworkAction& act) { + if ((get_host() == &act.get_src() || get_host() == &act.get_dst()) && iteration_running) { + post_task(); + } + }); } - virtual std::string get_name() const override { return "Adagio"; } + std::string get_name() const override { return "Adagio"; } void pre_task() { @@ -333,9 +335,8 @@ public: { double computed_flops = sg_host_get_computed_flops(get_host()) - comp_counter; double target_time = (simgrid::s4u::Engine::get_clock() - start_time); - target_time = - target_time * - static_cast(99.0 / 100.0); // FIXME We account for t_copy arbitrarily with 1% -- this needs to be fixed + target_time = target_time * 99.0 / 100.0; // FIXME We account for t_copy arbitrarily with 1% + // -- this needs to be fixed bool is_initialized = rates[task_id][best_pstate] != 0; rates[task_id][best_pstate] = computed_flops / comp_timer; @@ -355,7 +356,7 @@ public: task_id++; } - virtual void update() override {} + void update() override {} }; #endif } // namespace dvfs @@ -389,35 +390,24 @@ static void on_host_added(simgrid::s4u::Host& host) boost::algorithm::to_lower(dvfs_governor); } - auto governor = [&dvfs_governor, &daemon_proc]() { - if (dvfs_governor == "conservative") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Conservative(daemon_proc->get_host())); - } else if (dvfs_governor == "ondemand") { - return std::unique_ptr( - new simgrid::plugin::dvfs::OnDemand(daemon_proc->get_host())); - } + auto governor = [&dvfs_governor, &daemon_proc]() -> std::unique_ptr { + if (dvfs_governor == "conservative") + return std::make_unique(daemon_proc->get_host()); + if (dvfs_governor == "ondemand") + return std::make_unique(daemon_proc->get_host()); #if HAVE_SMPI - else if (dvfs_governor == "adagio") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Adagio(daemon_proc->get_host())); - } + if (dvfs_governor == "adagio") + return std::make_unique(daemon_proc->get_host()); #endif - else if (dvfs_governor == "performance") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Performance(daemon_proc->get_host())); - } else if (dvfs_governor == "powersave") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Powersave(daemon_proc->get_host())); - } else { + if (dvfs_governor == "powersave") + return std::make_unique(daemon_proc->get_host()); + if (dvfs_governor != "performance") XBT_CRITICAL("No governor specified for host %s, falling back to Performance", daemon_proc->get_host()->get_cname()); - return std::unique_ptr( - new simgrid::plugin::dvfs::Performance(daemon_proc->get_host())); - } + return std::make_unique(daemon_proc->get_host()); }(); - while (1) { + while (true) { // Sleep *before* updating; important for startup (i.e., t = 0). // In the beginning, we want to go with the pstates specified in the platform file // (so we sleep first) @@ -437,7 +427,7 @@ static void on_host_added(simgrid::s4u::Host& host) /* **************************** Public interface *************************** */ -/** @ingroup SURF_plugin_load +/** * @brief Initializes the HostDvfs plugin * @details The HostDvfs plugin provides an API to get the current load of each host. */