X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 7df0d784ae..954ae50a67 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2023. 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. */ @@ -6,11 +6,11 @@ #include "cpu_ti.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Engine.hpp" +#include "xbt/asserts.h" #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 #include @@ -19,9 +19,7 @@ constexpr double EPSILON = 0.000000001; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, res_cpu, "CPU resource, Trace Integration model"); -namespace simgrid { -namespace kernel { -namespace resource { +namespace simgrid::kernel::resource { /********* * Trace * @@ -31,15 +29,26 @@ CpuTiProfile::CpuTiProfile(const profile::Profile* profile) { double integral = 0; double time = 0; - unsigned long nb_points = profile->get_event_list().size() + 1; + double prev_value = 1; + const std::vector& events=profile->get_event_list(); + xbt_assert(not events.empty()); + unsigned long nb_points = events.size() + 1; time_points_.reserve(nb_points); integral_.reserve(nb_points); - for (auto const& val : profile->get_event_list()) { + for (auto const& val : events) { + time += val.date_; + integral += val.date_ * prev_value; time_points_.push_back(time); integral_.push_back(integral); - time += val.date_; - integral += val.date_ * val.value_; + prev_value = val.value_; } + + double delay=profile->get_repeat_delay()+ events.at(0).date_; + + xbt_assert( events.back().value_==prev_value,"Profiles need to end as they start"); + time += delay; + integral += delay*prev_value; + time_points_.push_back(time); integral_.push_back(integral); } @@ -163,15 +172,12 @@ double CpuTiTmgr::solve(double a, double amount) const 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; XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", reduced_a, reduced_amount); - double amount_till_end = integrate(reduced_a, last_time_); - if (amount_till_end > reduced_amount) { - reduced_b = profile_->solve_simple(reduced_a, reduced_amount); - } else { - reduced_b = last_time_ + profile_->solve_simple(0.0, reduced_amount - amount_till_end); - } + double amount_till_end = integrate(reduced_a, last_time_); + double reduced_b = amount_till_end > reduced_amount + ? profile_->solve_simple(reduced_a, reduced_amount) + : last_time_ + profile_->solve_simple(0.0, reduced_amount - amount_till_end); /* Re-map to the original b and amount */ return last_time_ * floor(a / last_time_) + (quotient * last_time_) + reduced_b; @@ -204,9 +210,9 @@ double CpuTiProfile::solve_simple(double a, double amount) const */ double CpuTiTmgr::get_power_scale(double a) const { - double reduced_a = a - floor(a / last_time_) * last_time_; - long point = CpuTiProfile::binary_search(profile_->time_points_, reduced_a); - kernel::profile::DatedValue val = speed_profile_->get_event_list().at(point); + double reduced_a = a - floor(a / last_time_) * last_time_; + long point = CpuTiProfile::binary_search(profile_->get_time_points(), reduced_a); + profile::DatedValue val = speed_profile_->get_event_list().at(point); return val.value_; } @@ -229,6 +235,8 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp return; } + xbt_assert(speed_profile->is_repeating()); + /* only one point available, fixed trace */ if (speed_profile->get_event_list().size() == 1) { value_ = speed_profile->get_event_list().front().value_; @@ -240,6 +248,7 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp /* count the total time of trace file */ for (auto const& val : speed_profile->get_event_list()) total_time += val.date_; + total_time += speed_profile->get_repeat_delay(); profile_ = std::make_unique(speed_profile); last_time_ = total_time; @@ -270,8 +279,9 @@ long CpuTiProfile::binary_search(const std::vector& array, double a) void CpuTiModel::create_pm_models() { auto cpu_model_pm = std::make_shared("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); + auto* engine = EngineImpl::get_instance(); + engine->add_model(cpu_model_pm); + engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm); } CpuImpl* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) @@ -306,7 +316,7 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) XBT_DEBUG("Action %p: finish", action); action->finish(Action::State::FINISHED); /* update remaining amount of all actions */ - action->cpu_->update_remaining_amount(surf_get_clock()); + action->cpu_->update_remaining_amount(EngineImpl::get_clock()); } } @@ -336,7 +346,7 @@ CpuImpl* CpuTi::set_speed_profile(kernel::profile::Profile* profile) 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(); + auto* prof = profile::ProfileBuilder::from_void(); speed_.event = prof->schedule(&profile::future_evt_set, this); } } @@ -349,7 +359,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) XBT_DEBUG("Speed changed in trace! New fixed value: %f", value); /* update remaining of actions and put in modified cpu list */ - update_remaining_amount(surf_get_clock()); + update_remaining_amount(EngineImpl::get_clock()); set_modified(true); @@ -359,7 +369,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) speed_.scale = value; tmgr_trace_event_unref(&speed_.event); - } else if (event == state_event_) { + } else if (event == get_state_event()) { if (value > 0) { if (not is_on()) { XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); @@ -367,7 +377,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } } else { get_iface()->turn_off(); - double date = surf_get_clock(); + double date = EngineImpl::get_clock(); /* put all action running on cpu to failed */ for (CpuTiAction& action : action_set_) { @@ -379,7 +389,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } } } - tmgr_trace_event_unref(&state_event_); + unref_state_event(); } else { xbt_die("Unknown event!\n"); @@ -453,7 +463,7 @@ bool CpuTi::is_used() const double CpuTi::get_speed_ratio() { - speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock()); + speed_.scale = speed_integrated_trace_->get_power_scale(EngineImpl::get_clock()); return CpuImpl::get_speed_ratio(); } @@ -602,11 +612,9 @@ void CpuTiAction::set_sharing_penalty(double sharing_penalty) double CpuTiAction::get_remains() { XBT_IN("(%p)", this); - cpu_->update_remaining_amount(surf_get_clock()); + cpu_->update_remaining_amount(EngineImpl::get_clock()); XBT_OUT(); return get_remains_no_update(); } -} // namespace resource -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::resource