X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2f2254d18ea12282dbc23cc2ff196be1ed89423..b59417738c8cf11f1804269c65a4738bbf43c150:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index b496745025..d9a6e9f4f5 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,290 +1,233 @@ +/* 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"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites"); -CpuModelPtr surf_cpu_model_pm; -CpuModelPtr surf_cpu_model_vm; +namespace simgrid { +namespace kernel { +namespace resource { /********* * Model * *********/ -void CpuModel::updateActionsStateLazy(double now, double /*delta*/) +void CpuModel::update_actions_state_lazy(double now, double /*delta*/) { - CpuActionPtr action; - while ((xbt_heap_size(getActionHeap()) > 0) - && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) { - action = static_cast(static_cast(xbt_heap_pop(getActionHeap()))); - XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - CpuPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); - TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(), - lmm_variable_getvalue(action->getVariable()), - action->getLastUpdate(), - now - action->getLastUpdate()); - } -#endif - - action->finish(); - XBT_CDEBUG(surf_kernel, "Action %p finished", action); + 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_DEBUG("Something happened to action %p", action); - action->updateEnergy(); - - /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->setRemains(0); - action->setState(SURF_ACTION_DONE); - action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped - } -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - //defining the last timestamp that we can safely dump to trace file - //without losing the event ascending order (considering all CPU's) - double smaller = -1; - ActionListPtr actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); - if (smaller < 0) { - smaller = action->getLastUpdate(); - continue; - } - if (action->getLastUpdate() < smaller) { - smaller = action->getLastUpdate(); - } - } - if (smaller > 0) { - TRACE_last_timestamp_to_dump = smaller; - } + action->finish(kernel::resource::Action::State::FINISHED); + XBT_DEBUG("Action %p finished", action); } -#endif - return; } -void CpuModel::updateActionsStateFull(double now, double delta) +void CpuModel::update_actions_state_full(double /*now*/, double delta) { - CpuActionPtr action = NULL; - ActionListPtr running_actions = getRunningActionSet(); - - for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) - ; it != itend ; it=itNext) { - ++itNext; - action = static_cast(&*it); -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var - (getMaxminSystem(), action->getVariable(), 0)); - - TRACE_surf_host_set_utilization(x->getName(), - action->getCategory(), - lmm_variable_getvalue(action->getVariable()), - now - delta, - delta); - TRACE_last_timestamp_to_dump = now - delta; - } -#endif - - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - - - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { + auto& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it + action.update_remains(action.get_rate() * delta); + action.update_max_duration(delta); - if ((action->getRemains() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(Action::State::FINISHED); } - action->updateEnergy(); } - - return; } /************ * Resource * ************/ - -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale) - : Resource(model, name, props) - , m_core(core) - , m_powerPeak(powerPeak) - , m_powerScale(powerScale) - , p_constraintCore(NULL) - , p_constraintCoreId(NULL) -{} - -Cpu::Cpu(ModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale) - : Resource(model, name, props, constraint) - , m_core(core) - , m_powerPeak(powerPeak) - , m_powerScale(powerScale) +CpuImpl::CpuImpl(s4u::Host* host, const std::vector& speed_per_pstate) + : Resource_T(host->get_cname()), piface_(host), speed_per_pstate_(speed_per_pstate) { - /* At now, we assume that a VM does not have a multicore CPU. */ - if (core > 1) - xbt_assert(model == surf_cpu_model_pm); - - p_constraintCore = NULL; - p_constraintCoreId = NULL; - if (model->getUpdateMechanism() != UM_UNDEFINED) { - p_constraintCore = xbt_new(lmm_constraint_t, core); - p_constraintCoreId = xbt_new(void*, core); - - int i; - for (i = 0; i < core; i++) { - /* just for a unique id, never used as a string. */ - p_constraintCoreId[i] = bprintf("%s:%i", name, i); - p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak); - } - } + speed_.scale = 1; + speed_.peak = speed_per_pstate_.front(); + host->set_cpu(this); } -Cpu::~Cpu(){ - if (p_constraintCoreId){ - for (int i = 0; i < m_core; i++) { - xbt_free(p_constraintCoreId[i]); - } - xbt_free(p_constraintCore); - } - if (p_constraintCoreId) - xbt_free(p_constraintCoreId); +void CpuImpl::reset_vcpu(CpuImpl* that) +{ + 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()); } -double Cpu::getSpeed(double load) +CpuImpl* CpuImpl::set_pstate(unsigned long pstate_index) { - return load * m_powerPeak; + 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; + + on_speed_change(); + return this; } -double Cpu::getAvailableSpeed() +CpuImpl* CpuImpl::set_pstate_speed(const std::vector& speed_per_state) { -/* number between 0 and 1 */ - return m_powerScale; + 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; } -int Cpu::getCore() +double CpuImpl::get_pstate_peak_speed(unsigned long pstate_index) const { - return m_core; + xbt_assert((pstate_index <= speed_per_pstate_.size()), "Invalid parameters (pstate index out of bounds)"); + + return speed_per_pstate_[pstate_index]; } -/********** - * Action * - **********/ +void CpuImpl::on_speed_change() +{ + s4u::Host::on_speed_change(*piface_); +} -void CpuAction::updateRemainingLazy(double now) +CpuImpl* CpuImpl::set_core_count(int core_count) { - double delta = 0.0; + 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"); - xbt_assert(getStateSet() == getModel()->getRunningActionSet(), - "You're updating an action that is not running."); + core_count_ = core_count; + return this; +} - /* bogus priority, skip it */ - xbt_assert(getPriority() > 0, - "You're updating an action that seems suspended."); +void CpuImpl::apply_sharing_policy_cfg() const +{ + if (!get_constraint()) + return; - delta = now - m_lastUpdate; + 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; - if (m_remains > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %lf, last_update was: %lf", this, m_remains, m_lastUpdate); - double_update(&(m_remains), m_lastValue * delta); + get_constraint()->set_sharing_policy(lmm_policy, sharing_policy_cb_); +} -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - CpuPtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); - TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); - } -#endif - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %lf", this, m_remains); - } +void CpuImpl::set_sharing_policy(s4u::Host::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) +{ + 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(); +} - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); +s4u::Host::SharingPolicy CpuImpl::get_sharing_policy() const +{ + return sharing_policy_; } -void CpuAction::setBound(double bound) +int CpuImpl::get_core_count() { - XBT_IN("(%p,%g)", this, bound); - m_bound = bound; - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); + return core_count_; +} - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); +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; } -/* - * - * This function formulates a constraint problem that pins a given task to - * particular cores. Currently, it is possible to pin a task to an exactly one - * specific core. The system links the variable object of the task to the - * per-core constraint object. - * - * But, the taskset command on Linux takes a mask value specifying a CPU - * affinity setting of a given task. If the mask value is 0x03, the given task - * will be executed on the first core (CPU0) or the second core (CPU1) on the - * given PM. The schedular will determine appropriate placements of tasks, - * considering given CPU affinities and task activities. - * - * How should the system formulate constraint problems for an affinity to - * multiple cores? - * - * The cpu argument must be the host where the task is being executed. The - * action object does not have the information about the location where the - * action is being executed. - */ -void CpuAction::setAffinity(CpuPtr cpu, unsigned long mask) +void CpuImpl::seal() { - lmm_variable_t var_obj = getVariable(); - XBT_IN("(%p,%lx)", this, mask); + 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(); +} - { - unsigned long nbits = 0; +/********** + * Action * + **********/ - /* FIXME: There is much faster algorithms doing this. */ - for (int i = 0; i < cpu->m_core; i++) { - unsigned long has_affinity = (1UL << i) & mask; - if (has_affinity) - nbits += 1; - } +void CpuAction::update_remains_lazy(double now) +{ + xbt_assert(get_state_set() == get_model()->get_started_action_set(), + "You're updating an action that is not running."); + xbt_assert(get_sharing_penalty() > 0, "You're updating an action that seems suspended."); - if (nbits > 1) { - XBT_CRITICAL("Do not specify multiple cores for an affinity mask."); - XBT_CRITICAL("See the comment in cpu_action_set_affinity()."); - DIE_IMPOSSIBLE; - } - } + double delta = now - get_last_update(); - for (int i = 0; i < cpu->m_core; i++) { - XBT_DEBUG("clear affinity %p to cpu-%d@%s", this, i, cpu->getName()); - lmm_shrink(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj); - - unsigned long has_affinity = (1UL << i) & mask; - if (has_affinity) { - /* This function only accepts an affinity setting on the host where the - * task is now running. In future, a task might move to another host. - * But, at this moment, this function cannot take an affinity setting on - * that future host. - * - * It might be possible to extend the code to allow this function to - * accept affinity settings on a future host. We might be able to assign - * zero to elem->value to maintain such inactive affinity settings in the - * system. But, this will make the system complex. */ - XBT_DEBUG("set affinity %p to cpu-%d@%s", this, i, cpu->getName()); - lmm_expand(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj, 1.0); - } + if (get_remains_no_update() > 0) { + 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_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } - if (cpu->getModel()->getUpdateMechanism() == UM_LAZY) { - /* FIXME (hypervisor): Do we need to do something for the LAZY mode? */ + set_last_update(); + set_last_value(get_rate()); +} + +xbt::signal CpuAction::on_state_change; + +void CpuAction::suspend() +{ + Action::State previous = get_state(); + on_state_change(*this, previous); + Action::suspend(); +} + +void CpuAction::resume() +{ + Action::State previous = get_state(); + on_state_change(*this, previous); + Action::resume(); +} + +void CpuAction::set_state(Action::State state) +{ + Action::State previous = get_state(); + Action::set_state(state); + on_state_change(*this, previous); +} + +/** @brief returns a list of all CPUs that this action is using */ +std::list CpuAction::cpus() const +{ + 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(); + auto* cpu = dynamic_cast(resource); + if (cpu != nullptr) + retlist.push_back(cpu); } - XBT_OUT(); + return retlist; } +} // namespace resource +} // namespace kernel +} // namespace simgrid