From 320331164b685e7d2a5b4400b24b95074997ac1e Mon Sep 17 00:00:00 2001
From: Janik Schlemminger <schlemmi@rhrk.uni-kl.de>
Date: Wed, 3 Sep 2014 18:52:32 +0200
Subject: [PATCH] xml extended, sim config introduced

---
 dram/resources/configs/memconfigs/fifo.xml    | 27 ++++++++---------
 dram/resources/configs/memconfigs/fr_fcfs.xml |  8 ++++-
 .../configs/memconfigs/fr_fcfs_bankwise.xml   | 15 ----------
 .../configs/memconfigs/fr_fcfs_unaware.xml    | 15 ----------
 dram/resources/configs/memconfigs/grouper.xml | 14 ---------
 .../configs/memconfigs/memconfig.xml          | 15 ----------
 dram/resources/configs/memconfigs/par_bs.xml  | 15 ----------
 .../configs/memconfigs/par_bs_unaware.xml     | 15 ----------
 dram/src/controller/core/ControllerCore.cpp   |  2 +-
 .../core/configuration/Configuration.cpp      | 30 ++++++++++++++-----
 .../core/configuration/Configuration.h        | 12 ++++++--
 .../powerdown/PowerDownManagerTimeout.cpp     |  2 +-
 dram/src/simulation/Simulation.cpp            |  2 +-
 13 files changed, 53 insertions(+), 119 deletions(-)
 delete mode 100644 dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml
 delete mode 100644 dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
 delete mode 100644 dram/resources/configs/memconfigs/grouper.xml
 delete mode 100644 dram/resources/configs/memconfigs/memconfig.xml
 delete mode 100644 dram/resources/configs/memconfigs/par_bs.xml
 delete mode 100644 dram/resources/configs/memconfigs/par_bs_unaware.xml

diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml
index 2e23e330..50ee681f 100644
--- a/dram/resources/configs/memconfigs/fifo.xml
+++ b/dram/resources/configs/memconfigs/fifo.xml
@@ -1,15 +1,12 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="0" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="0" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="50" />
-    <parameter id="scheduler" type="string" value="FIFO" />
-    <parameter id="capsize" type="uint" value="5" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="100" />
-
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
+<memconfig>
+  <BankwiseLogic value="0"/>
+  <OpenPagePolicy value="1" />
+  <AdaptiveOpenPagePolicy value="0" />
+  <RefreshAwareScheduling value="1" />
+  <MaxNrOfTransactions value="50" />
+  <Scheduler value="FIFO" />
+  <Capsize value="5" />
+  <PowerDownMode value="Staggered" />
+  <PowerDownTimeout value="100" />
+  <DatabaseRecordingEnabled value="1" />
+</memconfig>
\ No newline at end of file
diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml
index cce963c7..f3c383f3 100644
--- a/dram/resources/configs/memconfigs/fr_fcfs.xml
+++ b/dram/resources/configs/memconfigs/fr_fcfs.xml
@@ -8,5 +8,11 @@
   <Capsize value="5" />
   <PowerDownMode value="Staggered" />
   <PowerDownTimeout value="100" />
-  <DatabaseRecordingEnabled value="1" />
+  <!-- 
+  <Buswidth value="128" />
+  <ReadWriteGrouping value="false" />
+  <ModelStorage value="false" />
+  <ModelErrorInjection value="false" />
+  <ReorderBuffer value="false" />
+  -->
 </memconfig>
