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

changed build structure

Browse Source
This commit is contained in:
gernhard
2014-03-15 18:31:16 +01:00
parent 8ecd91c040
commit 4dffbf9383
49 changed files with 214 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
DRAM/.cproject
View File

@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<?fileVersion 4.0.0?>
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1370040858">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1370040858" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1370040858" moduleId="org.eclipse.cdt.core.settings" name="standalone">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1370040858" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1370040858" name="standalone" parent="cdt.managedbuild.config.gnu.exe.debug">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1370040858." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.885929366" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1576653236" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@@ -25,9 +27,10 @@
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.251136752" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.include.files.360537680" name="Include files (-include)" superClass="gnu.cpp.compiler.option.include.files"/>
<option id="gnu.cpp.compiler.option.include.paths.1915081878" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/local/gmock-1.7.0/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
<listOptionValue builtIn="false" value="/usr/local/systemc-2.3.0/include"/>
<listOptionValue builtIn="false" value="/home/gernhard/gmock-1.7.0/include"/>
<listOptionValue builtIn="false" value="/home/gernhard/systemc-2.3.0/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/dram}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc}/../common/common/standalone/include&quot;"/>
</option>
<option id="gnu.cpp.compiler.option.other.other.2019766237" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11" valueType="string"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.643453324" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -40,10 +43,12 @@
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.907462308" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1836604188" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
<option id="gnu.cpp.link.option.paths.973188119" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="/usr/local/gmock-1.7.0/lib"/>
<listOptionValue builtIn="false" value="/usr/local/systemc-2.3.0/lib-linux64"/>
<listOptionValue builtIn="false" value="/home/gernhard/gmock-1.7.0/lib"/>
<listOptionValue builtIn="false" value="/home/gernhard/systemc-2.3.0/lib-linux64"/>
<listOptionValue builtIn="false" value="${workspace_loc}/../common/common/standalone"/>
</option>
<option id="gnu.cpp.link.option.libs.1223301357" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="common"/>
<listOptionValue builtIn="false" value="gmock"/>
<listOptionValue builtIn="false" value="systemc"/>
<listOptionValue builtIn="false" value="pthread"/>
@@ -62,47 +67,72 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1948932292">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1948932292" moduleId="org.eclipse.cdt.core.settings" name="Release">
<externalSettings/>
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534" moduleId="org.eclipse.cdt.core.settings" name="platformArchitect">
<externalSettings>
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/DRAM"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/DRAM/platformArchitect"/>
<entry flags="RESOLVED" kind="libraryFile" name="DRAM" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1948932292" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1948932292." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1304429647" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2117723245" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
<builder buildPath="${workspace_loc:/DRAM-Model}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.179048212" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.198561954" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1633668164" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.661329754" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1947045903" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1777926483" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Build to be included in the PA" id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534" name="platformArchitect" parent="cdt.managedbuild.config.gnu.exe.debug" postbuildStep="cd ..;find dram -name &quot;*.h&quot;|cpio -pdvm ${PWD}/include">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1023307960" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.414978133" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
<builder buildPath="${workspace_loc:/DRAM-Model}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.816792307" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1004860099" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS} " id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2093880104" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1656587336" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1483570389" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.include.files.1410441150" name="Include files (-include)" superClass="gnu.cpp.compiler.option.include.files"/>
<option id="gnu.cpp.compiler.option.include.paths.1209861138" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/opt/synopsys/H-2013.06-SP2/SLS/linux/common/include"/>
<listOptionValue builtIn="false" value="/opt/synopsys/H-2013.06-SP2/SLS/linux/common/include/tlm"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/dram}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc}/../common/common/platformArchitect/include&quot;"/>
</option>
<option id="gnu.cpp.compiler.option.other.other.747930109" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1178281980" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1398731634" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.282006085" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.release.option.debugging.level.553635625" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1992326299" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1258877198" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.585247163" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.debug.option.debugging.level.190811164" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.445436925" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.934022736" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.2032691893" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1587368994" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1722966853" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.959608384" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
<option id="gnu.cpp.link.option.paths.546134415" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="/usr/local/gmock-1.7.0/lib"/>
<listOptionValue builtIn="false" value="/usr/local/systemc-2.3.0/lib-linux64"/>
</option>
<option id="gnu.cpp.link.option.libs.2006125917" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="gmock"/>
<listOptionValue builtIn="false" value="systemc"/>
<listOptionValue builtIn="false" value="pthread"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.93553316" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.481391656" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2043530174" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1909152899" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.126876343" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="main.cpp|testing" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
@@ -131,9 +161,13 @@
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/DRAM-Model"/>
</configuration>
<configuration configurationName="platformArchitect">
<resource resourceType="PROJECT" workspacePath="/DRAM"/>
</configuration>
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/DRAM-Model"/>
</configuration>
<configuration configurationName="standalone"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings">
<doc-comment-owner id="org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner">

2
DRAM/.gitignore vendored
View File

@@ -1 +1,3 @@
/Debug
/platformArchitect
/standalone

11
DRAM/.settings/language.settings.xml
View File

@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
<configuration id="cdt.managedbuild.config.gnu.exe.debug.1370040858" name="Debug">
<configuration id="cdt.managedbuild.config.gnu.exe.debug.1370040858" name="standalone">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-2055719358" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot; -std=c++11">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-908217774480930773" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot; -std=c++11">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
</extension>
</configuration>
<configuration id="cdt.managedbuild.config.gnu.exe.release.1948932292" name="Release">
<configuration id="cdt.managedbuild.config.gnu.exe.debug.1370040858.1136170534" name="platformArchitect">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-908217774480930773" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot; -std=c++11">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
</extension>
</configuration>
</project>

10
DRAM/src/core/Configuration.h → DRAM/dram/core/Configuration.h
View File

