From 61bacdfb9ff0937062fc72caae85496234cd81de Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 1 Jul 2014 14:39:58 +0200 Subject: [PATCH] resolved most warnings --- dram/src/common/DebugManager.h | 1 + dram/src/controller/Controller.h | 2 +- dram/src/controller/core/ControllerCore.cpp | 4 +- .../powerdown/PowerDownManagerTimeout.cpp | 4 +- .../core/refresh/RefreshManagerBankwise.cpp | 64 +++++++++---------- .../core/scheduling/ScheduledCommand.cpp | 64 +++++++++---------- .../core/scheduling/ScheduledCommand.h | 8 +-- dram/src/controller/scheduler/PARBS.h | 2 +- dram/src/simulation/Simulation.cpp | 2 +- dram/src/simulation/SimulationManager.cpp | 2 +- dram/src/simulation/TracePlayer.h | 2 +- dram/src/simulation/main.cpp | 2 +- 12 files changed, 78 insertions(+), 79 deletions(-) diff --git a/dram/src/common/DebugManager.h b/dram/src/common/DebugManager.h index 38a0d442..004c5691 100644 --- a/dram/src/common/DebugManager.h +++ b/dram/src/common/DebugManager.h @@ -35,6 +35,7 @@ public: void addToWhiteList(std::string sender); void addToWhiteList(std::vector senders); + private: DebugManager(); DebugManager(const DebugManager&){} diff --git a/dram/src/controller/Controller.h b/dram/src/controller/Controller.h index ea4a86f0..db4b0414 100644 --- a/dram/src/controller/Controller.h +++ b/dram/src/controller/Controller.h @@ -49,7 +49,7 @@ public: tlm_utils::simple_initiator_socket iSocket; tlm_utils::simple_target_socket tSocket; - Controller(sc_module_name name) : + Controller(sc_module_name /*name*/) : frontendPEQ(this, &Controller::frontendPEQCallback), dramPEQ(this, &Controller::dramPEQCallback), controllerCorePEQ( this, &Controller::controllerCorePEQCallback), debugManager(DebugManager::getInstance()) { diff --git a/dram/src/controller/core/ControllerCore.cpp b/dram/src/controller/core/ControllerCore.cpp index af2491d2..168521e0 100644 --- a/dram/src/controller/core/ControllerCore.cpp +++ b/dram/src/controller/core/ControllerCore.cpp @@ -30,8 +30,8 @@ namespace core { std::string ControllerCore::senderName = "Controller Core"; ControllerCore::ControllerCore(IWrapperConnector& wrapperConnector, std::map& numberOfPayloads) : - config(Configuration::getInstance()), state(&config), wrapper(wrapperConnector), commandChecker(), numberOfPayloads( - numberOfPayloads), savedState(&config), commandSequenceGenerator(state), commandSequenceScheduler(*this) + config(Configuration::getInstance()), state(&config), wrapper(wrapperConnector), numberOfPayloads( + numberOfPayloads), commandChecker(), savedState(&config), commandSequenceGenerator(state), commandSequenceScheduler(*this) { commandChecker[Command::Activate] = new ActivateChecker(config, state); diff --git a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp index 4a3d14f4..4f82b3cb 100644 --- a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp +++ b/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp @@ -102,7 +102,7 @@ void PowerDownManagerTimeout::wakeUpForRefresh(Bank bank, sc_time time) } } -void PowerDownManagerTimeout::triggerSleep(Bank bank, sc_time time) +void PowerDownManagerTimeout::triggerSleep(Bank /*bank*/, sc_time time) { if(canSleep() && !isInPowerDown()) { @@ -110,7 +110,7 @@ void PowerDownManagerTimeout::triggerSleep(Bank bank, sc_time time) } } -bool PowerDownManagerTimeout::isInSelfRefresh(Bank bank) +bool PowerDownManagerTimeout::isInSelfRefresh(Bank /*bank*/) { return powerDownState == PowerDownState::PDNSelfRefresh; } diff --git a/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp b/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp index 9ee29abd..e50bc250 100644 --- a/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp +++ b/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp @@ -15,13 +15,13 @@ using namespace std; namespace core { RefreshManagerBankwise::RefreshManagerBankwise(ControllerCore& controller) : - controller(controller) + controller(controller) { - for (Bank bank : controller.getBanks()) - { - setUpDummy(refreshPayloads[bank], bank); - planNextRefresh(bank); - } + for (Bank bank : controller.getBanks()) + { + setUpDummy(refreshPayloads[bank], bank); + planNextRefresh(bank); + } } RefreshManagerBankwise::~RefreshManagerBankwise() @@ -30,58 +30,56 @@ RefreshManagerBankwise::~RefreshManagerBankwise() bool RefreshManagerBankwise::hasCollision(const CommandSchedule& schedule) { - return schedule.getStart() < controller.state.getLastCommand(Command::AutoRefresh, schedule.getBank()).getEnd() - || schedule.getEnd() > nextPlannedRefreshs[schedule.getBank()]; + return schedule.getStart() < controller.state.getLastCommand(Command::AutoRefresh, schedule.getBank()).getEnd() + || schedule.getEnd() > nextPlannedRefreshs[schedule.getBank()]; } bool RefreshManagerBankwise::hasCollision(const ScheduledCommand& command) { - const ScheduledCommand& ref= controller.state.getLastCommand(Command::AutoRefresh, command.getBank()); - - return command.getStart() < controller.state.getLastCommand(Command::AutoRefresh, command.getBank()).getEnd() - || command.getEnd() > nextPlannedRefreshs[command.getBank()];} + return command.getStart() < controller.state.getLastCommand(Command::AutoRefresh, command.getBank()).getEnd() + || command.getEnd() > nextPlannedRefreshs[command.getBank()];} void RefreshManagerBankwise::scheduleRefresh(tlm::tlm_generic_payload& payload, sc_time time) { - sc_assert(!isInvalidated(payload, time)); + sc_assert(!isInvalidated(payload, time)); - tlm::tlm_generic_payload& refreshPayload = refreshPayloads[DramExtension::getExtension(payload).getBank()]; + tlm::tlm_generic_payload& refreshPayload = refreshPayloads[DramExtension::getExtension(payload).getBank()]; - DramExtension& extension = DramExtension::getExtension(refreshPayload); + DramExtension& extension = DramExtension::getExtension(refreshPayload); - if (controller.state.rowBufferStates.rowBufferIsOpen(extension.getBank())) - { - ScheduledCommand precharge(Command::Precharge, time, getExecutionTime(Command::Precharge, refreshPayload), extension); + if (controller.state.rowBufferStates.rowBufferIsOpen(extension.getBank())) + { + ScheduledCommand precharge(Command::Precharge, time, getExecutionTime(Command::Precharge, refreshPayload), extension); - controller.getCommandChecker(Command::Precharge).delayToSatisfyConstraints(precharge); - controller.state.change(precharge); - controller.wrapper.send(precharge, refreshPayload); - } + controller.getCommandChecker(Command::Precharge).delayToSatisfyConstraints(precharge); + controller.state.change(precharge); + controller.wrapper.send(precharge, refreshPayload); + } - ScheduledCommand nextRefresh(Command::AutoRefresh, time, getExecutionTime(Command::AutoRefresh, refreshPayload), extension); - controller.getCommandChecker(Command::AutoRefresh).delayToSatisfyConstraints(nextRefresh); - controller.state.change(nextRefresh); - controller.wrapper.send(nextRefresh, refreshPayload); + ScheduledCommand nextRefresh(Command::AutoRefresh, time, getExecutionTime(Command::AutoRefresh, refreshPayload), extension); + controller.getCommandChecker(Command::AutoRefresh).delayToSatisfyConstraints(nextRefresh); + controller.state.change(nextRefresh); + controller.wrapper.send(nextRefresh, refreshPayload); - extension.increaseRow(); - planNextRefresh(extension.getBank()); + extension.increaseRow(); + planNextRefresh(extension.getBank()); } void RefreshManagerBankwise::planNextRefresh(Bank bank) { - nextPlannedRefreshs[bank] += Configuration::getInstance().Timings.refreshTimings[bank].tREFI; - controller.wrapper.send(REFTrigger, nextPlannedRefreshs[bank], refreshPayloads[bank]); + nextPlannedRefreshs[bank] += Configuration::getInstance().Timings.refreshTimings[bank].tREFI; + controller.wrapper.send(REFTrigger, nextPlannedRefreshs[bank], refreshPayloads[bank]); } void RefreshManagerBankwise::reInitialize(Bank bank, sc_time time) { - nextPlannedRefreshs[bank] = clkAlign(time, Alignment::DOWN); - planNextRefresh(bank); + nextPlannedRefreshs[bank] = clkAlign(time, Alignment::DOWN); + planNextRefresh(bank); } bool RefreshManagerBankwise::isInvalidated(tlm::tlm_generic_payload& payload, sc_time time) { - return nextPlannedRefreshs[DramExtension::getExtension(payload).getBank()] > time; + return nextPlannedRefreshs[DramExtension::getExtension(payload).getBank()] > time; } } /* namespace core */ diff --git a/dram/src/controller/core/scheduling/ScheduledCommand.cpp b/dram/src/controller/core/scheduling/ScheduledCommand.cpp index e41e8184..bcef806b 100644 --- a/dram/src/controller/core/scheduling/ScheduledCommand.cpp +++ b/dram/src/controller/core/scheduling/ScheduledCommand.cpp @@ -13,98 +13,98 @@ namespace core { bool ScheduledCommand::isNoCommand() const { - return (command == Command::NOP && start == SC_ZERO_TIME && executionTime == SC_ZERO_TIME && end == SC_ZERO_TIME); + return (command == Command::NOP && start == SC_ZERO_TIME && executionTime == SC_ZERO_TIME && end == SC_ZERO_TIME); } bool ScheduledCommand::isValidCommand() const { - return !isNoCommand(); + return !isNoCommand(); } const sc_time ScheduledCommand::getStart() const { - return start; + return start; } void ScheduledCommand::setStart(sc_time newStart) { - start = newStart; - end = newStart + executionTime; + start = newStart; + end = newStart + executionTime; } void ScheduledCommand::delayStart(sc_time delay) { - setStart(start+delay); + setStart(start+delay); } void ScheduledCommand::delayToMeetConstraint(sc_time previous, sc_time constraint) { - delayStart(getDelayToMeetConstraint(previous, start, constraint)); + delayStart(getDelayToMeetConstraint(previous, start, constraint)); } -const sc_time ScheduledCommand::getEnd() const +sc_time ScheduledCommand::getEnd() const { - return end; + return end; } -const Command ScheduledCommand::getCommand() const +Command ScheduledCommand::getCommand() const { - return command; + return command; } -const sc_time ScheduledCommand::getExecutionTime() const +sc_time ScheduledCommand::getExecutionTime() const { - return executionTime; + return executionTime; } Bank ScheduledCommand::getBank() const { - return extension.getBank(); + return extension.getBank(); } BankGroup ScheduledCommand::getBankGroup() const { - return extension.getBankGroup(); + return extension.getBankGroup(); } Row ScheduledCommand::getRow() const { - return extension.getRow(); + return extension.getRow(); } unsigned int ScheduledCommand::getBurstLength() const { - return extension.getBurstlength(); + return extension.getBurstlength(); } bool ScheduledCommand::operator ==(const ScheduledCommand& b) const { - return b.command == command && b.start == start && b.executionTime == executionTime && b.end == end; + return b.command == command && b.start == start && b.executionTime == executionTime && b.end == end; } bool ScheduledCommand::commandIsIn(const std::vector& commandSet) const { - return isIn(command, commandSet); + return isIn(command, commandSet); } TimeInterval ScheduledCommand::getIntervalOnDataStrobe() const { - sc_assert( - getCommand() == Command::Read || getCommand() == Command::ReadA - || getCommand() == Command::Write - || getCommand() == Command::WriteA); + sc_assert( + getCommand() == Command::Read || getCommand() == Command::ReadA + || getCommand() == Command::Write + || getCommand() == Command::WriteA); - TimingConfiguration& timings = Configuration::getInstance().Timings; + TimingConfiguration& timings = Configuration::getInstance().Timings; - if (getCommand() == Command::Read || getCommand() == Command::ReadA) - { - return TimeInterval(getStart() + timings.tRL,getStart() + timings.tRL + getReadAccessTime()); - } - else - { - return TimeInterval(getStart() + timings.tWL - timings.clk / 2, getStart() + timings.tWL + getWriteAccessTime() - timings.clk / 2); - } + if (getCommand() == Command::Read || getCommand() == Command::ReadA) + { + return TimeInterval(getStart() + timings.tRL,getStart() + timings.tRL + getReadAccessTime()); + } + else + { + return TimeInterval(getStart() + timings.tWL - timings.clk / 2, getStart() + timings.tWL + getWriteAccessTime() - timings.clk / 2); + } } diff --git a/dram/src/controller/core/scheduling/ScheduledCommand.h b/dram/src/controller/core/scheduling/ScheduledCommand.h index c0ab7536..50b3ad1b 100644 --- a/dram/src/controller/core/scheduling/ScheduledCommand.h +++ b/dram/src/controller/core/scheduling/ScheduledCommand.h @@ -41,9 +41,9 @@ public: void delayStart(sc_time delay); void delayToMeetConstraint(sc_time previous, sc_time constraint); - const sc_time getEnd() const; - const Command getCommand() const; - const sc_time getExecutionTime() const; + sc_time getEnd() const; + Command getCommand() const; + sc_time getExecutionTime() const; Bank getBank() const; BankGroup getBankGroup() const; @@ -57,11 +57,11 @@ public: private: - DramExtension extension; Command command; sc_time start; sc_time executionTime; sc_time end; + DramExtension extension; }; } /* namespace controller */ diff --git a/dram/src/controller/scheduler/PARBS.h b/dram/src/controller/scheduler/PARBS.h index f15ef2c1..2c6f9398 100644 --- a/dram/src/controller/scheduler/PARBS.h +++ b/dram/src/controller/scheduler/PARBS.h @@ -25,8 +25,8 @@ public: private: void formBatch(); - bool useExternalBankstates; core::ControllerCore& controllerCore; + bool useExternalBankstates; core::RowBufferState internalBankstates; FR_FCFS *batch; FR_FCFS *buffer; diff --git a/dram/src/simulation/Simulation.cpp b/dram/src/simulation/Simulation.cpp index 4a392d2a..80af5417 100644 --- a/dram/src/simulation/Simulation.cpp +++ b/dram/src/simulation/Simulation.cpp @@ -20,7 +20,7 @@ using namespace std; namespace simulation { -Simulation::Simulation(sc_module_name name, string pathToResources, string traceName, DramSetup setup, +Simulation::Simulation(sc_module_name /*name*/, string pathToResources, string traceName, DramSetup setup, std::vector devices) : traceName(traceName), dramSetup(setup) diff --git a/dram/src/simulation/SimulationManager.cpp b/dram/src/simulation/SimulationManager.cpp index 7d622ecd..fdc9fc4b 100644 --- a/dram/src/simulation/SimulationManager.cpp +++ b/dram/src/simulation/SimulationManager.cpp @@ -16,7 +16,7 @@ using namespace simulation; namespace simulation { SimulationManager::SimulationManager(string resources) : - resources(resources), silent(false) + silent(false), resources(resources) { } diff --git a/dram/src/simulation/TracePlayer.h b/dram/src/simulation/TracePlayer.h index d5f3cdd2..20aa8c6d 100644 --- a/dram/src/simulation/TracePlayer.h +++ b/dram/src/simulation/TracePlayer.h @@ -31,7 +31,7 @@ struct TracePlayer: public sc_module { public: tlm_utils::simple_initiator_socket iSocket; - TracePlayer(sc_module_name name, string pathToTrace, unsigned int burstLength, + TracePlayer(sc_module_name /*name*/, string pathToTrace, unsigned int burstLength, simulation::ISimulation* simulationManager) : payloadEventQueue(this, &TracePlayer::peqCallback), file(pathToTrace), burstlenght(burstLength), numberOfPendingTransactions( 0), transactionsSent(0), transactionsReceived(0), simulationManager( diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp index c064bc67..19f063f6 100644 --- a/dram/src/simulation/main.cpp +++ b/dram/src/simulation/main.cpp @@ -39,7 +39,7 @@ int sc_main(int argc, char **argv) if(argc > 1) simulationToRun = argv[1]; else - simulationToRun = "sim-batch.xml"; + simulationToRun = "tests.xml"; SimulationManager manager(resources); manager.loadSimulationsFromXML(resources + "/simulations/" + simulationToRun);