From af8624c9e9757866b94f80769855c67f13625b3c Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Wed, 5 Aug 2015 09:40:48 +0200 Subject: [PATCH] STL data player added --- DRAMSys/dramSys/src/simulation/Simulation.cpp | 15 +++++++++++++-- DRAMSys/dramSys/src/simulation/Simulation.h | 1 - 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/DRAMSys/dramSys/src/simulation/Simulation.cpp b/DRAMSys/dramSys/src/simulation/Simulation.cpp index dc2e1ab5..d036e4d9 100644 --- a/DRAMSys/dramSys/src/simulation/Simulation.cpp +++ b/DRAMSys/dramSys/src/simulation/Simulation.cpp @@ -47,7 +47,7 @@ #include "../controller/core/ControllerCore.h" #include "../controller/core/configuration/ConfigurationLoader.h" #include "../common/Utils.h" -#include "../error/flip_memory.h" +#include "../simulation/StlDataPlayer.h" using namespace std; @@ -107,7 +107,18 @@ void Simulation::instantiateModules(const string &traceName, const string &pathT { for (size_t i = 0; i < Configuration::getInstance().NumberOfTracePlayers; i++) { std::string playerStr = "player" + std::to_string(i); - TracePlayer<> *player = new StlPlayer<>(playerStr.c_str(), pathToResources + string("traces/") + devices[i].trace, devices[i].clkMhz, this); + TracePlayer<> *player; + // When data should be stored during the simulation the StlDataPlayer is needed. + // Else: no data should be stored, for instance to get a faster simulation + // or if you simply dont care about the data the normal StlPlayer is used. + if(Configuration::getInstance().ErrorStoreMode == ErrorStorageMode::NoStorage) + { + player = new StlPlayer<>(playerStr.c_str(), pathToResources + string("traces/") + devices[i].trace, devices[i].clkMhz, this); + } + else + { + player = new StlDataPlayer<>(playerStr.c_str(), pathToResources + string("traces/") + devices[i].trace, devices[i].clkMhz, this); + } players.push_back(player); } diff --git a/DRAMSys/dramSys/src/simulation/Simulation.h b/DRAMSys/dramSys/src/simulation/Simulation.h index d6c24451..560dd289 100644 --- a/DRAMSys/dramSys/src/simulation/Simulation.h +++ b/DRAMSys/dramSys/src/simulation/Simulation.h @@ -50,7 +50,6 @@ #include "StlPlayer.h" #include "../controller/Controller.h" #include "../common/third_party/tinyxml2/tinyxml2.h" -#include "../error/flip_memory.h" struct DramSetup {