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

Revert changes from previous commit.

Browse Source
This commit is contained in:
Lukas Steiner
2021-05-19 15:34:14 +02:00
parent ff265a8a95
commit dda39ac4ef
4 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,21 +261,20 @@ void Controller::controllerMethod()
commandTuple = powerDownManagers[rankID]->getNextCommand();
if (std::get<CommandTuple::Command>(commandTuple) != Command::NOP)
readyCommands.emplace_back(commandTuple);
// (4.2) Check for refresh commands (PREA/PRE or REFA/REFB)
commandTuple = refreshManagers[rankID]->getNextCommand();
if (std::get<CommandTuple::Command>(commandTuple) != Command::NOP)
else
{
readyCommands.emplace_back(commandTuple);
powerDownManagers[rankID]->triggerInterruption();
}
// (4.3) Check for bank commands (PRE, ACT, RD/RDA or WR/WRA)
for (auto it : bankMachinesOnRank[rankID])
{
commandTuple = it->getNextCommand();
// (4.2) Check for refresh commands (PREA/PRE or REFA/REFB)
commandTuple = refreshManagers[rankID]->getNextCommand();
if (std::get<CommandTuple::Command>(commandTuple) != Command::NOP)
readyCommands.emplace_back(commandTuple);
// (4.3) Check for bank commands (PRE, ACT, RD/RDA or WR/WRA)
for (auto it : bankMachinesOnRank[rankID])
{
commandTuple = it->getNextCommand();
if (std::get<CommandTuple::Command>(commandTuple) != Command::NOP)
readyCommands.emplace_back(commandTuple);
}
}
}

13
DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.cpp
View File

@@ -66,9 +66,9 @@ sc_time RefreshManagerAllBank::start()
if (sc_time_stamp() >= timeForNextTrigger)
{
// powerDownManager->triggerInterruption();
// if (sleeping)
// return timeToSchedule;
powerDownManager->triggerInterruption();
if (sleeping)
return timeToSchedule;
if (sc_time_stamp() >= timeForNextTrigger + memSpec->getRefreshIntervalAB())
{
@@ -108,8 +108,7 @@ sc_time RefreshManagerAllBank::start()
else
nextCommand = Command::REFA;
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank, BankGroup(0), Bank(0));
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank, BankGroup(0), Bank(0));
return timeToSchedule;
}
else // if (state == RmState::Pulledin)
@@ -133,9 +132,7 @@ sc_time RefreshManagerAllBank::start()
else
{
nextCommand = Command::REFA;
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank, BankGroup(0), Bank(0));
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank, BankGroup(0), Bank(0));
return timeToSchedule;
}
}

16
DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.cpp
View File

@@ -76,9 +76,9 @@ sc_time RefreshManagerPerBank::start()
if (sc_time_stamp() >= timeForNextTrigger)
{
// powerDownManager->triggerInterruption();
// if (sleeping)
// return timeToSchedule;
powerDownManager->triggerInterruption();
if (sleeping)
return timeToSchedule;
if (sc_time_stamp() >= timeForNextTrigger + memSpec->getRefreshIntervalPB())
{
@@ -129,9 +129,8 @@ sc_time RefreshManagerPerBank::start()
}
}
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentBankMachine->getBankGroup(), currentBankMachine->getBank());
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentBankMachine->getBankGroup(), currentBankMachine->getBank());
return timeToSchedule;
}
}
@@ -163,9 +162,8 @@ sc_time RefreshManagerPerBank::start()
else
nextCommand = Command::REFB;
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentBankMachine->getBankGroup(), currentBankMachine->getBank());
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentBankMachine->getBankGroup(), currentBankMachine->getBank());
return timeToSchedule;
}
}

16
DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.cpp
View File

@@ -85,9 +85,9 @@ sc_time RefreshManagerSameBank::start()
if (sc_time_stamp() >= timeForNextTrigger)
{
// powerDownManager->triggerInterruption();
// if (sleeping)
// return timeToSchedule;
powerDownManager->triggerInterruption();
if (sleeping)
return timeToSchedule;
if (sc_time_stamp() >= timeForNextTrigger + memSpec->getRefreshIntervalSB())
{
@@ -148,9 +148,8 @@ sc_time RefreshManagerSameBank::start()
skipSelection = true;
}
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentIterator->front()->getBankGroup(), currentIterator->front()->getBank());
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentIterator->front()->getBankGroup(), currentIterator->front()->getBank());
return timeToSchedule;
}
}
@@ -196,9 +195,8 @@ sc_time RefreshManagerSameBank::start()
}
}
if (!sleeping)
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentIterator->front()->getBankGroup(), currentIterator->front()->getBank());
timeToSchedule = checker->timeToSatisfyConstraints(nextCommand, rank,
currentIterator->front()->getBankGroup(), currentIterator->front()->getBank());
return timeToSchedule;
}
}