A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
simplify writing in model setup + may fix issue with unit-tests
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index bb70aefe2289efbced3d18d5a23408be534ab81a..d183dc3f492042069b154e039f884af3a7820ada 100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-31,10
+31,10
@@
CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
{
double integral = 0;
double time = 0;
- unsigned
nb_points = profile->event_list
.size() + 1;
+ unsigned
long 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_;
@@
-56,11
+56,10
@@
CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
*/
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;
@@
-107,10
+106,10
@@
double CpuTiProfile::integrate_simple_point(double a) const
{
double integral = 0;
double a_aux = a;
-
int ind
= binary_search(time_points_, a);
+
long ind
= binary_search(time_points_, a);
integral += integral_[ind];
- XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1],
+ XBT_DEBUG("a %f ind %
l
d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1],
integral_[ind], time_points_[ind + 1], time_points_[ind]);
double_update(&a_aux, time_points_[ind], sg_maxmin_precision * sg_surf_precision);
if (a_aux > 0)
@@
-158,8
+157,8
@@
double CpuTiTmgr::solve(double a, double amount) const
XBT_DEBUG("amount %f total %f", amount, total_);
/* Reduce the problem to one where amount <= trace_total */
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_));
+ 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: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
@@
-188,7
+187,7
@@
double CpuTiTmgr::solve(double a, double amount) const
double CpuTiProfile::solve_simple(double a, double amount) const
{
double integral_a = integrate_simple_point(a);
-
int ind
= binary_search(integral_, integral_a + amount);
+
long ind
= binary_search(integral_, integral_a + amount);
double time = time_points_[ind];
time += (integral_a + amount - integral_[ind]) /
((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind]));
@@
-206,8
+205,8
@@
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_;
-
int point
= CpuTiProfile::binary_search(profile_->time_points_, reduced_a);
- kernel::profile::DatedValue val = speed_profile_->
event_list
.at(point);
+
long point
= CpuTiProfile::binary_search(profile_->time_points_, reduced_a);
+ kernel::profile::DatedValue val = speed_profile_->
get_event_list()
.at(point);
return val.value_;
}
@@
-231,15
+230,15
@@
CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp
}
/* 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_ = std::make_unique<CpuTiProfile>(speed_profile);
@@
-256,7
+255,7
@@
CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp
* @param a Value to search
* @return Index of point
*/
-
int
CpuTiProfile::binary_search(const std::vector<double>& array, double a)
+
long
CpuTiProfile::binary_search(const std::vector<double>& array, double a)
{
if (array[0] > a)
return 0;
@@
-270,13
+269,13
@@
int CpuTiProfile::binary_search(const std::vector<double>& array, double a)
void CpuTiModel::create_pm_models()
{
- auto cpu_model_pm = std::make_shared<CpuTiModel>();
- simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm,
-
true
);
-
simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl
()->set_cpu_pm_model(cpu_model_pm);
+ auto cpu_model_pm = std::make_shared<CpuTiModel>(
"Cpu_TI"
);
+ auto* engine = EngineImpl::get_instance();
+
engine->add_model(cpu_model_pm
);
+
engine->get_netzone_root
()->set_cpu_pm_model(cpu_model_pm);
}
-Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+Cpu
Impl
* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
return (new CpuTi(host, speed_per_pstate))->set_model(this);
}
@@
-315,7
+314,7
@@
void CpuTiModel::update_actions_state(double now, double /*delta*/)
/************
* Resource *
************/
-CpuTi::CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu(host, speed_per_pstate)
+CpuTi::CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu
Impl
(host, speed_per_pstate)
{
speed_.peak = speed_per_pstate.front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
@@
-329,19
+328,20
@@
CpuTi::~CpuTi()
delete speed_integrated_trace_;
}
-
void
CpuTi::set_speed_profile(kernel::profile::Profile* profile)
+
CpuImpl*
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)
@@
-412,7
+412,7
@@
void CpuTi::update_actions_finish_time(double now)
}
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() != get_model()->get_started_action_set())
continue;
@@
-455,7
+455,7
@@
bool CpuTi::is_used() const
double CpuTi::get_speed_ratio()
{
speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock());
- return Cpu::get_speed_ratio();
+ return Cpu
Impl
::get_speed_ratio();
}
/** @brief Update the remaining amount of actions */
@@
-496,9
+496,10
@@
void CpuTi::update_remaining_amount(double now)
last_update_ = now;
}
-CpuAction* CpuTi::execution_start(double size)
+CpuAction* CpuTi::execution_start(double size
, double user_bound
)
{
XBT_IN("(%s,%g)", get_cname(), size);
+ xbt_assert(user_bound <= 0, "Invalid user bound (%lf) in CPU TI model", user_bound);
auto* action = new CpuTiAction(this, size);
action_set_.push_back(*action); // Actually start the action
@@
-591,26
+592,6
@@
void CpuTiAction::resume()
XBT_OUT();
}
-void CpuTiAction::set_max_duration(double duration)
-{
- double min_finish;
-
- XBT_IN("(%p,%g)", this, duration);
-
- Action::set_max_duration(duration);
-
- if (duration >= 0)
- min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
- : get_finish_time();
- else
- min_finish = get_finish_time();
-
- /* add in action heap */
- get_model()->get_action_heap().update(this, min_finish, ActionHeap::Type::unset);
-
- XBT_OUT();
-}
-
void CpuTiAction::set_sharing_penalty(double sharing_penalty)
{
XBT_IN("(%p,%g)", this, sharing_penalty);