From f1cfb80337d0f4703ced4aec37bd4ad0ae0fd53a Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Mon, 21 Aug 2023 10:10:49 +0200 Subject: [PATCH] Minor readability fixes --- .../DRAMSys/controller/Controller.cpp | 4 ++-- .../controller/scheduler/SchedulerFrFcfs.cpp | 18 +++++++------- .../scheduler/SchedulerGrpFrFcfs.cpp | 24 +++++++++---------- .../scheduler/SchedulerGrpFrFcfsWm.cpp | 24 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/libdramsys/DRAMSys/controller/Controller.cpp b/src/libdramsys/DRAMSys/controller/Controller.cpp index 7a4206b6..74ff6042 100644 --- a/src/libdramsys/DRAMSys/controller/Controller.cpp +++ b/src/libdramsys/DRAMSys/controller/Controller.cpp @@ -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::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()) diff --git a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp index f27a07fc..dfdd566e 100644 --- a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp +++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp @@ -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) { diff --git a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp index 49c2d364..0fb5091d 100644 --- a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp +++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp @@ -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 diff --git a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp index 61145a4f..1957d020 100644 --- a/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp +++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp @@ -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;