\ No newline at end of file
diff --git a/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml b/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml
deleted file mode 100644
index 1c2d4e9d..00000000
--- a/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="1" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="0" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="2000" />
-    <parameter id="scheduler" type="string" value="FR_FCFS" />
-    <parameter id="capsize" type="uint" value="5" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="3" />
-    
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml b/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
deleted file mode 100644
index 167af96e..00000000
--- a/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="0" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="0" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="2000" />
-    <parameter id="scheduler" type="string" value="FR_FCFS" />
-    <parameter id="capsize" type="uint" value="5" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="3" />
-  
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
diff --git a/dram/resources/configs/memconfigs/grouper.xml b/dram/resources/configs/memconfigs/grouper.xml
deleted file mode 100644
index 73116e13..00000000
--- a/dram/resources/configs/memconfigs/grouper.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="0" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="1" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="50" />
-    <parameter id="scheduler" type="string" value="Grouper" />
-    <parameter id="capsize" type="uint" value="5" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="100" />
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
diff --git a/dram/resources/configs/memconfigs/memconfig.xml b/dram/resources/configs/memconfigs/memconfig.xml
deleted file mode 100644
index 1c2d4e9d..00000000
--- a/dram/resources/configs/memconfigs/memconfig.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="1" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="0" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="2000" />
-    <parameter id="scheduler" type="string" value="FR_FCFS" />
-    <parameter id="capsize" type="uint" value="5" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="3" />
-    
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
diff --git a/dram/resources/configs/memconfigs/par_bs.xml b/dram/resources/configs/memconfigs/par_bs.xml
deleted file mode 100644
index d2f77288..00000000
--- a/dram/resources/configs/memconfigs/par_bs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="0" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="1" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="50" />
-    <parameter id="scheduler" type="string" value="PAR_BS" />
-    <parameter id="capsize" type="uint" value="8" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="3" />
-
-    <parameter id="databaseRecordingEnabled" type="bool" value="0" />
-  </memconfig>
-</memspec>
diff --git a/dram/resources/configs/memconfigs/par_bs_unaware.xml b/dram/resources/configs/memconfigs/par_bs_unaware.xml
deleted file mode 100644
index aed501d7..00000000
--- a/dram/resources/configs/memconfigs/par_bs_unaware.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<memspec>
-  <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="0" />
-    <parameter id="openPagePolicy" type="bool" value="1" />
-    <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
-    <parameter id="refreshAwareScheduling" type="bool" value="0" />
-    <parameter id="maxNrOfTransactionsInDram" type="uint" value="50" />
-    <parameter id="scheduler" type="string" value="PAR_BS" />
-    <parameter id="capsize" type="uint" value="8" />
-    <parameter id="powerDownMode" type="string" value="Staggered" />
-    <parameter id="powerDownTimeout" type="uint" value="3" />
-  
-    <parameter id="databaseRecordingEnabled" type="bool" value="1" />
-  </memconfig>
-</memspec>
diff --git a/dram/src/controller/core/ControllerCore.cpp b/dram/src/controller/core/ControllerCore.cpp
index 6e73f2f3..81e1601a 100644
--- a/dram/src/controller/core/ControllerCore.cpp
+++ b/dram/src/controller/core/ControllerCore.cpp
@@ -58,7 +58,7 @@ ControllerCore::ControllerCore(IWrapperConnector& wrapperConnector, std::map<Ban
     else
     {
         refreshManager = new RefreshManager(*this);
-        if(config.powerDownMode == PowerDownMode::Staggered)
+        if(config.PowerDownMode == EPowerDownMode::Staggered)
         {
             powerDownManager = new PowerDownManager(*this);
         }
diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/dram/src/controller/core/configuration/Configuration.cpp
index b8eef538..2915a755 100644
--- a/dram/src/controller/core/configuration/Configuration.cpp
+++ b/dram/src/controller/core/configuration/Configuration.cpp
@@ -41,16 +41,16 @@ int string2int(string s)
     }
 }
 
