From 10d01a832e65ebeb5a8ca1a28786ae16b139dfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Wed, 6 Apr 2016 17:22:23 +0200
Subject: [PATCH] Created a separate "sim-batch.xml" file for the simple test.

This way eventual changes to the default "sim-batch.xml" file will not affect
the result of this test.

Updated the expected values (expected.txt) after running the test with its own
sim-batch config file.
---
 DRAMSys/tests/simple/expected.txt  | 12 ++++----
 DRAMSys/tests/simple/sim-batch.xml | 49 ++++++++++++++++++++++++++++++
 DRAMSys/tests/simple/test.pl       |  3 +-
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 DRAMSys/tests/simple/sim-batch.xml

diff --git a/DRAMSys/tests/simple/expected.txt b/DRAMSys/tests/simple/expected.txt
index 0af7ea7c..88f5d510 100644
--- a/DRAMSys/tests/simple/expected.txt
+++ b/DRAMSys/tests/simple/expected.txt
@@ -1,9 +1,9 @@
 Info: /OSCI/SystemC: Simulation stopped by user.
-sim.dram0	Total Energy: 	4322095.399584
-sim.dram0	Average Power: 	12.680122
+sim.dram0	Total Energy: 	4300303.748256
+sim.dram0	Average Power: 	12.617304
 sim.dram1	Total Energy: 	2157481.552032
 sim.dram1	Average Power: 	6.404758
-sim.dram2	Total Energy: 	3293520.001632
-sim.dram2	Average Power: 	9.667110
-sim.dram3	Total Energy: 	2216673.062784
-sim.dram3	Average Power: 	6.580476
+sim.dram2	Total Energy: 	4202780.152032
+sim.dram2	Average Power: 	12.337053
+sim.dram3	Total Energy: 	2293679.842704
+sim.dram3	Average Power: 	6.809080
diff --git a/DRAMSys/tests/simple/sim-batch.xml b/DRAMSys/tests/simple/sim-batch.xml
new file mode 100644
index 00000000..783ff0c7
--- /dev/null
+++ b/DRAMSys/tests/simple/sim-batch.xml
@@ -0,0 +1,49 @@
+<simulation>
+    <!-- General Simulator Configuration (used for all simulation setups) -->
+    <simconfig>
+        <Debug value="0" />
+        <DatabaseRecording value="1" />
+        <PowerAnalysis value="1" />
+        <PowerWindowSize value="1000" />
+        <PowerWindowUnit value="ns" />
+        <NumberOfTracePlayers value="1"/>
+        <NumberOfMemChannels value="4"/>
+        <ControllerCoreDisableRefresh value="0"/>
+        <ThermalSimulation value="0"/>
+    </simconfig>
+
+    <!-- Temperature Simulator Configuration (used for all simulation setups) -->
+    <thermalsimconfig>
+        <TemperatureScale value="Celsius" />
+        <StaticTemperatureDefaultValue value="89" />
+        <ThermalSimPeriod value="100" />
+        <ThermalSimUnit value="us" />
+        <PowerInfoFile value="../../DRAMSys/simulator/resources/configs/thermalsim/powerInfo.xml"/>
+        <IceServerIp value="127.0.0.1" />
+        <IceServerPort value="11880" />
+        <SimPeriodAdjustFactor value="10" />
+        <NPowStableCyclesToIncreasePeriod value="5" />
+        <GenerateTemperatureMap value="1" />
+        <GeneratePowerMap value="1" />
+    </thermalsimconfig>
+
+    <memspecs>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
+    </memspecs>
+
+    <addressmappings>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+    </addressmappings>
+
+    <memconfigs>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml"/>
+    </memconfigs>
+
+    <tracesetups>
+        <tracesetup id="simple_test_fifoStrict_chstone-adpcm_32">
+            <device clkMhz="200">chstone-adpcm_32.stl</device>
+        </tracesetup>
+    </tracesetups>
+
+</simulation>
+
diff --git a/DRAMSys/tests/simple/test.pl b/DRAMSys/tests/simple/test.pl
index e91fb713..9f4dd029 100644
--- a/DRAMSys/tests/simple/test.pl
+++ b/DRAMSys/tests/simple/test.pl
@@ -40,7 +40,7 @@ use File::Compare;
 
 # Run Simulation:
 chdir("../../../build/simulator/");
-`./dramSys > ../../DRAMSys/tests/simple/output.txt`;
+`./dramSys ../../DRAMSys/tests/simple/sim-batch.xml > ../../DRAMSys/tests/simple/output.txt`;
 
 chdir("../../DRAMSys/tests/simple");
 
@@ -54,3 +54,4 @@ else
 {
     exit -1
 }
+