X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db5adf7439201fb67d1d697b86806d58ace9fe85..76d4849864c227687e17bdd93c5b1338e9b4cb50:/src/plugins/host_dvfs.cpp diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index 82c38aa728..c9cf1ac6be 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -1,35 +1,41 @@ -/* Copyright (c) 2010-2020. 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. */ -#include "simgrid/plugins/dvfs.h" -#include "simgrid/plugins/load.h" -#include "simgrid/s4u/Engine.hpp" +#include +#include +#include +#include +#include +#include +#include + #include "src/internal_config.h" // HAVE_SMPI -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" #if HAVE_SMPI +#include "src/smpi/include/smpi_request.hpp" #include "src/smpi/plugins/ampi/ampi.hpp" #endif -#include #include -#if HAVE_SMPI -#include "src/smpi/include/smpi_request.hpp" -#endif 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", - std::map({ + std::map>({ #if HAVE_SMPI {"adagio", "TODO: Doc"}, #endif @@ -43,12 +49,12 @@ static simgrid::config::Flag cfg_governor("plugin/dvfs/governor", }); static simgrid::config::Flag - cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"}, + 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"}, + 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 @@ -85,8 +91,8 @@ namespace dvfs { class Governor { simgrid::s4u::Host* const host_; double sampling_rate_; - 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 + unsigned long min_pstate = cfg_min_pstate; //< Never use a pstate less than this one + unsigned long max_pstate = cfg_max_pstate; //< Never use a pstate larger than this one public: explicit Governor(simgrid::s4u::Host* ptr) @@ -99,8 +105,8 @@ public: virtual ~Governor() = default; virtual std::string get_name() const = 0; simgrid::s4u::Host* get_host() const { return host_; } - int get_min_pstate() const { return min_pstate; } - int get_max_pstate() const { return max_pstate; } + unsigned long get_min_pstate() const { return min_pstate; } + unsigned long get_max_pstate() const { return max_pstate; } void init() { @@ -112,16 +118,15 @@ public: } const char* local_min_pstate_config = host_->get_property(cfg_min_pstate.get_name()); if (local_min_pstate_config != nullptr) { - min_pstate = std::stoi(local_min_pstate_config); + min_pstate = std::stoul(local_min_pstate_config); } 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::stoul(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!"); - xbt_assert(0 <= min_pstate, "min_pstate is negative!"); } virtual void update() = 0; @@ -140,7 +145,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()); } @@ -158,7 +163,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()); } @@ -181,7 +186,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 @@ -191,7 +196,7 @@ public: if (load > freq_up_threshold_) { get_host()->set_pstate(get_min_pstate()); /* Run at max. performance! */ - XBT_INFO("Load: %f > threshold: %f --> changed to pstate %i", load, freq_up_threshold_, get_min_pstate()); + XBT_INFO("Load: %f > threshold: %f --> changed to pstate %lu", load, freq_up_threshold_, get_min_pstate()); } else { /* The actual implementation uses a formula here: (See Kernel file cpufreq_ondemand.c:158) * @@ -202,12 +207,12 @@ 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); + auto new_pstate = get_max_pstate() - static_cast(load) * (get_max_pstate() + 1); if (new_pstate < get_min_pstate()) new_pstate = get_min_pstate(); get_host()->set_pstate(new_pstate); - XBT_DEBUG("Load: %f < threshold: %f --> changed to pstate %i", load, freq_up_threshold_, new_pstate); + XBT_DEBUG("Load: %f < threshold: %f --> changed to pstate %lu", load, freq_up_threshold_, new_pstate); } } }; @@ -229,30 +234,30 @@ class Conservative : public Governor { double freq_down_threshold_ = .2; public: - explicit Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "Conservative"; } void update() override { double load = get_host()->get_core_count() * sg_host_get_avg_load(get_host()); - int pstate = get_host()->get_pstate(); + unsigned long pstate = get_host()->get_pstate(); sg_host_load_reset(get_host()); // Only consider the period between two calls to this method! if (load > freq_up_threshold_) { if (pstate != get_min_pstate()) { get_host()->set_pstate(pstate - 1); - XBT_INFO("Load: %f > threshold: %f -> increasing performance to pstate %d", load, freq_up_threshold_, + XBT_INFO("Load: %f > threshold: %f -> increasing performance to pstate %lu", load, freq_up_threshold_, pstate - 1); } else { - XBT_DEBUG("Load: %f > threshold: %f -> but cannot speed up even more, already in highest pstate %d", load, + XBT_DEBUG("Load: %f > threshold: %f -> but cannot speed up even more, already in highest pstate %lu", load, freq_up_threshold_, pstate); } } else if (load < freq_down_threshold_) { if (pstate != get_max_pstate()) { // Are we in the slowest pstate already? get_host()->set_pstate(pstate + 1); - XBT_INFO("Load: %f < threshold: %f -> slowing down to pstate %d", load, freq_down_threshold_, pstate + 1); + XBT_INFO("Load: %f < threshold: %f -> slowing down to pstate %lu", load, freq_down_threshold_, pstate + 1); } else { - XBT_DEBUG("Load: %f < threshold: %f -> cannot slow down even more, already in slowest pstate %d", load, + XBT_DEBUG("Load: %f < threshold: %f -> cannot slow down even more, already in slowest pstate %lu", load, freq_down_threshold_, pstate); } } @@ -261,11 +266,10 @@ public: #if HAVE_SMPI class Adagio : public Governor { -private: - int best_pstate = 0; - double start_time = 0; - double comp_counter = 0; - double comp_timer = 0; + unsigned long best_pstate = 0; + double start_time = 0; + double comp_counter = 0; + double comp_timer = 0; std::vector> rates; // Each host + all frequencies of that host @@ -291,21 +295,25 @@ public: task_id = 0; } }); - simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) { + simgrid::s4u::Exec::on_start_cb([this](simgrid::s4u::Exec const& activity) { if (activity.get_host() == get_host()) pre_task(); }); - simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) { + simgrid::s4u::Activity::on_completion_cb([this](simgrid::s4u::Activity& activity) { + const auto* exec = dynamic_cast(&activity); + if (exec == nullptr) // Only Execs are concerned here + return; // For more than one host (not yet supported), we can access the host via // 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(); + if (exec->get_host() == get_host() && iteration_running) { + comp_timer += exec->get_finish_time() - exec->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](const kernel::resource::NetworkAction& act) { - if ((get_host() == &act.get_src() || get_host() == &act.get_dst()) && iteration_running) { + kernel::activity::CommImpl::on_start.connect([this](const kernel::activity::CommImpl& comm) { + const auto* act = static_cast(comm.surf_action_); + if ((get_host() == &act->get_src() || get_host() == &act->get_dst()) && iteration_running) { post_task(); } }); @@ -324,7 +332,7 @@ public: if (rates[task_id][best_pstate] == 0) best_pstate = 0; get_host()->set_pstate(best_pstate); // Load our schedule - XBT_DEBUG("Set pstate to %i", best_pstate); + XBT_DEBUG("Set pstate to %lu", best_pstate); } void post_task() @@ -337,12 +345,12 @@ public: bool is_initialized = rates[task_id][best_pstate] != 0; rates[task_id][best_pstate] = computed_flops / comp_timer; if (not is_initialized) { - for (int i = 1; i < get_host()->get_pstate_count(); i++) { + for (unsigned long i = 1; i < get_host()->get_pstate_count(); i++) { rates[task_id][i] = rates[task_id][0] * (get_host()->get_pstate_speed(i) / get_host()->get_speed()); } } - for (int pstate = get_host()->get_pstate_count() - 1; pstate >= 0; pstate--) { + for (unsigned long pstate = get_host()->get_pstate_count() - 1; pstate != 0; pstate--) { if (computed_flops / rates[task_id][pstate] <= target_time) { // We just found the pstate we want to use! best_pstate = pstate; @@ -387,25 +395,20 @@ static void on_host_added(simgrid::s4u::Host& host) } auto governor = [&dvfs_governor, &daemon_proc]() -> std::unique_ptr { - if (dvfs_governor == "conservative") { + if (dvfs_governor == "conservative") return std::make_unique(daemon_proc->get_host()); - } else if (dvfs_governor == "ondemand") { + if (dvfs_governor == "ondemand") return std::make_unique(daemon_proc->get_host()); - } #if HAVE_SMPI - else if (dvfs_governor == "adagio") { + if (dvfs_governor == "adagio") return std::make_unique(daemon_proc->get_host()); - } #endif - else if (dvfs_governor == "performance") { - return std::make_unique(daemon_proc->get_host()); - } else if (dvfs_governor == "powersave") { + if (dvfs_governor == "powersave") return std::make_unique(daemon_proc->get_host()); - } else { + if (dvfs_governor != "performance") XBT_CRITICAL("No governor specified for host %s, falling back to Performance", daemon_proc->get_host()->get_cname()); - return std::make_unique(daemon_proc->get_host()); - } + return std::make_unique(daemon_proc->get_host()); }(); while (true) { @@ -441,5 +444,5 @@ void sg_host_dvfs_plugin_init() sg_host_load_plugin_init(); - simgrid::s4u::Host::on_creation.connect(&on_host_added); + simgrid::s4u::Host::on_creation_cb(&on_host_added); }