X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/485fa582bda7c51fb184bf0f82d0eb250be9f805..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/plugins/host_dvfs.cpp diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index 9ab9a25765..db1af095e7 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -1,23 +1,25 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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) @@ -61,7 +63,7 @@ static simgrid::config::Flag */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_plugin_dvfs, surf, "Logging specific to the SURF HostDvfs plugin"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host_dvfs, kernel, "Logging specific to the HostDvfs plugin"); namespace simgrid { namespace plugin { @@ -103,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() { @@ -194,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) * @@ -205,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 = static_cast(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); } } }; @@ -238,24 +240,24 @@ public: 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); } } @@ -264,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 @@ -294,21 +295,25 @@ public: task_id = 0; } }); - simgrid::s4u::Exec::on_start.connect([this](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::Exec const& activity) { + simgrid::s4u::Activity::on_completion_cb([this](simgrid::s4u::Activity const& 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(); } }); @@ -327,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() @@ -345,7 +350,7 @@ public: } } - 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; @@ -439,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); }