allow users to create clusters with pstates

diff --git a/ChangeLog b/ChangeLog
index 60ce7d1..b7af4de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,10 @@ SimGrid (3.15) UNRELEASED; urgency=low
 
  XBT
  - Kill the fifo data container: we don't use it anymore.
- 
+
+ XML
+ - A <cluster> can now be created with different speed values to represent pstates.
+   see examples/platforms/energy_cluster.xml for an example.
  -- target_date=March 20 2017 -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.14.159) stable; urgency=low

diff --git a/examples/msg/energy-pstate/energy-pstate.tesh b/examples/msg/energy-pstate/energy-pstate.tesh
index 08a5ade..6628264 100644 (file)
--- a/examples/msg/energy-pstate/energy-pstate.tesh
+++ b/examples/msg/energy-pstate/energy-pstate.tesh
@@ -20,3 +20,22 @@ $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/ener
 > [  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:maestro@) Total simulation time: 6.000000e+00
+
+$ ${bindir:=.}/energy-pstate/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] (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] (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] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00
+> [  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:maestro@) Total simulation time: 6.000000e+00

diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml
new file mode 100644 (file)
index 0000000..a237075
--- /dev/null
+++ b/examples/platforms/energy_cluster.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <cluster id="cluster" prefix="MyHost" radical="1-2" suffix="" speed="100.0Mf,50.0Mf,20.0Mf"
+           bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
+    <!--  List of min_power:max_power pairs (in Watts) corresponding to the speed consumed when the processor is idle
+          and when it is fully loaded -->
+    <!--  The list must contain one speed pair for each previously defined pstate-->
+    <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+    <prop id="watt_off" value="10" />
+  </cluster>
+</platform>

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bb4d2e8..3ce4e72 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -191,7 +191,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
     char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
     char * link_id = bprintf("%s_link_%d", cluster->id, i);
 
-    XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speed);
+    XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speeds.front());
 
     s_sg_platf_host_cbarg_t host;
     memset(&host, 0, sizeof(host));
@@ -206,7 +206,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
       }
     }
 
-    host.speed_per_pstate.push_back(cluster->speed);
+    host.speed_per_pstate = cluster->speeds;
     host.pstate = 0;
     host.core_amount = cluster->core_amount;
     host.coord = "";

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 092e81c..3e0cfe6 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -96,7 +96,7 @@ typedef struct s_sg_platf_cluster_cbarg {
   const char* prefix;
   const char* suffix;
   std::vector<int>* radicals;
-  double speed;
+  std::vector<double> speeds;
   int core_amount;
   double bw;
   double lat;

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 63708b1..cbca3d7 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -270,6 +270,28 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c
       "Append 'f' or 'flops' to your speed to get flop per second", "f");
 }
 
+static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){
+
+  std::vector<double> speed_per_pstate;
+
+  if (strchr(speeds, ',') == nullptr){
+    double speed = surf_parse_get_speed(speeds, entity_kind, id);
+    speed_per_pstate.push_back(speed);
+  } else {
+    xbt_dynar_t pstate_list = xbt_str_split(speeds, ",");
+    unsigned int i;
+    char* speed_str;
+    xbt_dynar_foreach(pstate_list, i, speed_str) {
+      xbt_str_trim(speed_str, nullptr);
+      double speed = surf_parse_get_speed(speed_str,entity_kind, id);
+      speed_per_pstate.push_back(speed);
+      XBT_DEBUG("Speed value: %f", speed);
+    }
+    xbt_dynar_free(&pstate_list);
+  }
+  return speed_per_pstate;
+}
+
 /*
  * All the callback lists that can be overridden anywhere.
  * (this list should probably be reduced to the bare minimum to allow the models to work)
@@ -487,24 +509,7 @@ void ETag_surfxml_host()    {
 
   host.id = A_surfxml_host_id;
 
-  char* buf = A_surfxml_host_speed;
-  XBT_DEBUG("Buffer: %s", buf);
-  if (strchr(buf, ',') == nullptr){
-    double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id);
-    host.speed_per_pstate.push_back(speed);
-  }
-  else {
-    xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
-    unsigned int i;
-    char* speed_str;
-    xbt_dynar_foreach(pstate_list, i, speed_str) {
-      xbt_str_trim(speed_str, nullptr);
-      double speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
-      host.speed_per_pstate.push_back(speed);
-      XBT_DEBUG("Speed value: %f", speed);
-    }
-    xbt_dynar_free(&pstate_list);
-  }
+  host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id);
 
   XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
   host.core_amount = surf_parse_get_int(A_surfxml_host_core);
@@ -541,7 +546,7 @@ void ETag_surfxml_cluster(){
   cluster.prefix      = A_surfxml_cluster_prefix;
   cluster.suffix      = A_surfxml_cluster_suffix;
   cluster.radicals    = explodesRadical(A_surfxml_cluster_radical);
-  cluster.speed       = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id);
+  cluster.speeds      = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id);
   cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
   cluster.bw          = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id);
   cluster.lat         = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id);
@@ -588,8 +593,7 @@ void ETag_surfxml_cluster(){
     cluster.sharing_policy = SURF_LINK_FATPIPE;
     break;
   default:
-    surf_parse_error("Invalid cluster sharing policy for cluster %s",
-                     cluster.id);
+    surf_parse_error("Invalid cluster sharing policy for cluster %s", cluster.id);
     break;
   }
   switch (AX_surfxml_cluster_bb___sharing___policy) {
@@ -600,8 +604,7 @@ void ETag_surfxml_cluster(){
     cluster.bb_sharing_policy = SURF_LINK_SHARED;
     break;
   default:
-    surf_parse_error("Invalid bb sharing policy in cluster %s",
-                     cluster.id);
+    surf_parse_error("Invalid bb sharing policy in cluster %s", cluster.id);
     break;
   }