@@ -15,13 +15,15 @@ namespace controller{
struct Configuration
{
Configuration():Timings(numberOfBanks){}
unsigned int numberOfBanks = 8;
Configuration(): numberOfBanks(8),Timings(numberOfBanks), RefreshBankwise(false),
nActivate(4)
{}
unsigned int numberOfBanks;
TimingConfiguration Timings;
bool RefreshBankwise = false;
bool RefreshBankwise;
unsigned int nActivate = 4;
unsigned int nActivate;
};
} /* namespace controller */

8
DRAM/src/core/Controller.cpp → DRAM/dram/core/Controller.cpp
View File

@@ -19,10 +19,10 @@ Controller::Controller() :
*this), refreshManager(config.Timings.refreshTimings[0], bus), bus(config, state,
allCommandChecker)
{
addCommandChecker(Command::Activate, new ActivateChecker(config, bus));
addCommandChecker(Command::Precharge, new PrechargeChecker(config, bus));
addCommandChecker(Command::Read, new ReadChecker(config, bus));
addCommandChecker(Command::Write, new WriteChecker(config, bus));
addCommandChecker(Activate, new ActivateChecker(config, bus));
addCommandChecker(Precharge, new PrechargeChecker(config, bus));
addCommandChecker(Read, new ReadChecker(config, bus));
addCommandChecker(Write, new WriteChecker(config, bus));
}
void Controller::addCommandChecker(Command command, ICommandChecker* checker)

0
DRAM/src/core/Controller.h → DRAM/dram/core/Controller.h
View File

0
DRAM/src/core/ControllerState.cpp → DRAM/dram/core/ControllerState.cpp
View File

2
DRAM/src/core/ControllerState.h → DRAM/dram/core/ControllerState.h
View File

@@ -17,7 +17,7 @@ public:
ControllerState(unsigned int numberOfBanks);
virtual ~ControllerState();
common::BankStates bankStates;
BankStates bankStates;
};
} /* namespace controller */

37
DRAM/src/core/TimingConfiguration.h → DRAM/dram/core/TimingConfiguration.h
View File

@@ -30,27 +30,26 @@ struct TimingConfiguration
sc_time tREFI = sc_time(15.6, SC_US); //TODO align
refreshTimings.push_back(RefreshTiming(tRFC, tREFI));
}
clk = sc_time(6.0, SC_NS); // 166MHz
tRP = 3*clk; //precharge-time (pre -> act same bank)
tRAS = 6*clk; //active-time (act -> pre same bank)
tRC = tRP + tRAS; //RAS-cycle-time (min time bw 2 succesive ACT to same bank)
tRRD = 2*clk; //(min time bw 2 succesive ACT to different banks)
tRCD = 5*clk; //act -> read/write
tTAW = clkAlign(sc_time(50, SC_NS), clk);
}
sc_time clk = sc_time(6.0, SC_NS); // 166MHz
sc_time tRP = 3*clk; //precharge-time (pre -> act same bank)
sc_time tRAS = 6*clk; //active-time (act -> pre same bank)
sc_time tRC = tRP + tRAS; //RAS-cycle-time (min time bw 2 succesive ACT to same bank)
sc_time tRRD = 2*clk; //(min time bw 2 succesive ACT to different banks)
sc_time tRCD = 5*clk; //act -> read/write
sc_time tTAW = clkAlign(sc_time(50, SC_NS), clk, Alignment::UP);
//Refresh
//sc_time tRFC = 18*clk;
//sc_time tREF = sc_time(64, SC_MS);
//sc_time tREFA = tRP + tRFC;
//sc_time tREFB = tRP + tRC;
//sc_time tREFI = tREFA;
sc_time clk;
sc_time tRP;
sc_time tRAS;
sc_time tRC;
sc_time tRRD;
sc_time tRCD;
sc_time tTAW;
std::vector<RefreshTiming> refreshTimings;

0
DRAM/src/core/powerdown/PowerDownManager.cpp → DRAM/dram/core/powerdown/PowerDownManager.cpp
View File

0
DRAM/src/core/powerdown/PowerDownManager.h → DRAM/dram/core/powerdown/PowerDownManager.h
View File

1
DRAM/src/core/refresh/BankwiseRefreshManager.cpp → DRAM/dram/core/refresh/BankwiseRefreshManager.cpp
View File

