diff --git a/dram/resources/configs/memconfigs/memconfig.xml b/dram/resources/configs/memconfigs/memconfig.xml
deleted file mode 100644
index ad54f1e4..00000000
--- a/dram/resources/configs/memconfigs/memconfig.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp
index f76956de..c163e489 100644
--- a/dram/src/simulation/main.cpp
+++ b/dram/src/simulation/main.cpp
@@ -25,8 +25,6 @@ string pathOfFile(string file)
return file.substr(0, file.find_last_of('/'));
}
-
-
void startTraceAnalyzer(string traceName)
{
string p = getenv("trace");
@@ -50,43 +48,42 @@ bool runSimulation(string resources, string traceName, DramSetup setup, vector> tracePairs)
{
- int id =0;
- for(pair pair : tracePairs)
+ int id = 0;
+ for (pair pair : tracePairs)
{
id++;
string traceName = "batch" + to_string(id) + ".tdb";
- if(runSimulation(resources, traceName, setup, { Device(pair.first), Device(pair.second) }))
- return true;//kill child
+ if (runSimulation(resources, traceName, setup, { Device(pair.first), Device(pair.second) }))
+ return true; //kill child
}
}
-bool batchSetups(pairtracePair, vector setups)
+bool batchSetups(pair tracePair, vector setups)
{
- int id =0;
- for(auto& setup : setups)
+ int id = 0;
+ for (auto& setup : setups)
{
id++;
string traceName = "batch0" + to_string(id) + ".tdb";
- if(runSimulation(resources, traceName, setup, { Device(tracePair.first), Device(tracePair.second) }))
- return true;//kill child
+ if (runSimulation(resources, traceName, setup,
+ { Device(tracePair.first), Device(tracePair.second) }))
+ return true; //kill child
}
}
int sc_main(int argc, char **argv)
{
sc_set_time_resolution(1, SC_PS);
- resources = pathOfFile(argv[0]) + string("/../resources/");
+ resources = pathOfFile(argv[0]) + string("/../resources/");
+ DramSetup setup;
+ setup.memconfig = "memconfig.xml";
+ setup.memspec = "MatzesWideIO.xml";
+ //setup.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
- DramSetup setup;
- setup.memconfig = "memconfig.xml";
- setup.memspec = "MatzesWideIO.xml";
- //setup.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
-
- DramSetup setup2;
- setup2.memconfig = "memconfig.xml";
- setup2.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
-
+ DramSetup setup2;
+ setup2.memconfig = "memconfig.xml";
+ setup2.memspec = "MICRON_4Gb_DDR4-1866_8bit_A.xml";
vector> tracePairs;
tracePairs.push_back(pair("trace.stl", "empty.stl"));
@@ -95,9 +92,13 @@ int sc_main(int argc, char **argv)
//batchTraces(setup, tracePairs);
//batchSetups(tracePairs[0], {setup});
- string traceName = "mediabench-h263encode_32.tdb";
+ string traceName("tpr.tdb");
- if(runSimulation(resources, traceName, setup, { Device("mediabench-h263encode_32.stl"), Device("empty.stl") }))
+ string trace2 = "empty.stl";
+ string trace1 = "chstone-jpeg_32.stl";
+ trace1 = "trace.stl";
+
+ if (runSimulation(resources, traceName, setup, { Device(trace1), Device(trace2) }))
startTraceAnalyzer(traceName);
return 0;
}