From a433ad6fcfe048e265f63e541b2d5ac75c263440 Mon Sep 17 00:00:00 2001
From: robert <robertgernha@gmail.com>
Date: Thu, 10 Apr 2014 10:14:20 +0200
Subject: [PATCH] bankgroup is now recorded

---
 dram/.cproject                                |  2 +-
 dram/.gitignore                               |  3 +-
 dram/resources/configs/memconfigs/fifo.xml    | 11 +++++
 dram/resources/configs/memconfigs/fr_fcfs.xml | 11 +++++
 .../configs/memconfigs/fr_fcfs_unaware.xml    | 11 +++++
 dram/resources/configs/memconfigs/par_bs.xml  | 11 +++++
 .../configs/memconfigs/par_bs_unaware.xml     | 11 +++++
 .../configs/memspecs/MatzesWideIO.xml         |  2 +-
 dram/src/common/DebugManager.cpp              |  2 +-
 dram/src/simulation/Controller.h              |  5 +++
 dram/src/simulation/SimulationManager.cpp     |  3 --
 dram/src/simulation/main.cpp                  | 43 +++++++++++++------
 12 files changed, 95 insertions(+), 20 deletions(-)
 create mode 100644 dram/resources/configs/memconfigs/fifo.xml
 create mode 100644 dram/resources/configs/memconfigs/fr_fcfs.xml
 create mode 100644 dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
 create mode 100644 dram/resources/configs/memconfigs/par_bs.xml
 create mode 100644 dram/resources/configs/memconfigs/par_bs_unaware.xml

diff --git a/dram/.cproject b/dram/.cproject
index 362fbe05..4e75fe86 100644
--- a/dram/.cproject
+++ b/dram/.cproject
@@ -19,7 +19,7 @@
 							<builder autoBuildTarget="all" buildPath="${workspace_loc:/dram}/build-simulation" cleanBuildTarget="clean" enableAutoBuild="false" id="org.eclipse.cdt.build.core.internal.builder.1698165306" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1509734096" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.789860529" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.2041174282" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.2041174282" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.2092267417" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.include.paths.1823643375" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/opt/systemc-2.3.0/include"/>
diff --git a/dram/.gitignore b/dram/.gitignore
index c1bea3e6..3f6fb6f0 100644
--- a/dram/.gitignore
+++ b/dram/.gitignore
@@ -1,4 +1,5 @@
 /build-simulation
 *.tdb
 *.tdb-journal
-*.out
\ No newline at end of file
+*.out
+*.txt
\ No newline at end of file
diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml
new file mode 100644
index 00000000..e0c9501c
--- /dev/null
+++ b/dram/resources/configs/memconfigs/fifo.xml
@@ -0,0 +1,11 @@
+<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" />
+  </memconfig>
+</memspec>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml
new file mode 100644
index 00000000..ad54f1e4
--- /dev/null
+++ b/dram/resources/configs/memconfigs/fr_fcfs.xml
@@ -0,0 +1,11 @@
+<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="FR_FCFS" />
+    <parameter id="capsize" type="uint" value="5" />
+  </memconfig>
+</memspec>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml b/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
new file mode 100644
index 00000000..1da98872
--- /dev/null
+++ b/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml
@@ -0,0 +1,11 @@
+<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="FR_FCFS" />
+    <parameter id="capsize" type="uint" value="5" />
+  </memconfig>
+</memspec>
diff --git a/dram/resources/configs/memconfigs/par_bs.xml b/dram/resources/configs/memconfigs/par_bs.xml
new file mode 100644
index 00000000..2cc90b3a
--- /dev/null
+++ b/dram/resources/configs/memconfigs/par_bs.xml
@@ -0,0 +1,11 @@
+<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="5" />
+  </memconfig>
+</memspec>
diff --git a/dram/resources/configs/memconfigs/par_bs_unaware.xml b/dram/resources/configs/memconfigs/par_bs_unaware.xml
new file mode 100644
index 00000000..f2e238a6
--- /dev/null
+++ b/dram/resources/configs/memconfigs/par_bs_unaware.xml
@@ -0,0 +1,11 @@
+<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="5" />
+  </memconfig>
+</memspec>
diff --git a/dram/resources/configs/memspecs/MatzesWideIO.xml b/dram/resources/configs/memspecs/MatzesWideIO.xml
index 57599053..8679ff1c 100644
--- a/dram/resources/configs/memspecs/MatzesWideIO.xml
+++ b/dram/resources/configs/memspecs/MatzesWideIO.xml
@@ -28,7 +28,7 @@
       <!--<parameter id="XPDLL" type="uint" value="2" />-->
       <parameter id="XS" type="uint" value="2" /><!--tRFC+2clk-->
       <!--<parameter id="XSDLL" type="uint" value="20" />-->
