From cd9760bf804feaecfb3364eec52bb02f78b8faab Mon Sep 17 00:00:00 2001
From: Felipe Salerno Prado <sprado@dram.eit.uni-kl.de>
Date: Wed, 1 Jun 2016 14:58:31 +0200
Subject: [PATCH] Updates

---
 .../resources/simulations/sim-batch.xml        |  2 +-
 DRAMSys/tests/error/sim-batch.xml              | 16 ++++++++--------
 DRAMSys/tests/simple/expected.txt              | 18 ++++++++++--------
 DRAMSys/tests/simple/sim-batch.xml             |  8 ++++----
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/DRAMSys/simulator/resources/simulations/sim-batch.xml b/DRAMSys/simulator/resources/simulations/sim-batch.xml
index 3ea21963..a6f0853e 100644
--- a/DRAMSys/simulator/resources/simulations/sim-batch.xml
+++ b/DRAMSys/simulator/resources/simulations/sim-batch.xml
@@ -9,7 +9,7 @@
         <NumberOfMemChannels value="4"/>
         <ControllerCoreDisableRefresh value="0"/>
         <ThermalSimulation value="0"/>
-        <SimulationProgressBar value="1"/>
+        <SimulationProgressBar value="0"/>
     </simconfig>
 
     <!-- Temperature Simulator Configuration (used for all simulation setups) -->
diff --git a/DRAMSys/tests/error/sim-batch.xml b/DRAMSys/tests/error/sim-batch.xml
index 3ea21963..239fb065 100644
--- a/DRAMSys/tests/error/sim-batch.xml
+++ b/DRAMSys/tests/error/sim-batch.xml
@@ -2,7 +2,7 @@
     <!-- General Simulator Configuration (used for all simulation setups) -->
     <simconfig>
         <Debug value="0" />
-        <DatabaseRecording value="1" />
+        <DatabaseRecording value="0" />
         <PowerAnalysis value="1" />
         <NumberOfTimeWindows value="1000" />
         <NumberOfTracePlayers value="1"/>
@@ -16,8 +16,8 @@
     <thermalsimconfig>
         <TemperatureScale value="Celsius" />
         <StaticTemperatureDefaultValue value="89" />
-        <ThermalSimPeriod value="100" />
-        <ThermalSimUnit value="us" />
+        <ThermalSimPeriod value="10" />
+        <ThermalSimUnit value="ms" />
         <PowerInfoFile value="../../DRAMSys/simulator/resources/configs/thermalsim/powerInfo.xml"/>
         <IceServerIp value="127.0.0.1" />
         <IceServerPort value="11880" />
@@ -28,20 +28,20 @@
     </thermalsimconfig>
 
     <memspecs>
-        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/tests/error/WideIO.xml"></memspec>
     </memspecs>
 
     <addressmappings>
-        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/tests/error/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml"/>
+        <memconfig src="../../DRAMSys/tests/error/fr_fcfs.xml"/>
     </memconfigs>
 
     <tracesetups>
-        <tracesetup id="fifo">
-            <device clkMhz="200">chstone-adpcm_32.stl</device>
+        <tracesetup id="errorTest_fr_fcfs_test_error.stl">
+            <device clkMhz="1000">../../../tests/error/test_error.stl</device>
         </tracesetup>
     </tracesetups>
 
diff --git a/DRAMSys/tests/simple/expected.txt b/DRAMSys/tests/simple/expected.txt
index 0d71b5fb..b3d42711 100644
--- a/DRAMSys/tests/simple/expected.txt
+++ b/DRAMSys/tests/simple/expected.txt
@@ -1,25 +1,27 @@
 Info: /OSCI/SystemC: Simulation stopped by user.
-sim.dram0	Total Energy: 	4300303.75 pJ
-sim.dram0	Average Power: 	12.61 mW
+sim.dram0	Total Energy: 	4304742.773616 pJ
+sim.dram0	Average Power: 	12.598042 mW
 sim.dram0	Total Time: 	340669248 ps
 sim.dram0	AVG BW: 	1.00 GiB/s (4.81 %)
 sim.dram0	AVG BW/IDLE: 	10.64 GiB/s (51.27 %)
 sim.dram0	MAX BW: 	20.75 GiB/s
-sim.dram1	Total Energy: 	2173431.43 pJ
-sim.dram1	Average Power: 	6.37 mW
+sim.dram1	Total Energy: 	2182523.777856 pJ
+sim.dram1	Average Power: 	6.385687 mW
 sim.dram1	Total Time: 	0 s
 sim.dram1	AVG BW: 	-nan GiB/s (-nan %)
 sim.dram1	AVG BW/IDLE: 	-nan GiB/s (-nan %)
 sim.dram1	MAX BW: 	20.75 GiB/s
-sim.dram2	Total Energy: 	4202780.15 pJ
-sim.dram2	Average Power: 	12.33 mW
+sim.dram2	Total Energy: 	4209360.998544 pJ
+sim.dram2	Average Power: 	12.311957 mW
 sim.dram2	Total Time: 	340115040 ps
 sim.dram2	AVG BW: 	0.75 GiB/s (3.63 %)
 sim.dram2	AVG BW/IDLE: 	15.65 GiB/s (75.44 %)
 sim.dram2	MAX BW: 	20.75 GiB/s
-sim.dram3	Total Energy: 	2309629.72 pJ
-sim.dram3	Average Power: 	6.77 mW
+sim.dram3	Total Energy: 	2318171.017104 pJ
+sim.dram3	Average Power: 	6.784720 mW
 sim.dram3	Total Time: 	312862464 ps
 sim.dram3	AVG BW: 	0.03 GiB/s (0.14 %)
 sim.dram3	AVG BW/IDLE: 	9.21 GiB/s (44.40 %)
 sim.dram3	MAX BW: 	20.75 GiB/s
+
+
diff --git a/DRAMSys/tests/simple/sim-batch.xml b/DRAMSys/tests/simple/sim-batch.xml
index 3ea21963..64ae63dd 100644
--- a/DRAMSys/tests/simple/sim-batch.xml
+++ b/DRAMSys/tests/simple/sim-batch.xml
@@ -16,8 +16,8 @@
     <thermalsimconfig>
         <TemperatureScale value="Celsius" />
         <StaticTemperatureDefaultValue value="89" />
-        <ThermalSimPeriod value="100" />
-        <ThermalSimUnit value="us" />
+        <ThermalSimPeriod value="10" />
+        <ThermalSimUnit value="ms" />
         <PowerInfoFile value="../../DRAMSys/simulator/resources/configs/thermalsim/powerInfo.xml"/>
         <IceServerIp value="127.0.0.1" />
         <IceServerPort value="11880" />
@@ -36,11 +36,11 @@
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml"/>
+        <memconfig src="../../DRAMSys/tests/simple/fifoStrict.xml"/>
     </memconfigs>
 
     <tracesetups>
-        <tracesetup id="fifo">
+        <tracesetup id="simple_test_fifoStrict_chstone-adpcm_32">
             <device clkMhz="200">chstone-adpcm_32.stl</device>
         </tracesetup>
     </tracesetups>