Merge pull request #11 from tukl-msd/feat/RefModeEnums

add RefMode enums for DDR4 and DDR5

Author: derchr

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h

@@ -45,6 +45,20 @@
 
 namespace DRAMUtils::MemSpec {
 
+enum class RefModeTypeDDR4
+{
+    INVALID = -1,
+    REF_MODE_1 = 1,
+    REF_MODE_2 = 2,
+    REF_MODE_4 = 4
+};
+NLOHMANN_JSON_SERIALIZE_ENUM(RefModeTypeDDR4, {
+    {RefModeTypeDDR4::INVALID, nullptr},
+    {RefModeTypeDDR4::REF_MODE_1, 1},
+    {RefModeTypeDDR4::REF_MODE_2, 2},
+    {RefModeTypeDDR4::REF_MODE_4, 4},
+})
+
 struct MemArchitectureSpecTypeDDR4
 {
     uint64_t nbrOfChannels;
@@ -57,7 +71,7 @@ struct MemArchitectureSpecTypeDDR4
     uint64_t burstLength;
     uint64_t dataRate;
     uint64_t width;
-    uint64_t RefMode;
+    RefModeTypeDDR4 RefMode;
     std::optional<uint64_t> maxBurstLength;
 };
 NLOHMANN_JSONIFY_ALL_THINGS(MemArchitectureSpecTypeDDR4, nbrOfChannels, nbrOfDevices, nbrOfRanks, nbrOfBanks, nbrOfBankGroups, nbrOfRows, nbrOfColumns, burstLength, dataRate, width, RefMode, maxBurstLength)
@@ -78,11 +92,10 @@ struct MemTimingSpecTypeDDR4
     uint64_t    WR;
     uint64_t    XP;
     uint64_t    XS;
-    uint64_t    REFM;
     uint64_t    REFI;
-    uint64_t    RFC1;
-    uint64_t    RFC2;
-    uint64_t    RFC4;
+    uint64_t    RFC1; // RefModeTypeDDR4::REF_MODE_1 || RefModeTypeDDR4::INVALID
+    uint64_t    RFC2; // RefModeTypeDDR4::REF_MODE_2
+    uint64_t    RFC4; // RefModeTypeDDR4::REF_MODE_4
     uint64_t    RP;
     uint64_t    DQSCK;
     uint64_t    CCD_S;
@@ -100,7 +113,7 @@ struct MemTimingSpecTypeDDR4
     uint64_t    REFPDEN;
     uint64_t    RTRS;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemTimingSpecTypeDDR4, tCK, CKE, CKESR, RAS, RC, RCD, RL, RPRE, RTP, WL, WPRE, WR, XP, XS, REFM, REFI, RFC1, RFC2, RFC4, RP, DQSCK, CCD_S, CCD_L, FAW, RRD_S, RRD_L, WTR_S, WTR_L, XPDLL, XSDLL, AL, ACTPDEN, PRPDEN, REFPDEN, RTRS)
+NLOHMANN_JSONIFY_ALL_THINGS(MemTimingSpecTypeDDR4, tCK, CKE, CKESR, RAS, RC, RCD, RL, RPRE, RTP, WL, WPRE, WR, XP, XS, REFI, RFC1, RFC2, RFC4, RP, DQSCK, CCD_S, CCD_L, FAW, RRD_S, RRD_L, WTR_S, WTR_L, XPDLL, XSDLL, AL, ACTPDEN, PRPDEN, REFPDEN, RTRS)
 
 struct MemPowerSpecTypeDDR4
 {
@@ -124,15 +137,15 @@ struct MemPowerSpecTypeDDR4
     double ipp2p;
     double ipp3p;
 
-    // MemArchitectureSpecTypeDDR4::RefMode==1
+    // RefModeTypeDDR4::REF_MODE_1 || RefModeTypeDDR4::INVALID
     double idd5B;
     double ipp5B;
 
-    // MemArchitectureSpecTypeDDR4::RefMode==2
+    // RefModeTypeDDR4::REF_MODE_2
     double idd5F2;
     double ipp5F2;
 
-    // MemArchitectureSpecTypeDDR4::RefMode==4
+    // RefModeTypeDDR4::REF_MODE_4
     double idd5F4;
     double ipp5F4;
 

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h

@@ -44,6 +44,18 @@
 
 namespace DRAMUtils::MemSpec {
 
+enum class RefModeTypeDDR5
+{
+    INVALID = -1,
+    REF_MODE_1 = 1,
+    REF_MODE_2 = 2,
+};
+NLOHMANN_JSON_SERIALIZE_ENUM(RefModeTypeDDR5, {
+    {RefModeTypeDDR5::INVALID, nullptr},
+    {RefModeTypeDDR5::REF_MODE_1, 1},
+    {RefModeTypeDDR5::REF_MODE_2, 2},
+})
+
 struct MemArchitectureSpecTypeDDR5
 {
     uint64_t nbrOfChannels;
@@ -59,7 +71,7 @@ struct MemArchitectureSpecTypeDDR5
     uint64_t burstLength;
     uint64_t dataRate;
     uint64_t width;
-    uint64_t RefMode;
+    RefModeTypeDDR5 RefMode;
     std::optional<uint64_t> maxBurstLength;
 
     uint64_t cmdMode;
@@ -105,12 +117,12 @@ struct MemTimingSpecTypeDDR5
     uint64_t    WTR_L;
     uint64_t    WTR_M;
     uint64_t    WTR_S;
-    uint64_t    RFC1_slr; // MemArchitectureSpecTypeDDR5::RefMode == 1
-    uint64_t    RFC2_slr; // MemArchitectureSpecTypeDDR5::RefMode == 2
-    uint64_t    RFC1_dlr; // MemArchitectureSpecTypeDDR5::RefMode == 1
-    uint64_t    RFC2_dlr; // MemArchitectureSpecTypeDDR5::RefMode == 2
-    uint64_t    RFC1_dpr; // MemArchitectureSpecTypeDDR5::RefMode == 1
-    uint64_t    RFC2_dpr; // MemArchitectureSpecTypeDDR5::RefMode == 2
+    uint64_t    RFC1_slr; // RefModeTypeDDR5::REF_MODE_1
+    uint64_t    RFC2_slr; // RefModeTypeDDR5::REF_MODE_2
+    uint64_t    RFC1_dlr; // RefModeTypeDDR5::REF_MODE_1
+    uint64_t    RFC2_dlr; // RefModeTypeDDR5::REF_MODE_2
+    uint64_t    RFC1_dpr; // RefModeTypeDDR5::REF_MODE_1
+    uint64_t    RFC2_dpr; // RefModeTypeDDR5::REF_MODE_2
     uint64_t    RFCsb_slr;
     uint64_t    RFCsb_dlr;
     uint64_t    REFI1;
@@ -152,11 +164,11 @@ struct MemPowerSpecTypeDDR5
     double ipp2p;
     double ipp3p;
 
-    double idd5b; // MemArchitectureSpecTypeDDR5::RefMode == 1
-    double idd5f; // MemArchitectureSpecTypeDDR5::RefMode == 2
+    double idd5b; // RefModeTypeDDR5::REF_MODE_1
+    double idd5f; // RefModeTypeDDR5::REF_MODE_2
 
-    double ipp5b; // MemArchitectureSpecTypeDDR5::RefMode == 1
-    double ipp5f; // MemArchitectureSpecTypeDDR5::RefMode == 2
+    double ipp5b; // RefModeTypeDDR5::REF_MODE_1
+    double ipp5f; // RefModeTypeDDR5::REF_MODE_2
 
     double vddq;