From 2f405b6f2718785bb78ca4ae12854c10c74f0882 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 22 Oct 2015 00:44:15 +0200 Subject: [PATCH] revalidate the tesh files after the modifications of the energy_platform.xml file --- .../consumption/energy_consumption.tesh | 1 + examples/msg/energy/pstate/pstate.tesh | 12 ++++++++---- examples/smpi/energy/energy.tesh | 13 +++++++++---- examples/smpi/energy/f77/energy.tesh | 19 +++++++++++++------ examples/smpi/energy/f90/energy.tesh | 17 ++++++++++++----- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/examples/msg/energy/consumption/energy_consumption.tesh b/examples/msg/energy/consumption/energy_consumption.tesh index d701b8bd14..a937e91de4 100644 --- a/examples/msg/energy/consumption/energy_consumption.tesh +++ b/examples/msg/energy/consumption/energy_consumption.tesh @@ -19,4 +19,5 @@ $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../pl > [ 30.000000] (0:@) Total simulation time: 30.00 > [ 30.000000] (0:@) Total energy of host MyHost1: 3160.000000 Joules > [ 30.000000] (0:@) Total energy of host MyHost2: 2100.000000 Joules +> [ 30.000000] (0:@) Total energy of host MyHost3: 3000.000000 Joules > [ 30.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=3160 J diff --git a/examples/msg/energy/pstate/pstate.tesh b/examples/msg/energy/pstate/pstate.tesh index 89cc7de5c1..6e461c1791 100644 --- a/examples/msg/energy/pstate/pstate.tesh +++ b/examples/msg/energy/pstate/pstate.tesh @@ -5,15 +5,19 @@ p Testing the DVFS-related functions ! output sort 19 $ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/pstate/deployment_pstate.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 -> [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=1 +> [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000 > [ 1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00 > [ 1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00 -> [ 1.000000] (2:dvfs_test@MyHost2) Cannot set pstate 2, host supports only 1 pstates > [ 1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2) +> [ 1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2) > [ 1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00 -> [ 6.000000] (1:dvfs_test@MyHost1) Count of Processor states=1 -> [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 +> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 +> [ 6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 +> [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:@) Total simulation time: 6.000000e+00 diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh index 4ab3300d5d..dce378e670 100644 --- a/examples/smpi/energy/energy.tesh +++ b/examples/smpi/energy/energy.tesh @@ -5,15 +5,20 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platf > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' -> [0.000000] [rank 1] Pstates: 1; Powers: 100000000 > [0.000000] [rank 0] Pstates: 3; Powers: 100000000, 50000000, 20000000 -> [0.000000] [rank 1] Current pstate: 0; Current power: 100000000 +> [0.000000] [rank 1] Pstates: 3; Powers: 100000000, 50000000, 20000000 > [0.000000] [rank 0] Current pstate: 0; Current power: 100000000 -> [10.000000] [rank 1] Energy consumed: 2000 Joules. +> [0.000000] [rank 1] Current pstate: 0; Current power: 100000000 > [10.000000] [rank 0] Energy consumed: 2000 Joules. +> [10.000000] [rank 1] Energy consumed: 2000 Joules. > [10.000000] [rank 0] Current pstate: 1; Current power: 50000000 +> [10.000000] [rank 1] Current pstate: 1; Current power: 50000000 > [30.000000] [rank 0] Energy consumed: 5400 Joules. +> [30.000000] [rank 1] Energy consumed: 5400 Joules. > [30.000000] [rank 0] Current pstate: 2; Current power: 20000000 +> [30.000000] [rank 1] Current pstate: 2; Current power: 20000000 > [80.000000] [rank 0] Energy consumed: 12900 Joules. +> [80.000000] [rank 1] Energy consumed: 12900 Joules. > [80.000000] [surf_energy/INFO] Total energy of host MyHost1: 12900.000000 Joules -> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 9000.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 12900.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost3: 8000.000000 Joules diff --git a/examples/smpi/energy/f77/energy.tesh b/examples/smpi/energy/f77/energy.tesh index 17ce4fd2ae..f83182c3ef 100644 --- a/examples/smpi/energy/f77/energy.tesh +++ b/examples/smpi/energy/f77/energy.tesh @@ -1,24 +1,31 @@ p Test smpi bindings for dvfs functions (Fortran 77 example) -! output sort 1 + $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/cpu_threshold:-1 ${bindir:=.}/f77/sef --cfg=plugin:Energy --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' -> [80.000000] [surf_energy/INFO] Total energy of host MyHost1: 12900.000000 Joules -> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 9000.000000 Joules > [ 0.0000000000000000 ] [rank 0 ] 3 pstates available -> [ 0.0000000000000000 ] [rank 1 ] 1 pstates available +> [ 0.0000000000000000 ] [rank 1 ] 3 pstates available > [ 0.0000000000000000 ] [rank 0 ] Power: 100000000.00000000 > [ 0.0000000000000000 ] [rank 1 ] Power: 100000000.00000000 > [ 0.0000000000000000 ] [rank 0 ] Power: 50000000.000000000 +> [ 0.0000000000000000 ] [rank 1 ] Power: 50000000.000000000 > [ 0.0000000000000000 ] [rank 0 ] Power: 20000000.000000000 -> [ 0.0000000000000000 ] [rank 1 ] Current pstate: 0 ; Current power: 100000000.00000000 +> [ 0.0000000000000000 ] [rank 1 ] Power: 20000000.000000000 > [ 0.0000000000000000 ] [rank 0 ] Current pstate: 0 ; Current power: 100000000.00000000 -> [ 10.000000000000000 ] [rank 1 ] Energy consumed (Joules): 2000.0000000000000 +> [ 0.0000000000000000 ] [rank 1 ] Current pstate: 0 ; Current power: 100000000.00000000 > [ 10.000000000000000 ] [rank 0 ] Energy consumed (Joules): 2000.0000000000000 +> [ 10.000000000000000 ] [rank 1 ] Energy consumed (Joules): 2000.0000000000000 > [ 10.000000000000000 ] [rank 0 ] Current pstate: 1 ; Current power: 50000000.000000000 +> [ 10.000000000000000 ] [rank 1 ] Current pstate: 1 ; Current power: 50000000.000000000 > [ 30.000000000000000 ] [rank 0 ] Energy consumed (Joules): 5400.0000000000000 +> [ 30.000000000000000 ] [rank 1 ] Energy consumed (Joules): 5400.0000000000000 > [ 30.000000000000000 ] [rank 0 ] Current pstate: 2 ; Current power: 20000000.000000000 +> [ 30.000000000000000 ] [rank 1 ] Current pstate: 2 ; Current power: 20000000.000000000 > [ 80.000000000000000 ] [rank 0 ] Energy consumed (Joules): 12900.000000000000 +> [ 80.000000000000000 ] [rank 1 ] Energy consumed (Joules): 12900.000000000000 +> [80.000000] [surf_energy/INFO] Total energy of host MyHost1: 12900.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 12900.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost3: 8000.000000 Joules diff --git a/examples/smpi/energy/f90/energy.tesh b/examples/smpi/energy/f90/energy.tesh index e17fb4f866..02394d7000 100644 --- a/examples/smpi/energy/f90/energy.tesh +++ b/examples/smpi/energy/f90/energy.tesh @@ -6,19 +6,26 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platf > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' -> [80.000000] [surf_energy/INFO] Total energy of host MyHost1: 12900.000000 Joules -> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 9000.000000 Joules > [ 0.0000000000000000 ] [rank 0 ] 3 pstates available -> [ 0.0000000000000000 ] [rank 1 ] 1 pstates available +> [ 0.0000000000000000 ] [rank 1 ] 3 pstates available > [ 0.0000000000000000 ] [rank 0 ] Power: 100000000.00000000 > [ 0.0000000000000000 ] [rank 1 ] Power: 100000000.00000000 > [ 0.0000000000000000 ] [rank 0 ] Power: 50000000.000000000 +> [ 0.0000000000000000 ] [rank 1 ] Power: 50000000.000000000 > [ 0.0000000000000000 ] [rank 0 ] Power: 20000000.000000000 -> [ 0.0000000000000000 ] [rank 1 ] Current pstate: 0 ; Current power: 100000000.00000000 +> [ 0.0000000000000000 ] [rank 1 ] Power: 20000000.000000000 > [ 0.0000000000000000 ] [rank 0 ] Current pstate: 0 ; Current power: 100000000.00000000 -> [ 10.000000000000000 ] [rank 1 ] Energy consumed (Joules): 2000.0000000000000 +> [ 0.0000000000000000 ] [rank 1 ] Current pstate: 0 ; Current power: 100000000.00000000 > [ 10.000000000000000 ] [rank 0 ] Energy consumed (Joules): 2000.0000000000000 +> [ 10.000000000000000 ] [rank 1 ] Energy consumed (Joules): 2000.0000000000000 > [ 10.000000000000000 ] [rank 0 ] Current pstate: 1 ; Current power: 50000000.000000000 +> [ 10.000000000000000 ] [rank 1 ] Current pstate: 1 ; Current power: 50000000.000000000 > [ 30.000000000000000 ] [rank 0 ] Energy consumed (Joules): 5400.0000000000000 +> [ 30.000000000000000 ] [rank 1 ] Energy consumed (Joules): 5400.0000000000000 > [ 30.000000000000000 ] [rank 0 ] Current pstate: 2 ; Current power: 20000000.000000000 +> [ 30.000000000000000 ] [rank 1 ] Current pstate: 2 ; Current power: 20000000.000000000 > [ 80.000000000000000 ] [rank 0 ] Energy consumed (Joules): 12900.000000000000 +> [ 80.000000000000000 ] [rank 1 ] Energy consumed (Joules): 12900.000000000000 +> [80.000000] [surf_energy/INFO] Total energy of host MyHost1: 12900.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost2: 12900.000000 Joules +> [80.000000] [surf_energy/INFO] Total energy of host MyHost3: 8000.000000 Joules -- 2.20.1