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

Code formatting.

Browse Source
This commit is contained in:
Lukas Steiner
2021-04-23 10:51:35 +02:00
parent fc44d319bb
commit 399a073912
2 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
View File

@@ -60,13 +60,10 @@ CommandTuple::Type CmdMuxOldest::selectCommand(const ReadyCommands &readyCommand
lastPayloadID = newPayloadID;
result = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
result = it;
}
lastPayloadID = newPayloadID;
result = it;
}
}
@@ -82,6 +79,7 @@ CmdMuxOldestRasCas::CmdMuxOldestRasCas() : memSpec(Configuration::getInstance().
{
readyRasCommands.reserve(memSpec->numberOfBanks);
readyCasCommands.reserve(memSpec->numberOfBanks);
readyRasCasCommands.reserve(2);
}
CommandTuple::Type CmdMuxOldestRasCas::selectCommand(const ReadyCommands &readyCommands)
@@ -118,13 +116,10 @@ CommandTuple::Type CmdMuxOldestRasCas::selectCommand(const ReadyCommands &readyC
lastPayloadID = newPayloadID;
resultRas = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
resultRas = it;
}
lastPayloadID = newPayloadID;
resultRas = it;
}
}
@@ -143,13 +138,10 @@ CommandTuple::Type CmdMuxOldestRasCas::selectCommand(const ReadyCommands &readyC
lastPayloadID = newPayloadID;
resultCas = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
resultCas = it;
}
lastPayloadID = newPayloadID;
resultCas = it;
}
}
@@ -174,13 +166,10 @@ CommandTuple::Type CmdMuxOldestRasCas::selectCommand(const ReadyCommands &readyC
lastPayloadID = newPayloadID;
result = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
result = it;
}
lastPayloadID = newPayloadID;
result = it;
}
}

72
DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
View File

@@ -56,39 +56,19 @@ CommandTuple::Type CmdMuxStrict::selectCommand(const ReadyCommands &readyCommand
if (newTimestamp < lastTimestamp)
{
if (isCasCommand(std::get<CommandTuple::Command>(*it)))
{
if (newPayloadID == nextPayloadID)
{
lastTimestamp = newTimestamp;
lastPayloadID = newPayloadID;
result = it;
}
}
else
if (isRasCommand(std::get<CommandTuple::Command>(*it)) || newPayloadID == nextPayloadID)
{
lastTimestamp = newTimestamp;
lastPayloadID = newPayloadID;
result = it;
}
}
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (isCasCommand(std::get<CommandTuple::Command>(*it)))
if (isRasCommand(std::get<CommandTuple::Command>(*it)) || newPayloadID == nextPayloadID)
{
if ((newPayloadID < lastPayloadID) && (newPayloadID == nextPayloadID))
{
lastPayloadID = newPayloadID;
result = it;
}
}
else
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
result = it;
}
lastPayloadID = newPayloadID;
result = it;
}
}
}
@@ -109,6 +89,7 @@ CmdMuxStrictRasCas::CmdMuxStrictRasCas() : memSpec(Configuration::getInstance().
{
readyRasCommands.reserve(memSpec->numberOfBanks);
readyCasCommands.reserve(memSpec->numberOfBanks);
readyRasCasCommands.reserve(2);
}
CommandTuple::Type CmdMuxStrictRasCas::selectCommand(const ReadyCommands &readyCommands)
@@ -145,41 +126,21 @@ CommandTuple::Type CmdMuxStrictRasCas::selectCommand(const ReadyCommands &readyC
lastPayloadID = newPayloadID;
resultRas = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
resultRas = it;
}
lastPayloadID = newPayloadID;
resultRas = it;
}
}
lastPayloadID = UINT64_MAX;
lastTimestamp = sc_max_time();
for (auto it = readyCasCommands.cbegin(); it != readyCasCommands.cend(); it++)
{
newTimestamp = std::get<CommandTuple::Timestamp>(*it) +
memSpec->getCommandLength(std::get<CommandTuple::Command>(*it));
newPayloadID = DramExtension::getChannelPayloadID(std::get<CommandTuple::Payload>(*it));
if (newPayloadID == nextPayloadID)
{
if (newTimestamp < lastTimestamp)
{
lastTimestamp = newTimestamp;
lastPayloadID = newPayloadID;
resultCas = it;
}
else if (newTimestamp == lastTimestamp)
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
resultCas = it;
}
}
resultCas = it;
break;
}
}
@@ -204,13 +165,10 @@ CommandTuple::Type CmdMuxStrictRasCas::selectCommand(const ReadyCommands &readyC
lastPayloadID = newPayloadID;
result = it;
}
else if (newTimestamp == lastTimestamp)
else if ((newTimestamp == lastTimestamp) && (newPayloadID < lastPayloadID))
{
if (newPayloadID < lastPayloadID)
{
lastPayloadID = newPayloadID;
result = it;
}
lastPayloadID = newPayloadID;
result = it;
}
}