From 427725696dc0fbd835ec26b47db6f83ed03002bb Mon Sep 17 00:00:00 2001 From: scorrea Date: Wed, 8 Apr 2020 23:15:28 +0200 Subject: [PATCH] nlohmann json parser added as a submodule --- DRAMSys/library/CMakeLists.txt | 3 +++ DRAMSys/library/resources/configs/mcconfigs/fifo.json | 1 + DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json | 1 + DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json | 1 + xml_json.py | 2 +- 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 DRAMSys/library/resources/configs/mcconfigs/fifo.json create mode 100644 DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json create mode 100644 DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt index 31729d23..18d7d71c 100644 --- a/DRAMSys/library/CMakeLists.txt +++ b/DRAMSys/library/CMakeLists.txt @@ -38,6 +38,9 @@ project(DRAMSysLibrary) # Add DRAMPower: add_subdirectory(src/common/third_party/DRAMPower) +# Add nlohmann: +add_subdirectory(src/common/third_party/nlohmann) + # Add SystemC: set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libs") add_subdirectory(src/common/third_party/systemc) diff --git a/DRAMSys/library/resources/configs/mcconfigs/fifo.json b/DRAMSys/library/resources/configs/mcconfigs/fifo.json new file mode 100644 index 00000000..82be88b8 --- /dev/null +++ b/DRAMSys/library/resources/configs/mcconfigs/fifo.json @@ -0,0 +1 @@ +{"mcconfig": {"PagePolicy": {"@value": "Open"}, "Scheduler": {"@value": "Fifo"}, "RequestBufferSize": {"@value": "8"}, "CmdMux": {"@value": "Strict"}, "RespQueue": {"@value": "Fifo"}, "RefreshPolicy": {"@value": "Rankwise"}, "RefreshMode": {"@value": "1"}, "RefreshMaxPostponed": {"@value": "8"}, "RefreshMaxPulledin": {"@value": "8"}, "PowerDownPolicy": {"@value": "NoPowerDown"}, "PowerDownTimeout": {"@value": "100"}}} \ No newline at end of file diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json new file mode 100644 index 00000000..1170848e --- /dev/null +++ b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json @@ -0,0 +1 @@ +{"mcconfig": {"PagePolicy": {"@value": "Open"}, "Scheduler": {"@value": "FrFcfs"}, "RequestBufferSize": {"@value": "8"}, "CmdMux": {"@value": "Oldest"}, "RespQueue": {"@value": "Fifo"}, "RefreshPolicy": {"@value": "Rankwise"}, "RefreshMode": {"@value": "1"}, "RefreshMaxPostponed": {"@value": "8"}, "RefreshMaxPulledin": {"@value": "8"}, "PowerDownPolicy": {"@value": "NoPowerDown"}, "PowerDownTimeout": {"@value": "100"}}} \ No newline at end of file diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json new file mode 100644 index 00000000..2ed9772d --- /dev/null +++ b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json @@ -0,0 +1 @@ +{"mcconfig": {"PagePolicy": {"@value": "Open"}, "Scheduler": {"@value": "FrFcfsGrp"}, "RequestBufferSize": {"@value": "8"}, "CmdMux": {"@value": "Oldest"}, "RespQueue": {"@value": "Fifo"}, "RefreshPolicy": {"@value": "Rankwise"}, "RefreshMode": {"@value": "1"}, "RefreshMaxPostponed": {"@value": "8"}, "RefreshMaxPulledin": {"@value": "8"}, "PowerDownPolicy": {"@value": "NoPowerDown"}, "PowerDownTimeout": {"@value": "100"}}} \ No newline at end of file diff --git a/xml_json.py b/xml_json.py index 47014e5c..dac1c8d1 100644 --- a/xml_json.py +++ b/xml_json.py @@ -5,7 +5,7 @@ from pathlib import Path -basepath= Path('DRAMSys/library/resources/configs/simulator') +basepath= Path('DRAMSys/library/resources/configs/mcconfigs') for path in basepath.iterdir(): if path.is_file(): filename=str(path)