renamed namespace DRAMUtils::Config to DRAMUtils::MemSpec

tukl-msd · Jul 15, 2024 · e4443d4 · e4443d4
1 parent 3465199
commit e4443d4
Show file tree

Hide file tree

Showing 99 changed files with 126 additions and 126 deletions.
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpec.h b/src/DRAMPower/DRAMPower/memspec/MemSpec.h
@@ -54,7 +54,7 @@ namespace DRAMPower {
 
 struct MemSpecContainer
 {
-    DRAMUtils::Config::MemSpecVariant memspec;
+    DRAMUtils::MemSpec::MemSpecVariant memspec;
 };
 NLOHMANN_JSONIFY_ALL_THINGS(MemSpecContainer, memspec)
 

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp
@@ -40,7 +40,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
 
 
-MemSpecDDR4::MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec)
+MemSpecDDR4::MemSpecDDR4(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec)
     : MemSpec(memspec)
 {
 
@@ -120,7 +120,7 @@ MemSpecDDR4::MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec)
     parsePrePostamble(memspec);
 }
 
-void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memspec) {
+void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;
@@ -134,7 +134,7 @@ void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memsp
     memImpedanceSpec.R_eq_wb = memspec.memimpedancespec.R_eq_wb;
 }
 
-void MemSpecDDR4::parsePrePostamble(const DRAMUtils::Config::MemSpecDDR4 &memspec)
+void MemSpecDDR4::parsePrePostamble(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec)
 {
     prePostamble.read_zeroes = memspec.prepostamble.read_zeroes;
     prePostamble.write_zeroes = memspec.prepostamble.write_zeroes;

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h
@@ -45,7 +45,7 @@
 using json = nlohmann::json;
 namespace DRAMPower {
 
-class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
+class MemSpecDDR4 final : public MemSpec<DRAMUtils::MemSpec::MemSpecDDR4>
 {
 public:
 
@@ -57,7 +57,7 @@ class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
 public:
     MemSpecDDR4() = delete;
 
-	MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec);
+	MemSpecDDR4(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
 
 	MemSpecDDR4(json &data) = delete;
 	MemSpecDDR4(const json &data) = delete;
@@ -156,8 +156,8 @@ class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
 	PrePostamble prePostamble;
 	BankWiseParams bwParams;
 private:
-	void parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memspec);
-	void parsePrePostamble(const DRAMUtils::Config::MemSpecDDR4 &memspec);
+	void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
+	void parsePrePostamble(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
 };
 
 }

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp
@@ -3,7 +3,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
 
 
-MemSpecDDR5::MemSpecDDR5(const DRAMUtils::Config::MemSpecDDR5 &memspec)
+MemSpecDDR5::MemSpecDDR5(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec)
         : MemSpec(memspec)
 {
     numberOfBankGroups      = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -99,7 +99,7 @@ uint64_t MemSpecDDR5::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 }
 
-void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec) {
+void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;
@@ -113,7 +113,7 @@ void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memsp
     memImpedanceSpec.R_eq_wb = memspec.memimpedancespec.R_eq_wb;
 }
 
