X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16f843b808b321508679187eae65e1fec3cf14ee..7c14726fd0862a988b835b24e85c6c5b83b81900:/src/smpi/smpi_bench.c diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index fe8f3b4e0e..a7e06c0a15 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -25,6 +25,10 @@ #include #include +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (benchmarking)"); @@ -65,14 +69,13 @@ xbt_dict_t allocs = NULL; /* Allocated on first use */ xbt_dict_t allocs_metadata = NULL; /* Allocated on first use */ xbt_dict_t samples = NULL; /* Allocated on first use */ xbt_dict_t calls = NULL; /* Allocated on first use */ -__thread int smpi_current_rank = 0; /* Updated after each MPI call */ double smpi_cpu_threshold; double smpi_running_power; -int* fds; +static int* fds; void** mappings; -int loaded_page = -1; +int smpi_loaded_page = -1; char* start_data_exe = NULL; int size_data_exe = 0; int smpi_privatize_global_variables; @@ -114,7 +117,7 @@ static void* shm_map(int fd, size_t size, shared_data_t* data) { xbt_die("Could not map fd %d: %s", fd, strerror(errno)); } if(!allocs_metadata) { - allocs_metadata = xbt_dict_new_homogeneous(xbt_free); + allocs_metadata = xbt_dict_new_homogeneous(xbt_free_f); } snprintf(loc, PTR_STRLEN, "%p", mem); meta = xbt_new(shared_metadata_t, 1); @@ -182,48 +185,65 @@ void smpi_execute(double duration) } } -void switch_data_segment(int dest); +void smpi_switch_data_segment(int dest); void smpi_bench_begin(void) { - switch_data_segment(smpi_process_index()); + smpi_switch_data_segment(smpi_process_index()); xbt_os_threadtimer_start(smpi_process_timer()); - smpi_current_rank = smpi_process_index(); } void smpi_bench_end(void) { xbt_os_timer_t timer = smpi_process_timer(); xbt_os_threadtimer_stop(timer); -// switch_data_segment(smpi_process_count()); +// smpi_switch_data_segment(smpi_process_count()); if (smpi_process_get_sampling()) { XBT_CRITICAL("Cannot do recursive benchmarks."); XBT_CRITICAL("Are you trying to make a call to MPI within a SMPI_SAMPLE_ block?"); xbt_backtrace_display_current(); xbt_die("Aborting."); } - smpi_execute(xbt_os_timer_elapsed(timer)); + // Simulate the benchmarked computation unless disabled via command-line argument + if (sg_cfg_get_boolean("smpi/simulate_computation")) { + smpi_execute(xbt_os_timer_elapsed(timer)); + } } -unsigned int smpi_sleep(unsigned int secs) +/* Private sleep function used by smpi_sleep() and smpi_usleep() */ +static unsigned int private_sleep(double secs) { - smx_action_t action; - smpi_bench_end(); - double flops = (double) secs*simcall_host_get_speed(SIMIX_host_self()); - XBT_DEBUG("Sleep for: %f flops", flops); - action = simcall_host_execute("computation", SIMIX_host_self(), flops, 1, 0, 0); + XBT_DEBUG("Sleep for: %lf secs", secs); #ifdef HAVE_TRACING - simcall_set_category (action, TRACE_internal_smpi_get_category()); - #endif - simcall_host_execution_wait(action); + int rank = smpi_comm_rank(MPI_COMM_WORLD); + 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); +#endif + simcall_process_sleep(secs); +#ifdef HAVE_TRACING + TRACE_smpi_sleeping_out(rank); +#endif smpi_bench_begin(); - return secs; + return 0; } -int smpi_gettimeofday(struct timeval *tv) +unsigned int smpi_sleep(unsigned int secs) +{ + return private_sleep((double)secs); +} + +int smpi_usleep(useconds_t usecs) +{ + return (int)private_sleep((double)usecs / 1000000.0); +} + + +int smpi_gettimeofday(struct timeval *tv, void* tz) { double now; smpi_bench_end(); @@ -240,11 +260,11 @@ int smpi_gettimeofday(struct timeval *tv) return 0; } -extern double sg_maxmin_precision; +extern double sg_surf_precision; unsigned long long smpi_rastro_resolution (void) { smpi_bench_end(); - double resolution = (1/sg_maxmin_precision); + double resolution = (1/sg_surf_precision); smpi_bench_begin(); return (unsigned long long)resolution; } @@ -484,7 +504,7 @@ void smpi_shared_free(void *ptr) shared_metadata_t* meta; shared_data_t* data; if (sg_cfg_get_boolean("smpi/use_shared_malloc")){ - + if (!allocs) { XBT_WARN("Cannot free: nothing was allocated"); return; @@ -570,7 +590,6 @@ void* smpi_shared_set_call(const char* func, const char* input, void* data) { -#ifndef WIN32 #define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize) @@ -583,18 +602,17 @@ void* smpi_shared_set_call(const char* func, const char* input, void* data) { -void switch_data_segment(int dest){ +void smpi_switch_data_segment(int dest){ if(size_data_exe == 0)//no need to switch return; - if (loaded_page==dest)//no need to switch either + if (smpi_loaded_page==dest)//no need to switch either return; - #ifdef HAVE_MMAP int i; - if(loaded_page==-1){//initial switch, do the copy from the real page here + if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here for (i=0; i< SIMIX_process_count(); i++){ memcpy(mappings[i],TOPAGE(start_data_exe),size_data_exe); } @@ -604,7 +622,7 @@ void switch_data_segment(int dest){ void* tmp = mmap (TOPAGE(start_data_exe), size_data_exe, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0); if (tmp != TOPAGE(start_data_exe)) xbt_die("Couldn't map the new region"); - loaded_page=dest; + smpi_loaded_page=dest; #endif } @@ -665,7 +683,7 @@ void smpi_get_executable_global_size(){ found++; }else if(strcmp(lfields[1], ".bss") == 0){ //the beginning of bss is not exactly the end of data if not aligned, grow bss reported size accordingly - //TODO : check if this is OK, as some segments may be inserted between them.. + //TODO : check if this is OK, as some segments may be inserted between them.. size_bss_binary = ((char*) strtoul(lfields[4], NULL, 16) - (start_data_exe + size_data_binary)) + strtoul(lfields[2], NULL, 16); found++; @@ -758,6 +776,3 @@ void smpi_destroy_global_memory_segments(){ #endif } - - -#endif