Merge branch 'master' into Simple_SMS

* master: (36 commits)
  Reference code provided by Menbere.
  AddressOffset is only used when we use gem5.
  Avoid some assertions when using gem5
  Small fix.
  Fix for disable refresh
  Further imporovement of the gem5 integration
  gem5 subproject added to DRAMSys
  Added sonification script to the arbiter
  Sonification script added
  changes for 4 channels
  wideio
  Bandwidth over time plot
  Fix compilation for newer gcc versions.
  First step in fixing the test system
  Fixed Test Starting Script
  Fixed small bug in resource file
  Added outputs to plots.py for Matlab
  Bugfix order of compilation
  Fixed compile bug on MAC
  Fixed bug which was introduced due to boost removal
  ...

# Conflicts:
#	DRAMSys/simulator/resources/resources.pri
#	DRAMSys/simulator/simulator.pro
#	DRAMSys/simulator/src/simulation/main.cpp
This commit is contained in:
Thanh C. Tran
2017-05-09 17:13:09 +02:00
75 changed files with 2170 additions and 1652 deletions

View File

@@ -5,8 +5,19 @@ using namespace std;
void SMS::schedule(gp *payload)
{
buffer[DramExtension::getExtension(payload).getThread()].emplace_back(payload);
inFlightMemRequestCounter[DramExtension::getExtension(payload).getThread()]++;
Thread thread = DramExtension::getExtension(payload).getThread();
buffer[thread].emplace_back(payload);
if (inFlightMemRequestCounter.find(thread) == inFlightMemRequestCounter.end()) {
inFlightMemRequestCounter[thread] = 0;
}
inFlightMemRequestCounter[thread]++;
if (readybatches.find(thread) == readybatches.end()) {
readybatches[thread] = new ReadyBatch();
}
newRequest.notify(SC_ZERO_TIME);
}