sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

SE/FS: Get rid of FULL_SYSTEM in mem.

Browse source
This commit is contained in:
Gabe Black 2011-11-07 01:13:43 -08:00
parent 812277ac6a
commit 71c4534ce9
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mem/cache/base.cc vendored
View file

@ -38,6 +38,7 @@
#include "debug/Cache.hh"
#include "mem/cache/base.hh"
#include "mem/cache/mshr.hh"
#include "sim/full_system.hh"
using namespace std;
@ -151,11 +152,7 @@ BaseCache::regStats()
const string &cstr = cmd.toString();
hits[access_idx]
#if FULL_SYSTEM
.init(_numCpus + 1)
#else
.init(_numCpus)
#endif
.init(FullSystem ? (_numCpus + 1) : _numCpus)
.name(name() + "." + cstr + "_hits")
.desc("number of " + cstr + " hits")
.flags(total | nozero | nonan)
@ -192,11 +189,7 @@ BaseCache::regStats()
const string &cstr = cmd.toString();
misses[access_idx]
#if FULL_SYSTEM
.init(_numCpus + 1)
#else
.init(_numCpus)
#endif
.init(FullSystem ? (_numCpus + 1) : _numCpus)
.name(name() + "." + cstr + "_misses")
.desc("number of " + cstr + " misses")
.flags(total | nozero | nonan)

9
src/mem/cache/base.hh vendored
View file

@ -57,6 +57,7 @@
#include "mem/tport.hh"
#include "params/BaseCache.hh"
#include "sim/eventq.hh"
#include "sim/full_system.hh"
#include "sim/sim_exit.hh"
class MSHR;
@ -505,12 +506,10 @@ class BaseCache : public MemObject
* available, meanwhile writeback hit/miss stats are not used
* in any aggregate hit/miss calculations, so just lump them all
* in bucket 0 */
#if FULL_SYSTEM
} else if (id == -1) {
} else if (FullSystem && id == -1) {
// Device accesses have id -1
// lump device accesses into their own bucket
misses[pkt->cmdToIndex()][_numCpus]++;
#endif
} else {
misses[pkt->cmdToIndex()][id % _numCpus]++;
}
@ -533,12 +532,10 @@ class BaseCache : public MemObject
if (pkt->cmd == MemCmd::Writeback) {
assert(id == -1);
hits[pkt->cmdToIndex()][0]++;
#if FULL_SYSTEM
} else if (id == -1) {
} else if (FullSystem && id == -1) {
// Device accesses have id -1
// lump device accesses into their own bucket
hits[pkt->cmdToIndex()][_numCpus]++;
#endif
} else {
/* the % is necessary in case there are switch cpus */
hits[pkt->cmdToIndex()][id % _numCpus]++;