From 45b13fcf6c141697cb12a9eea42f45fc14dc3c87 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Mon, 10 Jan 2022 09:40:46 +0100 Subject: [PATCH] Change devices in test files. --- DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp | 2 +- DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp | 2 +- DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp | 2 +- DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp | 2 +- DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp | 1 + DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp | 1 + .../configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json | 2 +- .../DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json | 4 ++-- DRAMSys/tests/HBM2/configs/memspecs/HBM2.json | 1 + .../LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json | 3 ++- 16 files changed, 18 insertions(+), 8 deletions(-) diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp index aec1376e..1e599c99 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp @@ -109,7 +109,7 @@ MemSpecDDR3::MemSpecDDR3(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; - std::cout << " Devices on DIMM: " << numberOfDevices << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp index 8c582ba8..b8b119de 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp @@ -128,7 +128,7 @@ MemSpecDDR4::MemSpecDDR4(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; - std::cout << " Devices on DIMM: " << numberOfDevices << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp index d94376ff..40648435 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp @@ -177,7 +177,7 @@ MemSpecDDR5::MemSpecDDR5(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; - std::cout << " Devices on DIMM: " << numberOfDevices << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp index 368c0348..f498f21b 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp @@ -107,6 +107,7 @@ MemSpecGDDR5::MemSpecGDDR5(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp index 63404caf..af98befb 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp @@ -106,6 +106,7 @@ MemSpecGDDR5X::MemSpecGDDR5X(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp index efb130e8..a7690dba 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp @@ -110,6 +110,7 @@ MemSpecGDDR6::MemSpecGDDR6(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp index 82fe29e9..6d382555 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp @@ -104,6 +104,7 @@ MemSpecHBM2::MemSpecHBM2(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp index 2c4883f3..53647408 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp @@ -113,6 +113,7 @@ MemSpecLPDDR4::MemSpecLPDDR4(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp index a7074a4d..64122b69 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp @@ -119,6 +119,7 @@ MemSpecLPDDR5::MemSpecLPDDR5(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp index 8e48f81e..198f5de7 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp @@ -94,7 +94,7 @@ MemSpecSTTMRAM::MemSpecSTTMRAM(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; - std::cout << " Devices on DIMM: " << numberOfDevices << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp index b0ee45d9..e363d1a5 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp @@ -115,6 +115,7 @@ MemSpecWideIO::MemSpecWideIO(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp b/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp index 9762e5f1..275529e4 100644 --- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp +++ b/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp @@ -97,6 +97,7 @@ MemSpecWideIO2::MemSpecWideIO2(json &memspec) std::cout << " Device width in bits: " << bitWidth << std::endl; std::cout << " Device size in bits: " << deviceSizeBits << std::endl; std::cout << " Device size in bytes: " << deviceSizeBytes << std::endl; + std::cout << " Devices per rank: " << numberOfDevices << std::endl; std::cout << std::endl; } diff --git a/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json b/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json index 0c90c3ca..e9dc9a59 100644 --- a/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json +++ b/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json @@ -9,7 +9,7 @@ "nbrOfChannels": 1, "nbrOfRows": 16384, "width": 64, - "nbrOfDevicesOnDIMM": 1 + "nbrOfDevices": 1 }, "memoryId": "MICRON_2GB_DDR3-1066_64bit_D_SODIMM", "memoryType": "DDR3", diff --git a/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json b/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json index 960db938..95234154 100644 --- a/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json +++ b/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json @@ -10,7 +10,7 @@ "nbrOfChannels": 1, "nbrOfRows": 32768, "width": 8, - "nbrOfDevicesOnDIMM": 8 + "nbrOfDevices": 8 }, "memoryId": "MICRON_4Gb_DDR4-1866_8bit_A", "memoryType": "DDR4", @@ -68,4 +68,4 @@ "clkMhz": 933 } } -} \ No newline at end of file +} diff --git a/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json b/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json index c10d1242..dae57fbc 100644 --- a/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json +++ b/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json @@ -8,6 +8,7 @@ "nbrOfColumns": 128, "nbrOfRanks": 1, "nbrOfChannels": 2, + "nbrOfDevices": 1, "nbrOfRows": 32768, "width": 128 }, diff --git a/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json b/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json index 223f064d..34230486 100644 --- a/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json +++ b/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json @@ -7,6 +7,7 @@ "nbrOfColumns": 1024, "nbrOfRanks": 1, "nbrOfChannels": 1, + "nbrOfDevices": 1, "nbrOfRows": 65536, "width": 16 }, @@ -47,4 +48,4 @@ "clkMhz": 1600 } } -} \ No newline at end of file +}