From 73a42589c0523bab27ef0a68f80d632d2ab4979c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Thu, 7 Jul 2016 10:33:02 +0200
Subject: [PATCH] New configuration parameter NumberOfDevicesOnDIMM

---
 DRAMSys/simulator/resources/simulations/ddr3-example.xml       | 1 +
 DRAMSys/simulator/resources/simulations/sim-batch.xml          | 3 ++-
 .../src/controller/core/configuration/Configuration.cpp        | 2 ++
 .../src/controller/core/configuration/Configuration.h          | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example.xml b/DRAMSys/simulator/resources/simulations/ddr3-example.xml
index 776656ce..19bfe07f 100644
--- a/DRAMSys/simulator/resources/simulations/ddr3-example.xml
+++ b/DRAMSys/simulator/resources/simulations/ddr3-example.xml
@@ -10,6 +10,7 @@
         <ControllerCoreDisableRefresh value="0"/>
         <ThermalSimulation value="0"/>
         <SimulationProgressBar value="1"/>
+        <NumberOfDevicesOnDIMM value = "8" />
     </simconfig>
 
     <!-- Temperature Simulator Configuration (used for all simulation setups) -->
diff --git a/DRAMSys/simulator/resources/simulations/sim-batch.xml b/DRAMSys/simulator/resources/simulations/sim-batch.xml
index b81a7cca..2b8428cf 100644
--- a/DRAMSys/simulator/resources/simulations/sim-batch.xml
+++ b/DRAMSys/simulator/resources/simulations/sim-batch.xml
@@ -1,7 +1,7 @@
 <simulation>
     <!-- General Simulator Configuration (used for all simulation setups) -->
     <simconfig>
-        <Debug value="1" />
+        <Debug value="0" />
         <DatabaseRecording value="0" />
         <PowerAnalysis value="0" />
         <NumberOfTimeWindows value="1000" />
@@ -10,6 +10,7 @@
         <ControllerCoreDisableRefresh value="0"/>
         <ThermalSimulation value="0"/>
         <SimulationProgressBar value="0"/>
+        <NumberOfDevicesOnDIMM value = "1" />
     </simconfig>
 
     <!-- Temperature Simulator Configuration (used for all simulation setups) -->
diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
index 04ef17da..a4304974 100644
--- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
+++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
@@ -165,6 +165,8 @@ void Configuration::setParameter(std::string name, std::string value)
         ThermalSimulation = string2bool(value);
     else if(name == "SimulationProgressBar")
         SimulationProgressBar = string2bool(value);
+    else if(name == "NumberOfDevicesOnDIMM")
+        NumberOfDevicesOnDIMM = string2int(value);
     // Specification for ErrorChipSeed, ErrorCSVFile path and ErrorStoreMode
     else if(name == "ErrorChipSeed")
         ErrorChipSeed = string2int(value);
diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
index 6c27b786..8d1c008e 100644
--- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
+++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
@@ -83,6 +83,7 @@ struct Configuration
     bool ControllerCoreDisableRefresh = false;
     bool ThermalSimulation = false;
     bool SimulationProgressBar;
+    unsigned int NumberOfDevicesOnDIMM = 1;
 
     //MemSpec(from DRAM-Power XML)
     MemSpec memSpec;