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

Minor readability fixes

Browse Source
This commit is contained in:
Derek Christ
2023-08-21 10:10:49 +02:00
parent a0f93a75e2
commit f1cfb80337
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libdramsys/DRAMSys/controller/Controller.cpp
View File

@@ -293,7 +293,7 @@ void Controller::controllerMethod()
readyCommands.emplace_back(commandTuple);
// (4.3) Check for bank commands (PREPB, ACT, RD/RDA or WR/WRA)
for (auto it : bankMachinesOnRank[rank])
for (auto* it : bankMachinesOnRank[rank])
{
commandTuple = it->getNextCommand();
if (std::get<CommandTuple::Command>(commandTuple) != Command::NOP)
@@ -322,7 +322,7 @@ void Controller::controllerMethod()
if (command.isRankCommand())
{
for (auto it : bankMachinesOnRank[rank])
for (auto* it : bankMachinesOnRank[rank])
it->update(command);
}
else if (command.isGroupCommand())

18
src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp
View File

@@ -60,19 +60,19 @@ bool SchedulerFrFcfs::hasBufferSpace() const
return bufferCounter->hasBufferSpace();
}
void SchedulerFrFcfs::storeRequest(tlm_generic_payload& trans)
void SchedulerFrFcfs::storeRequest(tlm_generic_payload& payload)
{
buffer[ControllerExtension::getBank(trans)].push_back(&trans);
bufferCounter->storeRequest(trans);
buffer[ControllerExtension::getBank(payload)].push_back(&payload);
bufferCounter->storeRequest(payload);
}
void SchedulerFrFcfs::removeRequest(tlm_generic_payload& trans)
void SchedulerFrFcfs::removeRequest(tlm_generic_payload& payload)
{
bufferCounter->removeRequest(trans);
Bank bank = ControllerExtension::getBank(trans);
bufferCounter->removeRequest(payload);
Bank bank = ControllerExtension::getBank(payload);
for (auto it = buffer[bank].begin(); it != buffer[bank].end(); it++)
{
if (*it == &trans)
if (*it == &payload)
{
buffer[bank].erase(it);
break;
@@ -89,7 +89,7 @@ tlm_generic_payload* SchedulerFrFcfs::getNextRequest(const BankMachine& bankMach
{
// Search for row hit
Row openRow = bankMachine.getOpenRow();
for (auto it : buffer[bank])
for (auto* it : buffer[bank])
{
if (ControllerExtension::getRow(*it) == openRow)
return it;
@@ -104,7 +104,7 @@ tlm_generic_payload* SchedulerFrFcfs::getNextRequest(const BankMachine& bankMach
bool SchedulerFrFcfs::hasFurtherRowHit(Bank bank, Row row, [[maybe_unused]] tlm_command command) const
{
unsigned rowHitCounter = 0;
for (auto it : buffer[bank])
for (auto* it : buffer[bank])
{
if (ControllerExtension::getRow(*it) == row)
{

24
src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp
View File

@@ -63,25 +63,25 @@ bool SchedulerGrpFrFcfs::hasBufferSpace() const
return bufferCounter->hasBufferSpace();
}
void SchedulerGrpFrFcfs::storeRequest(tlm_generic_payload& trans)
void SchedulerGrpFrFcfs::storeRequest(tlm_generic_payload& payload)
{
if (trans.is_read())
readBuffer[ControllerExtension::getBank(trans)].push_back(&trans);
if (payload.is_read())
readBuffer[ControllerExtension::getBank(payload)].push_back(&payload);
else
writeBuffer[ControllerExtension::getBank(trans)].push_back(&trans);
bufferCounter->storeRequest(trans);
writeBuffer[ControllerExtension::getBank(payload)].push_back(&payload);
bufferCounter->storeRequest(payload);
}
void SchedulerGrpFrFcfs::removeRequest(tlm_generic_payload& trans)
void SchedulerGrpFrFcfs::removeRequest(tlm_generic_payload& payload)
{
bufferCounter->removeRequest(trans);
lastCommand = trans.get_command();
Bank bank = ControllerExtension::getBank(trans);
bufferCounter->removeRequest(payload);
lastCommand = payload.get_command();
Bank bank = ControllerExtension::getBank(payload);
if (trans.is_read())
readBuffer[bank].remove(&trans);
if (payload.is_read())
readBuffer[bank].remove(&payload);
else
writeBuffer[bank].remove(&trans);
writeBuffer[bank].remove(&payload);
}
tlm_generic_payload* SchedulerGrpFrFcfs::getNextRequest(const BankMachine& bankMachine) const

24
src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
View File

@@ -67,25 +67,25 @@ bool SchedulerGrpFrFcfsWm::hasBufferSpace() const
return bufferCounter->hasBufferSpace();
}
void SchedulerGrpFrFcfsWm::storeRequest(tlm_generic_payload& trans)
void SchedulerGrpFrFcfsWm::storeRequest(tlm_generic_payload& payload)
{
if (trans.is_read())
readBuffer[ControllerExtension::getBank(trans)].push_back(&trans);
if (payload.is_read())
readBuffer[ControllerExtension::getBank(payload)].push_back(&payload);
else
writeBuffer[ControllerExtension::getBank(trans)].push_back(&trans);
bufferCounter->storeRequest(trans);
writeBuffer[ControllerExtension::getBank(payload)].push_back(&payload);
bufferCounter->storeRequest(payload);
evaluateWriteMode();
}
void SchedulerGrpFrFcfsWm::removeRequest(tlm_generic_payload& trans)
void SchedulerGrpFrFcfsWm::removeRequest(tlm_generic_payload& payload)
{
bufferCounter->removeRequest(trans);
Bank bank = ControllerExtension::getBank(trans);
bufferCounter->removeRequest(payload);
Bank bank = ControllerExtension::getBank(payload);
if (trans.is_read())
readBuffer[bank].remove(&trans);
if (payload.is_read())
readBuffer[bank].remove(&payload);
else
writeBuffer[bank].remove(&trans);
writeBuffer[bank].remove(&payload);
evaluateWriteMode();
}
@@ -120,7 +120,7 @@ tlm_generic_payload* SchedulerGrpFrFcfsWm::getNextRequest(const BankMachine& ban
{
// Search for write row hit
Row openRow = bankMachine.getOpenRow();
for (auto it : writeBuffer[bank])
for (auto* it : writeBuffer[bank])
{
if (ControllerExtension::getRow(*it) == openRow)
return it;