X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c864f7396a94658545769fb9c28e9ff7cef02530..bf228ee6da7ac6b3b91c61fcf3c902740cc94526:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 6c326faa93..0c2d89b60e 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. */ @@ -20,6 +20,7 @@ #ifndef WIN32 #include #endif +#include #include #if HAVE_PAPI @@ -47,27 +48,16 @@ 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_cfg_cpu_thresh()) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); - double flops = duration * smpi_cfg_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_cfg_cpu_thresh()); @@ -77,11 +67,17 @@ void smpi_execute(double duration) void smpi_execute_benched(double duration) { smpi_bench_end(); - double speed = sg_host_speed(sg_host_self()); + double speed = sg_host_get_speed(sg_host_self()); smpi_execute_flops(duration*speed); 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_cfg_privatization() == SmpiPrivStrategies::MMAP) { @@ -108,8 +104,7 @@ void smpi_bench_begin() double smpi_adjust_comp_speed(){ double speedup=1; if (smpi_cfg_comp_adjustment_file()[0] != '\0') { - - smpi_trace_call_location_t* loc = smpi_process()->call_location(); + const 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); if (it != location2speedup.end()) { @@ -135,7 +130,7 @@ void smpi_bench_end() 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()); + std::vector event_values(counter_data.size()); if (PAPI_stop(event_set, &event_values[0]) != PAPI_OK) { // Error XBT_CRITICAL("Could not stop PAPI counters.\n"); @@ -150,7 +145,7 @@ void smpi_bench_end() if (smpi_process()->sampling()) { XBT_CRITICAL("Cannot do recursive benchmarks."); - XBT_CRITICAL("Are you trying to make a call to MPI within a SMPI_SAMPLE_ block?"); + XBT_CRITICAL("Are you trying to make a call to MPI within an SMPI_SAMPLE_ block?"); xbt_backtrace_display_current(); xbt_die("Aborting."); } @@ -163,12 +158,12 @@ void smpi_bench_end() #if HAVE_PAPI if (not smpi_cfg_papi_events_file().empty() && TRACE_smpi_is_enabled()) { - container_t container = + 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)); + auto* variable = static_cast(container->type_->by_name(pair.first)); variable->set_event(SIMIX_get_clock(), pair.second); } } @@ -241,15 +236,17 @@ int smpi_gettimeofday(struct timeval* tv, struct timezone* tz) #if _POSIX_TIMERS > 0 int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp) { + if (not tp) { + errno = EFAULT; + return -1; + } if (not smpi_process()) return clock_gettime(clk_id, tp); //there is only one time in SMPI, so clk_id is ignored. smpi_bench_end(); double now = SIMIX_get_clock(); - if (tp) { - tp->tv_sec = static_cast(now); - tp->tv_nsec = static_cast((now - tp->tv_sec) * 1e9); - } + tp->tv_sec = static_cast(now); + tp->tv_nsec = static_cast((now - tp->tv_sec) * 1e9); if (smpi_wtime_sleep > 0) simgrid::s4u::this_actor::sleep_for(smpi_wtime_sleep); smpi_bench_begin(); @@ -286,10 +283,10 @@ unsigned long long smpi_rastro_timestamp () smpi_bench_end(); double now = SIMIX_get_clock(); - unsigned long long sec = static_cast(now); + auto sec = static_cast(now); unsigned long long pre = (now - sec) * smpi_rastro_resolution(); smpi_bench_begin(); - return static_cast(sec) * smpi_rastro_resolution() + pre; + return sec * smpi_rastro_resolution() + pre; } /* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/ @@ -377,7 +374,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 @@ -447,7 +444,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(); @@ -475,13 +472,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); }