From cc9345a7abaaf39bc78733ed8247c0331260a298 Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Fri, 21 Oct 2016 15:15:50 +0200 Subject: [PATCH] Rename memconfig to mcconfig --- DRAMSys/analyzer/data/tracedb.cpp | 6 +++--- DRAMSys/analyzer/scripts/memUtil.py | 14 ++++++------- DRAMSys/analyzer/scripts/metrics.py | 16 +++++++-------- DRAMSys/analyzer/scripts/tests.py | 6 +++--- .../{memconfigs => mcconfigs}/.gitignore | 0 .../_old/fr_fcfs_bankwise.xml | 4 ++-- .../_old/fr_fcfs_unaware.xml | 4 ++-- .../_old/grouper.xml | 4 ++-- .../{memconfigs => mcconfigs}/_old/par_bs.xml | 5 ++--- .../_old/par_bs_unaware.xml | 7 +++---- .../{memconfigs => mcconfigs}/fifo.xml | 4 ++-- .../{memconfigs => mcconfigs}/fifoStrict.xml | 8 ++++---- .../{memconfigs => mcconfigs}/fr_fcfs.xml | 4 ++-- .../{memconfigs => mcconfigs}/par_bs.xml | 4 ++-- DRAMSys/simulator/resources/resources.pri | 20 +++++++++---------- .../resources/scripts/createTraceDB.sql | 2 +- .../resources/simulations/ddr3-example.xml | 6 +++--- .../resources/simulations/sim-batch.xml | 13 ++++++------ DRAMSys/simulator/src/common/TlmRecorder.cpp | 6 +++--- DRAMSys/simulator/src/common/TlmRecorder.h | 4 ++-- .../core/configuration/Configuration.cpp | 2 +- .../core/configuration/Configuration.h | 4 ++-- .../configuration/ConfigurationLoader.cpp | 20 +++++++++---------- .../core/configuration/ConfigurationLoader.h | 4 ++-- .../simulator/src/simulation/Simulation.cpp | 4 ++-- DRAMSys/simulator/src/simulation/Simulation.h | 8 ++++---- .../src/simulation/SimulationManager.cpp | 10 +++++----- DRAMSys/tests/TLM_compliance/fifoStrict.xml | 4 ++-- DRAMSys/tests/TLM_compliance/sim-batch.xml | 6 +++--- DRAMSys/tests/error/fr_fcfs.xml | 4 ++-- DRAMSys/tests/error/sim-batch.xml | 6 +++--- DRAMSys/tests/simple/fifoStrict.xml | 4 ++-- DRAMSys/tests/simple/sim-batch.xml | 6 +++--- .../tests/timing_compliance/fifoStrict.xml | 4 ++-- DRAMSys/tests/timing_compliance/sim-batch.xml | 6 +++--- DRAMSys/tests/unit/mem_util.py | 12 +++++------ DRAMSys/tests/unit/unit_test.py | 4 ++-- 37 files changed, 122 insertions(+), 123 deletions(-) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/.gitignore (100%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/_old/fr_fcfs_bankwise.xml (95%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/_old/fr_fcfs_unaware.xml (95%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/_old/grouper.xml (95%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/_old/par_bs.xml (95%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/_old/par_bs_unaware.xml (86%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/fifo.xml (95%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/fifoStrict.xml (73%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/fr_fcfs.xml (96%) rename DRAMSys/simulator/resources/configs/{memconfigs => mcconfigs}/par_bs.xml (95%) diff --git a/DRAMSys/analyzer/data/tracedb.cpp b/DRAMSys/analyzer/data/tracedb.cpp index e56ece6e..b0e88b4d 100644 --- a/DRAMSys/analyzer/data/tracedb.cpp +++ b/DRAMSys/analyzer/data/tracedb.cpp @@ -199,7 +199,7 @@ ID TraceDB::getTransactionIDFromPhaseID(ID phaseID) GeneralInfo TraceDB::getGeneralInfoFromDB() { QSqlQuery query(database); - query.prepare("SELECT NumberOfTransactions,TraceEnd,NumberOfBanks,Clk,UnitOfTime,Traces,Memspec,Memconfig, WindowSize FROM GeneralInfo"); + query.prepare("SELECT NumberOfTransactions,TraceEnd,NumberOfBanks,Clk,UnitOfTime,Traces,Memspec,MCconfig, WindowSize FROM GeneralInfo"); executeQuery(query); if(query.next()) @@ -213,11 +213,11 @@ GeneralInfo TraceDB::getGeneralInfoFromDB() QString traces = "Traces: " + query.value(5).toString(); QString memspec = "Memspec: " + query.value(6).toString(); - QString memconfig = "Memconfig: " + query.value(7).toString(); + QString mcconfig = "MCconfig: " + query.value(7).toString(); unsigned int windowSize = query.value(8).toInt(); QString description = (traces + "\n"); - description += memconfig + "\n"; + description += mcconfig + "\n"; description += memspec + "\n"; description += "Number of Transactions: " + QString::number(numberOfTransactions) + "\n"; description += "Clock period: " + QString::number(clkPeriod) + " " + unitOfTime + "\n"; diff --git a/DRAMSys/analyzer/scripts/memUtil.py b/DRAMSys/analyzer/scripts/memUtil.py index 76a7ff71..445cd6be 100755 --- a/DRAMSys/analyzer/scripts/memUtil.py +++ b/DRAMSys/analyzer/scripts/memUtil.py @@ -1,24 +1,24 @@ import xml.etree.ElementTree as ET -class MemConfig(object): - """ Memory Configuration Class +class MCConfig(object): + """ Memory Controller Configuration Class The format used in memory specification XML files differs from the - format used in memory configuration XML files. Each class uses the - proper format when searching for elements. + format used in memory controller configuration XML files. Each class + uses the proper format when searching for elements. """ def getValue(self, id): - return self.xmlMemConfig.findall(id)[0].attrib['value'] + return self.xmlMCConfig.findall(id)[0].attrib['value'] def getIntValue(self, id): return int(self.getValue(id)) def __init__(self, dbconnection): cursor = dbconnection.cursor() - cursor.execute("SELECT Memconfig FROM GeneralInfo") + cursor.execute("SELECT MCconfig FROM GeneralInfo") result = cursor.fetchone() - self.xmlMemConfig = ET.parse(result[0]) + self.xmlMCConfig = ET.parse(result[0]) class MemSpec(object): diff --git a/DRAMSys/analyzer/scripts/metrics.py b/DRAMSys/analyzer/scripts/metrics.py index 54cf1e32..da21d95c 100644 --- a/DRAMSys/analyzer/scripts/metrics.py +++ b/DRAMSys/analyzer/scripts/metrics.py @@ -371,8 +371,8 @@ def time_in_SREFB_percent(connection): @metric def time_in_power_down_states_in_ns(connection): - memconfig = MemConfig(connection) - bankwiseLogic = memconfig.getValue("BankwiseLogic") + mcconfig = MCConfig(connection) + bankwiseLogic = mcconfig.getValue("BankwiseLogic") if bankwiseLogic == "0": totalTimeInPDNA = time_in_PDNA_in_ns(connection) totalTimeInPDNP = time_in_PDNP_in_ns(connection) @@ -389,8 +389,8 @@ def time_in_power_down_states_in_ns(connection): @metric def time_in_power_down_states_percent(connection): - memconfig = MemConfig(connection) - bankwiseLogic = memconfig.getValue("BankwiseLogic") + mcconfig = MCConfig(connection) + bankwiseLogic = mcconfig.getValue("BankwiseLogic") if bankwiseLogic == "0": totalTimeAllBanks = trace_length_in_ns(connection) else: @@ -447,8 +447,8 @@ def getMetrics(pathToTrace): selectedMetrics = [] connection = sqlite3.connect(pathToTrace) - memconfig = MemConfig(connection) - bankwiseLogic = memconfig.getValue("BankwiseLogic") + mcconfig = MCConfig(connection) + bankwiseLogic = mcconfig.getValue("BankwiseLogic") if bankwiseLogic == "0": pdnMetrics = [time_in_PDNA_in_ns, time_in_PDNA_percent, time_in_PDNP_in_ns, time_in_PDNP_percent, time_in_SREF_in_ns, time_in_SREF_percent] @@ -481,8 +481,8 @@ def calculateMetrics(pathToTrace, selectedMetrics = []): calculatedMetrics = [] connection = sqlite3.connect(pathToTrace) - memconfig = MemConfig(connection) - bankwiseLogic = memconfig.getValue("BankwiseLogic") + mcconfig = MCConfig(connection) + bankwiseLogic = mcconfig.getValue("BankwiseLogic") if bankwiseLogic == "0": pdnMetrics = [time_in_PDNA_in_ns, time_in_PDNA_percent, time_in_PDNP_in_ns, time_in_PDNP_percent, time_in_SREF_in_ns, time_in_SREF_percent] diff --git a/DRAMSys/analyzer/scripts/tests.py b/DRAMSys/analyzer/scripts/tests.py index a7e26334..9b2e5703 100755 --- a/DRAMSys/analyzer/scripts/tests.py +++ b/DRAMSys/analyzer/scripts/tests.py @@ -43,15 +43,15 @@ class DramConfig(object): def readConfigFromFiles(self, connection): print("Parsing dram configuration") - memconfig = MemConfig(connection) + mcconfig = MCConfig(connection) memspec = MemSpec(connection) clkWithUnit = getClock(connection) self.clk = clkWithUnit[0] self.unitOfTime = clkWithUnit[1].lower() - self.bankwiseLogic = memconfig.getValue("BankwiseLogic") - self.scheduler = memconfig.getValue("Scheduler") + self.bankwiseLogic = mcconfig.getValue("BankwiseLogic") + self.scheduler = mcconfig.getValue("Scheduler") self.numberOfBanks = memspec.getIntValue("nbrOfBanks") self.burstLength = memspec.getIntValue("burstLength") diff --git a/DRAMSys/simulator/resources/configs/memconfigs/.gitignore b/DRAMSys/simulator/resources/configs/mcconfigs/.gitignore similarity index 100% rename from DRAMSys/simulator/resources/configs/memconfigs/.gitignore rename to DRAMSys/simulator/resources/configs/mcconfigs/.gitignore diff --git a/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml b/DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_bankwise.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_bankwise.xml index 1c2d4e9d..b9448e54 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_bankwise.xml @@ -1,5 +1,5 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml b/DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_unaware.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_unaware.xml index 167af96e..0e4816cb 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/_old/fr_fcfs_unaware.xml @@ -1,5 +1,5 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/_old/grouper.xml b/DRAMSys/simulator/resources/configs/mcconfigs/_old/grouper.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/_old/grouper.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/_old/grouper.xml index 73116e13..2f843ecd 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/_old/grouper.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/_old/grouper.xml @@ -1,5 +1,5 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs.xml b/DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs.xml index d2f77288..af7f33bd 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs.xml @@ -1,5 +1,5 @@ - + @@ -9,7 +9,6 @@ - - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs_unaware.xml b/DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs_unaware.xml similarity index 86% rename from DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs_unaware.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs_unaware.xml index aed501d7..c0b02587 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/_old/par_bs_unaware.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/_old/par_bs_unaware.xml @@ -1,5 +1,5 @@ - + @@ -8,8 +8,7 @@ - - + - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/fifo.xml b/DRAMSys/simulator/resources/configs/mcconfigs/fifo.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/fifo.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/fifo.xml index 8df130c3..2048948f 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/fifo.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/fifo.xml @@ -1,4 +1,4 @@ - + @@ -11,4 +11,4 @@ - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml b/DRAMSys/simulator/resources/configs/mcconfigs/fifoStrict.xml similarity index 73% rename from DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/fifoStrict.xml index 179defd4..6b7c9fa5 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/fifoStrict.xml @@ -1,15 +1,15 @@ - - + + - + - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml b/DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs.xml similarity index 96% rename from DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs.xml index f33160bb..0a272072 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs.xml @@ -1,4 +1,4 @@ - + @@ -19,5 +19,5 @@ --> - + diff --git a/DRAMSys/simulator/resources/configs/memconfigs/par_bs.xml b/DRAMSys/simulator/resources/configs/mcconfigs/par_bs.xml similarity index 95% rename from DRAMSys/simulator/resources/configs/memconfigs/par_bs.xml rename to DRAMSys/simulator/resources/configs/mcconfigs/par_bs.xml index 65be1936..24418246 100644 --- a/DRAMSys/simulator/resources/configs/memconfigs/par_bs.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/par_bs.xml @@ -1,4 +1,4 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/simulator/resources/resources.pri b/DRAMSys/simulator/resources/resources.pri index 3f2dc9ce..cc46c3c4 100644 --- a/DRAMSys/simulator/resources/resources.pri +++ b/DRAMSys/simulator/resources/resources.pri @@ -49,16 +49,16 @@ OTHER_FILES += resources/traces/small.stl OTHER_FILES += resources/traces/chstone-motion_32.stl OTHER_FILES += resources/traces/mediabench-adpcmdecode_32.stl -# memconfigs -OTHER_FILES += resources/configs/memconfigs/fifoStrict.xml -OTHER_FILES += resources/configs/memconfigs/fifo.xml -OTHER_FILES += resources/configs/memconfigs/_old/par_bs_unaware.xml -OTHER_FILES += resources/configs/memconfigs/_old/fr_fcfs_unaware.xml -OTHER_FILES += resources/configs/memconfigs/_old/grouper.xml -OTHER_FILES += resources/configs/memconfigs/_old/par_bs.xml -OTHER_FILES += resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml -OTHER_FILES += resources/configs/memconfigs/fr_fcfs.xml -OTHER_FILES += resources/configs/memconfigs/par_bs.xml +# mcconfigs +OTHER_FILES += resources/configs/mcconfigs/fifoStrict.xml +OTHER_FILES += resources/configs/mcconfigs/fifo.xml +OTHER_FILES += resources/configs/mcconfigs/_old/par_bs_unaware.xml +OTHER_FILES += resources/configs/mcconfigs/_old/fr_fcfs_unaware.xml +OTHER_FILES += resources/configs/mcconfigs/_old/grouper.xml +OTHER_FILES += resources/configs/mcconfigs/_old/par_bs.xml +OTHER_FILES += resources/configs/mcconfigs/_old/fr_fcfs_bankwise.xml +OTHER_FILES += resources/configs/mcconfigs/fr_fcfs.xml +OTHER_FILES += resources/configs/mcconfigs/par_bs.xml # memspecs OTHER_FILES += resources/configs/memspecs/memspec.dtd diff --git a/DRAMSys/simulator/resources/scripts/createTraceDB.sql b/DRAMSys/simulator/resources/scripts/createTraceDB.sql index ed09d7b9..5f1d0d38 100644 --- a/DRAMSys/simulator/resources/scripts/createTraceDB.sql +++ b/DRAMSys/simulator/resources/scripts/createTraceDB.sql @@ -20,7 +20,7 @@ CREATE TABLE GeneralInfo( NumberOfBanks INTEGER, clk INTEGER, UnitOfTime TEXT, - Memconfig TEXT, + MCconfig TEXT, Memspec TEXT, Traces TEXT, WindowSize INTEGER diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example.xml b/DRAMSys/simulator/resources/simulations/ddr3-example.xml index 73da61ff..4368ca7b 100644 --- a/DRAMSys/simulator/resources/simulations/ddr3-example.xml +++ b/DRAMSys/simulator/resources/simulations/ddr3-example.xml @@ -37,9 +37,9 @@ - - - + + + diff --git a/DRAMSys/simulator/resources/simulations/sim-batch.xml b/DRAMSys/simulator/resources/simulations/sim-batch.xml index 73ca12b6..37801270 100644 --- a/DRAMSys/simulator/resources/simulations/sim-batch.xml +++ b/DRAMSys/simulator/resources/simulations/sim-batch.xml @@ -2,17 +2,17 @@ - + - + - + @@ -38,13 +38,14 @@ - - - + + + chstone-adpcm_32.stl + chstone-jpeg_32.stl diff --git a/DRAMSys/simulator/src/common/TlmRecorder.cpp b/DRAMSys/simulator/src/common/TlmRecorder.cpp index e017dc5b..0f2466f4 100644 --- a/DRAMSys/simulator/src/common/TlmRecorder.cpp +++ b/DRAMSys/simulator/src/common/TlmRecorder.cpp @@ -270,8 +270,8 @@ void TlmRecorder::prepareSqlStatements() updatePhaseString = "UPDATE Phases SET PhaseEnd = :end WHERE Transact = :trans AND PhaseName = :name"; insertGeneralInfoString = - "INSERT INTO GeneralInfo (NumberOfTransactions,TraceEnd,NumberOfBanks,clk,UnitOfTime,Memconfig,Memspec,Traces, WindowSize) VALUES" - "(:numberOfTransactions,:end,:numberOfBanks,:clk,:unitOfTime,:memconfig,:memspec,:traces,:windowSize)"; + "INSERT INTO GeneralInfo (NumberOfTransactions,TraceEnd,NumberOfBanks,clk,UnitOfTime,MCconfig,Memspec,Traces, WindowSize) VALUES" + "(:numberOfTransactions,:end,:numberOfBanks,:clk,:unitOfTime,:mcconfig,:memspec,:traces,:windowSize)"; insertDebugMessageString = "INSERT INTO DebugMessages (Time,Message) Values (:time,:message)"; insertPowerString = "INSERT INTO Power VALUES (:time,:averagePower)"; @@ -301,7 +301,7 @@ void TlmRecorder::insertGeneralInfo() Configuration::getInstance().memSpec.NumberOfBanks); sqlite3_bind_int(insertGeneralInfoStatement, 4, Configuration::getInstance().memSpec.clk.value()); sqlite3_bind_text(insertGeneralInfoStatement, 5, "PS", 2, NULL); - sqlite3_bind_text(insertGeneralInfoStatement, 6, memconfig.c_str(), memconfig.length(), NULL); + sqlite3_bind_text(insertGeneralInfoStatement, 6, mcconfig.c_str(), mcconfig.length(), NULL); sqlite3_bind_text(insertGeneralInfoStatement, 7, memspec.c_str(), memspec.length(), NULL); sqlite3_bind_text(insertGeneralInfoStatement, 8, traces.c_str(), traces.length(), NULL); if(!Configuration::getInstance().EnableWindowing) diff --git a/DRAMSys/simulator/src/common/TlmRecorder.h b/DRAMSys/simulator/src/common/TlmRecorder.h index d0c0ad49..bec9e68a 100644 --- a/DRAMSys/simulator/src/common/TlmRecorder.h +++ b/DRAMSys/simulator/src/common/TlmRecorder.h @@ -64,7 +64,7 @@ public: TlmRecorder(sc_module_name /*name*/, string uri, string dbname, bool recenable); ~TlmRecorder(); - void recordMemconfig(string memconfig){this->memconfig = memconfig;} + void recordMCconfig(string mcconfig){this->mcconfig = mcconfig;} void recordMemspec(string memspec){this->memspec = memspec;} void recordTracenames(string traces){this->traces = traces;} @@ -100,7 +100,7 @@ private: void setPhaseEnd(string name,sc_time end); }; - std::string memconfig,memspec,traces; + std::string mcconfig,memspec,traces; void prepareSqlStatements(); void executeSqlCommand(std::string command); diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp index a4170649..720df283 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp +++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp @@ -44,7 +44,7 @@ using namespace std; string Configuration::memspecUri = ""; -string Configuration::memconfigUri = ""; +string Configuration::mcconfigUri = ""; Configuration::Configuration() { diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h index 01d6383a..fb50a590 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h +++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h @@ -53,7 +53,7 @@ enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF}; struct Configuration { static std::string memspecUri; - static std::string memconfigUri; + static std::string mcconfigUri; static inline Configuration& getInstance() { @@ -61,7 +61,7 @@ struct Configuration return configuration; } - //MemConfig + //MCConfig bool BankwiseLogic = false; bool OpenPagePolicy = true; unsigned int MaxNrOfTransactions = 8; diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp index acb5c4f1..0b44528a 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp +++ b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp @@ -135,26 +135,26 @@ void ConfigurationLoader::loadMemSpec(Configuration& config, XMLElement* memspec } } -void ConfigurationLoader::loadMemConfig(Configuration& config, string memconfigUri) +void ConfigurationLoader::loadMCConfig(Configuration& config, string mcconfigUri) { tinyxml2::XMLDocument doc; - loadXML(memconfigUri, doc); - XMLElement* memconfig = doc.FirstChildElement("memconfig"); - loadConfig(config, memconfig); + loadXML(mcconfigUri, doc); + XMLElement* mcconfig = doc.FirstChildElement("mcconfig"); + loadConfig(config, mcconfig); } -void ConfigurationLoader::loadMemConfig(Configuration& config, XMLElement* memconfig) +void ConfigurationLoader::loadMCConfig(Configuration& config, XMLElement* mcconfig) { - if(memconfig->Attribute("src")) + if(mcconfig->Attribute("src")) { XMLDocument doc; - string src(memconfig->Attribute("src")); - config.memconfigUri = src; + string src(mcconfig->Attribute("src")); + config.mcconfigUri = src; loadXML(src, doc); - loadMemConfig(config, doc.FirstChildElement("memconfig")); + loadMCConfig(config, doc.FirstChildElement("mcconfig")); } - loadConfig(config, memconfig); + loadConfig(config, mcconfig); } void ConfigurationLoader::loadDDR3(Configuration& config, XMLElement* memspec) diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h index 46bab656..9c319129 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h +++ b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h @@ -45,8 +45,8 @@ class ConfigurationLoader { public: - static void loadMemConfig(Configuration& config, std::string memconfigUri); - static void loadMemConfig(Configuration& config, tinyxml2::XMLElement* memconfig); + static void loadMCConfig(Configuration& config, std::string mcconfigUri); + static void loadMCConfig(Configuration& config, tinyxml2::XMLElement* mcconfig); static void loadSimConfig(Configuration& config, std::string simconfigUri); static void loadSimConfig(Configuration& config,tinyxml2::XMLElement* simconfig); diff --git a/DRAMSys/simulator/src/simulation/Simulation.cpp b/DRAMSys/simulator/src/simulation/Simulation.cpp index 7311ab08..71acb46c 100644 --- a/DRAMSys/simulator/src/simulation/Simulation.cpp +++ b/DRAMSys/simulator/src/simulation/Simulation.cpp @@ -64,7 +64,7 @@ Simulation::Simulation(sc_module_name __attribute__((unused)) name, string pathT xmlAddressDecoder::Initialize(setup.addressmapping); xmlAddressDecoder::getInstance().print(); - ConfigurationLoader::loadMemConfig(Configuration::getInstance(), setup.memconfig); + ConfigurationLoader::loadMCConfig(Configuration::getInstance(), setup.mcconfig); ConfigurationLoader::loadMemSpec(Configuration::getInstance(), setup.memspec); ConfigurationLoader::loadSimConfig(Configuration::getInstance(), setup.simconfig); ConfigurationLoader::loadTemperatureSimConfig(Configuration::getInstance(), setup.thermalsimconfig); @@ -92,7 +92,7 @@ void Simulation::setupTlmRecorders(const string &traceName, const string &pathTo std::string recorderName = "tlmRecorder" + std::to_string(i); TlmRecorder *tlmRecorder = new TlmRecorder(recorderName.c_str(), sqlScriptURI.c_str(), dbName.c_str(), Configuration::getInstance().DatabaseRecording); - tlmRecorder->recordMemconfig(Configuration::getInstance().memconfigUri); + tlmRecorder->recordMCconfig(Configuration::getInstance().mcconfigUri); tlmRecorder->recordMemspec(Configuration::getInstance().memspecUri); tlmRecorders.push_back(tlmRecorder); diff --git a/DRAMSys/simulator/src/simulation/Simulation.h b/DRAMSys/simulator/src/simulation/Simulation.h index e9091dc5..0fb8a523 100644 --- a/DRAMSys/simulator/src/simulation/Simulation.h +++ b/DRAMSys/simulator/src/simulation/Simulation.h @@ -58,11 +58,11 @@ struct DramSetup { - DramSetup():memspec(NULL),memconfig(NULL),simconfig(NULL),addressmapping(NULL), thermalsimconfig(NULL) {} - DramSetup(tinyxml2::XMLElement* memspec, tinyxml2::XMLElement* memconfig, tinyxml2::XMLElement* simconfig, tinyxml2::XMLElement* addressmapping, tinyxml2::XMLElement *tsc) - : memspec(memspec), memconfig(memconfig), simconfig(simconfig), addressmapping(addressmapping), thermalsimconfig(tsc) {} + DramSetup():memspec(NULL),mcconfig(NULL),simconfig(NULL),addressmapping(NULL), thermalsimconfig(NULL) {} + DramSetup(tinyxml2::XMLElement* memspec, tinyxml2::XMLElement* mcconfig, tinyxml2::XMLElement* simconfig, tinyxml2::XMLElement* addressmapping, tinyxml2::XMLElement *tsc) + : memspec(memspec), mcconfig(mcconfig), simconfig(simconfig), addressmapping(addressmapping), thermalsimconfig(tsc) {} tinyxml2::XMLElement* memspec; - tinyxml2::XMLElement* memconfig; + tinyxml2::XMLElement* mcconfig; tinyxml2::XMLElement* simconfig; tinyxml2::XMLElement* addressmapping; tinyxml2::XMLElement* thermalsimconfig; diff --git a/DRAMSys/simulator/src/simulation/SimulationManager.cpp b/DRAMSys/simulator/src/simulation/SimulationManager.cpp index a03f87fa..7fd9b47b 100644 --- a/DRAMSys/simulator/src/simulation/SimulationManager.cpp +++ b/DRAMSys/simulator/src/simulation/SimulationManager.cpp @@ -108,8 +108,8 @@ void SimulationManager::parseSimulationBatch(XMLElement* simulation) XMLElement* addressmappings = simulation->FirstChildElement("addressmappings"); if(addressmappings == NULL) addressmappings = simulation; - XMLElement* memconfigs = simulation->FirstChildElement("memconfigs"); - if(memconfigs == NULL) memconfigs = simulation; + XMLElement* mcconfigs = simulation->FirstChildElement("mcconfigs"); + if(mcconfigs == NULL) mcconfigs = simulation; for (XMLElement* memspec = memspecs->FirstChildElement("memspec"); memspec != NULL; memspec = memspec->NextSiblingElement("memspec")) @@ -119,10 +119,10 @@ void SimulationManager::parseSimulationBatch(XMLElement* simulation) addressmapping = addressmapping->NextSiblingElement("addressmapping")) { - for (XMLElement* memconfig = memconfigs->FirstChildElement("memconfig"); - memconfig != NULL; memconfig = memconfig->NextSiblingElement("memconfig")) + for (XMLElement* mcconfig = mcconfigs->FirstChildElement("mcconfig"); + mcconfig != NULL; mcconfig = mcconfig->NextSiblingElement("mcconfig")) { - batch.dramSetups.push_back(DramSetup(memspec, memconfig, simconfig, addressmapping, thermalsimconfig)); + batch.dramSetups.push_back(DramSetup(memspec, mcconfig, simconfig, addressmapping, thermalsimconfig)); } } } diff --git a/DRAMSys/tests/TLM_compliance/fifoStrict.xml b/DRAMSys/tests/TLM_compliance/fifoStrict.xml index 826abe9d..dc5126eb 100644 --- a/DRAMSys/tests/TLM_compliance/fifoStrict.xml +++ b/DRAMSys/tests/TLM_compliance/fifoStrict.xml @@ -1,4 +1,4 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/tests/TLM_compliance/sim-batch.xml b/DRAMSys/tests/TLM_compliance/sim-batch.xml index 0d9d029d..98f51a71 100644 --- a/DRAMSys/tests/TLM_compliance/sim-batch.xml +++ b/DRAMSys/tests/TLM_compliance/sim-batch.xml @@ -38,9 +38,9 @@ - - - + + + diff --git a/DRAMSys/tests/error/fr_fcfs.xml b/DRAMSys/tests/error/fr_fcfs.xml index f5a42db0..0171f137 100644 --- a/DRAMSys/tests/error/fr_fcfs.xml +++ b/DRAMSys/tests/error/fr_fcfs.xml @@ -1,4 +1,4 @@ - + @@ -19,5 +19,5 @@ --> - + diff --git a/DRAMSys/tests/error/sim-batch.xml b/DRAMSys/tests/error/sim-batch.xml index 7b741534..67b89310 100644 --- a/DRAMSys/tests/error/sim-batch.xml +++ b/DRAMSys/tests/error/sim-batch.xml @@ -38,9 +38,9 @@ - - - + + + diff --git a/DRAMSys/tests/simple/fifoStrict.xml b/DRAMSys/tests/simple/fifoStrict.xml index 270d9037..a8f1e6d3 100644 --- a/DRAMSys/tests/simple/fifoStrict.xml +++ b/DRAMSys/tests/simple/fifoStrict.xml @@ -1,4 +1,4 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/tests/simple/sim-batch.xml b/DRAMSys/tests/simple/sim-batch.xml index f7efc847..616e95a0 100644 --- a/DRAMSys/tests/simple/sim-batch.xml +++ b/DRAMSys/tests/simple/sim-batch.xml @@ -38,9 +38,9 @@ - - - + + + diff --git a/DRAMSys/tests/timing_compliance/fifoStrict.xml b/DRAMSys/tests/timing_compliance/fifoStrict.xml index 46b65ad7..cba9c369 100644 --- a/DRAMSys/tests/timing_compliance/fifoStrict.xml +++ b/DRAMSys/tests/timing_compliance/fifoStrict.xml @@ -1,4 +1,4 @@ - + @@ -11,5 +11,5 @@ - + diff --git a/DRAMSys/tests/timing_compliance/sim-batch.xml b/DRAMSys/tests/timing_compliance/sim-batch.xml index acae2530..16c6b333 100644 --- a/DRAMSys/tests/timing_compliance/sim-batch.xml +++ b/DRAMSys/tests/timing_compliance/sim-batch.xml @@ -38,9 +38,9 @@ - - - + + + diff --git a/DRAMSys/tests/unit/mem_util.py b/DRAMSys/tests/unit/mem_util.py index cb487a37..2cafec98 100644 --- a/DRAMSys/tests/unit/mem_util.py +++ b/DRAMSys/tests/unit/mem_util.py @@ -35,21 +35,21 @@ import xml.etree.ElementTree as ET -class MemConfig(object): - """ Memory Configuration Class +class MCConfig(object): + """ Memory Controller Configuration Class The format used in memory specification XML files differs from the - format used in memory configuration XML files. Each class uses the - proper format when searching for elements. + format used in memory controller configuration XML files. Each class + uses the proper format when searching for elements. """ def getValue(self, id): - return self.xmlMemConfig.findall(id)[0].attrib['value'] + return self.xmlMCConfig.findall(id)[0].attrib['value'] def getIntValue(self, id): return int(self.getValue(id)) def __init__(self, xmlfile): - self.xmlMemConfig = ET.parse(xmlfile) + self.xmlMCConfig = ET.parse(xmlfile) class MemSpec(object): diff --git a/DRAMSys/tests/unit/unit_test.py b/DRAMSys/tests/unit/unit_test.py index aacc500b..b2d64341 100644 --- a/DRAMSys/tests/unit/unit_test.py +++ b/DRAMSys/tests/unit/unit_test.py @@ -49,7 +49,7 @@ tempfile.tempdir = os.getcwd() + '/' + rootdir builddir = tempfile.mkdtemp() simdir = builddir + '/simulator' -memConfigPath = rootdir + '/DRAMSys/simulator/resources/configs/memconfigs' +mcConfigPath = rootdir + '/DRAMSys/simulator/resources/configs/mcconfigs' memSpecsPath = rootdir + '/DRAMSys/simulator/resources/configs/memspecs' @@ -90,7 +90,7 @@ class TestOutput(unittest.TestCase): @unittest.skip("skipping this") class TestDummy(unittest.TestCase): def test_list_files(self): - for file in os.listdir(memConfigPath): + for file in os.listdir(mcConfigPath): if file.endswith(".xml"): print(file) for file in os.listdir(memSpecsPath):