From 465bbdbe7e739f001d3bc70ce35e4fad407693ec Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Tue, 2 Feb 2021 12:08:31 +0100
Subject: [PATCH] Add new configuration parameters for arbiter.

---
 DRAMSys/library/resources/configs/mcconfigs/fifo.json    | 6 ++++--
 .../library/resources/configs/mcconfigs/fifoStrict.json  | 6 ++++--
 DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json | 9 ++-------
 .../library/resources/configs/mcconfigs/fr_fcfs_grp.json | 6 ++++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/DRAMSys/library/resources/configs/mcconfigs/fifo.json b/DRAMSys/library/resources/configs/mcconfigs/fifo.json
index e2981949..e0464e6c 100644
--- a/DRAMSys/library/resources/configs/mcconfigs/fifo.json
+++ b/DRAMSys/library/resources/configs/mcconfigs/fifo.json
@@ -2,13 +2,15 @@
     "mcconfig": {
         "PagePolicy": "Open", 
         "Scheduler": "Fifo", 
+        "SchedulerBuffer": "Bankwise",
         "RequestBufferSize": 8, 
         "CmdMux": "Oldest", 
         "RespQueue": "Fifo", 
         "RefreshPolicy": "AllBank", 
         "RefreshMaxPostponed": 8, 
         "RefreshMaxPulledin": 8, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "PowerDownTimeout": 100
+        "PowerDownPolicy": "NoPowerDown",
+        "Arbiter": "Simple",
+        "MaxActiveTransactions": 128
     }
 }
\ No newline at end of file
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json b/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json
index fe74a8c9..93984245 100644
--- a/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json
+++ b/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json
@@ -2,13 +2,15 @@
     "mcconfig": {
         "PagePolicy": "Open", 
         "Scheduler": "Fifo", 
+        "SchedulerBuffer": "Bankwise",
         "RequestBufferSize": 8, 
         "CmdMux": "Strict", 
         "RespQueue": "Fifo", 
         "RefreshPolicy": "AllBank", 
         "RefreshMaxPostponed": 8, 
         "RefreshMaxPulledin": 8, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "PowerDownTimeout": 100
+        "PowerDownPolicy": "NoPowerDown",
+        "Arbiter": "Simple",
+        "MaxActiveTransactions": 128
     }
 }
\ 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
index b38761e5..6c4c2562 100644
--- a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json
+++ b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json
@@ -10,12 +10,7 @@
         "RefreshMaxPostponed": 8,
         "RefreshMaxPulledin": 8,
         "PowerDownPolicy": "NoPowerDown",
-        "PowerDownTimeout": 100,
-        "ArbitrationDelayFw": 0,
-        "ArbitrationDelayBw": 0,
-        "ThinkDelayFw": 0, 
-        "ThinkDelayBw": 0, 
-        "PhyDelayFw": 0,
-        "PhyDelayBw": 0
+        "Arbiter": "Simple",
+        "MaxActiveTransactions": 128
     }
 }
\ 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
index c6c0ed8a..3fcf7ca8 100644
--- a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json
+++ b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json
@@ -2,13 +2,15 @@
     "mcconfig": {
         "PagePolicy": "Open", 
         "Scheduler": "FrFcfsGrp", 
+        "SchedulerBuffer": "Bankwise",
         "RequestBufferSize": 8, 
         "CmdMux": "Oldest", 
         "RespQueue": "Fifo", 
         "RefreshPolicy": "AllBank", 
         "RefreshMaxPostponed": 8, 
         "RefreshMaxPulledin": 8, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "PowerDownTimeout": 100
+        "PowerDownPolicy": "NoPowerDown",
+        "Arbiter": "Simple",
+        "MaxActiveTransactions": 128
     }
 }
\ No newline at end of file