From d386fef6786742d4227dbc96e14106dca6befeba Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 10 Sep 2018 16:19:17 +0200 Subject: [PATCH] fix the SMPI tests that mandate smpi/wtime == 0 --- examples/smpi/ampi/ampi.tesh | 2 +- examples/smpi/energy/energy.tesh | 3 ++- examples/smpi/energy/f77/energy.tesh | 2 +- examples/smpi/energy/f90/energy.tesh | 2 +- teshsuite/smpi/timers/timers.tesh | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/smpi/ampi/ampi.tesh b/examples/smpi/ampi/ampi.tesh index be6bb157fa..bc3d78fb80 100644 --- a/examples/smpi/ampi/ampi.tesh +++ b/examples/smpi/ampi/ampi.tesh @@ -5,7 +5,7 @@ p Test if the load balancing code gets traced correctly ! timeout 60 -$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:${bindir:=.}/smpi_trace.trace --cfg=tracing/smpi/format/ti-one-file:yes -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./ampi/smpi_ampi ${srcdir:=.}/replay/actions_bcast.txt --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning +$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:${bindir:=.}/smpi_trace.trace --cfg=tracing/smpi/format/ti-one-file:yes -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./ampi/smpi_ampi ${srcdir:=.}/replay/actions_bcast.txt --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0 $ bash -c "cat ${bindir:=.}/smpi_trace.trace_files/*" > 0 init diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh index 1895a49d55..ce5bf0dbc3 100644 --- a/examples/smpi/energy/energy.tesh +++ b/examples/smpi/energy/energy.tesh @@ -1,5 +1,6 @@ p Test smpi bindings for dvfs functions (C example) -$ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${platfdir}/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/../examples/smpi/energy/smpi_energy --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning + +$ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${platfdir}/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/../examples/smpi/energy/smpi_energy --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0 > [0.000000] [rank 0] Pstates: 3; Powers: 100000000, 50000000, 20000000 > [0.000000] [rank 1] Pstates: 3; Powers: 100000000, 50000000, 20000000 > [0.000000] [rank 0] Current pstate: 0; Current power: 100000000 diff --git a/examples/smpi/energy/f77/energy.tesh b/examples/smpi/energy/f77/energy.tesh index c9de94b728..a311eb6ce4 100644 --- a/examples/smpi/energy/f77/energy.tesh +++ b/examples/smpi/energy/f77/energy.tesh @@ -1,6 +1,6 @@ p Test smpi bindings for dvfs functions (Fortran 77 example) -$ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/f77/sef --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning +$ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/f77/sef --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0 > [ 0.00000000] [rank 0] 3 pstates available > [ 0.00000000] [rank 1] 3 pstates available > [ 0.00000000] [rank 0] Power: 100000000.0000 diff --git a/examples/smpi/energy/f90/energy.tesh b/examples/smpi/energy/f90/energy.tesh index 5394bfcd07..033b99d1b2 100644 --- a/examples/smpi/energy/f90/energy.tesh +++ b/examples/smpi/energy/f90/energy.tesh @@ -1,6 +1,6 @@ p Test smpi bindings for dvfs functions (Fortran 90 example) -$ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/f90/sef90 --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning +$ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/f90/sef90 --cfg=plugin:host_energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0 > [ 0.00000000] [rank 0] 3 pstates available > [ 0.00000000] [rank 1] 3 pstates available > [ 0.00000000] [rank 0] Power: 100000000.0000 diff --git a/teshsuite/smpi/timers/timers.tesh b/teshsuite/smpi/timers/timers.tesh index 92448d179b..eb782b8060 100644 --- a/teshsuite/smpi/timers/timers.tesh +++ b/teshsuite/smpi/timers/timers.tesh @@ -1,4 +1,4 @@ p Test timers -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 1 ${bindir:=.}/timers -q --log=smpi_kernel.thres:warning --cfg=smpi/simulate-computation:no --cfg=smpi/host-speed:100000 --log=xbt_cfg.thres:warning +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 1 ${bindir:=.}/timers -q --log=smpi_kernel.thres:warning --cfg=smpi/simulate-computation:no --cfg=smpi/host-speed:100000 --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0 > [rank 0] -> Tremblay -- 2.20.1