diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml index 9dd3c80c..8aa70731 100644 --- a/dram/resources/configs/memconfigs/fr_fcfs.xml +++ b/dram/resources/configs/memconfigs/fr_fcfs.xml @@ -9,6 +9,6 @@ - + diff --git a/dram/resources/simulations/sim-batch.xml b/dram/resources/simulations/sim-batch.xml index a5a1c593..b8df13be 100644 --- a/dram/resources/simulations/sim-batch.xml +++ b/dram/resources/simulations/sim-batch.xml @@ -5,12 +5,13 @@ fr_fcfs.xml + grouper.xml - mediabench-epic_32.stl + mediabench-fractal_32.stl diff --git a/dram/src/controller/Controller.h b/dram/src/controller/Controller.h index a7505976..e40f8ade 100644 --- a/dram/src/controller/Controller.h +++ b/dram/src/controller/Controller.h @@ -116,7 +116,6 @@ template void Controller::buildScheduler() { string selectedScheduler = Configuration::getInstance().Scheduler; - selectedScheduler = "ReadWriteGrouper"; if (selectedScheduler == "FR_FCFS") { @@ -131,7 +130,7 @@ void Controller::buildScheduler() { scheduler = new Fifo(*controllerCore); } - else if (selectedScheduler == "ReadWriteGrouper") + else if (selectedScheduler == "Grouper") { scheduler = new ReadWriteGrouper(*controllerCore); } diff --git a/dram/src/controller/scheduler/Scheduler.cpp b/dram/src/controller/scheduler/Scheduler.cpp index f86a59d0..a872e821 100644 --- a/dram/src/controller/scheduler/Scheduler.cpp +++ b/dram/src/controller/scheduler/Scheduler.cpp @@ -10,7 +10,7 @@ std::string Scheduler::sendername = "scheduler"; void Scheduler::printDebugMessage(std::string message) { - cout << "scheduler: " << message << std::endl; - //DebugManager::getInstance().printDebugMessage(Scheduler::sendername, message); + //cout << "scheduler: " << message << std::endl; + DebugManager::getInstance().printDebugMessage(Scheduler::sendername, message); }