derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further renaming of schedulers.

Browse Source
This commit is contained in:
Lukas Steiner
2019-06-22 21:49:18 +02:00
parent 882a0eaa90
commit c3da6912a9
12 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DRAMSys/library/resources/configs/mcconfigs/fifo.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FIFO" />
<Scheduler value="Fifo" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/fifoStrict.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FIFO_STRICT" />
<Scheduler value="FifoStrict" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/fifo_ecc.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FIFO" />
<Scheduler value="Fifo" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FR_FCFS" />
<Scheduler value="FrFcfs" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="16" />
<Scheduler value="FR_FCFS_GRP" />
<Scheduler value="FrFcfsGrp" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_rp.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="16" />
<Scheduler value="FR_FCFS_RP" />
<Scheduler value="FrFcfsRp" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/grp.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="32" />
<Scheduler value="GRP" />
<Scheduler value="Grp" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />

2
DRAMSys/library/resources/configs/mcconfigs/rgrmccfg.xml
View File

@@ -1,7 +1,7 @@
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="16" />
<Scheduler value="FR_FCFS" />
<Scheduler value="FrFcfs" />
<Capsize value="5" />
<PowerDownMode value="NoPowerDown" />
<PowerDownTimeout value="100" />

12
DRAMSys/library/src/controller/Controller.cpp
View File

@@ -103,17 +103,17 @@ void Controller::buildScheduler()
{
string selectedScheduler = Configuration::getInstance().Scheduler;
if (selectedScheduler == "FIFO") {
if (selectedScheduler == "Fifo") {
scheduler = new Fifo(*controllerCore);
} else if (selectedScheduler == "FIFO_STRICT") {
} else if (selectedScheduler == "FifoStrict") {
scheduler = new FifoStrict(*this, *controllerCore);
} else if (selectedScheduler == "FR_FCFS") {
} else if (selectedScheduler == "FrFcfs") {
scheduler = new FrFcfs(*controllerCore);
} else if (selectedScheduler == "FR_FCFS_RP") {
} else if (selectedScheduler == "FrFcfsRp") {
scheduler = new FrFcfsRp(*controllerCore);
} else if (selectedScheduler == "FR_FCFS_GRP") {
} else if (selectedScheduler == "FrFcfsGrp") {
scheduler = new FrFcfsGrp(*controllerCore, this);
} else if (selectedScheduler == "GRP") {
} else if (selectedScheduler == "Grp") {
scheduler = new Grp(*controllerCore, this);
} else if (selectedScheduler == "SMS") {
scheduler = new SMS("SMS", *controllerCore,

4
DRAMSys/library/src/controller/scheduler/FrFcfs.cpp
View File

@@ -73,7 +73,7 @@ std::pair<Command, gp *> FrFcfs::getNextRequest(Bank bank)
if (buffer[bank].empty())
return std::pair<Command, tlm::tlm_generic_payload *>(Command::NOP, NULL);
// In FR_FCFS row hits have always the highest priority, therefore we search
// In FrFcfs row hits have always the highest priority, therefore we search
// for row hits. If we find a row hit, we remove the transaction from the
// queue and send it to the DRAM.
std::deque<gp *>::iterator it = findRowHit(bank);
@@ -84,7 +84,7 @@ std::pair<Command, gp *> FrFcfs::getNextRequest(Bank bank)
return std::pair<Command, gp *>(getReadWriteCommand(payload), payload);
}
// If there is no row hit, the FR_FCFS takes always the oldest transaction
// If there is no row hit, the FrFcfs takes always the oldest transaction
// in the buffer, i.e. the transaction in the front.
return std::pair<Command, gp *>(getNextCommand(buffer[bank].front()),
buffer[bank].front());

4
DRAMSys/traceAnalyzer/scripts/tests.py
View File

@@ -713,10 +713,10 @@ def strict_transaction_order(connection):
transactions += str(currentRow[0]) + ","
if (transactions != ""):
if (dramconfig.scheduler == "FIFO_STRICT"):
if (dramconfig.scheduler == "FifoStrict"):
return TestFailed("Transactions {0} is/are not in Order ".format(transactions))
else:
return TestResult(True, "Transactions are not in Order, however this is okay since no FIFO_STRICT was choosen")
return TestResult(True, "Transactions are not in Order, however this is okay since no FifoStrict was choosen")
return TestSuceeded()
# ----------- powerdown checks ---------------------------------------

14
README.md
View File

@@ -706,7 +706,7 @@ Below, the sub-configurations are listed and explained.
<mcconfig>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FIFO" />
<Scheduler value="Fifo" />
<Capsize value="5" />
<!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
<PowerDownMode value="NoPowerDown" />
@@ -764,9 +764,13 @@ Below, the sub-configurations are listed and explained.
- *MaxNrOfTransactions* (unsigned int)
- Maximum number of transactions.
- *Scheduler* (string)
- "FIFO": first in, first out
- "FIFO_STRICT": out-of-order treatment of queue elements not allowed
- "FR_FCFS": first-come, first-served
- "Fifo": first in, first out
- "FifoStrict": out-of-order treatment of queue elements not allowed
- "FrFcfs": first ready first-come-first-served
- "FrFcfsRp": first ready first-come-first-served read priority
- "FrFcfsGrp": first ready first-come-first-served grouper
- "Grp": grouper
- "SMS": will be removed
- *Capsize* (unsigned int)
- Capacitor cell size.
- *PowerDownMode* (enum EPowerDownMode)
@@ -1410,7 +1414,7 @@ Enable the error model in fr_fcfs.xml.
<BankwiseLogic value="0"/>
<OpenPagePolicy value="1" />
<MaxNrOfTransactions value="8" />
<Scheduler value="FR_FCFS" />
<Scheduler value="FrFcfs" />
<Capsize value="5" />
<PowerDownMode value="NoPowerDown"/>
<PowerDownTimeout value="100" />