From 2093781c3522f4122f1914486e94c1d4b8bcb3e2 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 26 Jun 2013 13:58:41 +0200 Subject: [PATCH 1/1] Fix smpi_sleep to execute the sleep on the simulated host (ignoring running host power) --- src/smpi/smpi_bench.c | 2 +- teshsuite/smpi/mpich-test/coll/runtests | 3 +-- teshsuite/smpi/mpich-test/env/runtests | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index cdb3c5a50b..84a0bac483 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -164,7 +164,7 @@ void smpi_bench_end(void) unsigned int smpi_sleep(unsigned int secs) { smpi_bench_end(); - smpi_execute((double) secs); + smpi_execute_flops((double) secs*simcall_host_get_speed(SIMIX_host_self())); smpi_bench_begin(); return secs; } diff --git a/teshsuite/smpi/mpich-test/coll/runtests b/teshsuite/smpi/mpich-test/coll/runtests index 1b56ab05fd..65bcdd79a3 100755 --- a/teshsuite/smpi/mpich-test/coll/runtests +++ b/teshsuite/smpi/mpich-test/coll/runtests @@ -153,7 +153,7 @@ rm -f longuser1 #CleanExe allredmany RunTest grouptest 4 -#uses MPI_Dims_create, MPI_Cart_create ... removed + RunTest allred 4 "*** Allred ***" RunTest allred2 4 "*** Allred2 ***" @@ -162,7 +162,6 @@ RunTest allred2 4 "*** Allred2 ***" RunTest scattern 4 "*** Scattern ***" -#fails, more debug needed to understand RunTest redscat 4 "*** Reduce_scatter ***" RunTest alltoallv_mpich 4 "*** Alltoallv ***" diff --git a/teshsuite/smpi/mpich-test/env/runtests b/teshsuite/smpi/mpich-test/env/runtests index 75a58bf8ca..e002051d70 100755 --- a/teshsuite/smpi/mpich-test/env/runtests +++ b/teshsuite/smpi/mpich-test/env/runtests @@ -80,7 +80,7 @@ fi testfiles="" if [ $runtests = 1 ] ; then -#RunTest timers 1 "*** Timer tests ***" +RunTest timers 1 "*** Timer tests ***" RunTest init 2 "*** MPI_Initialized tests ***" # uses MPI_Attr_get -- 2.20.1