From e9f29c92eafec7c8713674e5c605164ac2be6851 Mon Sep 17 00:00:00 2001
From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Sun, 19 Feb 2017 17:49:37 +0100
Subject: [PATCH] Small Changes

---
 .../configs/simulator/ddr3-single-device.xml       |  1 +
 .../simulator/resources/configs/simulator/ddr3.xml |  1 +
 .../resources/configs/simulator/wideio.xml         |  1 +
 .../resources/configs/simulator/wideio_thermal.xml | 14 ++++++++++++++
 .../resources/simulations/ddr3-example.xml         |  2 +-
 .../resources/simulations/ddr3-single-device.xml   |  2 +-
 .../resources/simulations/wideio-example.xml       |  2 +-
 DRAMSys/simulator/src/simulation/TraceSetup.cpp    |  2 --
 DRAMSys/simulator/src/simulation/main.cpp          |  2 +-
 README.md                                          |  4 ++--
 10 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml

diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
index a366a987..3dec948e 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
@@ -9,4 +9,5 @@
     <SimulationProgressBar value="1"/>
     <NumberOfMemChannels value="1"/>
     <NumberOfDevicesOnDIMM value = "8" />
+    <CheckTLM2Protocol value = "0" />
 </simconfig>
diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
index 4390ad5c..d13a4acc 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
@@ -9,4 +9,5 @@
     <SimulationProgressBar value="1"/>
     <NumberOfMemChannels value="1"/>
     <NumberOfDevicesOnDIMM value = "8" />
+    <CheckTLM2Protocol value = "0" />
 </simconfig>
diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio.xml b/DRAMSys/simulator/resources/configs/simulator/wideio.xml
index b9bc18b9..c811e71a 100644
--- a/DRAMSys/simulator/resources/configs/simulator/wideio.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/wideio.xml
@@ -9,5 +9,6 @@
     <SimulationProgressBar value="1"/>
     <NumberOfMemChannels value="1"/>
     <NumberOfDevicesOnDIMM value = "1" />
+    <CheckTLM2Protocol value = "0" />
 </simconfig>
 
diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml b/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml
new file mode 100644
index 00000000..42dcda72
--- /dev/null
+++ b/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml
@@ -0,0 +1,14 @@
+<simconfig>
+    <SimulationName value="wideio" />
+    <Debug value="0" />
+    <DatabaseRecording value="1" />
+    <PowerAnalysis value="1" />
+    <EnableWindowing value = "1" />
+    <WindowSize value="1000" />
+    <ThermalSimulation value="1"/>
+    <SimulationProgressBar value="1"/>
+    <NumberOfMemChannels value="1"/>
+    <NumberOfDevicesOnDIMM value = "1" />
+    <CheckTLM2Protocol value = "0" />
+</simconfig>
+
diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example.xml b/DRAMSys/simulator/resources/simulations/ddr3-example.xml
index a9ae4a7d..7fda33e5 100644
--- a/DRAMSys/simulator/resources/simulations/ddr3-example.xml
+++ b/DRAMSys/simulator/resources/simulations/ddr3-example.xml
@@ -13,7 +13,7 @@
     The following trace setup is only used in standalone mode.
     In library mode e.g. in Platform Architect the trace setup is ignored.
     -->
-    <tracesetup id="fifo_scram">
+    <tracesetup>
         <!--
         This device mimics an image processing application
         running on an FPGA with 200 Mhz.
diff --git a/DRAMSys/simulator/resources/simulations/ddr3-single-device.xml b/DRAMSys/simulator/resources/simulations/ddr3-single-device.xml
index 524742bf..c028331c 100644
--- a/DRAMSys/simulator/resources/simulations/ddr3-single-device.xml
+++ b/DRAMSys/simulator/resources/simulations/ddr3-single-device.xml
@@ -13,7 +13,7 @@
     The following trace setup is only used in standalone mode.
     In library mode e.g. in Platform Architect the trace setup is ignored.
     -->
-    <tracesetup id="fifo">
+    <tracesetup>
         <!--
         This device mimics an image processing application
         running on an FPGA with 200 Mhz.
diff --git a/DRAMSys/simulator/resources/simulations/wideio-example.xml b/DRAMSys/simulator/resources/simulations/wideio-example.xml
index 87cdcdc1..8c068c25 100644
--- a/DRAMSys/simulator/resources/simulations/wideio-example.xml
+++ b/DRAMSys/simulator/resources/simulations/wideio-example.xml
@@ -13,7 +13,7 @@
     The following trace setup is only used in standalone mode.
     In library mode e.g. in Platform Architect the trace setup is ignored.
     -->
-    <tracesetup id="fifo">
+    <tracesetup>
         <!--
         This device mimics an processor running at 1 GHz.
         -->
diff --git a/DRAMSys/simulator/src/simulation/TraceSetup.cpp b/DRAMSys/simulator/src/simulation/TraceSetup.cpp
index 9c26cded..aafcdd20 100644
--- a/DRAMSys/simulator/src/simulation/TraceSetup.cpp
+++ b/DRAMSys/simulator/src/simulation/TraceSetup.cpp
@@ -93,8 +93,6 @@ traceSetup::traceSetup(std::string uri,
     }
     remainingTransactions = totalTransactions;
     NumberOfTracePlayers = devices->size();
-    cout << "NumberOfTracePlayers: " << NumberOfTracePlayers << endl;
-    cout << "totalTransactions: " << totalTransactions << endl;
 }
 
 
diff --git a/DRAMSys/simulator/src/simulation/main.cpp b/DRAMSys/simulator/src/simulation/main.cpp
index a592af7b..e6a4388d 100644
--- a/DRAMSys/simulator/src/simulation/main.cpp
+++ b/DRAMSys/simulator/src/simulation/main.cpp
@@ -82,7 +82,7 @@ int sc_main(int argc, char **argv)
     DRAMSys dramSys("DRAMSys", SimulationXML, resources);
 
     // Instantiate STL Players:
-    traceSetup setup = traceSetup(SimulationXML, resources, &players);
+    traceSetup(SimulationXML, resources, &players);
 
     // Bind STL Players with DRAMSys:
     for(auto& p : players)
diff --git a/README.md b/README.md
index e674b867..3c1b7646 100644
--- a/README.md
+++ b/README.md
@@ -498,7 +498,7 @@ The XML code below shows a typic configuration:
     The following trace setup is only used in standalone mode.
     In library mode e.g. in Platform Architect the trace setup is ignored.
     -->
-    <tracesetup id="fifo_scram">
+    <tracesetup>
         <!--
         Specify here a trace file for each of the trace players. Trace
         players without a file will not generate transactions.
@@ -824,7 +824,7 @@ The DRAMSys' main configuration file is presented below.
     The following trace setup is only used in standalone mode.
     In library mode e.g. in Platform Architect the trace setup is ignored.
     -->
-    <tracesetup id="fifo_scram">
+    <tracesetup>
         <!--
         This device mimics an image processing application
         running on an FPGA with 200 Mhz.