diff --git a/DRAMSys/analyzer/traceanalyzer.cpp b/DRAMSys/analyzer/traceanalyzer.cpp index bffd186b..55ecbd86 100644 --- a/DRAMSys/analyzer/traceanalyzer.cpp +++ b/DRAMSys/analyzer/traceanalyzer.cpp @@ -93,9 +93,14 @@ TraceAnalyzer::~TraceAnalyzer() void TraceAnalyzer::on_actionOpen_triggered() { - QStringList paths = QFileDialog::getOpenFileNames(this,tr("Open Tracefile"),"",tr("Tracefile(*.tdb)")); + QStringList paths = QFileDialog::getOpenFileNames(this, + tr("Open Tracefile"), + "../simulator/", + tr("Tracefile (*.tdb)")); if(paths.isEmpty()) + { return; + } for(const QString &path: paths) { diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp index d717e2d0..beee8c9d 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp +++ b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp @@ -100,6 +100,7 @@ void ConfigurationLoader::loadConfigFromUri(Configuration &config, std::string u void ConfigurationLoader::loadMemSpec(Configuration& config, string memspecUri) { tinyxml2::XMLDocument doc; + config.memspecUri = memspecUri; loadXML(memspecUri, doc); XMLElement* memspec = doc.FirstChildElement("memspec"); loadMemSpec(config, memspec); @@ -131,7 +132,7 @@ void ConfigurationLoader::loadMemSpec(Configuration& config, XMLElement* memspec void ConfigurationLoader::loadMCConfig(Configuration& config, string mcconfigUri) { tinyxml2::XMLDocument doc; - + config.mcconfigUri = mcconfigUri; loadXML(mcconfigUri, doc); XMLElement* mcconfig = doc.FirstChildElement("mcconfig"); loadConfig(config, mcconfig); @@ -146,13 +147,12 @@ void ConfigurationLoader::loadMCConfig(Configuration& config, XMLElement* mcconf config.mcconfigUri = src; loadXML(src, doc); loadMCConfig(config, doc.FirstChildElement("mcconfig")); - } else - loadConfig(config, mcconfig); - - // check compatible between Store Mode and PowerDown Mode - if (config.StoreMode == StorageMode::ErrorModel && config.PowerDownMode != EPowerDownMode::NoPowerDown) { - SC_REPORT_FATAL("ConfigurationLoader", "Does not yet support error model and power down modes activated at the same time"); } + else + { + loadConfig(config, mcconfig); + } + } diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.cpp b/DRAMSys/simulator/src/simulation/DRAMSys.cpp index 2987bf70..5454f2ea 100644 --- a/DRAMSys/simulator/src/simulation/DRAMSys.cpp +++ b/DRAMSys/simulator/src/simulation/DRAMSys.cpp @@ -168,13 +168,7 @@ void DRAMSys::setupTlmRecorders(const string &traceName, tlmRecorders.push_back(tlmRecorder); - std::string traceNames = "FOO"; // TODO - //for (size_t i = 0; i < devices.size(); i++) { - // traceNames.append(devices[i].trace); - // if (i == devices.size() - 1) - // continue; - // traceNames.append(","); - //} + std::string traceNames = Configuration::getInstance().SimulationName; tlmRecorder->recordTracenames(traceNames); } } diff --git a/DRAMSys/simulator/src/simulation/TraceSetup.cpp b/DRAMSys/simulator/src/simulation/TraceSetup.cpp index aafcdd20..6ebb0f35 100644 --- a/DRAMSys/simulator/src/simulation/TraceSetup.cpp +++ b/DRAMSys/simulator/src/simulation/TraceSetup.cpp @@ -91,6 +91,7 @@ traceSetup::traceSetup(std::string uri, totalTransactions += player->getNumberOfLines(stlFile); } } + remainingTransactions = totalTransactions; NumberOfTracePlayers = devices->size(); }