Refactor configuration library

The configuration library has been refactored to make use of nlohmann
macros to reduce boilerplate code.
The nlohmann parser callback is used to decide whether to include
configuration json objects directly, or if they need to be loaded
from a sperate file.

extensions/apps/traceAnalyzer/simulationdialog.cpp

@@ -217,7 +217,7 @@ void SimulationDialog::saveConfiguration(QFile &file)
 
     loadConfigurationFromTextFields();
 
-    std::string dump = DRAMSys::Config::dump(configuration, 4);
+    std::string dump = nlohmann::json(configuration).dump(4);
     out << dump.c_str();
 }
 
@@ -252,13 +252,13 @@ void SimulationDialog::loadConfigurationFromTextFields()
 
     try
     {
-        from_dump(ui->addressMappingTextEdit->toPlainText().toStdString(), addressMapping);
-        from_dump(ui->mcConfigTextEdit->toPlainText().toStdString(), mcConfig);
-        from_dump(ui->memSpecTextEdit->toPlainText().toStdString(), memSpec);
-        from_dump(ui->simConfigTextEdit->toPlainText().toStdString(), simConfig);
+        nlohmann::json::parse(ui->addressMappingTextEdit->toPlainText().toStdString()).get_to(addressMapping);
+        nlohmann::json::parse(ui->mcConfigTextEdit->toPlainText().toStdString()).get_to(mcConfig);
+        nlohmann::json::parse(ui->memSpecTextEdit->toPlainText().toStdString()).get_to(memSpec);
+        nlohmann::json::parse(ui->simConfigTextEdit->toPlainText().toStdString()).get_to(simConfig);
 
         if (!ui->traceSetupTextEdit->toPlainText().toStdString().empty())
-            from_dump(ui->traceSetupTextEdit->toPlainText().toStdString(), traceSetup);
+            nlohmann::json::parse(ui->traceSetupTextEdit->toPlainText().toStdString()).get_to(traceSetup);
     }
     catch (const std::exception &e)
     {
@@ -300,9 +300,9 @@ void SimulationDialog::loadConfiguration()
 {
     ui->simulationIdLabel->setEnabled(true);
     ui->simulationId->setEnabled(true);
-    ui->simulationId->setText(configuration.simulationId.c_str());
+    ui->simulationId->setText(configuration.simulationid.c_str());
 
-    ui->simulationIdLineEdit->setText(configuration.simulationId.c_str());
+    ui->simulationIdLineEdit->setText(configuration.simulationid.c_str());
 
     loadSimConfig();
     loadMcConfig();
@@ -316,7 +316,7 @@ void SimulationDialog::loadSimConfig()
 {
     ui->simConfigTextEdit->clear();
 
-    std::string dump = DRAMSys::Config::dump(configuration.simConfig, 4);
+    std::string dump = nlohmann::json(configuration.simconfig).dump(4);
     ui->simConfigTextEdit->setText(dump.c_str());
 }
 
@@ -324,7 +324,7 @@ void SimulationDialog::loadMcConfig()
 {
     ui->mcConfigTextEdit->clear();
 
-    std::string dump = DRAMSys::Config::dump(configuration.mcConfig, 4);
+    std::string dump = nlohmann::json(configuration.mcconfig).dump(4);
     ui->mcConfigTextEdit->setText(dump.c_str());
 }
 
@@ -332,7 +332,7 @@ void SimulationDialog::loadMemSpec()
 {
     ui->memSpecTextEdit->clear();
 
-    std::string dump = DRAMSys::Config::dump(configuration.memSpec, 4);
+    std::string dump = nlohmann::json(configuration.memspec).dump(4);
     ui->memSpecTextEdit->setText(dump.c_str());
 }
 
@@ -340,7 +340,7 @@ void SimulationDialog::loadAddressMapping()
 {
     ui->addressMappingTextEdit->clear();
 
-    std::string dump = DRAMSys::Config::dump(configuration.addressMapping, 4);
+    std::string dump = nlohmann::json(configuration.addressmapping).dump(4);
     ui->addressMappingTextEdit->setText(dump.c_str());
 }
 
@@ -348,9 +348,9 @@ void SimulationDialog::loadTraceSetup()
 {
     ui->traceSetupTextEdit->clear();
 
-    if (const auto &traceSetup = configuration.traceSetup)
+    if (const auto &traceSetup = configuration.tracesetup)
     {
-        std::string dump = DRAMSys::Config::dump(*traceSetup, 4);
+        std::string dump = nlohmann::json(*traceSetup).dump(4);
         ui->traceSetupTextEdit->setText(dump.c_str());
     }
 }
@@ -359,7 +359,7 @@ void SimulationDialog::loadPreview()
 {
     ui->previewTextEdit->clear();
 
-    std::string dump = DRAMSys::Config::dump(configuration, 4);
+    std::string dump = nlohmann::json(configuration).dump(4);
     ui->previewTextEdit->setText(dump.c_str());
 }
 
@@ -372,7 +372,7 @@ QFileInfoList SimulationDialog::getSimulationResults()
 
     for (const auto &fileInfo : baseDir.entryInfoList())
     {
-        if (fileInfo.baseName().startsWith(configuration.simulationId.c_str()))
+        if (fileInfo.baseName().startsWith(configuration.simulationid.c_str()))
         {
             // Dont open tracefiles that are older than a few seconds
             if (fileInfo.metadataChangeTime().secsTo(QDateTime::currentDateTime()) > 30)

extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp

@@ -45,80 +45,80 @@ using namespace tlm;
 
 MemSpecDDR5::MemSpecDDR5(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::DDR5,
-      memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfChannels"),
       1,
-      memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          / memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfDevices")),
-      dimmRanksPerChannel(memSpec.memArchitectureSpec.entries.at("nbrOfDIMMRanks")),
-      physicalRanksPerDimmRank(memSpec.memArchitectureSpec.entries.at("nbrOfPhysicalRanks")),
+      memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          / memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          * memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups")
+          * memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfDevices")),
+      dimmRanksPerChannel(memSpec.memarchitecturespec.entries.at("nbrOfDIMMRanks")),
+      physicalRanksPerDimmRank(memSpec.memarchitecturespec.entries.at("nbrOfPhysicalRanks")),
       physicalRanksPerChannel(physicalRanksPerDimmRank * dimmRanksPerChannel),
-      logicalRanksPerPhysicalRank(memSpec.memArchitectureSpec.entries.at("nbrOfLogicalRanks")),
+      logicalRanksPerPhysicalRank(memSpec.memarchitecturespec.entries.at("nbrOfLogicalRanks")),
       logicalRanksPerChannel(logicalRanksPerPhysicalRank * physicalRanksPerChannel),
-      cmdMode(memSpec.memArchitectureSpec.entries.at("cmdMode")),
-      refMode(memSpec.memArchitectureSpec.entries.at("refMode")),
-      RAAIMT(memSpec.memArchitectureSpec.entries.at("RAAIMT")),
-      RAAMMT(memSpec.memArchitectureSpec.entries.at("RAAMMT")),
-      RAACDR(memSpec.memArchitectureSpec.entries.at("RAACDR")),
-      tRCD           (tCK * memSpec.memTimingSpec.entries.at("RCD")),
-      tPPD           (tCK * memSpec.memTimingSpec.entries.at("PPD")),
-      tRP            (tCK * memSpec.memTimingSpec.entries.at("RP")),
-      tRAS           (tCK * memSpec.memTimingSpec.entries.at("RAS")),
+      cmdMode(memSpec.memarchitecturespec.entries.at("cmdMode")),
+      refMode(memSpec.memarchitecturespec.entries.at("refMode")),
+      RAAIMT(memSpec.memarchitecturespec.entries.at("RAAIMT")),
+      RAAMMT(memSpec.memarchitecturespec.entries.at("RAAMMT")),
+      RAACDR(memSpec.memarchitecturespec.entries.at("RAACDR")),
+      tRCD           (tCK * memSpec.memtimingspec.entries.at("RCD")),
+      tPPD           (tCK * memSpec.memtimingspec.entries.at("PPD")),
+      tRP            (tCK * memSpec.memtimingspec.entries.at("RP")),
+      tRAS           (tCK * memSpec.memtimingspec.entries.at("RAS")),
       tRC            (tRAS + tRP),
-      tRL            (tCK * memSpec.memTimingSpec.entries.at("RL")),
-      tRTP           (tCK * memSpec.memTimingSpec.entries.at("RTP")),
-      tRPRE          (tCK * memSpec.memTimingSpec.entries.at("RPRE")),
-      tRPST          (tCK * memSpec.memTimingSpec.entries.at("RPST")),
-      tRDDQS         (tCK * memSpec.memTimingSpec.entries.at("RDDQS")),
-      tWL            (tCK * memSpec.memTimingSpec.entries.at("WL")),
-      tWPRE          (tCK * memSpec.memTimingSpec.entries.at("WPRE")),
-      tWPST          (tCK * memSpec.memTimingSpec.entries.at("WPST")),
-      tWR            (tCK * memSpec.memTimingSpec.entries.at("WR")),
-      tCCD_L_slr     (tCK * memSpec.memTimingSpec.entries.at("CCD_L_slr")),
-      tCCD_L_WR_slr  (tCK * memSpec.memTimingSpec.entries.at("CCD_L_WR_slr")),
-      tCCD_L_WR2_slr (tCK * memSpec.memTimingSpec.entries.at("CCD_L_WR2_slr")),
-      tCCD_M_slr     (tCK * memSpec.memTimingSpec.entries.at("CCD_M_slr")),
-      tCCD_M_WR_slr  (tCK * memSpec.memTimingSpec.entries.at("CCD_M_WR_slr")),
-      tCCD_S_slr     (tCK * memSpec.memTimingSpec.entries.at("CCD_S_slr")),
-      tCCD_S_WR_slr  (tCK * memSpec.memTimingSpec.entries.at("CCD_S_WR_slr")),
-      tCCD_dlr       (tCK * memSpec.memTimingSpec.entries.at("CCD_dlr")),
-      tCCD_WR_dlr    (tCK * memSpec.memTimingSpec.entries.at("CCD_WR_dlr")),
-      tCCD_WR_dpr    (tCK * memSpec.memTimingSpec.entries.at("CCD_WR_dpr")),
-      tRRD_L_slr     (tCK * memSpec.memTimingSpec.entries.at("RRD_L_slr")),
-      tRRD_S_slr     (tCK * memSpec.memTimingSpec.entries.at("RRD_S_slr")),
-      tRRD_dlr       (tCK * memSpec.memTimingSpec.entries.at("RRD_dlr")),
-      tFAW_slr       (tCK * memSpec.memTimingSpec.entries.at("FAW_slr")),
-      tFAW_dlr       (tCK * memSpec.memTimingSpec.entries.at("FAW_dlr")),
-      tWTR_L         (tCK * memSpec.memTimingSpec.entries.at("WTR_L")),
-      tWTR_M         (tCK * memSpec.memTimingSpec.entries.at("WTR_M")),
-      tWTR_S         (tCK * memSpec.memTimingSpec.entries.at("WTR_S")),
-      tRFC_slr       ((refMode == 1) ? tCK * memSpec.memTimingSpec.entries.at("RFC1_slr")
-                             : tCK * memSpec.memTimingSpec.entries.at("RFC2_slr")),
-      tRFC_dlr       ((refMode == 1) ? tCK * memSpec.memTimingSpec.entries.at("RFC1_dlr")
-                             : tCK * memSpec.memTimingSpec.entries.at("RFC2_dlr")),
-      tRFC_dpr       ((refMode == 1) ? tCK * memSpec.memTimingSpec.entries.at("RFC1_dpr")
-                             : tCK * memSpec.memTimingSpec.entries.at("RFC2_dpr")),
-      tRFCsb_slr     (tCK * memSpec.memTimingSpec.entries.at("RFCsb_slr")),
-      tRFCsb_dlr     (tCK * memSpec.memTimingSpec.entries.at("RFCsb_dlr")),
-      tREFI          ((refMode == 1) ? tCK * memSpec.memTimingSpec.entries.at("REFI1")
-                             : tCK * memSpec.memTimingSpec.entries.at("REFI2")),
-      tREFIsb        (tCK * memSpec.memTimingSpec.entries.at("REFISB")),
-      tREFSBRD_slr   (tCK * memSpec.memTimingSpec.entries.at("REFSBRD_slr")),
-      tREFSBRD_dlr   (tCK * memSpec.memTimingSpec.entries.at("REFSBRD_dlr")),
-      tRTRS          (tCK * memSpec.memTimingSpec.entries.at("RTRS")),
-      tCPDED         (tCK * memSpec.memTimingSpec.entries.at("CPDED")),
-      tPD            (tCK * memSpec.memTimingSpec.entries.at("PD")),
-      tXP            (tCK * memSpec.memTimingSpec.entries.at("XP")),
-      tACTPDEN       (tCK * memSpec.memTimingSpec.entries.at("ACTPDEN")),
-      tPRPDEN        (tCK * memSpec.memTimingSpec.entries.at("PRPDEN")),
-      tREFPDEN       (tCK * memSpec.memTimingSpec.entries.at("REFPDEN")),
+      tRL            (tCK * memSpec.memtimingspec.entries.at("RL")),
+      tRTP           (tCK * memSpec.memtimingspec.entries.at("RTP")),
+      tRPRE          (tCK * memSpec.memtimingspec.entries.at("RPRE")),
+      tRPST          (tCK * memSpec.memtimingspec.entries.at("RPST")),
+      tRDDQS         (tCK * memSpec.memtimingspec.entries.at("RDDQS")),
+      tWL            (tCK * memSpec.memtimingspec.entries.at("WL")),
+      tWPRE          (tCK * memSpec.memtimingspec.entries.at("WPRE")),
+      tWPST          (tCK * memSpec.memtimingspec.entries.at("WPST")),
+      tWR            (tCK * memSpec.memtimingspec.entries.at("WR")),
+      tCCD_L_slr     (tCK * memSpec.memtimingspec.entries.at("CCD_L_slr")),
+      tCCD_L_WR_slr  (tCK * memSpec.memtimingspec.entries.at("CCD_L_WR_slr")),
+      tCCD_L_WR2_slr (tCK * memSpec.memtimingspec.entries.at("CCD_L_WR2_slr")),
+      tCCD_M_slr     (tCK * memSpec.memtimingspec.entries.at("CCD_M_slr")),
+      tCCD_M_WR_slr  (tCK * memSpec.memtimingspec.entries.at("CCD_M_WR_slr")),
+      tCCD_S_slr     (tCK * memSpec.memtimingspec.entries.at("CCD_S_slr")),
+      tCCD_S_WR_slr  (tCK * memSpec.memtimingspec.entries.at("CCD_S_WR_slr")),
+      tCCD_dlr       (tCK * memSpec.memtimingspec.entries.at("CCD_dlr")),
+      tCCD_WR_dlr    (tCK * memSpec.memtimingspec.entries.at("CCD_WR_dlr")),
+      tCCD_WR_dpr    (tCK * memSpec.memtimingspec.entries.at("CCD_WR_dpr")),
+      tRRD_L_slr     (tCK * memSpec.memtimingspec.entries.at("RRD_L_slr")),
+      tRRD_S_slr     (tCK * memSpec.memtimingspec.entries.at("RRD_S_slr")),
+      tRRD_dlr       (tCK * memSpec.memtimingspec.entries.at("RRD_dlr")),
+      tFAW_slr       (tCK * memSpec.memtimingspec.entries.at("FAW_slr")),
+      tFAW_dlr       (tCK * memSpec.memtimingspec.entries.at("FAW_dlr")),
+      tWTR_L         (tCK * memSpec.memtimingspec.entries.at("WTR_L")),
+      tWTR_M         (tCK * memSpec.memtimingspec.entries.at("WTR_M")),
+      tWTR_S         (tCK * memSpec.memtimingspec.entries.at("WTR_S")),
+      tRFC_slr       ((refMode == 1) ? tCK * memSpec.memtimingspec.entries.at("RFC1_slr")
+                             : tCK * memSpec.memtimingspec.entries.at("RFC2_slr")),
+      tRFC_dlr       ((refMode == 1) ? tCK * memSpec.memtimingspec.entries.at("RFC1_dlr")
+                             : tCK * memSpec.memtimingspec.entries.at("RFC2_dlr")),
+      tRFC_dpr       ((refMode == 1) ? tCK * memSpec.memtimingspec.entries.at("RFC1_dpr")
+                             : tCK * memSpec.memtimingspec.entries.at("RFC2_dpr")),
+      tRFCsb_slr     (tCK * memSpec.memtimingspec.entries.at("RFCsb_slr")),
+      tRFCsb_dlr     (tCK * memSpec.memtimingspec.entries.at("RFCsb_dlr")),
+      tREFI          ((refMode == 1) ? tCK * memSpec.memtimingspec.entries.at("REFI1")
+                             : tCK * memSpec.memtimingspec.entries.at("REFI2")),
+      tREFIsb        (tCK * memSpec.memtimingspec.entries.at("REFISB")),
+      tREFSBRD_slr   (tCK * memSpec.memtimingspec.entries.at("REFSBRD_slr")),
+      tREFSBRD_dlr   (tCK * memSpec.memtimingspec.entries.at("REFSBRD_dlr")),
+      tRTRS          (tCK * memSpec.memtimingspec.entries.at("RTRS")),
+      tCPDED         (tCK * memSpec.memtimingspec.entries.at("CPDED")),
+      tPD            (tCK * memSpec.memtimingspec.entries.at("PD")),
+      tXP            (tCK * memSpec.memtimingspec.entries.at("XP")),
+      tACTPDEN       (tCK * memSpec.memtimingspec.entries.at("ACTPDEN")),
+      tPRPDEN        (tCK * memSpec.memtimingspec.entries.at("PRPDEN")),
+      tREFPDEN       (tCK * memSpec.memtimingspec.entries.at("REFPDEN")),
       shortCmdOffset (cmdMode == 2 ? 1 * tCK : 0 * tCK),
       longCmdOffset  (cmdMode == 2 ? 3 * tCK : 1 * tCK),
       tBURST16       (tCK * 8),

extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp

@@ -44,51 +44,51 @@ using namespace tlm;
 
 MemSpecHBM3::MemSpecHBM3(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::HBM3,
-      memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          / memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfDevices")),
-      RAAIMT(memSpec.memArchitectureSpec.entries.at("RAAIMT")),
-      RAAMMT(memSpec.memArchitectureSpec.entries.at("RAAMMT")),
-      RAACDR(memSpec.memArchitectureSpec.entries.at("RAACDR")),
-      tDQSCK  (tCK * memSpec.memTimingSpec.entries.at("DQSCK")),
-      tRC     (tCK * memSpec.memTimingSpec.entries.at("RC")),
-      tRAS    (tCK * memSpec.memTimingSpec.entries.at("RAS")),
-      tRCDRD  (tCK * memSpec.memTimingSpec.entries.at("RCDRD")),
-      tRCDWR  (tCK * memSpec.memTimingSpec.entries.at("RCDWR")),
-      tRRDL   (tCK * memSpec.memTimingSpec.entries.at("RRDL")),
-      tRRDS   (tCK * memSpec.memTimingSpec.entries.at("RRDS")),
-      tFAW    (tCK * memSpec.memTimingSpec.entries.at("FAW")),
-      tRTP    (tCK * memSpec.memTimingSpec.entries.at("RTP")),
-      tRP     (tCK * memSpec.memTimingSpec.entries.at("RP")),
-      tRL     (tCK * memSpec.memTimingSpec.entries.at("RL")),
-      tWL     (tCK * memSpec.memTimingSpec.entries.at("WL")),
-      tPL     (tCK * memSpec.memTimingSpec.entries.at("PL")),
-      tWR     (tCK * memSpec.memTimingSpec.entries.at("WR")),
-      tCCDL   (tCK * memSpec.memTimingSpec.entries.at("CCDL")),
-      tCCDS   (tCK * memSpec.memTimingSpec.entries.at("CCDS")),
-      tWTRL   (tCK * memSpec.memTimingSpec.entries.at("WTRL")),
-      tWTRS   (tCK * memSpec.memTimingSpec.entries.at("WTRS")),
-      tRTW    (tCK * memSpec.memTimingSpec.entries.at("RTW")),
-      tXP     (tCK * memSpec.memTimingSpec.entries.at("XP")),
-      tCKE    (tCK * memSpec.memTimingSpec.entries.at("CKE")),
+      memSpec.memarchitecturespec.entries.at("nbrOfChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfPseudoChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfPseudoChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          / memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          * memSpec.memarchitecturespec.entries.at("nbrOfPseudoChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups")
+          * memSpec.memarchitecturespec.entries.at("nbrOfPseudoChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfDevices")),
+      RAAIMT(memSpec.memarchitecturespec.entries.at("RAAIMT")),
+      RAAMMT(memSpec.memarchitecturespec.entries.at("RAAMMT")),
+      RAACDR(memSpec.memarchitecturespec.entries.at("RAACDR")),
+      tDQSCK  (tCK * memSpec.memtimingspec.entries.at("DQSCK")),
+      tRC     (tCK * memSpec.memtimingspec.entries.at("RC")),
+      tRAS    (tCK * memSpec.memtimingspec.entries.at("RAS")),
+      tRCDRD  (tCK * memSpec.memtimingspec.entries.at("RCDRD")),
+      tRCDWR  (tCK * memSpec.memtimingspec.entries.at("RCDWR")),
+      tRRDL   (tCK * memSpec.memtimingspec.entries.at("RRDL")),
+      tRRDS   (tCK * memSpec.memtimingspec.entries.at("RRDS")),
+      tFAW    (tCK * memSpec.memtimingspec.entries.at("FAW")),
+      tRTP    (tCK * memSpec.memtimingspec.entries.at("RTP")),
+      tRP     (tCK * memSpec.memtimingspec.entries.at("RP")),
+      tRL     (tCK * memSpec.memtimingspec.entries.at("RL")),
+      tWL     (tCK * memSpec.memtimingspec.entries.at("WL")),
+      tPL     (tCK * memSpec.memtimingspec.entries.at("PL")),
+      tWR     (tCK * memSpec.memtimingspec.entries.at("WR")),
+      tCCDL   (tCK * memSpec.memtimingspec.entries.at("CCDL")),
+      tCCDS   (tCK * memSpec.memtimingspec.entries.at("CCDS")),
+      tWTRL   (tCK * memSpec.memtimingspec.entries.at("WTRL")),
+      tWTRS   (tCK * memSpec.memtimingspec.entries.at("WTRS")),
+      tRTW    (tCK * memSpec.memtimingspec.entries.at("RTW")),
+      tXP     (tCK * memSpec.memtimingspec.entries.at("XP")),
+      tCKE    (tCK * memSpec.memtimingspec.entries.at("CKE")),
       tPD     (tCKE),
       tCKESR  (tCKE + tCK),
-      tXS     (tCK * memSpec.memTimingSpec.entries.at("XS")),
-      tRFC    (tCK * memSpec.memTimingSpec.entries.at("RFC")),
-      tRFCPB  (tCK * memSpec.memTimingSpec.entries.at("RFCPB")),
-      tRREFD  (tCK * memSpec.memTimingSpec.entries.at("RREFD")),
-      tREFI   (tCK * memSpec.memTimingSpec.entries.at("REFI")),
-      tREFIPB (tCK * memSpec.memTimingSpec.entries.at("REFIPB")),
-      tPPD    (tCK * memSpec.memTimingSpec.entries.at("PPD"))
+      tXS     (tCK * memSpec.memtimingspec.entries.at("XS")),
+      tRFC    (tCK * memSpec.memtimingspec.entries.at("RFC")),
+      tRFCPB  (tCK * memSpec.memtimingspec.entries.at("RFCPB")),
+      tRREFD  (tCK * memSpec.memtimingspec.entries.at("RREFD")),
+      tREFI   (tCK * memSpec.memtimingspec.entries.at("REFI")),
+      tREFIPB (tCK * memSpec.memtimingspec.entries.at("REFIPB")),
+      tPPD    (tCK * memSpec.memtimingspec.entries.at("PPD"))
 {
     commandLengthInCycles[Command::ACT] = 1.5;
     commandLengthInCycles[Command::PREPB] = 0.5;

extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.cpp

@@ -44,42 +44,42 @@ using namespace tlm;
 
 MemSpecLPDDR5::MemSpecLPDDR5(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::LPDDR5,
-      memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
+      memSpec.memarchitecturespec.entries.at("nbrOfChannels"),
       1,
-      memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          / memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBanks")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfBankGroups")
-          * memSpec.memArchitectureSpec.entries.at("nbrOfRanks"),
-      memSpec.memArchitectureSpec.entries.at("nbrOfDevices")),
-      per2BankOffset(memSpec.memArchitectureSpec.entries.at("per2BankOffset")),
-      tREFI   (tCK * memSpec.memTimingSpec.entries.at("REFI")),
-      tREFIpb (tCK * memSpec.memTimingSpec.entries.at("REFIpb")),
-      tRFCab  (tCK * memSpec.memTimingSpec.entries.at("RFCab")),
-      tRFCpb  (tCK * memSpec.memTimingSpec.entries.at("RFCpb")),
-      tRPab   (tCK * memSpec.memTimingSpec.entries.at("RPab")),
-      tRPpb   (tCK * memSpec.memTimingSpec.entries.at("RPpb")),
-      tRCab   (tCK * memSpec.memTimingSpec.entries.at("RCab")),
-      tRCpb   (tCK * memSpec.memTimingSpec.entries.at("RCpb")),
-      tPPD    (tCK * memSpec.memTimingSpec.entries.at("PPD")),
-      tRAS    (tCK * memSpec.memTimingSpec.entries.at("RAS")),
-      tRCD_L  (tCK * memSpec.memTimingSpec.entries.at("RCD_L")),
-      tRCD_S  (tCK * memSpec.memTimingSpec.entries.at("RCD_S")),
-      tFAW    (tCK * memSpec.memTimingSpec.entries.at("FAW")),
-      tRRD    (tCK * memSpec.memTimingSpec.entries.at("RRD")),
+      memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          / memSpec.memarchitecturespec.entries.at("nbrOfBankGroups"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBanks")
+          * memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfBankGroups")
+          * memSpec.memarchitecturespec.entries.at("nbrOfRanks"),
+      memSpec.memarchitecturespec.entries.at("nbrOfDevices")),
+      per2BankOffset(memSpec.memarchitecturespec.entries.at("per2BankOffset")),
+      tREFI   (tCK * memSpec.memtimingspec.entries.at("REFI")),
+      tREFIpb (tCK * memSpec.memtimingspec.entries.at("REFIpb")),
+      tRFCab  (tCK * memSpec.memtimingspec.entries.at("RFCab")),
+      tRFCpb  (tCK * memSpec.memtimingspec.entries.at("RFCpb")),
+      tRPab   (tCK * memSpec.memtimingspec.entries.at("RPab")),
+      tRPpb   (tCK * memSpec.memtimingspec.entries.at("RPpb")),
+      tRCab   (tCK * memSpec.memtimingspec.entries.at("RCab")),
+      tRCpb   (tCK * memSpec.memtimingspec.entries.at("RCpb")),
+      tPPD    (tCK * memSpec.memtimingspec.entries.at("PPD")),
+      tRAS    (tCK * memSpec.memtimingspec.entries.at("RAS")),
+      tRCD_L  (tCK * memSpec.memtimingspec.entries.at("RCD_L")),
+      tRCD_S  (tCK * memSpec.memtimingspec.entries.at("RCD_S")),
+      tFAW    (tCK * memSpec.memtimingspec.entries.at("FAW")),
+      tRRD    (tCK * memSpec.memtimingspec.entries.at("RRD")),
       //tCCD    (tCK * parseUint(memspec["memtimingspec"], "CCD")),
-      tRL     (tCK * memSpec.memTimingSpec.entries.at("RL")),
+      tRL     (tCK * memSpec.memtimingspec.entries.at("RL")),
       //tRPST   (tCK * parseUint(memspec["memtimingspec"], "RPST")),
       //tDQSCK  (tCK * parseUint(memspec["memtimingspec"], "DQSCK")),
-      tRBTP    (tCK * memSpec.memTimingSpec.entries.at("RBTP")),
-      tWL     (tCK * memSpec.memTimingSpec.entries.at("WL")),
+      tRBTP    (tCK * memSpec.memtimingspec.entries.at("RBTP")),
+      tWL     (tCK * memSpec.memtimingspec.entries.at("WL")),
       //tDQSS   (tCK * parseUint(memspec["memtimingspec"], "DQSS")),
       //tDQS2DQ (tCK * parseUint(memspec["memtimingspec"], "DQS2DQ")),
-      tWR     (tCK * memSpec.memTimingSpec.entries.at("WR")),
+      tWR     (tCK * memSpec.memtimingspec.entries.at("WR")),
       //tWPRE   (tCK * parseUint(memspec["memtimingspec"], "WPRE")),
       //tWTR    (tCK * parseUint(memspec["memtimingspec"], "WTR")),
       //tXP     (tCK * parseUint(memspec["memtimingspec"] "XP")),
@@ -88,20 +88,20 @@ MemSpecLPDDR5::MemSpecLPDDR5(const DRAMSys::Config::MemSpec &memSpec)
       //tESCKE  (tCK * parseUint(memspec["memtimingspec"], "ESCKE")),
       //tCKE    (tCK * parseUint(memspec["memtimingspec"], "CKE")),
       //tCMDCKE (tCK * parseUint(memspec["memtimingspec"], "CMDCKE")),
-      BL_n_min_16(tCK * memSpec.memTimingSpec.entries.at("BL_n_min_16")),
-      BL_n_max_16(tCK * memSpec.memTimingSpec.entries.at("BL_n_max_16")),
-      BL_n_L_16(tCK * memSpec.memTimingSpec.entries.at("BL_n_L_16")),
-      BL_n_S_16(tCK * memSpec.memTimingSpec.entries.at("BL_n_S_16")),
-      BL_n_min_32(tCK * memSpec.memTimingSpec.entries.at("BL_n_min_32")),
-      BL_n_max_32(tCK * memSpec.memTimingSpec.entries.at("BL_n_max_32")),
-      BL_n_L_32(tCK * memSpec.memTimingSpec.entries.at("BL_n_L_32")),
-      BL_n_S_32(tCK * memSpec.memTimingSpec.entries.at("BL_n_S_32")),
-      tWTR_L   (tCK * memSpec.memTimingSpec.entries.at("WTR_L")),
-      tWTR_S   (tCK * memSpec.memTimingSpec.entries.at("WTR_S")),
-      tWCK2DQO(tCK * memSpec.memTimingSpec.entries.at("WCK2DQO")),
-      tpbR2act(tCK * memSpec.memTimingSpec.entries.at("pbR2act")),
-      tpbR2pbR(tCK * memSpec.memTimingSpec.entries.at("pbR2pbR")),
-      tRTRS   (tCK * memSpec.memTimingSpec.entries.at("RTRS")),
+      BL_n_min_16(tCK * memSpec.memtimingspec.entries.at("BL_n_min_16")),
+      BL_n_max_16(tCK * memSpec.memtimingspec.entries.at("BL_n_max_16")),
+      BL_n_L_16(tCK * memSpec.memtimingspec.entries.at("BL_n_L_16")),
+      BL_n_S_16(tCK * memSpec.memtimingspec.entries.at("BL_n_S_16")),
+      BL_n_min_32(tCK * memSpec.memtimingspec.entries.at("BL_n_min_32")),
+      BL_n_max_32(tCK * memSpec.memtimingspec.entries.at("BL_n_max_32")),
+      BL_n_L_32(tCK * memSpec.memtimingspec.entries.at("BL_n_L_32")),
+      BL_n_S_32(tCK * memSpec.memtimingspec.entries.at("BL_n_S_32")),
+      tWTR_L   (tCK * memSpec.memtimingspec.entries.at("WTR_L")),
+      tWTR_S   (tCK * memSpec.memtimingspec.entries.at("WTR_S")),
+      tWCK2DQO(tCK * memSpec.memtimingspec.entries.at("WCK2DQO")),
+      tpbR2act(tCK * memSpec.memtimingspec.entries.at("pbR2act")),
+      tpbR2pbR(tCK * memSpec.memtimingspec.entries.at("pbR2pbR")),
+      tRTRS   (tCK * memSpec.memtimingspec.entries.at("RTRS")),
       tBURST16(tCK * 16 / dataRate),
       tBURST32(tCK * 32 / dataRate),
       bankMode(groupsPerRank != 1 ? BankMode::MBG : (banksPerRank == 16 ? BankMode::M16B : BankMode::M8B))