diff --git a/configs/memspec/HBM3.json b/configs/memspec/HBM3.json index 16c18b75..beb83f01 100644 --- a/configs/memspec/HBM3.json +++ b/configs/memspec/HBM3.json @@ -13,7 +13,7 @@ "nbrOfChannels": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "", "memoryType": "HBM3", diff --git a/configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json index e4bdd037..5ffd1317 100644 --- a/configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json +++ b/configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-3200A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json index f719e72a..c94d640b 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-3200A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json index 359b362a..a5913b8a 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-3600A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json index 411f7e07..f48596fc 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-4000A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json index 9f270893..d1a93f20 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-4400A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json index b2ee9f4c..6424362d 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-4800A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json index f6195751..6bf5cb52 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-5200A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json index dac8025d..c207eac2 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-5600A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json index a916a36b..b3d03b9c 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-6000A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json index 3cd3e234..9ceca17c 100644 --- a/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json +++ b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x4x1Gbx8_DDR5-6400A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json index 8f72eba6..502313f6 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 32, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-3200A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json index dd7baaf9..dca9d207 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-3600A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json index c7f182eb..c74eb0bc 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-4000A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json index fe7878e2..6b9f3c45 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-4400A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json index c9b2f126..8a2d1ed3 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-4800A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json index 85b13eee..074ead09 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-5200A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json index 09418ff4..5a09329a 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-5600A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json index 420e23a5..a9f029df 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-6000A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json index c8d3f989..7a3a0186 100644 --- a/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json +++ b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-6400A", "memoryType": "DDR5", diff --git a/configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json index caa01d4c..1ab159ed 100644 --- a/configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json +++ b/configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 16, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x8x8Gbx4_DDR5-3200A_4bit", "memoryType": "DDR5", diff --git a/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp index ab201a8d..d09907f1 100644 --- a/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp +++ b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp @@ -66,7 +66,7 @@ MemSpecDDR5::MemSpecDDR5(const DRAMSys::Config::MemSpec &memSpec) refMode(memSpec.memarchitecturespec.entries.at("refMode")), RAAIMT(memSpec.memarchitecturespec.entries.at("RAAIMT")), RAAMMT(memSpec.memarchitecturespec.entries.at("RAAMMT")), - RAACDR(memSpec.memarchitecturespec.entries.at("RAACDR")), + RAADEC(memSpec.memarchitecturespec.entries.at("RAADEC")), tRCD (tCK * memSpec.memtimingspec.entries.at("RCD")), tPPD (tCK * memSpec.memtimingspec.entries.at("PPD")), tRP (tCK * memSpec.memtimingspec.entries.at("RP")), @@ -196,9 +196,9 @@ sc_time MemSpecDDR5::getRefreshIntervalSB() const return tREFIsb; } -unsigned MemSpecDDR5::getRAACDR() const +unsigned MemSpecDDR5::getRAADEC() const { - return RAACDR; + return RAADEC; } unsigned MemSpecDDR5::getRAAIMT() const diff --git a/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h index 485d229b..b8be3db3 100644 --- a/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h +++ b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h @@ -54,7 +54,7 @@ public: const unsigned refMode; const unsigned RAAIMT; const unsigned RAAMMT; - const unsigned RAACDR; + const unsigned RAADEC; // Memspec Variables: const sc_core::sc_time tRCD; @@ -119,7 +119,7 @@ public: sc_core::sc_time getRefreshIntervalAB() const override; sc_core::sc_time getRefreshIntervalSB() const override; - unsigned getRAACDR() const override; + unsigned getRAADEC() const override; unsigned getRAAIMT() const override; unsigned getRAAMMT() const override; diff --git a/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp index c717c23d..18c96690 100644 --- a/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp +++ b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp @@ -58,7 +58,7 @@ MemSpecHBM3::MemSpecHBM3(const DRAMSys::Config::MemSpec &memSpec) memSpec.memarchitecturespec.entries.at("nbrOfDevices")), RAAIMT(memSpec.memarchitecturespec.entries.at("RAAIMT")), RAAMMT(memSpec.memarchitecturespec.entries.at("RAAMMT")), - RAACDR(memSpec.memarchitecturespec.entries.at("RAACDR")), + RAADEC(memSpec.memarchitecturespec.entries.at("RAADEC")), tDQSCK (tCK * memSpec.memtimingspec.entries.at("DQSCK")), tRC (tCK * memSpec.memtimingspec.entries.at("RC")), tRAS (tCK * memSpec.memtimingspec.entries.at("RAS")), @@ -179,9 +179,9 @@ TimeInterval MemSpecHBM3::getIntervalOnDataStrobe(Command command, const tlm_gen } } -unsigned MemSpecHBM3::getRAACDR() const +unsigned MemSpecHBM3::getRAADEC() const { - return RAACDR; + return RAADEC; } unsigned MemSpecHBM3::getRAAIMT() const diff --git a/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h index 02126885..592e6353 100644 --- a/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h +++ b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h @@ -47,7 +47,7 @@ public: const unsigned RAAIMT; const unsigned RAAMMT; - const unsigned RAACDR; + const unsigned RAADEC; // Memspec Variables: const sc_core::sc_time tDQSCK; @@ -89,7 +89,7 @@ public: sc_core::sc_time getRefreshIntervalAB() const override; sc_core::sc_time getRefreshIntervalPB() const override; - unsigned getRAACDR() const override; + unsigned getRAADEC() const override; unsigned getRAAIMT() const override; unsigned getRAAMMT() const override; diff --git a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp index e27e22d1..665763f6 100644 --- a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp +++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp @@ -122,7 +122,7 @@ unsigned MemSpec::getPer2BankOffset() const return 0; } -unsigned MemSpec::getRAACDR() const +unsigned MemSpec::getRAADEC() const { SC_REPORT_FATAL("MemSpec", "Refresh Management not supported"); return 0; diff --git a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h index f431886a..21a105f4 100644 --- a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h +++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h @@ -92,7 +92,7 @@ public: virtual unsigned getRAAIMT() const; virtual unsigned getRAAMMT() const; - virtual unsigned getRAACDR() const; + virtual unsigned getRAADEC() const; virtual bool hasRasAndCasBus() const; diff --git a/src/libdramsys/DRAMSys/controller/BankMachine.cpp b/src/libdramsys/DRAMSys/controller/BankMachine.cpp index cd9ac0d1..bfa8e8ba 100644 --- a/src/libdramsys/DRAMSys/controller/BankMachine.cpp +++ b/src/libdramsys/DRAMSys/controller/BankMachine.cpp @@ -85,8 +85,8 @@ void BankMachine::update(Command command) if (refreshManagement) { - if (refreshManagementCounter > memSpec.getRAACDR()) - refreshManagementCounter -= memSpec.getRAACDR(); + if (refreshManagementCounter > memSpec.getRAADEC()) + refreshManagementCounter -= memSpec.getRAADEC(); else refreshManagementCounter = 0; } diff --git a/tests/tests_configuration/reference.json b/tests/tests_configuration/reference.json index 42d01beb..bac5c903 100644 --- a/tests/tests_configuration/reference.json +++ b/tests/tests_configuration/reference.json @@ -66,7 +66,7 @@ }, "memspec": { "memarchitecturespec": { - "RAACDR": 1, + "RAADEC": 1, "RAAIMT": 32, "RAAMMT": 96, "burstLength": 16, diff --git a/tests/tests_configuration/resources/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json b/tests/tests_configuration/resources/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json index 9b3e1e4e..548c990f 100644 --- a/tests/tests_configuration/resources/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json +++ b/tests/tests_configuration/resources/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json @@ -18,7 +18,7 @@ "refMode": 1, "RAAIMT" : 32, "RAAMMT" : 96, - "RAACDR" : 16 + "RAADEC" : 16 }, "memoryId": "JEDEC_2x8x2Gbx4_DDR5-3200A", "memoryType": "DDR5", diff --git a/tests/tests_configuration/test_configuration.cpp b/tests/tests_configuration/test_configuration.cpp index ca0430cf..cea44692 100644 --- a/tests/tests_configuration/test_configuration.cpp +++ b/tests/tests_configuration/test_configuration.cpp @@ -141,7 +141,7 @@ DRAMSys::Config::MemSpec ConfigurationTest::createMemSpec() {"refMode", 1}, {"RAAIMT", 32}, {"RAAMMT", 96}, - {"RAACDR", 1}}}; + {"RAADEC", 1}}}; MemTimingSpecType memTimingSpec{{{ {"RCD", 22}, {"PPD", 2}, {"RP", 22}, {"RAS", 52}, @@ -352,7 +352,7 @@ TEST_F(ConfigurationTest, MemSpec) { "memspec": { "memarchitecturespec": { - "RAACDR": 1, + "RAADEC": 1, "RAAIMT": 32, "RAAMMT": 96, "burstLength": 16,