-      <parameter id="REFI" type="uint" value="1300" />
+      <parameter id="REFI" type="uint" value="300" /> <!-- 1300 -->
       <!--<parameter id="CL" type="uint" value="3" />-->
       <parameter id="TAW" type="uint" value="10" />
       <parameter id="RRD" type="uint" value="2" />
diff --git a/dram/src/common/DebugManager.cpp b/dram/src/common/DebugManager.cpp
index e11e42c8..819c9195 100644
--- a/dram/src/common/DebugManager.cpp
+++ b/dram/src/common/DebugManager.cpp
@@ -23,7 +23,7 @@ void DebugManager::printDebugMessage(string sender, string message)
 			cout << " at " << sc_time_stamp() << "\t in " << sender << "\t: " << message << endl;
 
 		if (writeToFile)
-			debugFile << " at " << sc_time_stamp().to_default_time_units() << " in " << sender << "\t: " << message << "\n";
+			debugFile << " at " << sc_time_stamp() << " in " << sender << "\t: " << message << "\n";
 	}
 }
 
diff --git a/dram/src/simulation/Controller.h b/dram/src/simulation/Controller.h
index 3b0ee8d1..6d209219 100644
--- a/dram/src/simulation/Controller.h
+++ b/dram/src/simulation/Controller.h
@@ -65,6 +65,11 @@ public:
 
 		if (selectedScheduler == "FR_FCFS")
 		{
+			if(Configuration::getInstance().RefreshAwareScheduling)
+				cout << "Building refresh aware scheduler" << std::endl;
+			else
+				cout << "Building refresh un-aware scheduler" << std::endl;
+
 			scheduler = new FR_FCFS(controller->state.bankStates,
 					Configuration::getInstance().RefreshAwareScheduling,
 					Configuration::getInstance().AdaptiveOpenPagePolicy);
diff --git a/dram/src/simulation/SimulationManager.cpp b/dram/src/simulation/SimulationManager.cpp
index 00ac55c8..fb3f69b2 100644
--- a/dram/src/simulation/SimulationManager.cpp
+++ b/dram/src/simulation/SimulationManager.cpp
@@ -39,7 +39,6 @@ Simulation::Simulation(sc_module_name name, string pathToResources, string trace
 	arbiter = new Arbiter<numberOfTracePlayers, 128>("arbiter");
 	controller = new Controller<>("controller");
 
-
 	player1 = new TracePlayer<>("player1", pathToResources + string("traces/") + devices[0].trace,
 			devices[0].burstLength, this);
 	player2 = new TracePlayer<>("player2", pathToResources + string("traces/") + devices[1].trace,
@@ -78,8 +77,6 @@ Simulation::~Simulation()
 
 void Simulation::startSimulation()
 {
-
-
 	clock_t begin = clock();
 
 	DebugManager::getInstance().printDebugMessage(name(), "Starting simulation");
diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp
index 15c51195..3bb3a07d 100644
--- a/dram/src/simulation/main.cpp
+++ b/dram/src/simulation/main.cpp
@@ -19,6 +19,7 @@ using namespace std;
 using namespace simulation;
 
 string resources;
+bool silent = true;
 
 string pathOfFile(string file)
 {
@@ -32,13 +33,13 @@ void startTraceAnalyzer(string traceName)
 	system(run_tpr.c_str());
 }
 
-bool runSimulation(string resources, string traceName, DramSetup setup, vector<Device> devices)
+bool runSimulation(string traceName, DramSetup setup, vector<Device> devices)
 {
 	int pid = fork();
 	int status = 0;
 	if (pid == 0)
 	{
-		Simulation simulation("sim", resources, traceName, setup, devices);
+		Simulation simulation("sim", resources, traceName, setup, devices,silent);
 		simulation.startSimulation();
 		return true;
 	}
@@ -53,7 +54,7 @@ bool batchTraces(DramSetup setup, vector<pair<string, string>> tracePairs)
 	{
 		id++;
 		string traceName = "traceBatch" + to_string(id) + ".tdb";
-		if (runSimulation(resources, traceName, setup, { Device(pair.first), Device(pair.second) }))
+		if (runSimulation(traceName, setup, { Device(pair.first), Device(pair.second) }))
 			return true; //kill child
 	}
 }
@@ -65,7 +66,7 @@ bool batchSetups(pair<string, string> tracePair, vector<DramSetup> setups)
 	{
 		id++;
 		string traceName = "setupBatch" + to_string(id) + ".tdb";
-		if (runSimulation(resources, traceName, setup,
+		if (runSimulation(traceName, setup,
 				{ Device(tracePair.first), Device(tracePair.second) }))
 			return true; //kill child
 	}
@@ -76,21 +77,37 @@ int sc_main(int argc, char **argv)
 
 	resources = pathOfFile(argv[0]) + string("/../resources/");
 
-	DramSetup setup;
-	setup.memconfig = "memconfig.xml";
-	setup.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
-	//setup.memspec = "MatzesWideIO.xml";
-
-	vector<pair<string, string>> tracePairs;
-	tracePairs.push_back(pair<string, string>("chstone-mips_32.stl", "chstone-motion_32.stl"));
-
-	batchTraces(setup, tracePairs);
+//	DramSetup setup;
+//	setup.memconfig = "memconfig.xml";
+//	//setup.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
+//	setup.memspec = "MatzesWideIO.xml";
+//
+//	vector<pair<string, string>> tracePairs;
+//	tracePairs.push_back(pair<string, string>("chstone-mips_32.stl", "chstone-motion_32.stl"));
+//
+//	batchTraces(setup, tracePairs);
 
 //	DramSetup setup2;
 //	setup2.memconfig = "memconfig.xml";
 //	setup2.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
 	//batchSetups(tracePairs[0], { setup, setup2 });
 
+	Device d1("mediabench-c-ray-1.1_32.stl",4);
+	Device d2("mediabench-fractal_32.stl",4);
+	string dramSpec = "MatzesWideIO.xml";
+
+	if(runSimulation("fifo.tdb",DramSetup("fifo.xml",dramSpec),{d1,d2}))
+		return 0;
+	if(runSimulation("fr_fcfs.tdb",DramSetup("fr_fcfs.xml",dramSpec),{d1,d2}))
+		return 0;
+	if(runSimulation("fr_fcfs_unaware.tdb",DramSetup("fr_fcfs_unaware.xml",dramSpec),{d1,d2}))
+		return 0;
+	if(runSimulation("par_bs.tdb",DramSetup("par_bs.xml",dramSpec),{d1,d2}))
+		return 0;
+	if(runSimulation("par_bs_unaware.tdb",DramSetup("par_bs_unaware.xml",dramSpec),{d1,d2}))
+		return 0;
+
+	startTraceAnalyzer("fifo.tdb fr_fcfs.tdb fr_fcfs_unaware.tdb par_bs.tdb par_bs_unaware.tdb");
 	return 0;
 }