-void MemSpecDDR5::parseDataRateSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec) {
+void MemSpecDDR5::parseDataRateSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec) {
     if (!memspec.dataratespec.has_value()) {
         dataRateSpec = {2, 2, 2};
         return;

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h
@@ -7,7 +7,7 @@
 
 namespace DRAMPower {
 
-    class MemSpecDDR5 final : public MemSpec<DRAMUtils::Config::MemSpecDDR5> {
+    class MemSpecDDR5 final : public MemSpec<DRAMUtils::MemSpec::MemSpecDDR5> {
     public:
 
         enum VoltageDomain {
@@ -18,7 +18,7 @@ namespace DRAMPower {
     public:
         MemSpecDDR5() = delete;
 
-        MemSpecDDR5(const DRAMUtils::Config::MemSpecDDR5 &memspec);
+        MemSpecDDR5(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
 
         MemSpecDDR5(json &data) = delete;
         MemSpecDDR5(const json &data) = delete;
@@ -102,8 +102,8 @@ namespace DRAMPower {
         BankWiseParams bwParams;
 
     private:
-        void parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec);
-        void parseDataRateSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec);
+        void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
+        void parseDataRateSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
     };
 
 }

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp
@@ -3,7 +3,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
 
 
-MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec)
+MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec)
     : MemSpec(memspec), memImpedanceSpec{}
 {
     numberOfBankGroups     = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -65,7 +65,7 @@ MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec)
         bwParams.flgPASR = memspec.bankwisespec.value().hasPASR.value_or(false);
         if (memspec.bankwisespec.value().pasrMode.has_value())
         {
-           if(memspec.bankwisespec.value().pasrMode.value() == DRAMUtils::Config::pasrModesType::Invalid)
+           if(memspec.bankwisespec.value().pasrMode.value() == DRAMUtils::MemSpec::pasrModesType::Invalid)
            {
                 // pasrMode invalid
                 bwParams.pasrMode = 0;
@@ -217,7 +217,7 @@ uint64_t MemSpecLPDDR4::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 } // MemSpecLPDDR4::timeToCompletion
 
-void MemSpecLPDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR4 &memspec) {
+void MemSpecLPDDR4::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h
@@ -7,7 +7,7 @@
 
 namespace DRAMPower {
 
-class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
+class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::MemSpec::MemSpecLPDDR4>
 {
 public:
 
@@ -19,7 +19,7 @@ class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
 public:
 	MemSpecLPDDR4() = delete;
 
-	MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec);
+	MemSpecLPDDR4(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec);
 
 	MemSpecLPDDR4(json &data) = delete;
 	MemSpecLPDDR4(const json &data) = delete;
@@ -116,7 +116,7 @@ class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
 	BankWiseParams bwParams;
 
 private:
-    void parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR4 &memspec);
+    void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec);
 };
 
 }

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp
@@ -3,7 +3,7 @@
 using namespace DRAMPower;
 using json = nlohmann::json;
 
-MemSpecLPDDR5::MemSpecLPDDR5(const DRAMUtils::Config::MemSpecLPDDR5 &memspec)
+MemSpecLPDDR5::MemSpecLPDDR5(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec)
         : MemSpec(memspec)
 {
     numberOfBankGroups      = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -147,7 +147,7 @@ uint64_t MemSpecLPDDR5::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 }
 
-void MemSpecLPDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR5 &memspec) {
+void MemSpecLPDDR5::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec) {
 
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;

diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h
@@ -6,7 +6,7 @@
 
 namespace DRAMPower {
 
-    class MemSpecLPDDR5 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR5> {
+    class MemSpecLPDDR5 final : public MemSpec<DRAMUtils::MemSpec::MemSpecLPDDR5> {
     public:
         enum VoltageDomain {
             VDD1 = 0,
@@ -23,7 +23,7 @@ namespace DRAMPower {
     public:
         MemSpecLPDDR5() = delete;
 
-        MemSpecLPDDR5(const DRAMUtils::Config::MemSpecLPDDR5 &memspec);
+        MemSpecLPDDR5(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec);
 
         MemSpecLPDDR5(json &data) = delete;
         MemSpecLPDDR5(const json &data) = delete;
@@ -107,7 +107,7 @@ namespace DRAMPower {
         BankWiseParams bwParams;
 
        private:
-        void parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR5 &memspec);
+        void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec);
     };
 
 }  // namespace DRAMPower

diff --git a/src/cli/main.cpp b/src/cli/main.cpp
@@ -43,24 +43,24 @@ std::unique_ptr<dram_base<CmdType>> getMemory(const json &data)
 		std::unique_ptr<dram_base<CmdType>> result = nullptr;
 		std::visit( [&result] (auto&& arg) {
 			using T = std::decay_t<decltype(arg)>;
-			if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecDDR4>)
+			if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecDDR4>)
 			{
-				MemSpecDDR4 ddr (static_cast<DRAMUtils::Config::MemSpecDDR4>(arg));
+				MemSpecDDR4 ddr (static_cast<DRAMUtils::MemSpec::MemSpecDDR4>(arg));
 				result = std::make_unique<DDR4>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecDDR5>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecDDR5>)
 			{
-				MemSpecDDR5 ddr (static_cast<DRAMUtils::Config::MemSpecDDR5>(arg));
+				MemSpecDDR5 ddr (static_cast<DRAMUtils::MemSpec::MemSpecDDR5>(arg));
 				result = std::make_unique<DDR5>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecLPDDR4>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecLPDDR4>)
 			{
-				MemSpecLPDDR4 ddr (static_cast<DRAMUtils::Config::MemSpecLPDDR4>(arg));
+				MemSpecLPDDR4 ddr (static_cast<DRAMUtils::MemSpec::MemSpecLPDDR4>(arg));
 				result = std::make_unique<LPDDR4>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecLPDDR5>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecLPDDR5>)
 			{
-				MemSpecLPDDR5 ddr (static_cast<DRAMUtils::Config::MemSpecLPDDR5>(arg));
+				MemSpecLPDDR5 ddr (static_cast<DRAMUtils::MemSpec::MemSpecLPDDR5>(arg));
 				result = std::make_unique<LPDDR5>(ddr);
 			}
 		}, memspec.memspec.getVariant());

diff --git a/tests/tests_drampower/base/test_pattern_pre_cycles.cpp b/tests/tests_drampower/base/test_pattern_pre_cycles.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_Pre_Cycles : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfBanks = 2;
 		memSpec.numberOfBankGroups = 2;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp b/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp
@@ -65,7 +65,7 @@ class DramPowerTest_DDR4_MultiDevice : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfDevices = 5;
 
         numberOfDevices = memSpec.numberOfDevices;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp b/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp
@@ -38,7 +38,7 @@ class DDR4_MultirankTests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         spec->numberOfRanks = 2;
         ddr = std::make_unique<DDR4>(*spec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_DDR4_0 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR4_1 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp
@@ -47,7 +47,7 @@ class DramPowerTest_DDR4_10 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp
@@ -60,7 +60,7 @@ class DramPowerTest_DDR4_11 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_DDR4_12 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
 		memSpec.bitWidth = 16;
 

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_DDR4_13 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR4_14 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR4_15 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
 		memSpec.bitWidth = 16;
 

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR4_2 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp
@@ -41,7 +41,7 @@ class DramPowerTest_DDR4_3 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR4_4 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_DDR4_5 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }

diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR4_6 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }