From 417b45472689d8b8fbbb21cb690887bb69cf3ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Tue, 31 May 2016 18:01:02 +0200
Subject: [PATCH] Simple test updated

---
 DRAMSys/tests/simple/expected.txt | 32 +++++++++++++++++++++++--------
 DRAMSys/tests/simple/test.pl      |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/DRAMSys/tests/simple/expected.txt b/DRAMSys/tests/simple/expected.txt
index 88f5d510..0d71b5fb 100644
--- a/DRAMSys/tests/simple/expected.txt
+++ b/DRAMSys/tests/simple/expected.txt
@@ -1,9 +1,25 @@
 Info: /OSCI/SystemC: Simulation stopped by user.
-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: 	4202780.152032
-sim.dram2	Average Power: 	12.337053
-sim.dram3	Total Energy: 	2293679.842704
-sim.dram3	Average Power: 	6.809080
+sim.dram0	Total Energy: 	4300303.75 pJ
+sim.dram0	Average Power: 	12.61 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 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 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 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/test.pl b/DRAMSys/tests/simple/test.pl
index 9f4dd029..2d01a145 100644
--- a/DRAMSys/tests/simple/test.pl
+++ b/DRAMSys/tests/simple/test.pl
@@ -44,7 +44,7 @@ chdir("../../../build/simulator/");
 
 chdir("../../DRAMSys/tests/simple");
 
-`cat output.txt | tail -n 9 > current.txt`;
+`cat output.txt | tail -n 25 > current.txt`;
 
 if(compare("current.txt","expected.txt") == 0)
 {