From: Martin Quinson Date: Fri, 27 Sep 2019 22:01:57 +0000 (+0200) Subject: Merge branch 'master' into 'rework-energy-plugin' X-Git-Tag: v3.24~51^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/79f4c4c467150b3bea841b968cabd629e9d9282a?hp=05fa4346bbe0aa0593bc8c4cbb4ed165628abc54 Merge branch 'master' into 'rework-energy-plugin' # Conflicts: # include/simgrid/plugins/energy.h --- diff --git a/MANIFEST.in b/MANIFEST.in index 736fc92fe0..a7c7aadd5d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -355,6 +355,8 @@ include examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml include examples/s4u/energy-boot/platform_boot.xml include examples/s4u/energy-boot/s4u-energy-boot.cpp include examples/s4u/energy-boot/s4u-energy-boot.tesh +include examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp +include examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh include examples/s4u/energy-exec/s4u-energy-exec.cpp include examples/s4u/energy-exec/s4u-energy-exec.tesh include examples/s4u/energy-link/s4u-energy-link.cpp @@ -1684,6 +1686,7 @@ include tools/graphicator/graphicator.tesh include tools/normalize-pointers.py include tools/pkg-config/simgrid.pc.in include tools/sanitizers.supp +include tools/sg_xml_energy_ponecore_to_pepsilon.py include tools/sg_xml_unit_converter.py include tools/simgrid.supp include tools/simgrid2vite.sed diff --git a/examples/deprecated/java/energy/consumption/energy-consumption.tesh b/examples/deprecated/java/energy/consumption/energy-consumption.tesh index 62c75adc03..eccc8fdf9f 100644 --- a/examples/deprecated/java/energy/consumption/energy-consumption.tesh +++ b/examples/deprecated/java/energy/consumption/energy-consumption.tesh @@ -4,7 +4,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../../platforms/energy_platform.xml > [0.000000] [java/INFO] Using regular java threads. -> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 +> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J > [MyHost1:energyConsumer:(1) 10.000000] [java/INFO] Currently consumed energy after sleeping 10 sec: 1000.0 > [MyHost1:energyConsumer:(1) 20.000000] [java/INFO] Currently consumed energy after executing 1E9 flops: 2200.0 diff --git a/examples/platforms/cluster_multi.xml b/examples/platforms/cluster_multi.xml index 6302d78d8a..01a9441583 100644 --- a/examples/platforms/cluster_multi.xml +++ b/examples/platforms/cluster_multi.xml @@ -1,4 +1,4 @@ - + @@ -23,8 +23,8 @@ So the route from node-0 to node-1 is {l0.UP, l1.DOWN} --> - - + + @@ -39,11 +39,8 @@ The route from node-0 to the outer world begins with: l0.UP ; backbone --> - - + + @@ -55,10 +52,8 @@ - - Also, the hosts have 4 cores. --> - - + + @@ -74,23 +69,17 @@ - not by the network backbone. --> - + - + - + - + diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml index f703ff3285..4b6dcefe4c 100644 --- a/examples/platforms/energy_cluster.xml +++ b/examples/platforms/energy_cluster.xml @@ -1,12 +1,10 @@ - + - - - - + + + + diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml index 6cf6d72e67..17756adf39 100644 --- a/examples/platforms/energy_platform.xml +++ b/examples/platforms/energy_platform.xml @@ -1,42 +1,42 @@ - + - - + + - + - - - + + + - - - + + + - + - - + + - - + + - - + + diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 9462c8a19e..034f340c68 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -7,7 +7,7 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill app-chainsend app-pingpong app-token-ring async-ready async-wait async-waitany async-waitall async-waituntil cloud-capping cloud-migration cloud-simple - energy-exec energy-boot energy-link energy-vm + energy-exec energy-boot energy-link energy-vm energy-exec-ptask engine-filtering exec-async exec-basic exec-dvfs exec-ptask exec-remote exec-waitany io-async io-file-system io-file-remote io-disk-raw diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp new file mode 100644 index 0000000000..aa2c214e50 --- /dev/null +++ b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp @@ -0,0 +1,148 @@ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "simgrid/s4u.hpp" +#include "simgrid/plugins/energy.h" + +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example"); + +static void runner() +{ + simgrid::s4u::Host* host1 = simgrid::s4u::Host::by_name("MyHost1"); + simgrid::s4u::Host* host2 = simgrid::s4u::Host::by_name("MyHost2"); + std::vector hosts{host1, host2}; + + double old_energy_host1 = sg_host_get_consumed_energy(host1); + double old_energy_host2 = sg_host_get_consumed_energy(host2); + + XBT_INFO("[%s] Energetic profile: %s", host1->get_cname(), host1->get_property("watt_per_state")); + XBT_INFO("[%s] Initial peak speed=%.0E flop/s; Total energy dissipated =%.0E J", host1->get_cname(), host1->get_speed(), + old_energy_host1); + XBT_INFO("[%s] Energetic profile: %s", host2->get_cname(), host2->get_property("watt_per_state")); + XBT_INFO("[%s] Initial peak speed=%.0E flop/s; Total energy dissipated =%.0E J", host2->get_cname(), host2->get_speed(), + old_energy_host2); + + double start = simgrid::s4u::Engine::get_clock(); + XBT_INFO("Sleep for 10 seconds"); + simgrid::s4u::this_actor::sleep_for(10); + + double new_energy_host1 = sg_host_get_consumed_energy(host1); + double new_energy_host2 = sg_host_get_consumed_energy(host2); + XBT_INFO("Done sleeping (duration: %.2f s).\n" + "[%s] Current peak speed=%.0E; Energy dissipated during this step=%.2f J; Total energy dissipated=%.2f J\n" + "[%s] Current peak speed=%.0E; Energy dissipated during this step=%.2f J; Total energy dissipated=%.2f J\n", + simgrid::s4u::Engine::get_clock() - start, + host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1), + host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2)); + + old_energy_host1 = new_energy_host1; + old_energy_host2 = new_energy_host2; + + + // ========= Execute something ========= + start = simgrid::s4u::Engine::get_clock(); + double flopAmount = 1E9; + std::vector cpu_amounts{flopAmount, flopAmount}; + std::vector com_amounts{0, 0, 0, 0}; + XBT_INFO("Run a task of %.0E flops on two hosts", flopAmount); + simgrid::s4u::this_actor::parallel_execute(hosts, cpu_amounts, com_amounts); + + new_energy_host1 = sg_host_get_consumed_energy(host1); + new_energy_host2 = sg_host_get_consumed_energy(host2); + XBT_INFO("Task done (duration: %.2f s).\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n", + simgrid::s4u::Engine::get_clock() - start, + host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1), + host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2)); + + old_energy_host1 = new_energy_host1; + old_energy_host2 = new_energy_host2; + + + // ========= Change power peak ========= + int pstate = 2; + host1->set_pstate(pstate); + host2->set_pstate(pstate); + XBT_INFO("========= Requesting pstate %d for both hosts (speed should be of %.0E flop/s and is of %.0E flop/s)", pstate, + host1->get_pstate_speed(pstate), host1->get_speed()); + + + // ========= Run another ptask ========= + start = simgrid::s4u::Engine::get_clock(); + std::vector cpu_amounts2{flopAmount, flopAmount}; + std::vector com_amounts2{0, 0, 0, 0}; + XBT_INFO("Run a task of %.0E flops on %s and %.0E flops on %s.", flopAmount, host1->get_cname(), flopAmount, host2->get_cname()); + simgrid::s4u::this_actor::parallel_execute(hosts, cpu_amounts2, com_amounts2); + + new_energy_host1 = sg_host_get_consumed_energy(host1); + new_energy_host2 = sg_host_get_consumed_energy(host2); + XBT_INFO("Task done (duration: %.2f s).\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n", + simgrid::s4u::Engine::get_clock() - start, + host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1), + host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2)); + + old_energy_host1 = new_energy_host1; + old_energy_host2 = new_energy_host2; + + + // ========= A new ptask with computation and communication ========= + start = simgrid::s4u::Engine::get_clock(); + double comAmount = 1E7; + std::vector cpu_amounts3{flopAmount, flopAmount}; + std::vector com_amounts3{0, comAmount, comAmount, 0}; + XBT_INFO("Run a task with computation and communication on two hosts."); + simgrid::s4u::this_actor::parallel_execute(hosts, cpu_amounts3, com_amounts3); + + new_energy_host1 = sg_host_get_consumed_energy(host1); + new_energy_host2 = sg_host_get_consumed_energy(host2); + XBT_INFO("Task done (duration: %.2f s).\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n", + simgrid::s4u::Engine::get_clock() - start, + host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1), + host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2)); + + old_energy_host1 = new_energy_host1; + old_energy_host2 = new_energy_host2; + + + // ========= A new ptask with communication only ========= + start = simgrid::s4u::Engine::get_clock(); + std::vector cpu_amounts4{0, 0}; + std::vector com_amounts4{0, comAmount, comAmount, 0}; + XBT_INFO("Run a task with only communication on two hosts."); + simgrid::s4u::this_actor::parallel_execute(hosts, cpu_amounts4, com_amounts4); + + new_energy_host1 = sg_host_get_consumed_energy(host1); + new_energy_host2 = sg_host_get_consumed_energy(host2); + XBT_INFO("Task done (duration: %.2f s).\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n" + "[%s] Current peak speed=%.0E flop/s; Energy dissipated during this step=%.2f J; Total energy dissipated=%.0f J\n", + simgrid::s4u::Engine::get_clock() - start, + host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1), + host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2)); + + XBT_INFO("Now is time to quit!"); +} + +int main(int argc, char* argv[]) +{ + sg_host_energy_plugin_init(); + simgrid::s4u::Engine e(&argc, argv); + e.set_config("host/model:ptask_L07"); + //xbt_log_control_set("surf_energy.thresh:debug"); + + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]); + + e.load_platform(argv[1]); + simgrid::s4u::Actor::create("energy_ptask_test", simgrid::s4u::Host::by_name("MyHost1"), runner); + + e.run(); + XBT_INFO("End of simulation."); + return 0; +} diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh new file mode 100644 index 0000000000..376b3e8c91 --- /dev/null +++ b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh @@ -0,0 +1,83 @@ +#!/usr/bin/env tesh + +p Testing the mechanism for computing host energy consumption + +$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Initial peak speed=1E+08 flop/s; Total energy dissipated =0E+00 J +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost2] Energetic profile: 100.0:200.0:200.0, 93.0:170.0:170.0, 90.0:150.0:150.0 +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost2] Initial peak speed=1E+08 flop/s; Total energy dissipated =0E+00 J +> [ 0.000000] (1:energy_ptask_test@MyHost1) Sleep for 10 seconds +> [ 10.000000] (1:energy_ptask_test@MyHost1) Done sleeping (duration: 10.00 s). +> [MyHost1] Current peak speed=1E+08; Energy dissipated during this step=1000.00 J; Total energy dissipated=1000.00 J +> [MyHost2] Current peak speed=1E+08; Energy dissipated during this step=1000.00 J; Total energy dissipated=1000.00 J +> +> [ 10.000000] (1:energy_ptask_test@MyHost1) Run a task of 1E+09 flops on two hosts +> [ 20.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 10.00 s). +> [MyHost1] Current peak speed=1E+08 flop/s; Energy dissipated during this step=1200.00 J; Total energy dissipated=2200 J +> [MyHost2] Current peak speed=1E+08 flop/s; Energy dissipated during this step=2000.00 J; Total energy dissipated=3000 J +> +> [ 20.000000] (1:energy_ptask_test@MyHost1) ========= Requesting pstate 2 for both hosts (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) +> [ 20.000000] (1:energy_ptask_test@MyHost1) Run a task of 1E+09 flops on MyHost1 and 1E+09 flops on MyHost2. +> [ 70.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 50.00 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=5250.00 J; Total energy dissipated=7450 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=7500.00 J; Total energy dissipated=10500 J +> +> [ 70.000000] (1:energy_ptask_test@MyHost1) Run a task with computation and communication on two hosts. +> [270.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 200.00 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=18750.00 J; Total energy dissipated=26200 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=30000.00 J; Total energy dissipated=40500 J +> +> [270.000000] (1:energy_ptask_test@MyHost1) Run a task with only communication on two hosts. +> [470.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 200.00 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=18000.00 J; Total energy dissipated=44200 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=18000.00 J; Total energy dissipated=58500 J +> +> [470.000000] (1:energy_ptask_test@MyHost1) Now is time to quit! +> [470.000000] (0:maestro@) Total energy consumption: 149700.000000 Joules (used hosts: 102700.000000 Joules; unused/idle hosts: 47000.000000) +> [470.000000] (0:maestro@) End of simulation. +> [470.000000] (0:maestro@) Energy consumption of host MyHost1: 44200.000000 Joules +> [470.000000] (0:maestro@) Energy consumption of host MyHost2: 58500.000000 Joules +> [470.000000] (0:maestro@) Energy consumption of host MyHost3: 47000.000000 Joules + + +$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Initial peak speed=1E+08 flop/s; Total energy dissipated =0E+00 J +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost2] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 +> [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost2] Initial peak speed=1E+08 flop/s; Total energy dissipated =0E+00 J +> [ 0.000000] (1:energy_ptask_test@MyHost1) Sleep for 10 seconds +> [ 10.000000] (1:energy_ptask_test@MyHost1) Done sleeping (duration: 10.00 s). +> [MyHost1] Current peak speed=1E+08; Energy dissipated during this step=1000.00 J; Total energy dissipated=1000.00 J +> [MyHost2] Current peak speed=1E+08; Energy dissipated during this step=1000.00 J; Total energy dissipated=1000.00 J +> +> [ 10.000000] (1:energy_ptask_test@MyHost1) Run a task of 1E+09 flops on two hosts +> [ 20.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 10.00 s). +> [MyHost1] Current peak speed=1E+08 flop/s; Energy dissipated during this step=1200.00 J; Total energy dissipated=2200 J +> [MyHost2] Current peak speed=1E+08 flop/s; Energy dissipated during this step=1200.00 J; Total energy dissipated=2200 J +> +> [ 20.000000] (1:energy_ptask_test@MyHost1) ========= Requesting pstate 2 for both hosts (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) +> [ 20.000000] (1:energy_ptask_test@MyHost1) Run a task of 1E+09 flops on MyHost1 and 1E+09 flops on MyHost2. +> [ 70.000000] (1:energy_ptask_test@MyHost1) Task done (duration: 50.00 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=5250.00 J; Total energy dissipated=7450 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=5250.00 J; Total energy dissipated=7450 J +> +> [ 70.000000] (1:energy_ptask_test@MyHost1) Run a task with computation and communication on two hosts. +> [120.000600] (1:energy_ptask_test@MyHost1) Task done (duration: 50.00 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=5250.06 J; Total energy dissipated=12700 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=5250.06 J; Total energy dissipated=12700 J +> +> [120.000600] (1:energy_ptask_test@MyHost1) Run a task with only communication on two hosts. +> [120.081200] (1:energy_ptask_test@MyHost1) Task done (duration: 0.08 s). +> [MyHost1] Current peak speed=2E+07 flop/s; Energy dissipated during this step=7.25 J; Total energy dissipated=12707 J +> [MyHost2] Current peak speed=2E+07 flop/s; Energy dissipated during this step=7.25 J; Total energy dissipated=12707 J +> +> [120.081200] (1:energy_ptask_test@MyHost1) Now is time to quit! +> [120.081200] (0:maestro@) Total energy consumption: 25414.634000 Joules (used hosts: 25414.634000 Joules; unused/idle hosts: 0.000000) +> [120.081200] (0:maestro@) End of simulation. +> [120.081200] (0:maestro@) Energy consumption of host MyHost1: 12707.317000 Joules +> [120.081200] (0:maestro@) Energy consumption of host MyHost2: 12707.317000 Joules diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/s4u/energy-exec/s4u-energy-exec.tesh index e475904c6f..7568254cd2 100644 --- a/examples/s4u/energy-exec/s4u-energy-exec.tesh +++ b/examples/s4u/energy-exec/s4u-energy-exec.tesh @@ -3,12 +3,12 @@ p Testing the mechanism for computing host energy consumption $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 +> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J > [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops -> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 120W to 200W depending on load; Energy dissipated=1120 J +> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) > [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops > [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J @@ -25,12 +25,12 @@ $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[ $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. -> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 +> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J > [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops -> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 120W to 200W depending on load; Energy dissipated=1120 J +> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) > [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops > [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J diff --git a/include/simgrid/plugins/energy.h b/include/simgrid/plugins/energy.h index 041e4bd8c8..7b088181a9 100644 --- a/include/simgrid/plugins/energy.h +++ b/include/simgrid/plugins/energy.h @@ -17,6 +17,7 @@ XBT_PUBLIC double sg_host_get_consumed_energy(sg_host_t host); XBT_PUBLIC double sg_host_get_idle_consumption(sg_host_t host); XBT_PUBLIC double sg_host_get_wattmin_at(sg_host_t host, int pstate); XBT_PUBLIC double sg_host_get_wattmax_at(sg_host_t host, int pstate); +XBT_PUBLIC double sg_host_get_power_range_slope_at(sg_host_t host, int pstate); XBT_PUBLIC double sg_host_get_current_consumption(sg_host_t host); XBT_PUBLIC void sg_link_energy_plugin_init(); @@ -26,8 +27,9 @@ XBT_PUBLIC int sg_link_energy_is_inited(); #define MSG_host_energy_plugin_init() sg_host_energy_plugin_init() #define MSG_host_get_consumed_energy(host) sg_host_get_consumed_energy(host) -#define MSG_host_get_wattmin_at(host, pstate) sg_host_get_wattmin_at((host), (pstate)) -#define MSG_host_get_wattmax_at(host, pstate) sg_host_get_wattmax_at((host), (pstate)) +#define MSG_host_get_wattmin_at(host,pstate) sg_host_get_wattmin_at((host), (pstate)) +#define MSG_host_get_wattmax_at(host,pstate) sg_host_get_wattmax_at((host), (pstate)) +#define MSG_host_get_power_range_slope_at(host,pstate) sg_host_get_power_range_slope_at((host), (pstate)) #define MSG_host_get_current_consumption(host) sg_host_get_current_consumption(host) SG_END_DECL() diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 2d9f84b5c7..b3cb2a7379 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -30,57 +30,44 @@ abnormality when all the cores are idle. The full details are in As a result, our energy model takes 4 parameters: - @b Idle: instantaneous consumption (in Watt) when your host is up and running, but without anything to do. - - @b OneCore: instantaneous consumption (in Watt) when only one core is active, at 100%. + - @b Epsilon: instantaneous consumption (in Watt) when all cores are at 0 or epsilon%, but not in Idle state. - @b AllCores: instantaneous consumption (in Watt) when all cores of the host are at 100%. - @b Off: instantaneous consumption (in Watt) when the host is turned off. Here is an example of XML declaration: @code{.xml} - + @endcode -This example gives the following parameters: @b Off is 10 Watts; @b Idle is 100 Watts; @b OneCore is 120 Watts and @b +Please note that the 'Epsilon' parameter can be omitted in the XML declaration. In that case, the value of 'Epsilon' will +be the same as 'Idle'. + + +This example gives the following parameters: @b Off is 10 Watts; @b Idle is 100 Watts; @b Epsilon is 120 Watts and @b AllCores is 200 Watts. This is enough to compute the consumption as a function of the amount of loaded cores: - - - - + + + + +
@#Cores loadedConsumptionExplanation
0 100 WattsIdle value
1 120 WattsOneCore value
2 147 Wattslinear extrapolation between OneCore and AllCores
3 173 Wattslinear extrapolation between OneCore and AllCores
0 (idle) 100 WattsIdle value
0 (not idle) 120 WattsEpsilon value
1 140 Wattslinear extrapolation between Epsilon and AllCores
2 160 Wattslinear extrapolation between Epsilon and AllCores
3 180 Wattslinear extrapolation between Epsilon and AllCores
4 200 WattsAllCores value
-### What if a given core is only at load 50%? - -This is impossible in SimGrid because we recompute everything each time that the CPU starts or stops doing something. -So if a core is at load 50% over a period, it means that it is at load 100% half of the time and at load 0% the rest of -the time, and our model holds. - -### What if the host has only one core? - -In this case, the parameters @b OneCore and @b AllCores are obviously the same. -Actually, SimGrid expect an energetic profile formatted as 'Idle:Running' for mono-cores hosts. -If you insist on passing 3 parameters in this case, then you must have the same value for @b OneCore and @b AllCores. - -@code{.xml} - - - - -@endcode ### How does DVFS interact with the host energy model? If your host has several DVFS levels (several pstates), then you should give the energetic profile of each pstate level: @code{.xml} - + @@ -88,7 +75,7 @@ If your host has several DVFS levels (several pstates), then you should give the This encodes the following values - + @@ -117,10 +104,11 @@ namespace plugin { class PowerRange { public: double idle_; - double min_; + double epsilon_; double max_; + double slope_; - PowerRange(double idle, double min, double max) : idle_(idle), min_(min), max_(max) {} + PowerRange(double idle, double epsilon, double max) : idle_(idle), epsilon_(epsilon), max_(max), slope_(max-epsilon) {} }; class HostEnergy { @@ -137,12 +125,13 @@ public: double get_idle_consumption(); double get_watt_min_at(int pstate); double get_watt_max_at(int pstate); + double get_power_range_slope_at(int pstate); void update(); private: void init_watts_range_list(); simgrid::s4u::Host* host_ = nullptr; - /*< List of (min_power,max_power) pairs corresponding to each cpu pstate */ + /*< List of (idle_power, epsilon_power, max_power) tuple corresponding to each cpu pstate */ std::vector power_range_watts_list_; /* We need to keep track of what pstate has been used, as we will sometimes be notified only *after* a pstate has been @@ -177,16 +166,16 @@ void HostEnergy::update() if (start_time < finish_time) { double previous_energy = this->total_energy_; - double instantaneous_consumption = this->get_current_watts_value(); + double instantaneous_power_consumption = this->get_current_watts_value(); - double energy_this_step = instantaneous_consumption * (finish_time - start_time); + double energy_this_step = instantaneous_power_consumption * (finish_time - start_time); // TODO Trace: Trace energy_this_step from start_time to finish_time in host->getName() this->total_energy_ = previous_energy + energy_this_step; this->last_updated_ = finish_time; - XBT_DEBUG("[update_energy of %s] period=[%.8f-%.8f]; current speed=%.2E flop/s (pstate %i); total consumption before: consumption change: %.8f J -> added now: %.8f J", + XBT_DEBUG("[update_energy of %s] period=[%.8f-%.8f]; current speed=%.2E flop/s (pstate %i); total consumption before: %.8f J -> added now: %.8f J", host_->get_cname(), start_time, finish_time, host_->pimpl_cpu->get_pstate_peak_speed(this->pstate_), this->pstate_, previous_energy, energy_this_step); } @@ -225,7 +214,7 @@ double HostEnergy::get_watt_min_at(int pstate) { xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", host_->get_cname()); - return power_range_watts_list_[pstate].min_; + return power_range_watts_list_[pstate].epsilon_; } double HostEnergy::get_watt_max_at(int pstate) @@ -235,6 +224,13 @@ double HostEnergy::get_watt_max_at(int pstate) return power_range_watts_list_[pstate].max_; } +double HostEnergy::get_power_range_slope_at(int pstate) +{ + xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", + host_->get_cname()); + return power_range_watts_list_[pstate].slope_; +} + /** @brief Computes the power consumed by the host according to the current situation * * - If the host is off, that's the watts_off value @@ -255,7 +251,7 @@ double HostEnergy::get_current_watts_value() else { cpu_load = host_->pimpl_cpu->get_constraint()->get_usage() / current_speed; - /** Divide by the number of cores here **/ + /** Divide by the number of cores here to have a value between 0 and 1 **/ cpu_load /= host_->pimpl_cpu->get_core_count(); if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not more @@ -264,12 +260,16 @@ double HostEnergy::get_current_watts_value() host_was_used_ = true; } - /* The problem with this model is that the load is always 0 or 1, never something less. + /* @mquinson: The problem with this model is that the load is always 0 or 1, never something less. * Another possibility could be to model the total energy as * * X/(X+Y)*W_idle + Y/(X+Y)*W_burn * * where X is the amount of idling cores, and Y the amount of computing cores. + * + * @Mommessc: I do not think the load is always 0 or 1 anymore. + * Moreover, it is not quite clear how the regular model of power consumption (P = Pstatic + load * Pdynamic) + * is impacted if we separate the number of idle and working cores. */ return get_current_watts_value(cpu_load); } @@ -288,44 +288,29 @@ double HostEnergy::get_current_watts_value(double cpu_load) return watts_off_; } - /* min_power corresponds to the power consumed when only one core is active */ - /* max_power is the power consumed at 100% cpu load */ - auto range = power_range_watts_list_.at(this->pstate_); + PowerRange power_range = power_range_watts_list_.at(this->pstate_); double current_power; - double min_power; - double max_power; - double power_slope; - - if (cpu_load > 0) { /* Something is going on, the machine is not idle */ - min_power = range.min_; - max_power = range.max_; - - /** - * The min_power states how much we consume when only one single - * core is working. This means that when cpu_load == 1/coreCount, then - * current_power == min_power. - * - * The maximum must be reached when all cores are working (but 1 core was - * already accounted for by min_power) - * i.e., we need min_power + (maxCpuLoad-1/coreCount)*power_slope == max_power - * (maxCpuLoad is by definition 1) - */ - int coreCount = host_->get_core_count(); - double coreReciprocal = 1.0 / coreCount; - if (coreCount > 1) - power_slope = (max_power - min_power) / (1 - coreReciprocal); - else - power_slope = 0; // Should be 0, since max_power == min_power (in this case) - - current_power = min_power + (cpu_load - coreReciprocal) * power_slope; - } else { /* Our machine is idle, take the dedicated value! */ - min_power = 0; - max_power = 0; - power_slope = 0; - current_power = range.idle_; + + if (cpu_load > 0) + { + /** + * Something is going on, the host is not idle. + * + * The power consumption follows the regular model: + * P(cpu_load) = Pstatic + Pdynamic * cpu_load + * where Pstatic = power_range.epsilon_ and Pdynamic = power_range.slope_ + * and the cpu_load is a value between 0 and 1. + */ + current_power = power_range.epsilon_ + cpu_load * power_range.slope_; + } + else + { + /* The host is idle, take the dedicated value! */ + current_power = power_range.idle_; } - XBT_DEBUG("[get_current_watts] pstate=%i, min_power=%f, max_power=%f, slope=%f", this->pstate_, min_power, max_power, power_slope); + XBT_DEBUG("[get_current_watts] pstate=%i, epsilon_power=%f, max_power=%f, slope=%f", this->pstate_, power_range.epsilon_, + power_range.max_, power_range.slope_); XBT_DEBUG("[get_current_watts] Current power (watts) = %f, load = %f", current_power, cpu_load); return current_power; @@ -347,52 +332,47 @@ void HostEnergy::init_watts_range_list() std::vector all_power_values; boost::split(all_power_values, all_power_values_str, boost::is_any_of(",")); - XBT_DEBUG("%s: profile: %s, cores: %d", host_->get_cname(), all_power_values_str, host_->get_core_count()); + XBT_DEBUG("%s: power properties: %s", host_->get_cname(), all_power_values_str); int i = 0; for (auto const& current_power_values_str : all_power_values) { - /* retrieve the power values associated with the current pstate */ + /* retrieve the power values associated with the pstate i */ std::vector current_power_values; boost::split(current_power_values, current_power_values_str, boost::is_any_of(":")); - if (host_->get_core_count() == 1) { - xbt_assert(current_power_values.size() == 2 || current_power_values.size() == 3, - "Power properties incorrectly defined for host %s." - "It should be 'Idle:FullSpeed' power values because you have one core only.", - host_->get_cname()); - if (current_power_values.size() == 2) { - // In this case, 1core == AllCores - current_power_values.push_back(current_power_values.at(1)); - } else { // size == 3 - current_power_values[1] = current_power_values.at(2); - current_power_values[2] = current_power_values.at(2); - static bool displayed_warning = false; - if (not displayed_warning) { // Otherwise we get in the worst case no_pstate*no_hosts warnings - XBT_WARN("Host %s is a single-core machine and part of the power profile is '%s'" - ", which is in the 'Idle:OneCore:AllCores' format." - " Here, only the value for 'AllCores' is used.", host_->get_cname(), current_power_values_str.c_str()); - displayed_warning = true; - } - } - } else { - xbt_assert(current_power_values.size() == 3, - "Power properties incorrectly defined for host %s." - "It should be 'Idle:OneCore:AllCores' power values because you have more than one core.", - host_->get_cname()); + + xbt_assert(current_power_values.size() == 2 || current_power_values.size() == 3, + "Power properties incorrectly defined for host %s." + "It should be 'Idle:AllCores' (or 'Idle:Epsilon:AllCores') power values.", + host_->get_cname()); + + double idle_power; + double epsilon_power; + double max_power; + + char* msg_idle = bprintf("Invalid Idle value for pstate %d on host %s: %%s", i, host_->get_cname()); + char* msg_epsilon = bprintf("Invalid Epsilon value for pstate %d on host %s: %%s", i, host_->get_cname()); + char* msg_max = bprintf("Invalid AllCores value for pstate %d on host %s: %%s", i, host_->get_cname()); + + idle_power = xbt_str_parse_double((current_power_values.at(0)).c_str(), msg_idle); + if (current_power_values.size() == 2) // Case: Idle:AllCores + { + epsilon_power = xbt_str_parse_double((current_power_values.at(0)).c_str(), msg_idle); + max_power = xbt_str_parse_double((current_power_values.at(1)).c_str(), msg_max); } + else // Case: Idle:Epsilon:AllCores + { + epsilon_power = xbt_str_parse_double((current_power_values.at(1)).c_str(), msg_epsilon); + max_power = xbt_str_parse_double((current_power_values.at(2)).c_str(), msg_max); + } + + XBT_DEBUG("Creating PowerRange for host %s. Idle:%f, Epsilon:%f, AllCores:%f.", host_->get_cname(), idle_power, epsilon_power, max_power); - /* min_power corresponds to the idle power (cpu load = 0) */ - /* max_power is the power consumed at 100% cpu load */ - char* msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host_->get_cname()); - char* msg_min = bprintf("Invalid OneCore value for pstate %d on host %s: %%s", i, host_->get_cname()); - char* msg_max = bprintf("Invalid AllCores value for pstate %d on host %s: %%s", i, host_->get_cname()); - PowerRange range(xbt_str_parse_double((current_power_values.at(0)).c_str(), msg_idle), - xbt_str_parse_double((current_power_values.at(1)).c_str(), msg_min), - xbt_str_parse_double((current_power_values.at(2)).c_str(), msg_max)); + PowerRange range(idle_power, epsilon_power, max_power); power_range_watts_list_.push_back(range); xbt_free(msg_idle); - xbt_free(msg_min); + xbt_free(msg_epsilon); xbt_free(msg_max); - i++; + ++i; } } } // namespace plugin @@ -569,7 +549,15 @@ double sg_host_get_wattmax_at(sg_host_t host, int pstate) "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->get_watt_max_at(pstate); } - +/** @ingroup plugin_energy + * @brief Returns the power slope at the given pstate + */ +double sg_host_get_power_range_slope_at(sg_host_t host, int pstate) +{ + xbt_assert(HostEnergy::EXTENSION_ID.valid(), + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + return host->extension()->get_power_range_slope_at(pstate); +} /** @ingroup plugin_energy * @brief Returns the current consumption of the host */ diff --git a/teshsuite/msg/energy-consumption/energy-consumption.tesh b/teshsuite/msg/energy-consumption/energy-consumption.tesh index 439de73f24..b7752c9b69 100644 --- a/teshsuite/msg/energy-consumption/energy-consumption.tesh +++ b/teshsuite/msg/energy-consumption/energy-consumption.tesh @@ -3,12 +3,12 @@ p Testing the mechanism for computing host energy consumption $ ${bindir:=.}/energy-consumption ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 +> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J > [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops -> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 120W to 200W depending on load; Energy dissipated=1120 J +> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) > [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops > [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J @@ -25,12 +25,12 @@ $ ${bindir:=.}/energy-consumption ${platfdir}/energy_platform.xml "--log=root.fm $ ${bindir:=.}/energy-consumption ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. -> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 +> [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J > [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops -> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 120W to 200W depending on load; Energy dissipated=1120 J +> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 93W to 200W depending on load; Energy dissipated=1120 J > [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s) > [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops > [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1645 J diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 821c0f2110..7ad8d054e2 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -2,6 +2,7 @@ set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh ${CMAKE_CURRENT_SOURCE_DIR}/generate-dwarf-functions ${CMAKE_CURRENT_SOURCE_DIR}/normalize-pointers.py ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_unit_converter.py + ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_energy_ponecore_to_pepsilon.py ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_update_xml.pl ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_convert_TI_traces.py ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/fig2dev_postprocessor.pl diff --git a/tools/sg_xml_energy_ponecore_to_pepsilon.py b/tools/sg_xml_energy_ponecore_to_pepsilon.py new file mode 100755 index 0000000000..b78523ef0c --- /dev/null +++ b/tools/sg_xml_energy_ponecore_to_pepsilon.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright (c) 2019. The SimGrid Team. +# All rights reserved. + +# This program is free software; you can redistribute it and/or modify it +# under the terms of the license (GNU LGPL) which comes with this package. + +'''Update 3-part energy consumption syntax in SimGrid XML platform files. + +- watt_per_state: "pIdle:pOneCore:pFull" -> "pIdle:pEpsilon:pFull" + This is done by computing pEpsilon from pOneCore, pFull and #core.''' +import fnmatch +import os +import sys +import xml.etree.ElementTree as ET + +class TreeBuilderWithComments(ET.TreeBuilder): + def comment(self, data): + self.start(ET.Comment, {}) + self.data(data) + self.end(ET.Comment) + +def update_platform_file(filename): + comment_tb = TreeBuilderWithComments() + tree = ET.parse(filename, parser=ET.XMLParser(target=comment_tb)) + root = tree.getroot() + + parent_dict = {c:p for p in root.iter() for c in p} + + for prop in root.iter('prop'): + if 'id' in prop.attrib and prop.attrib['id'] == 'watt_per_state': + # Parse energy consumption and core count + values_str = "".join(prop.attrib['value'].split()) # remove whitespaces + values = values_str.split(',') + nb_core = 1 + if 'core' in parent_dict[prop].attrib: + nb_core = int(parent_dict[prop].attrib['core']) + if nb_core < 1: raise Exception(f'Invalid core count: {nb_core}') + + # If a middle value is given, pIdle:pOneCore:pFull is assumed + # and converted to pIdle:pEpsilon:pFull + consumption_per_pstate = [] + update_required = False + for value in values: + powers = value.split(':') + if len(powers) == 3: + update_required = True + (pIdle, p1, pFull) = [float(x) for x in powers] + if nb_core == 1: + if p1 != pFull: + raise Exception('Invalid energy consumption: ' + + "A 1-core host has pOneCore != pFull " + + f'({p1} != {pFull}).\n' + + 'Original watt_per_state value: "{}"'.format(prop.attrib['value'])) + pEpsilon = pFull + else: + pEpsilon = p1 - ((pFull - p1) / (nb_core - 1)) + consumption_per_pstate.append(f"{pIdle}:{pEpsilon}:{pFull}") + if pIdle > pEpsilon: + print(f"WARNING: pIdle > pEpsilon ({pIdle} > {pEpsilon})") + else: # len(powers) == 2 + if nb_core == 1: + update_required = True + (pIdle, pFull) = [float(x) for x in powers] + pEpsilon = pFull + consumption_per_pstate.append(f"{pIdle}:{pEpsilon}:{pFull}") + print(f"WARNING: putting {pFull} as pEpsilon by default for a single core") + else: + consumption_per_pstate.append(value) + + if update_required: + updated_value = ', '.join(consumption_per_pstate) + print(f'"{values_str}" -> "{updated_value}" (core={nb_core})') + prop.attrib['value'] = updated_value + + with open(filename, 'w', encoding='utf-8') as output_file: + # xml.etree.ElementTree does not handle doctypes =/ + # https://stackoverflow.com/questions/15304229/convert-python-elementtree-to-string + content = ''' + +{} +'''.format(ET.tostring(root, encoding="unicode")) + output_file.write(content) + +if __name__ == '__main__': + usage = "usage: {cmd} FILE\n\n{doc}".format(cmd=sys.argv[0], doc=__doc__) + + if len(sys.argv) != 2: + print(usage) + sys.exit(1) + + update_platform_file(sys.argv[1])
pstatePerformanceIdleOneCoreAllCores
pstatePerformanceIdleEpsilonAllCores
0100 Mflop/s95 Watts120 Watts200 Watts
150 Mflop/s93 Watts115 Watts170 Watts
220 Mflop/s90 Watts110 Watts150 Watts