X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/018dbe8afafe687069d74c58fea3a2f9a15a8085..c317a567f6e72c7e5619b9a636373f6b6fa8f2b6:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 20e22c73fd..d32f1151e2 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -12,6 +12,7 @@ #include "src/internal_config.h" #include "src/mc/mc_replay.hpp" #include "xbt/config.hpp" +#include "xbt/file.hpp" #include "src/smpi/include/smpi_actor.hpp" #include @@ -32,13 +33,9 @@ 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 spmi_execute_benched +// Private execute_flops used by smpi_execute and smpi_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); @@ -61,9 +58,9 @@ void smpi_execute_flops(double flops) { 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; + double flops = duration * smpi_cfg_host_speed(); int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_computing_in(rank, flops); @@ -73,7 +70,7 @@ void smpi_execute(double duration) } 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()); } } @@ -87,7 +84,7 @@ void smpi_execute_benched(double duration) 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()); } @@ -95,7 +92,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) { @@ -110,8 +107,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); @@ -135,7 +131,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()); @@ -160,12 +156,12 @@ 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()) { + if (not smpi_cfg_papi_events_file().empty() && TRACE_smpi_is_enabled()) { container_t 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(); @@ -351,12 +347,12 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr 0, // count true // benching (if we have no data, we need at least one) }); - LocalData& data = insert.first->second; if (insert.second) { XBT_DEBUG("XXXXX First time ever on benched nest %s.", loc.c_str()); xbt_assert(threshold > 0 || iters > 0, "You should provide either a positive amount of iterations to bench, or a positive maximal stderr (or both)"); } else { + LocalData& data = insert.first->second; if (data.iters != iters || data.threshold != threshold) { XBT_ERROR("Asked to bench block %s with different settings %d, %f is not %d, %f. " "How did you manage to give two numbers at the same line??", @@ -448,12 +444,12 @@ int smpi_sample_exit(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; if (smpi_process()->sampling()){//end of loop, but still sampling needed - smpi_process()->set_sampling(0); - smpi_execute(data.mean*iter_count); - smpi_bench_begin(); + LocalData& data = sample->second; + smpi_process()->set_sampling(0); + smpi_execute(data.mean * iter_count); + smpi_bench_begin(); } } return 0; @@ -470,8 +466,11 @@ void smpi_trace_set_call_location(const char* file, const int line) loc->previous_filename = loc->filename; loc->previous_linenumber = loc->linenumber; - loc->filename = file; - loc->linenumber = line; + if(not smpi_cfg_trace_call_use_absolute_path()) + loc->filename = simgrid::xbt::Path(file).get_base_name(); + else + loc->filename = file; + loc->linenumber = line; } /** Required for Fortran bindings */