From 9ed461c11fd10eeea596831f2791e359c05d26bf Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 1 May 2016 22:32:45 +0200 Subject: [PATCH] kill more old cruft: adaptative threshold That's too bad, it'd be good to have this running. But the code is not tested since a long time and I don't feel like fixing it before changing everything to SG4. --- src/simix/RawContext.cpp | 116 +-------------------------------------- src/simix/smx_global.cpp | 3 - src/simix/smx_private.h | 5 -- 3 files changed, 1 insertion(+), 123 deletions(-) diff --git a/src/simix/RawContext.cpp b/src/simix/RawContext.cpp index 94770aed67..67ebc5438c 100644 --- a/src/simix/RawContext.cpp +++ b/src/simix/RawContext.cpp @@ -89,30 +89,11 @@ static simgrid::simix::RawContext** raw_workers_context; /* space to save the static uintptr_t raw_threads_working; /* number of threads that have started their work */ static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */ #endif -#ifdef ADAPTIVE_THRESHOLD -#define SCHED_ROUND_LIMIT 5 -static xbt_os_timer_t round_time; -static double par_time,seq_time; -static double par_ratio,seq_ratio; -static int reached_seq_limit, reached_par_limit; -static unsigned int par_proc_that_ran = 0,seq_proc_that_ran = 0; /* Counters of processes that have run in SCHED_ROUND_LIMIT scheduling rounds */ -static unsigned int seq_sched_round=0, par_sched_round=0; /* Amount of SR that ran serial/parallel*/ -/*Varables used to calculate running variance and mean*/ -static double prev_avg_par_proc=0,prev_avg_seq_proc=0; -static double delta=0; -static double s_par_proc=0,s_seq_proc=0; /*Standard deviation of number of processes computed in par/seq during the current simulation*/ -static double avg_par_proc=0,sd_par_proc=0; -static double avg_seq_proc=0,sd_seq_proc=0; -static long long par_window=(long long)HUGE_VAL,seq_window=0; -#endif static unsigned long raw_process_index = 0; /* index of the next process to run in the * list of runnable processes */ static simgrid::simix::RawContext* raw_maestro_context; static bool raw_context_parallel = false; -#ifdef ADAPTIVE_THRESHOLD -static bool raw_context_adaptative = false; -#endif // ***** Raw context routines @@ -289,9 +270,6 @@ namespace simix { RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory") { -#ifdef ADAPTIVE_THRESHOLD - raw_context_adaptative = (SIMIX_context_get_parallel_threshold() > 1); -#endif raw_context_parallel = SIMIX_context_is_parallel(); if (raw_context_parallel) { #if HAVE_THREAD_CONTEXTS @@ -304,11 +282,6 @@ RawContextFactory::RawContextFactory() #endif // TODO, if(SIMIX_context_get_parallel_threshold() > 1) => choose dynamically } -#ifdef ADAPTIVE_THRESHOLD - round_time = xbt_os_timer_new(); - reached_seq_limit = 0; - reached_par_limit = 0; -#endif } RawContextFactory::~RawContextFactory() @@ -367,11 +340,6 @@ void RawContext::stop() void RawContextFactory::run_all() { -#ifdef ADAPTIVE_THRESHOLD - if (raw_context_adaptative) - run_all_adaptative(); - else -#endif if (raw_context_parallel) run_all_parallel(); else @@ -490,88 +458,7 @@ void RawContext::resume_parallel() #endif } -/** - * \brief Resumes all processes ready to run. - */ -#ifdef ADAPTIVE_THRESHOLD -void RawContectFactory::run_all_adaptative() -{ - unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); - unsigned long threshold = SIMIX_context_get_parallel_threshold(); - reached_seq_limit = (seq_sched_round % SCHED_ROUND_LIMIT == 0); - reached_par_limit = (par_sched_round % SCHED_ROUND_LIMIT == 0); - - if(reached_seq_limit && reached_par_limit){ - par_ratio = (par_proc_that_ran != 0) ? (par_time / (double)par_proc_that_ran) : 0; - seq_ratio = (seq_proc_that_ran != 0) ? (seq_time / (double)seq_proc_that_ran) : 0; - if(seq_ratio > par_ratio){ - if(nb_processes < avg_par_proc) { - threshold = (threshold>2) ? threshold - 1 : threshold ; - SIMIX_context_set_parallel_threshold(threshold); - } - } else { - if(nb_processes > avg_seq_proc){ - SIMIX_context_set_parallel_threshold(threshold+1); - } - } - } - - if (nb_processes >= SIMIX_context_get_parallel_threshold()) { - simix_global->context_factory->suspend = smx_ctx_raw_suspend_parallel; - if (nb_processes < par_window){ - par_sched_round++; - xbt_os_walltimer_start(round_time); - smx_ctx_raw_runall_parallel(); - xbt_os_walltimer_stop(round_time); - par_time += xbt_os_timer_elapsed(round_time); - - prev_avg_par_proc = avg_par_proc; - delta = nb_processes - avg_par_proc; - avg_par_proc = (par_sched_round==1) ? nb_processes : avg_par_proc + delta / (double) par_sched_round; - - if(par_sched_round>=2){ - s_par_proc = s_par_proc + (nb_processes - prev_avg_par_proc) * delta; - sd_par_proc = sqrt(s_par_proc / (par_sched_round-1)); - par_window = (int) (avg_par_proc + sd_par_proc); - }else{ - sd_par_proc = 0; - } - - par_proc_that_ran += nb_processes; - } else{ - smx_ctx_raw_runall_parallel(); - } - } else { - simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial; - if(nb_processes > seq_window){ - seq_sched_round++; - xbt_os_walltimer_start(round_time); - smx_ctx_raw_runall_serial(); - xbt_os_walltimer_stop(round_time); - seq_time += xbt_os_timer_elapsed(round_time); - - prev_avg_seq_proc = avg_seq_proc; - delta = (nb_processes-avg_seq_proc); - avg_seq_proc = (seq_sched_round==1) ? nb_processes : avg_seq_proc + delta / (double) seq_sched_round; - - if(seq_sched_round>=2){ - s_seq_proc = s_seq_proc + (nb_processes - prev_avg_seq_proc)*delta; - sd_seq_proc = sqrt(s_seq_proc / (seq_sched_round-1)); - seq_window = (int) (avg_seq_proc - sd_seq_proc); - } else { - sd_seq_proc = 0; - } - - seq_proc_that_ran += nb_processes; - } else { - smx_ctx_raw_runall_serial(); - } - } -} - -#else - -// TODO +/** @brief Resumes all processes ready to run. */ void RawContextFactory::run_all_adaptative() { unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); @@ -586,7 +473,6 @@ void RawContextFactory::run_all_adaptative() this->run_all_serial(); } } -#endif } } diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 6192bde8fd..e93da3a3ff 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -271,9 +271,6 @@ int smx_cleaned = 0; */ void SIMIX_clean(void) { -#ifdef TIME_BENCH_PER_SR - smx_ctx_raw_new_sr(); -#endif if (smx_cleaned) return; // to avoid double cleaning by java and C smx_cleaned = 1; XBT_DEBUG("SIMIX_clean called. Simulation's over."); diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 7190208dae..0f1c7bf834 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -56,11 +56,6 @@ typedef struct s_smx_context_factory *smx_context_factory_t; SG_BEGIN_DECL() -/* Define only for SimGrid benchmarking purposes */ -//#define TIME_BENCH_PER_SR /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */ -//#define ADAPTIVE_THRESHOLD /* this is to enable the adaptive threshold algorithm in raw contexts*/ -//#define TIME_BENCH_ENTIRE_SRS /* more general benchmark than TIME_BENCH_PER_SR. It aims to measure the total time spent in a whole scheduling round (including synchro costs)*/ - /********************************** Simix Global ******************************/ typedef struct s_smx_global { smx_context_factory_t context_factory; -- 2.20.1