diff options
author | Erik Hallnor <ehallnor@umich.edu> | 2003-10-16 17:04:25 -0400 |
---|---|---|
committer | Erik Hallnor <ehallnor@umich.edu> | 2003-10-16 17:04:25 -0400 |
commit | aeaf133d271a75d649451290d2b3ea12b2b744ec (patch) | |
tree | e8c9103896aa63a77350f6b12849ba45e347f5fc /cpu/memtest/memtest.hh | |
parent | a6788d64dd683c0e7d82f10049d39253c0ea03bb (diff) | |
parent | 4134477369028e04dd265a43753868c01912c465 (diff) | |
download | gem5-aeaf133d271a75d649451290d2b3ea12b2b744ec.tar.xz |
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision : 2979dcbf516446b45c7fb94454e4c4f013f480e4
Diffstat (limited to 'cpu/memtest/memtest.hh')
-rw-r--r-- | cpu/memtest/memtest.hh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpu/memtest/memtest.hh b/cpu/memtest/memtest.hh index 36c9691e6..bda807d11 100644 --- a/cpu/memtest/memtest.hh +++ b/cpu/memtest/memtest.hh @@ -49,9 +49,10 @@ class MemTest : public BaseCPU unsigned _memorySize, unsigned _percentReads, unsigned _percentUncacheable, - unsigned _maxReads, unsigned _progressInterval, - Addr _traceAddr); + Addr _traceAddr, + Counter max_loads_any_thread, + Counter max_loads_all_threads); // register statistics virtual void regStats(); @@ -82,8 +83,6 @@ class MemTest : public BaseCPU unsigned percentReads; // target percentage of read accesses unsigned percentUncacheable; - Tick maxReads; // max # of reads to perform (then quit) - unsigned blockSize; Addr blockAddrMask; @@ -104,9 +103,9 @@ class MemTest : public BaseCPU Tick noResponseCycles; - Statistics::Scalar<long long int> numReads; - Statistics::Scalar<long long int> numWrites; - Statistics::Scalar<long long int> numCopies; + Statistics::Scalar<> numReads; + Statistics::Scalar<> numWrites; + Statistics::Scalar<> numCopies; // called by MemCompleteEvent::process() void completeRequest(MemReqPtr req, uint8_t *data); |