X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0af9fb9273bace6930214d00b1000a58ec55742d..38f246c4c46920a78ea0af8233449f402c178f04:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 5ecb98a57e..d9a6e9f4f5 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,18 +1,15 @@ -/* Copyright (c) 2013-2019. 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_interface.hpp" +#include "cpu_ti.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" -XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); - -simgrid::kernel::resource::CpuModel* surf_cpu_model_pm; -simgrid::kernel::resource::CpuModel* surf_cpu_model_vm; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites"); namespace simgrid { namespace kernel { @@ -26,10 +23,10 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/) { while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { auto* action = static_cast(get_action_heap().pop()); - XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); + XBT_DEBUG("Something happened to action %p", action); action->finish(kernel::resource::Action::State::FINISHED); - XBT_CDEBUG(surf_kernel, "Action %p finished", action); + XBT_DEBUG("Action %p finished", action); } } @@ -39,7 +36,7 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta) auto& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it - action.update_remains(action.get_variable()->get_value() * delta); + action.update_remains(action.get_rate() * delta); action.update_max_duration(delta); if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || @@ -52,86 +49,120 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta) /************ * Resource * ************/ -Cpu::Cpu(Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core) - : Cpu(model, host, nullptr /*constraint*/, speed_per_pstate, core) -{ -} - -Cpu::Cpu(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::vector& speed_per_pstate, - int core) - : Resource(model, host->get_cname(), constraint) - , core_count_(core) - , host_(host) - , speed_per_pstate_(speed_per_pstate) +CpuImpl::CpuImpl(s4u::Host* host, const std::vector& speed_per_pstate) + : Resource_T(host->get_cname()), piface_(host), speed_per_pstate_(speed_per_pstate) { - xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname()); - + speed_.scale = 1; speed_.peak = speed_per_pstate_.front(); - speed_.scale = 1; - host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname()); + host->set_cpu(this); } -int Cpu::get_pstate_count() const +void CpuImpl::reset_vcpu(CpuImpl* that) { - return speed_per_pstate_.size(); + this->pstate_ = that->pstate_; + this->speed_ = that->speed_; + this->speed_per_pstate_.clear(); + this->speed_per_pstate_.assign(that->speed_per_pstate_.begin(), that->speed_per_pstate_.end()); } -void Cpu::set_pstate(int pstate_index) +CpuImpl* CpuImpl::set_pstate(unsigned long pstate_index) { - xbt_assert(pstate_index <= static_cast(speed_per_pstate_.size()), - "Invalid parameters for CPU %s (pstate %d > length of pstates %d). Please fix your platform file, or your " - "call to change the pstate.", - get_cname(), pstate_index, static_cast(speed_per_pstate_.size())); + xbt_assert( + pstate_index <= speed_per_pstate_.size(), + "Invalid parameters for CPU %s (pstate %lu > length of pstates %d). Please fix your platform file, or your " + "call to change the pstate.", + get_cname(), pstate_index, static_cast(speed_per_pstate_.size())); double new_peak_speed = speed_per_pstate_[pstate_index]; - pstate_ = pstate_index; - speed_.peak = new_peak_speed; + pstate_ = pstate_index; + speed_.peak = new_peak_speed; on_speed_change(); + return this; } -int Cpu::get_pstate() const +CpuImpl* CpuImpl::set_pstate_speed(const std::vector& speed_per_state) { - return pstate_; + xbt_assert(not speed_per_state.empty(), "CPU %s: processor speed vector cannot be empty", get_cname()); + xbt_assert(not is_sealed(), "CPU %s: processor speed cannot be changed once CPU has been sealed", get_cname()); + speed_per_pstate_ = speed_per_state; + speed_.peak = speed_per_pstate_.front(); + return this; } -double Cpu::get_pstate_peak_speed(int pstate_index) const +double CpuImpl::get_pstate_peak_speed(unsigned long pstate_index) const { - xbt_assert((pstate_index <= static_cast(speed_per_pstate_.size())), - "Invalid parameters (pstate index out of bounds)"); + xbt_assert((pstate_index <= speed_per_pstate_.size()), "Invalid parameters (pstate index out of bounds)"); return speed_per_pstate_[pstate_index]; } -double Cpu::get_speed(double load) const +void CpuImpl::on_speed_change() { - return load * speed_.peak; + s4u::Host::on_speed_change(*piface_); } -double Cpu::get_speed_ratio() +CpuImpl* CpuImpl::set_core_count(int core_count) { -/* number between 0 and 1 */ - return speed_.scale; + xbt_assert(not is_sealed(), "Core count cannot be changed once CPU has been sealed"); + xbt_assert(core_count > 0, "Host %s must have at least one core, not 0.", piface_->get_cname()); + if (dynamic_cast(get_model()) != nullptr) + xbt_assert(core_count == 1, "Multi-core not handled by this model yet"); + + core_count_ = core_count; + return this; } -void Cpu::on_speed_change() +void CpuImpl::apply_sharing_policy_cfg() const { - s4u::Host::on_speed_change(*host_); + if (!get_constraint()) + return; + + kernel::lmm::Constraint::SharingPolicy lmm_policy = kernel::lmm::Constraint::SharingPolicy::SHARED; + if (sharing_policy_ == s4u::Host::SharingPolicy::NONLINEAR) + lmm_policy = kernel::lmm::Constraint::SharingPolicy::NONLINEAR; + + get_constraint()->set_sharing_policy(lmm_policy, sharing_policy_cb_); } -int Cpu::get_core_count() +void CpuImpl::set_sharing_policy(s4u::Host::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) { - return core_count_; + xbt_assert(dynamic_cast(get_model()) == nullptr, "Cannot change sharing policy with CPU:TI model"); + sharing_policy_ = policy; + sharing_policy_cb_ = cb; + apply_sharing_policy_cfg(); } -void Cpu::set_speed_profile(kernel::profile::Profile* profile) +s4u::Host::SharingPolicy CpuImpl::get_sharing_policy() const { - xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname()); + return sharing_policy_; +} - speed_.event = profile->schedule(&profile::future_evt_set, this); +int CpuImpl::get_core_count() +{ + return core_count_; +} + +CpuImpl* CpuImpl::set_speed_profile(kernel::profile::Profile* profile) +{ + if (profile) { + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", piface_->get_cname()); + speed_.event = profile->schedule(&profile::future_evt_set, this); + } + return this; } +void CpuImpl::seal() +{ + if (is_sealed()) { + return; + } + lmm::System* lmm = get_model()->get_maxmin_system(); + if (dynamic_cast(get_model()) == nullptr) + this->set_constraint(lmm->constraint_new(this, core_count_ * speed_per_pstate_.front())); + apply_sharing_policy_cfg(); + Resource::seal(); +} /********** * Action * @@ -146,26 +177,28 @@ void CpuAction::update_remains_lazy(double now) double delta = now - get_last_update(); if (get_remains_no_update() > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), - get_last_update()); + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), + get_last_update()); update_remains(get_last_value() * delta); - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update()); + XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } set_last_update(); - set_last_value(get_variable()->get_value()); + set_last_value(get_rate()); } xbt::signal CpuAction::on_state_change; -void CpuAction::suspend(){ +void CpuAction::suspend() +{ Action::State previous = get_state(); on_state_change(*this, previous); Action::suspend(); } -void CpuAction::resume(){ +void CpuAction::resume() +{ Action::State previous = get_state(); on_state_change(*this, previous); Action::resume(); @@ -179,16 +212,16 @@ void CpuAction::set_state(Action::State state) } /** @brief returns a list of all CPUs that this action is using */ -std::list CpuAction::cpus() const +std::list CpuAction::cpus() const { - std::list retlist; + std::list retlist; int llen = get_variable()->get_number_of_constraint(); for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... Resource* resource = get_variable()->get_constraint(i)->get_id(); - Cpu* cpu = dynamic_cast(resource); + auto* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu); }