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

config xml extended

Browse Source
This commit is contained in:
Janik Schlemminger
2014-04-09 12:36:02 +02:00
parent 15944fe743
commit 339dfbbdbb
8 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dram/.settings/language.settings.xml
View File

@@ -4,7 +4,7 @@
<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="-64906255729110141" 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="-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">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

5
dram/resources/configs/memconfigs/memconfig.xml
View File

@@ -3,5 +3,10 @@
<parameter id="bankwiseLogic" type="bool" value="1" />
<parameter id="openPagePolicy" type="bool" value="1" />
<parameter id="adaptiveOpenPagePolicy" type="bool" value="1" />
<parameter id="refreshAwareScheduling" type="bool" value="1" />
<parameter id="maxNrOfTransactionsInDram" type="uint" value="100" />
<parameter id="scheduler" type="string" value="FR_FCFS" />
<parameter id="capsize" type="uint" value="10" />
</memconfig>
</memspec>

4
dram/src/core/configuration/Configuration.cpp
View File

@@ -12,8 +12,8 @@ using namespace std;
namespace core{
string Configuration::memspecUri = "/home/robert/git/dram/dram/resources/configs/memspecs/MatzesWideIO.xml";
string Configuration::memconfigUri = "/home/robert/git/dram/dram/resources/configs/memconfigs/memconfig.xml";
string Configuration::memspecUri = "";
string Configuration::memconfigUri = "";
Configuration::Configuration()
{

4
dram/src/core/configuration/Configuration.h
View File

@@ -40,6 +40,10 @@ struct Configuration
bool BankwiseLogic;
bool OpenPagePolicy;
bool AdaptiveOpenPagePolicy;
bool RefreshAwareScheduling;
unsigned int MaxNrOfTransactions;
string Scheduler;
unsigned int Capsize;
private:
Configuration();

4
dram/src/core/configuration/MemSpecLoader.cpp
View File

@@ -49,6 +49,10 @@ void MemSpecLoader::loadConfig(Configuration& config, XMLElement* memspec)
config.BankwiseLogic = queryBoolParameter(configuration, "bankwiseLogic");
config.OpenPagePolicy = queryBoolParameter(configuration, "openPagePolicy");
config.AdaptiveOpenPagePolicy = queryBoolParameter(configuration, "adaptiveOpenPagePolicy");
config.RefreshAwareScheduling = queryBoolParameter(configuration, "refreshAwareScheduling");
config.MaxNrOfTransactions = queryUIntParameter(configuration, "maxNrOfTransactionsInDram");
config.Scheduler = queryStringParameter(configuration, "scheduler");
config.Capsize = queryUIntParameter(configuration, "capsize");
}
void MemSpecLoader::loadDDR4(Configuration& config, XMLElement* memspec)

2
dram/src/core/configuration/TimingConfiguration.h
View File

@@ -40,7 +40,7 @@ struct TimingConfiguration
sc_time tWL; //write latency
sc_time tWR; //write recovery (write to precharge)
sc_time tWTR; //write to read (different bank group)
//sc_time tWTR; //.. (same bank group)
//sc_time tWTR_L; //.. (same bank group)
sc_time tCKESR; //min time in sref
sc_time tCKE; //min time in pdna or pdnp
sc_time tXP; //min delay to row access command after pdnpx pdnax

5
dram/src/core/scheduling/checker/ActivateChecker.cpp
View File

@@ -83,6 +83,11 @@ bool ActivateChecker::satsfies_activateToActivate_differentBank(ScheduledCommand
bool ActivateChecker::satisfies_nActivateWindow(ScheduledCommand& command) const
{
/*
* there may be activates scheduled in the future, so emplace
* command in a copied set (not necessarily the last in time),
* and check if the n-act constraint holds for the whole set.
*/
if (state.lastActivates.size() >= config.nActivate)
{
set<sc_time> lastActivates = state.lastActivates;

5
dram/src/simulation/main.cpp
View File

@@ -8,6 +8,7 @@
#include <iostream>
#include <string>
#include "SimulationManager.h"
#include "../core/configuration/Configuration.h"
using namespace std;
using namespace simulation;
@@ -28,6 +29,10 @@ int sc_main(int argc, char **argv)
{
sc_set_time_resolution(1, SC_PS);
Configuration::memspecUri = "/home/jonny/git/dram/dram/resources/configs/memspecs/MatzesWideIO.xml";
Configuration::memconfigUri = "/home/jonny/git/dram/dram/resources/configs/memconfigs/memconfig.xml";
string resources = pathOfFile(argv[0]) + string("/../resources/");
string stl1 = "chstone-sha_32.stl";
unsigned int burstlength1 = 4;