cc78d86661
src/mem/cache/base_cache.cc:
Fix a bug about not having a request to send
src/mem/cache/base_cache.hh:
Fix a bug with the blocking code
src/mem/cache/cache.hh:
AFix a bug with snoop hits in WB buffer
src/mem/cache/cache_impl.hh:
Fix a bug with snoop hits in WB buffer
Also, add better DPRINTF's
src/mem/cache/miss/miss_queue.cc:
Fix a bug with upgrades (Need to clean it up later)
src/mem/cache/miss/mshr.cc:
Fix a memory leak bug, still some outstanding with writebacks not being deleted
src/mem/cache/miss/mshr_queue.cc:
Fix a bug about upgrades (need to clean up later)
src/mem/packet.hh:
Fix for newly added cmd attribute for upgrades
tests/configs/memtest.py:
More interesting testcase
--HG--
extra : convert_revision : fcb4f17dd58b537bb4f67a8c835f50e455e8c688
93 lines
3 KiB
Python
93 lines
3 KiB
Python
# Copyright (c) 2006 The Regents of The University of Michigan
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met: redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer;
|
|
# redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution;
|
|
# neither the name of the copyright holders nor the names of its
|
|
# contributors may be used to endorse or promote products derived from
|
|
# this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# Authors: Ron Dreslinski
|
|
|
|
import m5
|
|
from m5.objects import *
|
|
|
|
# --------------------
|
|
# Base L1 Cache
|
|
# ====================
|
|
|
|
class L1(BaseCache):
|
|
latency = 1
|
|
block_size = 64
|
|
mshrs = 12
|
|
tgts_per_mshr = 8
|
|
protocol = CoherenceProtocol(protocol='moesi')
|
|
|
|
# ----------------------
|
|
# Base L2 Cache
|
|
# ----------------------
|
|
|
|
class L2(BaseCache):
|
|
block_size = 64
|
|
latency = 10
|
|
mshrs = 92
|
|
tgts_per_mshr = 16
|
|
write_buffers = 8
|
|
|
|
#MAX CORES IS 8 with the fals sharing method
|
|
nb_cores = 8
|
|
cpus = [ MemTest(max_loads=1e12, percent_uncacheable=0) for i in xrange(nb_cores) ]
|
|
|
|
# system simulated
|
|
system = System(cpu = cpus, funcmem = PhysicalMemory(),
|
|
physmem = PhysicalMemory(), membus = Bus())
|
|
|
|
# l2cache & bus
|
|
system.toL2Bus = Bus()
|
|
system.l2c = L2(size='64kB', assoc=8)
|
|
system.l2c.cpu_side = system.toL2Bus.port
|
|
|
|
# connect l2c to membus
|
|
system.l2c.mem_side = system.membus.port
|
|
|
|
which_port = 0
|
|
# add L1 caches
|
|
for cpu in cpus:
|
|
cpu.l1c = L1(size = '32kB', assoc = 4)
|
|
cpu.l1c.cpu_side = cpu.test
|
|
cpu.l1c.mem_side = system.toL2Bus.port
|
|
if which_port == 0:
|
|
system.funcmem.port = cpu.functional
|
|
which_port = 1
|
|
else:
|
|
system.funcmem.functional = cpu.functional
|
|
|
|
|
|
# connect memory to membus
|
|
system.physmem.port = system.membus.port
|
|
|
|
|
|
# -----------------------
|
|
# run simulation
|
|
# -----------------------
|
|
|
|
root = Root( system = system )
|
|
root.system.mem_mode = 'timing'
|
|
root.trace.flags="Cache"
|