From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 19 Jun 2017 20:09:38 +0000 (+0200)
Subject: adapt the platform examples to the new energy model checks
X-Git-Tag: v3.16~33
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/79c2631ed5952cb7497574889f3ab78f1e4d8ebe

adapt the platform examples to the new energy model checks
---

diff --git a/examples/msg/energy-onoff/platform_onoff.xml b/examples/msg/energy-onoff/platform_onoff.xml
index b0423a987a..5010de2b47 100644
--- a/examples/msg/energy-onoff/platform_onoff.xml
+++ b/examples/msg/energy-onoff/platform_onoff.xml
@@ -28,11 +28,11 @@
       values that are right for you. -->
 
     <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf,                               0.006666667f,0.1429f" pstate="0" >
-      <prop id="watt_per_state" value="95.0:120.0:200.0,93.0:110.0:170.0,90.0:100.0:150.0, 120:120:120,110:110:110" />
+      <prop id="watt_per_state" value="95.0:200.0,93.0:170.0,90.0:150.0, 120:120,110:110" />
       <prop id="watt_off"       value="10" />
     </host>
     <host id="MyHost2" speed="100.0Mf" >
-      <prop id="watt_per_state" value="100.0:120.0:200.0" />
+      <prop id="watt_per_state" value="100.0:200.0" />
       <prop id="watt_off"       value="10" />
     </host>
 
diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml
index 680a30e28c..fc4e9bb8aa 100644
--- a/examples/platforms/energy_cluster.xml
+++ b/examples/platforms/energy_cluster.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4.1">
-  <cluster id="cluster" prefix="MyHost" radical="1-2" suffix="" speed="100.0Mf,50.0Mf,20.0Mf"
+  <cluster id="cluster" prefix="MyHost" radical="1-2" suffix="" 
+           speed="100.0Mf,50.0Mf,20.0Mf" core="4"
            bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
     <!--  List of idle_power:min_power:max_power pairs (in Watts) -->
     <!--  The list must contain one speed tupple for each previously defined pstate-->
diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index 0af3e71fc5..03ce9c7e22 100644
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -5,19 +5,23 @@
     <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
     <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the lowest pstate corresponds to the highest
          processor speed) -->
-    <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-      <!--  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-->
+    <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" core="4" >
+      <!--  List of Idle:OneCore:AllCores (in Watts) corresponding to the speed consumed when the processor is idle
+            and when one core is at full speed, and when all cores are fully loaded -->
+      <!--  The list must contain one energetic profile 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" />
     </host>
-    <host id="MyHost2" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-      <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+    
+    <host id="MyHost2" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" core="1" >
+      <!-- This host is mono-core, so AllCores=OneCore and is omitted -->
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
       <prop id="watt_off" value="10" />
     </host>
-    <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-      <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+    
+    <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" core="1" >
+      <!-- This host is mono-core, so AllCores=OneCore and is omitted -->
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
       <prop id="watt_off" value="10" />
     </host>