From 377b789c08b8827183bb2146ed2fdb83b21a153d Mon Sep 17 00:00:00 2001 From: Takishipp Date: Tue, 21 Nov 2017 16:57:30 +0100 Subject: [PATCH] update reporting --- examples/s4u/CMakeLists.txt | 5 +- .../s4u/energy-pstate/s4u-energy-pstate.cpp | 67 +++++++++++++++++++ .../s4u/energy-pstate/s4u-energy-pstate.tesh | 41 ++++++++++++ 3 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 examples/s4u/energy-pstate/s4u-energy-pstate.cpp create mode 100644 examples/s4u/energy-pstate/s4u-energy-pstate.tesh diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index dac2b6bc1f..f1495d1878 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -1,6 +1,6 @@ foreach (example actions-comm actions-storage actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority - app-masterworker app-pingpong app-token-ring + app-masterworker app-pingpong app-token-ring energy-pstate async-wait async-waitany async-waitall plugin-hostload io mutex) add_executable (s4u-${example} ${example}/s4u-${example}.cpp) @@ -32,6 +32,7 @@ endforeach() set(examples_src ${examples_src} PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent.tesh ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/energy-pstate/s4u-energy-pstate.tesh ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority.tesh ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime.tesh ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait.tesh @@ -60,7 +61,7 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-a foreach(example actions-comm actions-storage actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend - app-bittorrent app-masterworker app-pingpong app-token-ring + app-bittorrent app-masterworker app-pingpong app-token-ring energy-pstate async-wait async-waitall async-waitany actor-priority dht-chord plugin-hostload io mutex) ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u-${example}.tesh) diff --git a/examples/s4u/energy-pstate/s4u-energy-pstate.cpp b/examples/s4u/energy-pstate/s4u-energy-pstate.cpp new file mode 100644 index 0000000000..6f82f4ea2f --- /dev/null +++ b/examples/s4u/energy-pstate/s4u-energy-pstate.cpp @@ -0,0 +1,67 @@ +/* Copyright (c) 2007-2010, 2013-2015. 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" + +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Pstate properties test"); + +static int dvfs(std::vector args) +{ + double workload = 100E6; + sg_host_t host = simgrid::s4u::this_actor::getHost(); + + int nb = sg_host_get_nb_pstates(host); + XBT_INFO("Count of Processor states=%d", nb); + + XBT_INFO("Current power peak=%f", host->getSpeed()); + + // Run a task + simgrid::s4u::this_actor::execute(workload); + + double task_time = simgrid::s4u::Engine::getClock(); + XBT_INFO("Task1 simulation time: %e", task_time); + + // Change power peak + int new_pstate = 2; + + XBT_INFO("Changing power peak value to %f (at index %d)", host->getPstateSpeed(new_pstate), new_pstate); + + sg_host_set_pstate(host, new_pstate); + + XBT_INFO("Current power peak=%f", host->getSpeed()); + + // Run a second task + simgrid::s4u::this_actor::execute(workload); + + task_time = simgrid::s4u::Engine::getClock() - task_time; + XBT_INFO("Task2 simulation time: %e", task_time); + + // Verify the default pstate is set to 0 + host = simgrid::s4u::Host::by_name_or_null("MyHost2"); + XBT_INFO("Count of Processor states=%d", sg_host_get_nb_pstates(host)); + + XBT_INFO("Current power peak=%f", host->getSpeed()); + return 0; +} + +int main(int argc, char *argv[]) +{ + simgrid::s4u::Engine e(&argc, argv); + std::vector args; + + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]); + + e.loadPlatform(argv[1]); /* - Load the platform description */ + + simgrid::s4u::Actor::createActor("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs, args); + simgrid::s4u::Actor::createActor("dvfs_test", simgrid::s4u::Host::by_name("MyHost2"), dvfs, args); + + e.run(); + + XBT_INFO("Total simulation time: %e", e.getClock()); + + return 0; +} diff --git a/examples/s4u/energy-pstate/s4u-energy-pstate.tesh b/examples/s4u/energy-pstate/s4u-energy-pstate.tesh new file mode 100644 index 0000000000..6a2e59374e --- /dev/null +++ b/examples/s4u/energy-pstate/s4u-energy-pstate.tesh @@ -0,0 +1,41 @@ +#! ./tesh + +p Testing the DVFS-related functions + +$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.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] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 +> [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 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] (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=3 +> [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 +> [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 +> [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 + +$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_cluster.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] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 +> [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 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] (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=3 +> [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 +> [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 +> [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -- 2.20.1