-PowerDownMode string2PDNMode(string s)
+EPowerDownMode string2PDNMode(string s)
 {
     if(s == "NoPowerDown")
-        return PowerDownMode::NoPowerDown;
+        return EPowerDownMode::NoPowerDown;
     else if(s == "Staggered")
-        return PowerDownMode::Staggered;
+        return EPowerDownMode::Staggered;
     else if (s == "TimeoutPDN")
-        return PowerDownMode::TimeoutPDN;
+        return EPowerDownMode::TimeoutPDN;
     else if (s == "TimeoutSREF")
-        return PowerDownMode::TimeoutSREF;
+        return EPowerDownMode::TimeoutSREF;
     else
     {
         SC_REPORT_FATAL("Configuration", ("Unknown PowerDownMode: " + s).c_str());
@@ -78,9 +78,23 @@ void Configuration::setParameter(std::string name, std::string value)
     else if(name == "PowerDownTimeout")
         powerDownTimeoutInClk = string2int(value);
     else if(name == "PowerDownMode")
-        powerDownMode = string2PDNMode(value);
-    else if(name == "DatabaseRecordingEnabled")
-        databaseRecordingEnabled = string2bool(value);
+        PowerDownMode = string2PDNMode(value);
+    else if(name == "Buswidth")
+        Buswidth = string2int(value);
+    else if(name == "ReadWriteGrouping")
+        ReadWriteGrouping = string2bool(value);
+    else if(name == "ModelStorage")
+        ModelStorage = string2bool(value);
+    else if(name == "ModelErrorInjection")
+        ModelErrorInjection = string2bool(value);
+    else if(name == "ReorderBuffer")
+        ReorderBuffer = string2bool(value);
+
+    //SimConfig------------------------------------------------
+    else if(name == "DatabaseRecording")
+        DatabaseRecording = string2bool(value);
+    else if(name == "PowerAnalysys")
+        PowerAnalysys = string2bool(value);
     else
     {
         SC_REPORT_FATAL("Configuration", ("Parameter " + name + " not defined in Configuration").c_str());
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index cc4835cc..9487c91f 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -14,7 +14,7 @@
 
 namespace core{
 
-enum class PowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
+enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
 
 
 struct Configuration
@@ -37,10 +37,16 @@ struct Configuration
     std::string Scheduler;
     unsigned int Capsize = 5;
     sc_time getPowerDownTimeout(){return powerDownTimeoutInClk*memSpec.clk;}
-    PowerDownMode powerDownMode = PowerDownMode::Staggered;
+    EPowerDownMode PowerDownMode = EPowerDownMode::Staggered;
+    unsigned int Buswidth = 128;
+    bool ReadWriteGrouping = false;
+    bool ModelStorage = false;
+    bool ModelErrorInjection = false;
+    bool ReorderBuffer = false;
 
     //SimConfig
-    bool databaseRecordingEnabled = true;
+    bool DatabaseRecording = true;
+    bool PowerAnalysys = false;
 
     //MemSpec(from DRAM-Power XML)
     MemSpec memSpec;
diff --git a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
index b4a3268a..61ebf3f0 100644
--- a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
+++ b/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
@@ -32,7 +32,7 @@ void PowerDownManagerTimeout::sleep(Bank bank, sc_time time)
     if(canSleep() && !isInPowerDown() && (time - controller.state.getLastScheduledCommand().getEnd()) >= Configuration::getInstance().getPowerDownTimeout())
     {
         PowerDownState newState;
-        if(Configuration::getInstance().powerDownMode == PowerDownMode::TimeoutPDN)
+        if(Configuration::getInstance().PowerDownMode == EPowerDownMode::TimeoutPDN)
         {
             newState = controller.state.rowBufferStates.allRowBuffersAreClosed() ? PowerDownState::PDNPrecharge : PowerDownState::PDNActive;
         }
diff --git a/dram/src/simulation/Simulation.cpp b/dram/src/simulation/Simulation.cpp
index db7a69a1..cee6ccdd 100644
--- a/dram/src/simulation/Simulation.cpp
+++ b/dram/src/simulation/Simulation.cpp
@@ -65,7 +65,7 @@ void Simulation::setupDebugManager(const string& traceName)
 
 void Simulation::setupTlmRecorder(const string &traceName, const string &pathToResources, const DramSetup &setup, const std::vector<Device> &devices)
 {
-    if(Configuration::getInstance().databaseRecordingEnabled)
+    if(Configuration::getInstance().DatabaseRecording)
     {
         TlmRecorder::recordingEnabled = true;
         TlmRecorder::dbName = traceName;