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

Merge remote-tracking branch 'EIT-Wehn/master'

Browse Source 
# Conflicts:
#	DRAMSys/simulator/src/controller/core/configuration/Configuration.h
This commit is contained in:
Johannes Feldmann
2017-04-17 15:46:48 +02:00
parent 11d428c1d5 eb526e7e83
commit 9a80296740
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DRAMSys/simulator/library.pro
View File

@@ -28,6 +28,17 @@ $$eval(dramsys_pct) {
DEFINES += DRAMSYS_PCT
}
# Check if gem5 should be used
gem5 = $$(GEM5)
isEmpty(gem5) {
message(GEM5 environment variable not found)
message(Gem5 Simulation Disabled)
} else {
message(Gem5 Simulation Feature Enabled)
message(Gem5 home is $${gem5})
DEFINES += DRAMSYS_GEM5
}
message(SystemC home is $${systemc_home})
systemc_target_arch = $$(SYSTEMC_TARGET_ARCH)

1
DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
View File

@@ -11,5 +11,4 @@
<NumberOfDevicesOnDIMM value = "8" />
<CheckTLM2Protocol value = "0" />
<AddressOffset value = "0" />
<gem5 value = "0" />
</simconfig>

4
DRAMSys/simulator/resources/configs/simulator/ddr3.xml
View File

@@ -11,11 +11,9 @@
<NumberOfDevicesOnDIMM value = "8" />
<CheckTLM2Protocol value = "0" />
<AddressOffset value = "0" />
<gem5 value = "0" />
<!-- Gem5 Related Configuration:
In the memory controller file the storage mode should be set to Store
E.g. the DRAM is located at 0x80000000 for gem5
<AddressOffset value = "214748364c8" />
<gem5 value = "1" />
<AddressOffset value = "2147483648" />
-->
</simconfig>

6
DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
View File

@@ -190,11 +190,13 @@ void Configuration::setParameter(std::string name, std::string value)
SC_REPORT_FATAL("Configuration", ("Invalid value for parameter " + name + ". This parameter must be at least one.").c_str());
} else
NumberOfDevicesOnDIMM = string2int(value);
else if(name == "gem5")
gem5 = string2bool(value);
else if(name == "AddressOffset")
{
#ifdef DRAMSYS_GEM5
AddressOffset = string2ull(value);
#else
AddressOffset = 0;
#endif
cout << "Address Offset: " << AddressOffset << endl;
}
else if(name == "CheckTLM2Protocol")

14
DRAMSys/simulator/src/simulation/Dram.h
View File

@@ -393,11 +393,8 @@ struct Dram : sc_module
}
else if (phase == BEGIN_WR)
{
#ifndef DRAMSYS_PCT
if(Configuration::getInstance().gem5 == false)
{
assert(payload.get_data_length() == bytesPerBurst);
}
#if !defined (DRAMSYS_PCT) && !defined (DRAMSYS_GEM5)
assert(payload.get_data_length() == bytesPerBurst);
#endif
if(powerAnalysis == true){DRAMPower->doCommand(MemCommand::WR, bank, cycle);}
@@ -421,11 +418,8 @@ struct Dram : sc_module
}
else if (phase == BEGIN_RD)
{
#ifndef DRAMSYS_PCT
if(Configuration::getInstance().gem5 == false)
{
assert(payload.get_data_length() == bytesPerBurst);
}
#if !defined (DRAMSYS_PCT) && !defined (DRAMSYS_GEM5)
assert(payload.get_data_length() == bytesPerBurst);
#endif
numberOfTransactionsServed++;