SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL;
double smpi_total_benched_time = 0;
-void smpi_execute_flops(double flops) {
+// Private execute_flops used by smpi_execute and spmi_execute_benched
+void private_execute_flops(double flops) {
xbt_assert(flops >= 0, "You're trying to execute a negative amount of flops (%f)!", flops);
XBT_DEBUG("Handle real computation time: %f flops", flops);
simgrid::s4u::this_actor::exec_init(flops)
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
+void smpi_execute_flops(double flops) {
+ int rank = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_computing_in(rank, flops);
+
+ private_execute_flops(flops);
+
+ TRACE_smpi_computing_out(rank);
+}
+
void smpi_execute(double duration)
{
if (duration >= smpi_cpu_threshold) {
int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_computing_in(rank, flops);
- smpi_execute_flops(flops);
+ private_execute_flops(flops);
TRACE_smpi_computing_out(rank);
xbt_os_threadtimer_start(smpi_process()->timer());
}
+double smpi_adjust_comp_speed(){
+ double speedup=1;
+ if (simgrid::config::get_value<std::string>("smpi/comp-adjustment-file")[0] != '\0') {
+
+ smpi_trace_call_location_t* loc = smpi_process()->call_location();
+ std::string key = loc->get_composed_key();
+ std::unordered_map<std::string, double>::const_iterator it = location2speedup.find(key);
+ if (it != location2speedup.end()) {
+ speedup = it->second;
+ }
+ }
+ return speedup;
+}
+
void smpi_bench_end()
{
if (MC_is_active() || MC_record_replay_is_active())
return;
- double speedup = 1;
xbt_os_timer_t timer = smpi_process()->timer();
xbt_os_threadtimer_stop(timer);
}
// Maybe we need to artificially speed up or slow down our computation based on our statistical analysis.
- if (simgrid::config::get_value<std::string>("smpi/comp-adjustment-file")[0] != '\0') {
-
- smpi_trace_call_location_t* loc = smpi_process()->call_location();
- std::string key = loc->get_composed_key();
- std::unordered_map<std::string, double>::const_iterator it = location2speedup.find(key);
- if (it != location2speedup.end()) {
- speedup = it->second;
- }
- }
-
// Simulate the benchmarked computation unless disabled via command-line argument
if (simgrid::config::get_value<bool>("smpi/simulate-computation")) {
- smpi_execute(xbt_os_timer_elapsed(timer)/speedup);
+ smpi_execute(xbt_os_timer_elapsed(timer)/smpi_adjust_comp_speed());
}
#if HAVE_PAPI