X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98a4fb37cf38be98161ec6fc43ed0733eaefcbee..56651d7c6d0cc1c2108ca0d8de7e34462acd0514:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 6380f77897..c28f90a63c 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -33,10 +33,6 @@ static simgrid::config::Flag "Minimum time to inject inside a call to MPI_Wtime(), gettimeofday() and clock_gettime()", 1e-8 /* Documented to be 10 ns */); -double smpi_cpu_threshold = -1; -double smpi_host_speed; - -SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL; double smpi_total_benched_time = 0; // Private execute_flops used by smpi_execute and smpi_execute_benched @@ -51,30 +47,19 @@ void private_execute_flops(double 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); - +void smpi_execute_flops(double flops) +{ private_execute_flops(flops); - - TRACE_smpi_computing_out(rank); } void smpi_execute(double duration) { - if (duration >= smpi_cpu_threshold) { + if (duration >= smpi_cfg_cpu_thresh()) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); - double flops = duration * smpi_host_speed; - int rank = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_computing_in(rank, flops); - - private_execute_flops(flops); - - TRACE_smpi_computing_out(rank); - + private_execute_flops(duration * smpi_cfg_host_speed()); } else { XBT_DEBUG("Real computation took %g while option smpi/cpu-threshold is set to %g => ignore it", duration, - smpi_cpu_threshold); + smpi_cfg_cpu_thresh()); } } @@ -86,9 +71,15 @@ void smpi_execute_benched(double duration) smpi_bench_begin(); } +void smpi_execute_flops_benched(double flops) { + smpi_bench_end(); + smpi_execute_flops(flops); + smpi_bench_begin(); +} + void smpi_bench_begin() { - if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) { smpi_switch_data_segment(simgrid::s4u::Actor::self()); } @@ -96,7 +87,7 @@ void smpi_bench_begin() return; #if HAVE_PAPI - if (not simgrid::config::get_value("smpi/papi-events").empty()) { + if (not smpi_cfg_papi_events_file().empty()) { int event_set = smpi_process()->papi_event_set(); // PAPI_start sets everything to 0! See man(3) PAPI_start if (PAPI_LOW_LEVEL_INITED == PAPI_is_initialized() && PAPI_start(event_set) != PAPI_OK) { @@ -111,8 +102,7 @@ void smpi_bench_begin() double smpi_adjust_comp_speed(){ double speedup=1; - if (simgrid::config::get_value("smpi/comp-adjustment-file")[0] != '\0') { - + if (smpi_cfg_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::const_iterator it = location2speedup.find(key); @@ -136,7 +126,7 @@ void smpi_bench_end() * An MPI function has been called and now is the right time to update * our PAPI counters for this process. */ - if (not simgrid::config::get_value("smpi/papi-events").empty()) { + if (not smpi_cfg_papi_events_file().empty()) { papi_counter_t& counter_data = smpi_process()->papi_counters(); int event_set = smpi_process()->papi_event_set(); std::vector event_values = std::vector(counter_data.size()); @@ -161,15 +151,15 @@ void smpi_bench_end() // Maybe we need to artificially speed up or slow down our computation based on our statistical analysis. // Simulate the benchmarked computation unless disabled via command-line argument - if (simgrid::config::get_value("smpi/simulate-computation")) { + if (smpi_cfg_simulate_computation()) { smpi_execute(xbt_os_timer_elapsed(timer)/smpi_adjust_comp_speed()); } #if HAVE_PAPI - if (not simgrid::config::get_value("smpi/papi-events").empty() && TRACE_smpi_is_enabled()) { - container_t container = + if (not smpi_cfg_papi_events_file().empty() && TRACE_smpi_is_enabled()) { + const simgrid::instr::Container* container = simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::get_pid())); - papi_counter_t& counter_data = smpi_process()->papi_counters(); + const papi_counter_t& counter_data = smpi_process()->papi_counters(); for (auto const& pair : counter_data) { simgrid::instr::VariableType* variable = static_cast(container->type_->by_name(pair.first)); @@ -381,7 +371,7 @@ int smpi_sample_2(int global, const char *file, int line, int iter_count) auto sample = samples.find(loc); if (sample == samples.end()) xbt_die("Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!"); - LocalData& data = sample->second; + const LocalData& data = sample->second; if (data.benching) { // we need to run a new bench @@ -451,7 +441,7 @@ int smpi_sample_exit(int global, const char *file, int line, int iter_count){ xbt_die("Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!"); if (smpi_process()->sampling()){//end of loop, but still sampling needed - LocalData& data = sample->second; + const LocalData& data = sample->second; smpi_process()->set_sampling(0); smpi_execute(data.mean * iter_count); smpi_bench_begin(); @@ -471,7 +461,7 @@ void smpi_trace_set_call_location(const char* file, const int line) loc->previous_filename = loc->filename; loc->previous_linenumber = loc->linenumber; - if(not simgrid::config::get_value("smpi/trace-call-use-absolute-path")) + if(not smpi_cfg_trace_call_use_absolute_path()) loc->filename = simgrid::xbt::Path(file).get_base_name(); else loc->filename = file; @@ -479,13 +469,13 @@ void smpi_trace_set_call_location(const char* file, const int line) } /** Required for Fortran bindings */ -void smpi_trace_set_call_location_(const char* file, int* line) +void smpi_trace_set_call_location_(const char* file, const int* line) { smpi_trace_set_call_location(file, *line); } /** Required for Fortran if -fsecond-underscore is activated */ -void smpi_trace_set_call_location__(const char* file, int* line) +void smpi_trace_set_call_location__(const char* file, const int* line) { smpi_trace_set_call_location(file, *line); }