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

Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system

Browse Source
This commit is contained in:
Matthias Jung
2014-07-29 15:18:30 +02:00
parent f74386a38e 8af2f3b898
commit 6ebafb9ece
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dram/resources/configs/amconfigs/am_ddr4.xml
View File

@@ -4,7 +4,7 @@
<dramconfig>
<addressmap length="32">
<row from="19" to="31" />
<colum from="9" to="18" />
<column from="9" to="18" />
<bank from="5" to="8" />
</addressmap>
</dramconfig>

2
dram/resources/configs/amconfigs/am_highHits.xml
View File

@@ -4,6 +4,6 @@
<addressmap length="32">
<row from="19" to="31" />
<bank from="15" to="18" />
<colum from="5" to="14" />
<column from="5" to="14" />
</addressmap>
</dramconfig>

2
dram/resources/configs/amconfigs/am_highPara.xml
View File

@@ -4,7 +4,7 @@
<dramconfig>
<addressmap length="32">
<row from="19" to="31" />
<colum from="9" to="18" />
<column from="9" to="18" />
<bank from="5" to="8" />
</addressmap>
</dramconfig>

2
dram/resources/configs/amconfigs/am_lowHits.xml
View File

@@ -3,7 +3,7 @@
<!-- should have high bank parallelism with a low hit rate -->
<dramconfig>
<addressmap length="32">
<colum from="24" to="31" />
<column from="24" to="31" />
<row from="9" to="23" />
<bank from="5" to="8" />
</addressmap>

2
dram/resources/configs/amconfigs/am_lowPara.xml
View File

@@ -5,7 +5,7 @@
<addressmap length="32">
<bank from="30" to="31" />
<row from="15" to="29" />
<colum from="5" to="14" />
<column from="5" to="14" />
</addressmap>
</dramconfig>

2
dram/resources/configs/amconfigs/am_wideioFourBanks.xml
View File

@@ -15,7 +15,7 @@
<channel from="27" to="28" />
<row from="13" to="26" />
<bank from="11" to="12" />
<colum from="4" to="10" />
<column from="4" to="10" />
<bytes from="0" to="3" />
<!-- <channel from="27" to="28" />
<row from="14" to="26" />

4
dram/src/common/TlmRecorder.cpp
View File

@@ -257,8 +257,8 @@ void TlmRecorder::insertTransactionInDB(Transaction& recordingData)
sqlite3_bind_int(insertTransactionStatement, 8, recordingData.dramExtension.getBankGroup().ID());
sqlite3_bind_int(insertTransactionStatement, 9, recordingData.dramExtension.getRow().ID());
sqlite3_bind_int(insertTransactionStatement, 10, recordingData.dramExtension.getColumn().ID());
sqlite3_bind_int(insertTransactionStatement, 11, recordingData.timeOnDataStrobe.start.value());
sqlite3_bind_int(insertTransactionStatement, 12, recordingData.timeOnDataStrobe.end.value());
sqlite3_bind_int64(insertTransactionStatement, 11, recordingData.timeOnDataStrobe.start.value());
sqlite3_bind_int64(insertTransactionStatement, 12, recordingData.timeOnDataStrobe.end.value());
sqlite3_bind_int64(insertTransactionStatement, 13, recordingData.timeOfGeneration.value());
executeSqlStatement(insertTransactionStatement);

12
dram/src/simulation/Arbiter.h
View File

@@ -56,7 +56,7 @@ private:
return TLM_ACCEPTED;
}
// Initiated by .stl players
// Initiated by senders
tlm_sync_enum nb_transport_fw(int socketId, tlm_generic_payload& payload, tlm_phase& phase,
sc_time& fwDelay)
{
@@ -74,7 +74,7 @@ private:
void peqCallback(tlm_generic_payload& payload, const tlm_phase& phase)
{
//Phases initiated by .stl players
//Phases initiated by intiator side
if (phase == BEGIN_REQ)
{
if(channelIsFree)
@@ -93,11 +93,11 @@ private:
sendToChannel(payload, phase, SC_ZERO_TIME );
}
//Phases initiated by dram backend
//Phases initiated by dram side
else if (phase == END_REQ)
{
channelIsFree = true;
sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
if(!backpressure.empty())
{
@@ -109,7 +109,7 @@ private:
}
else if (phase == BEGIN_RESP)
{
sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
}
else
@@ -125,7 +125,7 @@ private:
iSocket->nb_transport_fw(payload, TPhase, TDelay);
}
void sendToTraceplayer(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
void sendToInitiator(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
{
tlm_phase TPhase = phase;
sc_time TDelay = delay;