X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/794555c12839e503e3fd6e101e3e82336036939e..54cb3695a30bf100bec2710d11af87d3b6ba1a44:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 6c72dc4cd7..9793546b0f 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -1,14 +1,20 @@ -/* Copyright (c) 2007, 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ +#include "getopt.h" #include "private.hpp" +#include "simgrid/host.h" #include "simgrid/modelchecker.h" +#include "simgrid/s4u/Exec.hpp" #include "smpi_comm.hpp" -#include "smpi_process.hpp" #include "src/internal_config.h" -#include "src/mc/mc_replay.h" +#include "src/mc/mc_replay.hpp" +#include "src/simix/ActorImpl.hpp" +#include "xbt/config.hpp" + +#include "src/smpi/include/smpi_actor.hpp" #include #ifndef WIN32 @@ -22,31 +28,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (benchmarking)"); +static simgrid::config::Flag + smpi_wtime_sleep("smpi/wtime", + "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; -shared_malloc_type smpi_cfg_shared_malloc = shmalloc_global; +SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL; double smpi_total_benched_time = 0; -smpi_privatization_region_t smpi_privatization_regions; -extern "C" XBT_PUBLIC(void) smpi_execute_flops_(double *flops); +extern "C" XBT_PUBLIC void smpi_execute_flops_(double* flops); + void smpi_execute_flops_(double *flops) { smpi_execute_flops(*flops); } -extern "C" XBT_PUBLIC(void) smpi_execute_(double *duration); +extern "C" XBT_PUBLIC void smpi_execute_(double* duration); void smpi_execute_(double *duration) { smpi_execute(*duration); } void smpi_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); - smx_activity_t action = simcall_execution_start("computation", flops, 1, 0); - simcall_set_category (action, TRACE_internal_smpi_get_category()); - simcall_execution_wait(action); - smpi_switch_data_segment(smpi_process()->index()); + simgrid::s4u::this_actor::exec_init(flops) + ->set_name("computation") + ->set_tracing_category(TRACE_internal_smpi_get_category()) + ->start() + ->wait(); + smpi_switch_data_segment(simgrid::s4u::Actor::self()); } void smpi_execute(double duration) @@ -54,11 +68,8 @@ void smpi_execute(double duration) if (duration >= smpi_cpu_threshold) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); double flops = duration * smpi_host_speed; - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type=TRACING_COMPUTING; - extra->comp_size=flops; - TRACE_smpi_computing_in(rank, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_computing_in(rank, flops); smpi_execute_flops(flops); @@ -73,21 +84,22 @@ void smpi_execute(double duration) void smpi_execute_benched(double duration) { smpi_bench_end(); - smpi_execute(duration); + double speed = sg_host_speed(sg_host_self()); + smpi_execute_flops(duration*speed); smpi_bench_begin(); } void smpi_bench_begin() { - if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { - smpi_switch_data_segment(smpi_process()->index()); + if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + smpi_switch_data_segment(simgrid::s4u::Actor::self()); } if (MC_is_active() || MC_record_replay_is_active()) return; #if HAVE_PAPI - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') { + if (not simgrid::config::get_value("smpi/papi-events").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()) { @@ -116,7 +128,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 (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') { + if (not simgrid::config::get_value("smpi/papi-events").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()); @@ -139,8 +151,8 @@ void smpi_bench_end() xbt_die("Aborting."); } - if (xbt_cfg_get_string("smpi/comp-adjustment-file")[0] != '\0') { // Maybe we need to artificially speed up or slow - // down our computation based on our statistical analysis. + // Maybe we need to artificially speed up or slow down our computation based on our statistical analysis. + if (simgrid::config::get_value("smpi/comp-adjustment-file")[0] != '\0') { smpi_trace_call_location_t* loc = smpi_process()->call_location(); std::string key = loc->get_composed_key(); @@ -151,20 +163,19 @@ void smpi_bench_end() } // Simulate the benchmarked computation unless disabled via command-line argument - if (xbt_cfg_get_boolean("smpi/simulate-computation")) { + if (simgrid::config::get_value("smpi/simulate-computation")) { smpi_execute(xbt_os_timer_elapsed(timer)/speedup); } #if HAVE_PAPI - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) { - char container_name[INSTR_DEFAULT_STR_SIZE]; - smpi_container(smpi_process()->index(), container_name, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get(container_name); + if (not simgrid::config::get_value("smpi/papi-events").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(); for (auto const& pair : counter_data) { - new_pajeSetVariable(surf_get_clock(), container, - PJ_type_get(/* countername */ pair.first.c_str(), container->type), pair.second); + simgrid::instr::VariableType* variable = static_cast(container->type_->by_name(pair.first)); + variable->set_event(SIMIX_get_clock(), pair.second); } } #endif @@ -172,17 +183,14 @@ void smpi_bench_end() smpi_total_benched_time += xbt_os_timer_elapsed(timer); } -/* Private sleep function used by smpi_sleep() and smpi_usleep() */ +/* Private sleep function used by smpi_sleep(), smpi_usleep() and friends */ static unsigned int private_sleep(double secs) { smpi_bench_end(); XBT_DEBUG("Sleep for: %lf secs", secs); - int rank = MPI_COMM_WORLD->rank(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type=TRACING_SLEEPING; - extra->sleep_duration=secs; - TRACE_smpi_sleeping_in(rank, extra); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(rank, secs); simcall_process_sleep(secs); @@ -194,23 +202,32 @@ static unsigned int private_sleep(double secs) unsigned int smpi_sleep(unsigned int secs) { + if (not smpi_process()) + return sleep(secs); return private_sleep(static_cast(secs)); } int smpi_usleep(useconds_t usecs) { + if (not smpi_process()) + return usleep(usecs); return static_cast(private_sleep(static_cast(usecs) / 1000000.0)); } #if _POSIX_TIMERS > 0 -int smpi_nanosleep(const struct timespec *tp, struct timespec * t) +int smpi_nanosleep(const struct timespec* tp, struct timespec* t) { + if (not smpi_process()) + return nanosleep(tp,t); return static_cast(private_sleep(static_cast(tp->tv_sec + tp->tv_nsec / 1000000000.0))); } #endif -int smpi_gettimeofday(struct timeval *tv, void* tz) +int smpi_gettimeofday(struct timeval* tv, struct timezone* tz) { + if (not smpi_process()) + return gettimeofday(tv, tz); + smpi_bench_end(); double now = SIMIX_get_clock(); if (tv) { @@ -221,13 +238,17 @@ int smpi_gettimeofday(struct timeval *tv, void* tz) tv->tv_usec = static_cast((now - tv->tv_sec) * 1e6); #endif } + if (smpi_wtime_sleep > 0) + simcall_process_sleep(smpi_wtime_sleep); smpi_bench_begin(); return 0; } #if _POSIX_TIMERS > 0 -int smpi_clock_gettime(clockid_t clk_id, struct timespec *tp) +int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp) { + 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(); @@ -235,11 +256,28 @@ int smpi_clock_gettime(clockid_t clk_id, struct timespec *tp) tp->tv_sec = static_cast(now); tp->tv_nsec = static_cast((now - tp->tv_sec) * 1e9); } + if (smpi_wtime_sleep > 0) + simcall_process_sleep(smpi_wtime_sleep); smpi_bench_begin(); return 0; } #endif +double smpi_mpi_wtime() +{ + double time; + if (smpi_process()->initialized() && not smpi_process()->finalized() && not smpi_process()->sampling()) { + smpi_bench_end(); + time = SIMIX_get_clock(); + if (smpi_wtime_sleep > 0) + simcall_process_sleep(smpi_wtime_sleep); + smpi_bench_begin(); + } else { + time = SIMIX_get_clock(); + } + return time; +} + extern double sg_surf_precision; unsigned long long smpi_rastro_resolution () { @@ -267,7 +305,7 @@ public: SampleLocation(bool global, const char* file, int line) : std::string(std::string(file) + ":" + std::to_string(line)) { if (not global) - this->append(":" + std::to_string(smpi_process()->index())); + this->append(":" + std::to_string(simgrid::s4u::this_actor::get_pid())); } }; @@ -284,9 +322,6 @@ public: bool need_more_benchs() const; }; -} - -std::unordered_map> samples; bool LocalData::need_more_benchs() const { @@ -298,6 +333,9 @@ bool LocalData::need_more_benchs() const return res; } +std::unordered_map> samples; +} + void smpi_sample_1(int global, const char *file, int line, int iters, double threshold) { SampleLocation loc(global, file, line); @@ -401,7 +439,6 @@ void smpi_sample_3(int global, const char *file, int line) data.benching = false; } -extern "C" { /** These functions will be called from the user code **/ smpi_trace_call_location_t* smpi_trace_get_call_location() { return smpi_process()->call_location(); @@ -428,9 +465,40 @@ void smpi_trace_set_call_location__(const char* file, int* line) { smpi_trace_set_call_location(file, *line); } -} void smpi_bench_destroy() { samples.clear(); } + +int smpi_getopt_long_only (int argc, char *const *argv, const char *options, + const struct option * long_options, int *opt_index) +{ + if (smpi_process()) + optind = smpi_process()->get_optind(); + int ret = getopt_long_only (argc, argv, options, long_options, opt_index); + if (smpi_process()) + smpi_process()->set_optind(optind); + return ret; +} + +int smpi_getopt_long (int argc, char *const *argv, const char *options, + const struct option * long_options, int *opt_index) +{ + if (smpi_process()) + optind = smpi_process()->get_optind(); + int ret = getopt_long (argc, argv, options, long_options, opt_index); + if (smpi_process()) + smpi_process()->set_optind(optind); + return ret; +} + +int smpi_getopt (int argc, char *const *argv, const char *options) +{ + if (smpi_process()) + optind = smpi_process()->get_optind(); + int ret = getopt (argc, argv, options); + if (smpi_process()) + smpi_process()->set_optind(optind); + return ret; +}