@@ -7,7 +7,6 @@
#include <core/refresh/BankwiseRefreshManager.h>
using namespace common;
using namespace std;
namespace controller {

2
DRAM/src/core/refresh/BankwiseRefreshManager.h → DRAM/dram/core/refresh/BankwiseRefreshManager.h
View File

@@ -9,7 +9,7 @@
#define BANKWISEREFRESHMANAGER_H_
#include "IRefreshManager.h"
#include "common/dramextension.h"
#include "common/dramExtension.h"
#include "RefreshManager.h"
namespace controller {

0
DRAM/src/core/refresh/IRefreshManager.h → DRAM/dram/core/refresh/IRefreshManager.h
View File

8
DRAM/src/core/refresh/RefreshManager.cpp → DRAM/dram/core/refresh/RefreshManager.cpp
View File

@@ -8,7 +8,7 @@
#include <core/refresh/RefreshManager.h>
#include "core/utils/Utils.h"
using namespace common;
namespace controller {
@@ -17,7 +17,7 @@ RefreshManager::RefreshManager(const RefreshTiming& refreshTiming,
refreshTiming(refreshTiming), internalScheduler(internalScheduler)
{
setupTransaction(refreshTransaction, Bank(0));
nextPlannedRefresh = new ScheduledCommand(refreshTransaction, Command::Refresh, SC_ZERO_TIME,
nextPlannedRefresh = new ScheduledCommand(refreshTransaction, Refresh, SC_ZERO_TIME,
refreshTiming.tRFC);
planNextRefresh(*nextPlannedRefresh);
}
@@ -27,7 +27,7 @@ RefreshManager::RefreshManager(const RefreshTiming& refreshTiming,
refreshTiming(refreshTiming), internalScheduler(internalScheduler)
{
setupTransaction(refreshTransaction, bank);
nextPlannedRefresh = new ScheduledCommand(refreshTransaction, Command::Refresh, SC_ZERO_TIME,
nextPlannedRefresh = new ScheduledCommand(refreshTransaction, Refresh, SC_ZERO_TIME,
refreshTiming.tRFC);
planNextRefresh(*nextPlannedRefresh);
}
@@ -70,7 +70,7 @@ void RefreshManager::scheduleRefresh(ScheduledCommand& refresh)
void RefreshManager::planNextRefresh(ScheduledCommand& refresh) //TODO nicer to return the reference ?
{
refresh.delayStart(refreshTiming.tREFI);
internalScheduler.scheduleTrigger(Trigger::RefreshTrigger, refresh.getStart());
internalScheduler.scheduleTrigger(RefreshTrigger, refresh.getStart());
}
void RefreshManager::setupTransaction(tlm::tlm_generic_payload& transaction, Bank bank)

6
DRAM/src/core/refresh/RefreshManager.h → DRAM/dram/core/refresh/RefreshManager.h
View File

@@ -9,7 +9,7 @@
#define REFRESHMANAGER_H_
#include "IRefreshManager.h"
#include "common/dramextension.h"
#include "common/dramExtension.h"
namespace controller {
@@ -17,7 +17,7 @@ class RefreshManager : public IRefreshManager
{
public:
RefreshManager(const RefreshTiming& refreshTiming, IInternalScheduler& internalScheduler);
RefreshManager(const RefreshTiming& refreshTiming, IInternalScheduler& internalScheduler, common::Bank bank);
RefreshManager(const RefreshTiming& refreshTiming, IInternalScheduler& internalScheduler, Bank bank);
virtual ~RefreshManager();
virtual bool hasCollision(const CommandSchedule& schedule);
@@ -33,7 +33,7 @@ private:
void scheduleRefresh(ScheduledCommand& refresh);
void planNextRefresh(ScheduledCommand& refresh);
static void setupTransaction(tlm::tlm_generic_payload& transaction, common::Bank bank);
static void setupTransaction(tlm::tlm_generic_payload& transaction, Bank bank);
};
} /* namespace controller */

2
DRAM/src/core/scheduling/Command.h → DRAM/dram/core/scheduling/Command.h
View File

@@ -10,7 +10,7 @@
namespace controller {
enum class Command {NOP, Precharge, PrechargeAll, Activate, Read, Write, ReadA, WriteA, Refresh};
enum Command {NOP, Precharge, PrechargeAll, Activate, Read, Write, ReadA, WriteA, Refresh};
typedef std::vector<Command> CommandSequence;

20
DRAM/src/core/scheduling/CommandBus.cpp → DRAM/dram/core/scheduling/CommandBus.cpp
View File

@@ -37,17 +37,17 @@ void CommandBus::scheduleTrigger(const Trigger command, sc_time time)
//notify tlm wrapper
}
ScheduledCommand& CommandBus::getLastCommand(Command command, common::Bank bank)
ScheduledCommand& CommandBus::getLastCommand(Command command, Bank bank)
{
return lastCommandsOnBus[command][bank];
}
ScheduledCommand& CommandBus::getLastCommand(Command command)
{
ScheduledCommand* max = &getLastCommand(command, common::Bank(0));
ScheduledCommand* max = &getLastCommand(command, Bank(0));
for (unsigned int i = 0; i < config.numberOfBanks; ++i)
{
ScheduledCommand* current = &getLastCommand(command, common::Bank(i));
ScheduledCommand* current = &getLastCommand(command, Bank(i));
if (current->getStart() > max->getStart())
max = current;
}
@@ -59,7 +59,7 @@ bool CommandBus::notYetScheduled(Command command) const
return (lastCommandsOnBus.count(command) == 0);
}
bool CommandBus::notYetScheduled(Command command, common::Bank bank) const
bool CommandBus::notYetScheduled(Command command, Bank bank) const
{
return (notYetScheduled(command) || lastCommandsOnBus.find(command)->second.count(bank) == 0);
}
@@ -88,13 +88,13 @@ void CommandBus::changeControllerState(const ScheduledCommand& command)
{
switch (command.getCommand())
{
case Command::Refresh:
case Refresh:
refresh(command);
break;
case Command::Activate:
case Activate:
activate(command);
break;
case Command::Precharge:
case Precharge:
precharge(command);
default:
break;
@@ -116,11 +116,11 @@ void CommandBus::refresh(const ScheduledCommand& command)
void CommandBus::precharge(const ScheduledCommand& command)
{
if(command.getCommand() == Command::Precharge)
if(command.getCommand() == Precharge)
{
state.bankStates.closeRowBuffer(command.getBank());
}
else if(command.getCommand() == Command::PrechargeAll)
else if(command.getCommand() == PrechargeAll)
{
state.bankStates.closeAllRowBuffers();
}
@@ -128,7 +128,7 @@ void CommandBus::precharge(const ScheduledCommand& command)
void CommandBus::activate(const ScheduledCommand& command)
{
if(command.getCommand() == Command::Activate)
if(command.getCommand() == Activate)
{
state.bankStates.openRowInRowBuffer(command.getBank(), command.getRow());
}

6
DRAM/src/core/scheduling/CommandBus.h → DRAM/dram/core/scheduling/CommandBus.h
View File

@@ -29,10 +29,10 @@ public:
void cleanUpBus(sc_time currentTime);
ScheduledCommand& getLastCommand(Command command, common::Bank bank);//TODO simple way to make it const?
ScheduledCommand& getLastCommand(Command command, Bank bank);//TODO simple way to make it const?
ScheduledCommand& getLastCommand(Command command);
bool notYetScheduled(Command command) const;
bool notYetScheduled(Command command, common::Bank bank) const;
bool notYetScheduled(Command command, Bank bank) const;
sc_time getEarliestStartTime(const ScheduledCommand& command) const;
const std::set<sc_time>& getPendingBusCommands() const {return pendingBusCommands;}
@@ -42,7 +42,7 @@ private:
controller::ControllerState& state;
std::vector<ICommandChecker*>& checker;
std::map<Command,std::map<common::Bank, ScheduledCommand>> lastCommandsOnBus;
std::map<Command,std::map<Bank, ScheduledCommand> > lastCommandsOnBus;
std::set<sc_time> pendingBusCommands;
void changeControllerState(const ScheduledCommand& command);

8
DRAM/src/core/scheduling/CommandSchedule.h → DRAM/dram/core/scheduling/CommandSchedule.h
View File

@@ -9,7 +9,7 @@
#define COMMANDSCHEDULE_H_
#include <vector>
#include "common/dramextension.h"
#include "common/dramExtension.h"
#include "ScheduledCommand.h"
namespace controller {
@@ -18,7 +18,7 @@ class CommandSchedule
{
public:
CommandSchedule(tlm::tlm_generic_payload& transaction) :
transaction(&transaction), extension(common::DramExtension::getExtension(&transaction))
transaction(&transaction), extension(DramExtension::getExtension(&transaction))
{
}
@@ -53,7 +53,7 @@ public:
return scheduledCommands.back().getEnd() - scheduledCommands.front().getStart();
}
common::Bank getBank() const
Bank getBank() const
{
return extension.getBank();
}
@@ -62,7 +62,7 @@ private:
std::vector<ScheduledCommand> scheduledCommands;
tlm::tlm_generic_payload* transaction;
common::DramExtension extension;
DramExtension extension;
};
} /* namespace controller */

15
DRAM/src/core/scheduling/CommandSequenceGenerator.cpp → DRAM/dram/core/scheduling/CommandSequenceGenerator.cpp
View File

@@ -6,9 +6,8 @@
*/
#include "CommandSequenceGenerator.h"
#include "common/dramextension.h"
#include "common/dramExtension.h"
using namespace common;
using namespace std;
namespace controller {
@@ -44,7 +43,7 @@ CommandSequence CommandSequenceGenerator::generateCommandSequence(
CommandSequence CommandSequenceGenerator::getBankMissCommandSequence(tlm::tlm_generic_payload& transaction)
{
vector<Command> result;
result.push_back(Command::Activate);
result.push_back(Activate);
result.push_back(getReadWriteCommand(transaction));
return result;
}
@@ -52,8 +51,8 @@ CommandSequence CommandSequenceGenerator::getBankMissCommandSequence(tlm::tlm_ge
CommandSequence CommandSequenceGenerator::getRowMissCommandSequence(tlm::tlm_generic_payload& transaction)
{
vector<Command> result;
result.push_back(Command::Precharge);
result.push_back(Command::Activate);
result.push_back(Precharge);
result.push_back(Activate);
result.push_back(getReadWriteCommand(transaction));
return result;
}
@@ -67,14 +66,14 @@ CommandSequence CommandSequenceGenerator::getRowHitCommandSequence(tlm::tlm_gene
Command CommandSequenceGenerator::getReadWriteCommand(tlm::tlm_generic_payload& transaction)
{
if (transaction.get_command() == tlm::tlm_command::TLM_READ_COMMAND)
if (transaction.get_command() == tlm::TLM_READ_COMMAND)
{
//TODO READA
return Command::Read;
return Read;
}
else
{
return Command::Write;
return Write;
}
}

0
DRAM/src/core/scheduling/CommandSequenceGenerator.h → DRAM/dram/core/scheduling/CommandSequenceGenerator.h
View File

0
DRAM/src/core/scheduling/CommandSequenceScheduler.cpp → DRAM/dram/core/scheduling/CommandSequenceScheduler.cpp
View File

0
DRAM/src/core/scheduling/CommandSequenceScheduler.h → DRAM/dram/core/scheduling/CommandSequenceScheduler.h
View File

0
DRAM/src/core/scheduling/IInternalScheduler.h → DRAM/dram/core/scheduling/IInternalScheduler.h
View File

14
DRAM/src/core/scheduling/ScheduledCommand.h → DRAM/dram/core/scheduling/ScheduledCommand.h
View File

@@ -11,7 +11,7 @@
#include <systemc.h>
#include <tlm.h>
#include "Command.h"
#include "common/dramextension.h"
#include "common/dramExtension.h"
namespace controller {
@@ -22,18 +22,18 @@ public:
ScheduledCommand(tlm::tlm_generic_payload& transaction, Command command, sc_time time,
sc_time executionTime) :
transaction(&transaction), command(command), start(time), executionTime(executionTime), extension(common::DramExtension::getExtension(&transaction))
transaction(&transaction), command(command), start(time), executionTime(executionTime), extension(DramExtension::getExtension(&transaction))
{
}
ScheduledCommand() :
transaction(NULL), command(Command::NOP), start(SC_ZERO_TIME), executionTime(SC_ZERO_TIME), extension()
transaction(NULL), command(NOP), start(SC_ZERO_TIME), executionTime(SC_ZERO_TIME), extension()
{
}
bool isNoCommand() const
{
return (*this == ScheduledCommand::NoCommand);
return (*this == NoCommand);
}
const sc_time getStart() const
@@ -67,12 +67,12 @@ public:
return *transaction;
}
common::Bank getBank() const
Bank getBank() const
{
return extension.getBank();
}
common::Row getRow() const
Row getRow() const
{
return extension.getRow();
}
@@ -94,7 +94,7 @@ private:
sc_time start;
sc_time executionTime;
common::DramExtension extension;
DramExtension extension;
};
} /* namespace controller */

2
DRAM/src/core/scheduling/Trigger.h → DRAM/dram/core/scheduling/Trigger.h
View File

@@ -10,7 +10,7 @@
namespace controller {
enum class Trigger {RefreshTrigger};
enum Trigger {RefreshTrigger};
} /* namespace controller */

21
DRAM/src/core/scheduling/checker/ActivateChecker.cpp → DRAM/dram/core/scheduling/checker/ActivateChecker.cpp
View File

@@ -5,18 +5,17 @@
* Author: jonny
*/
#include <core/scheduling/checker/ActivateChecker.h>
#include <map>
#include "core/utils/Utils.h"
#include <algorithm>
#include "core/utils/Utils.h"
#include "core/scheduling/checker/ActivateChecker.h"
using namespace common;
namespace controller {
void ActivateChecker::check(ScheduledCommand& command) const
{
if (command.getCommand() != Command::Activate)
if (command.getCommand() != Activate)
return;
check_activateToActivate(command);
check_nActivateWindow(command);
@@ -26,17 +25,17 @@ void ActivateChecker::check(ScheduledCommand& command) const
sc_time ActivateChecker::getExecutionTime(const tlm::tlm_generic_payload& transaction,
Command command) const
{
assert(command == Command::Activate);
assert(command == Activate);
return config.Timings.tRCD;
}
void ActivateChecker::check_activateToActivate(ScheduledCommand& command) const
{
if (bus.notYetScheduled(Command::Activate))
if (bus.notYetScheduled(Activate))
return;
sc_time lastActivate = bus.getLastCommand(Command::Activate).getStart();
sc_time lastActivateOnBank = bus.getLastCommand(Command::Activate, command.getBank()).getStart();
sc_time lastActivate = bus.getLastCommand(Activate).getStart();
sc_time lastActivateOnBank = bus.getLastCommand(Activate, command.getBank()).getStart();
command.delayStart(delayByConstraint(lastActivate, command.getStart(), config.Timings.tRRD));
command.delayStart(
@@ -46,8 +45,8 @@ void ActivateChecker::check_activateToActivate(ScheduledCommand& command) const
void ActivateChecker::check_prechargeToActivate(ScheduledCommand& command) const
{
sc_time lastPrechargeOnBank = std::max(
bus.getLastCommand(Command::Precharge, command.getBank()).getStart(),
bus.getLastCommand(Command::PrechargeAll, command.getBank()).getStart());
bus.getLastCommand(Precharge, command.getBank()).getStart(),
bus.getLastCommand(PrechargeAll, command.getBank()).getStart());
command.delayStart(
delayByConstraint(lastPrechargeOnBank, command.getStart(), config.Timings.tRC));
}
@@ -68,7 +67,7 @@ void ActivateChecker::check_bus(ScheduledCommand& command) const
void ActivateChecker::cb_IInternalScheduler(const ScheduledCommand& command)
{
if (command.getCommand() == Command::Activate)
if (command.getCommand() == Activate)
{
nActivateWindow.put(command.getStart());
}

0
DRAM/src/core/scheduling/checker/ActivateChecker.h → DRAM/dram/core/scheduling/checker/ActivateChecker.h
View File

0
DRAM/src/core/scheduling/checker/ICommandChecker.h → DRAM/dram/core/scheduling/checker/ICommandChecker.h
View File

2
DRAM/src/core/scheduling/checker/PrechargeChecker.cpp → DRAM/dram/core/scheduling/checker/PrechargeChecker.cpp
View File

@@ -16,7 +16,7 @@ void PrechargeChecker::check(ScheduledCommand& command) const
sc_time PrechargeChecker::getExecutionTime(const tlm::tlm_generic_payload& transaction,
Command command) const
{
assert(command == Command::Precharge || command == Command::PrechargeAll);
assert(command == Precharge || command == PrechargeAll);
return config.Timings.tRP;
}
void PrechargeChecker::cb_IInternalScheduler(const ScheduledCommand& command)

0
DRAM/src/core/scheduling/checker/PrechargeChecker.h → DRAM/dram/core/scheduling/checker/PrechargeChecker.h
View File

2
DRAM/src/core/scheduling/checker/ReadChecker.cpp → DRAM/dram/core/scheduling/checker/ReadChecker.cpp
View File

@@ -16,7 +16,7 @@ void ReadChecker::check(ScheduledCommand& command) const
sc_time ReadChecker::getExecutionTime(const tlm::tlm_generic_payload& transaction,
Command command) const
{
assert(command == Command::Read || command == Command::ReadA);
assert(command == Read || command == ReadA);
return config.Timings.clk*8;
}

0
DRAM/src/core/scheduling/checker/ReadChecker.h → DRAM/dram/core/scheduling/checker/ReadChecker.h
View File

2
DRAM/src/core/scheduling/checker/WriteChecker.cpp → DRAM/dram/core/scheduling/checker/WriteChecker.cpp
View File

@@ -16,7 +16,7 @@ void WriteChecker::check(ScheduledCommand& command) const
sc_time WriteChecker::getExecutionTime(const tlm::tlm_generic_payload& transaction,
Command command) const
{
assert(command == Command::Write || command == Command::WriteA);
assert(command == Write || command == WriteA);
return config.Timings.clk*8;
}

0
DRAM/src/core/scheduling/checker/WriteChecker.h → DRAM/dram/core/scheduling/checker/WriteChecker.h
View File

0
DRAM/src/core/utils/RingBuffer.h → DRAM/dram/core/utils/RingBuffer.h
View File

4
DRAM/src/core/utils/Utils.cpp → DRAM/dram/core/utils/Utils.cpp
View File

@@ -7,8 +7,6 @@
#include "Utils.h"
using namespace common;
unsigned int getStartAddress(Bank bank)
{
return 0;
@@ -24,7 +22,7 @@ sc_time delayByConstraint(sc_time previous, sc_time start, sc_time constraint)
const sc_time clkAlign(sc_time time, sc_time clk, Alignment alignment)
{
if (alignment == Alignment::UP)
if (alignment == UP)
return ceil(time / clk) * clk;
else
return floor(time / clk) * clk;

8
DRAM/src/core/utils/Utils.h → DRAM/dram/core/utils/Utils.h
View File

@@ -8,16 +8,16 @@
#ifndef UTILS_H_
#define UTILS_H_
#include "common/dramextension.h"
#include "common/dramExtension.h"
#include <systemc.h>
unsigned int getStartAddress(common::Bank bank);
unsigned int getStartAddress(Bank bank);
sc_time delayByConstraint(sc_time previous, sc_time start, sc_time constraint);
enum class Alignment {UP, DOWN};
enum Alignment {UP, DOWN};
const sc_time clkAlign(sc_time time, sc_time clk, Alignment alignment = Alignment::UP);
const sc_time clkAlign(sc_time time, sc_time clk, Alignment alignment = UP);
bool isClkAligned(sc_time time, sc_time clk);
#endif /* UTILS_H_ */

57
DRAM/src/common/BankStates.cpp
View File

@@ -1,57 +0,0 @@
/*
* BankStates.cpp
*
* Created on: Feb 24, 2014
* Author: robert
*/
#include "BankStates.h"
namespace common {
using namespace std;
BankStates::BankStates(unsigned int numberOfBanks) :
rowsInRowBuffers(numberOfBanks)
{
for (unsigned int i = 0; i < numberOfBanks; ++i)
{
banks.push_back(Bank(i));
}
closeAllRowBuffers();
}
BankStates::~BankStates()
{
}
bool BankStates::rowBufferIsOpen(const Bank &bank) const
{
return rowsInRowBuffers.at(bank.ID()) != Row::NO_ROW;
}
Row BankStates::getRowInRowBuffer(const Bank &bank) const
{
return rowsInRowBuffers.at(bank.ID());
}
void BankStates::openRowInRowBuffer(const Bank &bank, const Row &row)
{
rowsInRowBuffers.at(bank.ID()) = row;
}
void BankStates::closeRowBuffer(const Bank &bank)
{
rowsInRowBuffers.at(bank.ID()) = Row::NO_ROW;
}
void BankStates::closeAllRowBuffers()
{
for(vector<Bank>::iterator it = banks.begin(); it != banks.end(); ++it)
{
closeRowBuffer(*it);
}
}
} /* namespace scheduler */

37
DRAM/src/common/BankStates.h
View File

@@ -1,37 +0,0 @@
/*
* BankStates.h
*
* Created on: Feb 24, 2014
* Author: robert
*/
#ifndef BANKSTATES_H_
#define BANKSTATES_H_
#include <vector>
#include "dramextension.h"
namespace common {
class BankStates {
public:
BankStates(unsigned int numberOfBanks);
virtual ~BankStates();
unsigned int getNumberOfBanks() const {return rowsInRowBuffers.size();}
const std::vector<Bank>& getBanks() const {return banks;}
bool rowBufferIsOpen(const Bank &bank) const;
Row getRowInRowBuffer(const Bank &bank) const;
void openRowInRowBuffer(const Bank &bank, const Row &row);
void closeRowBuffer(const Bank &bank);
void closeAllRowBuffers();
private:
std::vector<Bank> banks;
std::vector<Row> rowsInRowBuffers;
};
} /* namespace scheduler */
#endif /* BANKSTATES_H_ */

83
DRAM/src/common/dramextension.cpp
View File

@@ -1,83 +0,0 @@
#include "dramextension.h"
#include <assert.h>
using namespace tlm;
namespace common {
tlm_extension_base* DramExtension::clone() const
{
return new DramExtension(thread, bank, row, column);
}
void DramExtension::copy_from(const tlm_extension_base &ext)
{
const DramExtension &cpyFrom = static_cast<const DramExtension&>(ext);
thread = cpyFrom.thread;
bank = cpyFrom.bank;
row = cpyFrom.row;
column = cpyFrom.column;
}
/* Static methods
*
*/
const DramExtension& DramExtension::getExtension(const tlm_generic_payload *payload)
{
DramExtension *result = NULL;
payload->get_extension(result);
assert(result != NULL);
return *result;
}
bool operator ==(const Thread& lhs, const Thread& rhs)
{
return lhs.ID() == rhs.ID();
}
bool operator !=(const Thread& lhs, const Thread& rhs)
{
return !(lhs == rhs);
}
bool operator ==(const Bank& lhs, const Bank& rhs)
{
return lhs.ID() == rhs.ID();
}
bool operator !=(const Bank& lhs, const Bank& rhs)
{
return !(lhs == rhs);
}
bool operator <(const Bank& lhs, const Bank& rhs)
{
return lhs.ID() < rhs.ID();
}
const Row Row::NO_ROW;
bool operator ==(const Row& lhs, const Row& rhs)
{
if(lhs.isNoRow != rhs.isNoRow)
return false;
return lhs.ID() == rhs.ID();
}
bool operator !=(const Row& lhs, const Row& rhs)
{
return !(lhs == rhs);
}
bool operator ==(const Column& lhs, const Column& rhs)
{
return lhs.ID() == rhs.ID();
}
bool operator !=(const Column& lhs, const Column& rhs)
{
return !(lhs == rhs);
}
}

92
DRAM/src/common/dramextension.h
View File

@@ -1,92 +0,0 @@
#ifndef SCHEDULEREXTENSION_H
#define SCHEDULEREXTENSION_H
#include <tlm.h>
#include <iostream>
namespace common{
class Thread
{
public :
explicit Thread(unsigned int id) : id(id) {}
unsigned int ID() const { return id;}
private:
unsigned int id;
};
class Bank
{
public :
explicit Bank(unsigned int id) : id(id) {}
unsigned int ID() const { return id;}
private:
unsigned int id;
};
class Row
{
public :
static const Row NO_ROW;
Row() : id(0), isNoRow(true) {}
explicit Row(unsigned int id) : id(id), isNoRow(false) {}
unsigned int ID() const { return id;}
private:
unsigned int id;
bool isNoRow;
friend bool operator==(const Row &lhs, const Row &rhs);
};
class Column
{
public :
explicit Column(unsigned int id) : id(id) {}
unsigned int ID() const { return id;}
private:
unsigned int id;
};
bool operator==(const Thread &lhs, const Thread &rhs);
bool operator!=(const Thread &lhs, const Thread &rhs);
bool operator==(const Bank &lhs, const Bank &rhs);
bool operator!=(const Bank &lhs, const Bank &rhs);
bool operator<(const Bank &lhs, const Bank &rhs);
bool operator==(const Row &lhs, const Row &rhs);
bool operator!=(const Row &lhs, const Row &rhs);
bool operator==(const Column &lhs, const Column &rhs);
bool operator!=(const Column &lhs, const Column &rhs);
class DramExtension : public tlm::tlm_extension<DramExtension>
{
private:
Thread thread;
Bank bank;
Row row;
Column column;
public:
DramExtension():thread(0),bank(0),row(0),column(0){}
DramExtension(const Thread& thread, const Bank& bank, const Row& row, const Column& column) :
thread(thread),bank(bank),row(row),column(column){}
~DramExtension(){}
virtual tlm::tlm_extension_base* clone() const;
virtual void copy_from(const tlm_extension_base &ext);
const Thread& getThread() const{return thread;}
const Bank& getBank() const{return bank;}
const Row& getRow() const{return row;}
const Column& getColumn() const{return column;}
static const DramExtension& getExtension(const tlm::tlm_generic_payload *payload);
};
}
#endif // SCHEDULEREXTENSION_H

8
DRAM/testing/BankwiseRefreshManager_test.cpp
View File

@@ -9,10 +9,10 @@
#include <gmock/gmock.h>
#include <core/refresh/BankwiseRefreshManager.h>
#include "testUtils.h"
#include "common/dramextension.h"
#include "common/dramExtension.h"
using namespace testing;
using namespace common;
namespace controller {
@@ -39,7 +39,7 @@ public:
sc_time tREFI = config.Timings.refreshTimings.at(i).tREFI;
sc_time clk = config.Timings.clk;
colliding.add(Command::Read, tREFI - 1 * clk, 2 * clk);
colliding.add(Read, tREFI - 1 * clk, 2 * clk);
return colliding;
};
@@ -50,7 +50,7 @@ public:
sc_time tREFI = config.Timings.refreshTimings.at(i).tREFI;
sc_time clk = config.Timings.clk;
non_colliding.add(Command::Read, tREFI - 3 * clk, 2 * clk);
non_colliding.add(Read, tREFI - 3 * clk, 2 * clk);
return non_colliding;
};
};

44
DRAM/testing/CommandBus_test.cpp
View File

@@ -36,10 +36,10 @@ public:
TEST_F(CommandBusTest, cleanUpBusWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand cmd1(*dummy.get(), Command::Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Command::Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Command::Read, 7*clk, clk);
ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
bus.scheduleCommand(cmd1);
bus.scheduleCommand(cmd2);
@@ -57,13 +57,13 @@ TEST_F(CommandBusTest, cleanUpBusWorks)
TEST_F(CommandBusTest, getEarliestStartTimeWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand cmd1(*dummy.get(), Command::Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Command::Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Command::Read, 7*clk, clk);
ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
ScheduledCommand collision(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand noCollision(*dummy.get(), Command::Read, 6*clk, clk);
ScheduledCommand collision(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand noCollision(*dummy.get(), Read, 6*clk, clk);
bus.scheduleCommand(cmd1);
bus.scheduleCommand(cmd2);
@@ -78,34 +78,34 @@ TEST_F(CommandBusTest, getEarliestStartTimeWorks)
TEST_F(CommandBusTest, getESTDiesWithNotClkAligned)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand notAligned(*dummy.get(), Command::Read, 2.5*clk, clk);
ScheduledCommand notAligned(*dummy.get(), Read, 2.5*clk, clk);
EXPECT_DEATH(bus.getEarliestStartTime(notAligned), ".*");
}
TEST_F(CommandBusTest, getLastCommandWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(common::Thread(0), common::Bank(0));
shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(common::Thread(0), common::Bank(2));
shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(Thread(0), Bank(0));
shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(Thread(0), Bank(2));
ScheduledCommand read0(*dummy0.get(), Command::Read, 2*clk, clk);
ScheduledCommand read2(*dummy2.get(), Command::Read, 3*clk, clk);
ScheduledCommand read0(*dummy0.get(), Read, 2*clk, clk);
ScheduledCommand read2(*dummy2.get(), Read, 3*clk, clk);
bus.scheduleCommand(read0);
bus.scheduleCommand(read2);
EXPECT_EQ(read0, bus.getLastCommand(Command::Read, read0.getBank()));
EXPECT_EQ(read2, bus.getLastCommand(Command::Read, read2.getBank()));
EXPECT_EQ(read2.getStart(), bus.getLastCommand(Command::Read).getStart());
EXPECT_EQ(read0, bus.getLastCommand(Read, read0.getBank()));
EXPECT_EQ(read2, bus.getLastCommand(Read, read2.getBank()));
EXPECT_EQ(read2.getStart(), bus.getLastCommand(Read).getStart());
}
TEST_F(CommandBusTest, notYetScheduledWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(common::Thread(0), common::Bank(0));
ScheduledCommand read(*dummy.get(), Command::Read, 2*clk, clk);
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(Thread(0), Bank(0));
ScheduledCommand read(*dummy.get(), Read, 2*clk, clk);
EXPECT_TRUE(bus.notYetScheduled(Command::Read));
EXPECT_TRUE(bus.notYetScheduled(Read));
bus.scheduleCommand(read);
EXPECT_FALSE(bus.notYetScheduled(Command::Read));
EXPECT_FALSE(bus.notYetScheduled(Read));
}

21
DRAM/testing/CommandGenerator_test.cpp
View File

@@ -1,16 +1,17 @@
#include <gtest/gtest.h>
#include <vector>
#include <tlm.h>
#include "core/scheduling/CommandSequenceGenerator.h"
#include "testUtils.h"
#include <vector>
using namespace controller;
using namespace common;
using namespace std;
constexpr unsigned int numberOfBanks = 8;
constexpr tlm::tlm_command READ = tlm::tlm_command::TLM_READ_COMMAND;
constexpr tlm::tlm_command WRITE = tlm::tlm_command::TLM_WRITE_COMMAND;
constexpr tlm::tlm_command READ = tlm::TLM_READ_COMMAND;
constexpr tlm::tlm_command WRITE = tlm::TLM_WRITE_COMMAND;
TEST(CommandSequenceGenerator, ReadAndWriteWithRowHit)
{
@@ -23,8 +24,8 @@ TEST(CommandSequenceGenerator, ReadAndWriteWithRowHit)
auto hit_write = createDummyPayload(Thread(0), Bank(0), Row(3), Column(1), WRITE);
vector<Command> expected_read ({Command::Read});
vector<Command> expected_write ({Command::Write});
vector<Command> expected_read ({Read});
vector<Command> expected_write ({Write});
EXPECT_EQ(expected_read, generator.generateCommandSequence(hit_read.get()));
EXPECT_EQ(expected_write, generator.generateCommandSequence(hit_write.get()));
@@ -41,8 +42,8 @@ TEST(CommandSequenceGenerator, ReadAndWriteWithRowMiss)
auto miss_write = createDummyPayload(Thread(0), Bank(0), Row(4), Column(1), WRITE);
vector<Command> expected_read ({Command::Precharge, Command::Activate, Command::Read});
vector<Command> expected_write ({Command::Precharge, Command::Activate, Command::Write});
vector<Command> expected_read ({Precharge, Activate, Read});
vector<Command> expected_write ({Precharge, Activate, Write});
EXPECT_EQ(expected_read, generator.generateCommandSequence(miss_read.get()));
EXPECT_EQ(expected_write, generator.generateCommandSequence(miss_write.get()));
@@ -59,8 +60,8 @@ TEST(CommandSequenceGenerator, ReadAndWriteWithBankMiss)
auto miss_write = createDummyPayload(Thread(0), Bank(1), Row(4), Column(1), WRITE);
vector<Command> expected_read ({Command::Activate, Command::Read});
vector<Command> expected_write ({Command::Activate, Command::Write});
vector<Command> expected_read ({Activate, Read});
vector<Command> expected_write ({Activate, Write});
EXPECT_EQ(expected_read, generator.generateCommandSequence(miss_read.get()));
EXPECT_EQ(expected_write, generator.generateCommandSequence(miss_write.get()));

4
DRAM/testing/RefreshManager_test.cpp
View File

@@ -41,7 +41,7 @@ public:
sc_time tREFI = config.Timings.refreshTimings.at(0).tREFI;
sc_time clk = config.Timings.clk;
colliding.add(Command::Read, tREFI - 1 * clk, 2 * clk);
colliding.add(Read, tREFI - 1 * clk, 2 * clk);
return colliding;
};
@@ -52,7 +52,7 @@ public:
sc_time tREFI = config.Timings.refreshTimings.at(0).tREFI;
sc_time clk = config.Timings.clk;
non_colliding.add(Command::Read, tREFI - 3 * clk, 2 * clk);
non_colliding.add(Read, tREFI - 3 * clk, 2 * clk);
return non_colliding;
};
};

2
DRAM/testing/testUtils.cpp
View File

@@ -3,7 +3,7 @@
using namespace std;
using namespace tlm;
using namespace common;
/* Scheduler related stuff
*

20
DRAM/testing/testUtils.h
View File

@@ -3,24 +3,24 @@
#include <tlm.h>
#include <memory>
#include "common/dramextension.h"
#include "common/dramExtension.h"
#include "core/scheduling/ScheduledCommand.h"
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload();
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(common::DramExtension* extension);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(DramExtension* extension);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const common::Thread& thread,
const common::Bank& bank, const common::Row& row, const common::Column& column);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const Thread& thread,
const Bank& bank, const Row& row, const Column& column);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const common::Thread& thread,
const common::Bank& bank, const common::Row& row);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const Thread& thread,
const Bank& bank, const Row& row);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const common::Thread& thread,
const common::Bank& bank);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const Thread& thread,
const Bank& bank);
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const common::Thread& thread,
const common::Bank& bank, const common::Row& row, const common::Column& column,
std::shared_ptr<tlm::tlm_generic_payload> createDummyPayload(const Thread& thread,
const Bank& bank, const Row& row, const Column& column,
const tlm::tlm_command& command);
//std::shared_ptr<controller::ScheduledCommand> createDummyScheduledCommand(const sc_time);