Merge branch 'development'

# Conflicts:
#	.gitlab-ci.yml
#	DRAMSys/CMakeLists.txt
#	DRAMSys/gem5/CMakeLists.txt
#	DRAMSys/library/CMakeLists.txt
#	DRAMSys/library/resources/configs/mcconfigs/fifo.json
#	DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json
#	DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json
#	DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json
#	DRAMSys/library/resources/configs/memspecs/HBM2.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-200_128bit.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-266_128bit.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-1866_8bit_A.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-2400_8bit_A.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-400_64bit.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-533_64bit.json
#	DRAMSys/library/resources/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-800_8bit_G.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.json
#	DRAMSys/library/resources/configs/memspecs/MICRON_6Gb_LPDDR4-3200_32bit_A.json
#	DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.json
#	DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.json
#	DRAMSys/library/resources/configs/memspecs/memspec_ranktest.json
#	DRAMSys/library/resources/configs/simulator/ddr3.json
#	DRAMSys/library/resources/configs/simulator/ddr3_ecc.json
#	DRAMSys/library/resources/configs/simulator/ddr3_gem5_se.json
#	DRAMSys/library/resources/configs/simulator/ddr4.json
#	DRAMSys/library/resources/configs/simulator/hbm2.json
#	DRAMSys/library/resources/configs/simulator/lpddr4.json
#	DRAMSys/library/resources/configs/simulator/wideio.json
#	DRAMSys/library/resources/configs/simulator/wideio_ecc.json
#	DRAMSys/library/resources/configs/simulator/wideio_thermal.json
#	DRAMSys/library/src/common/TlmRecorder.cpp
#	DRAMSys/library/src/common/utils.cpp
#	DRAMSys/library/src/common/utils.h
#	DRAMSys/library/src/configuration/Configuration.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpec.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpec.h
#	DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp
#	DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp
#	DRAMSys/library/src/controller/Controller.cpp
#	DRAMSys/library/src/controller/ControllerRecordable.cpp
#	DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
#	DRAMSys/library/src/simulation/Arbiter.cpp
#	DRAMSys/library/src/simulation/DRAMSys.cpp
#	DRAMSys/library/src/simulation/DRAMSysRecordable.cpp
#	DRAMSys/library/src/simulation/Setup.h
#	DRAMSys/library/src/simulation/dram/DramRecordable.cpp
#	DRAMSys/pct/createPlatform.tcl
#	DRAMSys/simulator/CMakeLists.txt
#	DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml
#	DRAMSys/tests/DDR3/configs/mcconfigs/fifoStrict.xml
#	DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs.xml
#	DRAMSys/tests/DDR4/configs/simulator/ddr4.json
#	DRAMSys/tests/ddr3_multirank/configs/simulator/ddr3.json
#	DRAMSys/tests/lpddr4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json
#	README.md
This commit is contained in:
Lukas Steiner
2020-07-06 17:39:23 +02:00
430 changed files with 7445 additions and 53084 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, University of Kaiserslautern
* Copyright (c) 2015, Technische Universität Kaiserslautern
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without