-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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_ti.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include <algorithm>
+#include <memory>
constexpr double EPSILON = 0.000000001;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, res_cpu, "CPU resource, Trace Integration model");
namespace simgrid {
namespace kernel {
CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
{
- double integral = 0;
- double time = 0;
- unsigned nb_points = profile->event_list.size() + 1;
+ double integral = 0;
+ double time = 0;
+ unsigned nb_points = profile->get_event_list().size() + 1;
time_points_.reserve(nb_points);
integral_.reserve(nb_points);
- for (auto const& val : profile->event_list) {
+ for (auto const& val : profile->get_event_list()) {
time_points_.push_back(time);
integral_.push_back(integral);
time += val.date_;
* @param b End of interval
* @return the integrate value. -1 if an error occurs.
*/
-double CpuTiTmgr::integrate(double a, double b)
+double CpuTiTmgr::integrate(double a, double b) const
{
- if ((a < 0.0) || (a > b)) {
- xbt_die("Error, invalid integration interval [%.2f,%.2f]. "
- "You probably have a task executing with negative computation amount. Check your code.", a, b);
- }
+ xbt_assert(a >= 0.0 && a <= b,
+ "Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative "
+ "computation amount. Check your code.",
+ a, b);
if (fabs(a - b) < EPSILON)
return 0.0;
return (b - a) * value_;
}
- int a_index;
+ double a_index;
if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON)
- a_index = 1 + static_cast<int>(ceil(a / last_time_));
+ a_index = 1 + ceil(a / last_time_);
else
- a_index = static_cast<int>(ceil(a / last_time_));
+ a_index = ceil(a / last_time_);
+ double b_index = floor(b / last_time_);
- int b_index = static_cast<int>(floor(b / last_time_));
-
- if (a_index > b_index) { /* Same chunk */
- return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_);
+ if (a_index > b_index) { /* Same chunk */
+ return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - b_index * last_time_);
}
double first_chunk = profile_->integrate_simple(a - (a_index - 1) * last_time_, last_time_);
double middle_chunk = (b_index - a_index) * total_;
- double last_chunk = profile_->integrate_simple(0.0, b - (b_index)*last_time_);
+ double last_chunk = profile_->integrate_simple(0.0, b - b_index * last_time_);
XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk);
* @param a Initial point
* @param b Final point
*/
-double CpuTiProfile::integrate_simple(double a, double b)
+double CpuTiProfile::integrate_simple(double a, double b) const
{
return integrate_simple_point(b) - integrate_simple_point(a);
}
* @brief Auxiliary function to compute the integral at point a.
* @param a point
*/
-double CpuTiProfile::integrate_simple_point(double a)
+double CpuTiProfile::integrate_simple_point(double a) const
{
double integral = 0;
- double a_aux = a;
+ double a_aux = a;
int ind = binary_search(time_points_, a);
integral += integral_[ind];
* @param amount Amount to be executed
* @return End time
*/
-double CpuTiTmgr::solve(double a, double amount)
+double CpuTiTmgr::solve(double a, double amount) const
{
/* Fix very small negative numbers */
if ((a < 0.0) && (a > -EPSILON)) {
}
/* Sanity checks */
- if ((a < 0.0) || (amount < 0.0)) {
- XBT_CRITICAL ("Error, invalid parameters [a = %.2f, amount = %.2f]. "
- "You probably have a task executing with negative computation amount. Check your code.", a, amount);
- xbt_abort();
- }
+ xbt_assert(a >= 0.0 && amount >= 0.0,
+ "Error, invalid parameters [a = %.2f, amount = %.2f]. "
+ "You probably have a task executing with negative computation amount. Check your code.",
+ a, amount);
/* At this point, a and amount are positive */
if (amount < EPSILON)
XBT_DEBUG("amount %f total %f", amount, total_);
/* Reduce the problem to one where amount <= trace_total */
- int quotient = static_cast<int>(floor(amount / total_));
- double reduced_amount = (total_) * ((amount / total_) - floor(amount / total_));
- double reduced_a = a - (last_time_) * static_cast<int>(floor(a / last_time_));
+ double quotient = floor(amount / total_);
+ double reduced_amount = total_ * ((amount / total_) - floor(amount / total_));
+ double reduced_a = a - last_time_ * static_cast<int>(floor(a / last_time_));
- XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
+ XBT_DEBUG("Quotient: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
double reduced_b;
}
/* Re-map to the original b and amount */
- return (last_time_) * static_cast<int>(floor(a / last_time_)) + (quotient * last_time_) + reduced_b;
+ return last_time_ * floor(a / last_time_) + (quotient * last_time_) + reduced_b;
}
/**
* @param amount Amount of flops
* @return The date when amount is available.
*/
-double CpuTiProfile::solve_simple(double a, double amount)
+double CpuTiProfile::solve_simple(double a, double amount) const
{
double integral_a = integrate_simple_point(a);
int ind = binary_search(integral_, integral_a + amount);
* @param a Time
* @return CPU speed scale
*/
-double CpuTiTmgr::get_power_scale(double a)
+double CpuTiTmgr::get_power_scale(double a) const
{
- double reduced_a = a - floor(a / last_time_) * last_time_;
+ double reduced_a = a - floor(a / last_time_) * last_time_;
int point = CpuTiProfile::binary_search(profile_->time_points_, reduced_a);
- kernel::profile::DatedValue val = speed_profile_->event_list.at(point);
+ kernel::profile::DatedValue val = speed_profile_->get_event_list().at(point);
return val.value_;
}
}
/* only one point available, fixed trace */
- if (speed_profile->event_list.size() == 1) {
- value_ = speed_profile->event_list.front().value_;
+ if (speed_profile->get_event_list().size() == 1) {
+ value_ = speed_profile->get_event_list().front().value_;
return;
}
type_ = Type::DYNAMIC;
/* count the total time of trace file */
- for (auto const& val : speed_profile->event_list)
+ for (auto const& val : speed_profile->get_event_list())
total_time += val.date_;
- profile_.reset(new CpuTiProfile(speed_profile));
+ profile_ = std::make_unique<CpuTiProfile>(speed_profile);
last_time_ = total_time;
total_ = profile_->integrate_simple(0, total_time);
* Model *
*********/
-void CpuTiModel::create_pm_vm_models()
-{
- 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.");
-
- surf_cpu_model_pm = new CpuTiModel();
- surf_cpu_model_vm = new CpuTiModel();
-}
-
-CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
-{
- all_existing_models.push_back(this);
-}
-
-CpuTiModel::~CpuTiModel()
+void CpuTiModel::create_pm_models()
{
- surf_cpu_model_pm = nullptr;
+ auto cpu_model_pm = std::make_shared<CpuTiModel>("Cpu_TI");
+ simgrid::kernel::EngineImpl::get_instance()->add_model(cpu_model_pm);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
}
-Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
- return new CpuTi(this, host, speed_per_pstate, core);
+ return (new CpuTi(host, speed_per_pstate))->set_model(this);
}
double CpuTiModel::next_occurring_event(double now)
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
- : Cpu(model, host, speed_per_pstate, core)
+CpuTi::CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu(host, speed_per_pstate)
{
- xbt_assert(core == 1, "Multi-core not handled by this model yet");
-
speed_.peak = speed_per_pstate.front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
delete speed_integrated_trace_;
}
-void CpuTi::set_speed_profile(kernel::profile::Profile* profile)
+Cpu* CpuTi::set_speed_profile(kernel::profile::Profile* profile)
{
delete speed_integrated_trace_;
speed_integrated_trace_ = new CpuTiTmgr(profile, speed_.scale);
/* add a fake trace event if periodicity == 0 */
- if (profile && profile->event_list.size() > 1) {
- kernel::profile::DatedValue val = profile->event_list.back();
+ if (profile && profile->get_event_list().size() > 1) {
+ kernel::profile::DatedValue val = profile->get_event_list().back();
if (val.date_ < 1e-12) {
auto* prof = new kernel::profile::Profile();
speed_.event = prof->schedule(&profile::future_evt_set, this);
}
}
+ return this;
}
void CpuTi::apply_event(kernel::profile::Event* event, double value)
} else if (event == state_event_) {
if (value > 0) {
if (not is_on()) {
- XBT_VERB("Restart processes 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 {
- get_host()->turn_off();
+ get_iface()->turn_off();
double date = surf_get_clock();
/* put all action running on cpu to failed */
sum_priority_ = 0.0;
for (CpuTiAction const& action : action_set_) {
/* action not running, skip it */
- if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* bogus priority, skip it */
}
for (CpuTiAction& action : action_set_) {
- double min_finish = -1;
+ double min_finish = NO_MAX_DURATION;
/* action not running, skip it */
- if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* verify if the action is really running on cpu */
set_modified(false);
}
-bool CpuTi::is_used()
+bool CpuTi::is_used() const
{
return not action_set_.empty();
}
