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

config: Improve ruby simobject names

Browse source 
This patch attaches ruby objects to the system before the topology is
created so that their simobject names read their meaningful variable
names instead of their topology name.
This commit is contained in:
Brad Beckmann 2010-08-20 11:46:11 -07:00
parent 09854be558
commit 10e25cb1d0
10 changed files with 94 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/example/memtest-ruby.py
View file

@ -111,7 +111,7 @@ system = System(cpu = cpus,
funcmem = PhysicalMemory(), funcmem = PhysicalMemory(),
physmem = PhysicalMemory()) physmem = PhysicalMemory())
system.ruby = Ruby.create_system(options, system.physmem) system.ruby = Ruby.create_system(options, system)
assert(len(cpus) == len(system.ruby.cpu_ruby_ports)) assert(len(cpus) == len(system.ruby.cpu_ruby_ports))

2
configs/example/ruby_fs.py
View file

@ -113,7 +113,7 @@ CPUClass.clock = options.clock
system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0]) system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
system.ruby = Ruby.create_system(options, system.ruby = Ruby.create_system(options,
system.physmem, system,
system.piobus, system.piobus,
system.dma_devices) system.dma_devices)

2
configs/example/ruby_se.py
View file

@ -150,7 +150,7 @@ np = options.num_cpus
system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)], system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
physmem = PhysicalMemory()) physmem = PhysicalMemory())
system.ruby = Ruby.create_system(options, system.physmem) system.ruby = Ruby.create_system(options, system)
assert(options.num_cpus == len(system.ruby.cpu_ruby_ports)) assert(options.num_cpus == len(system.ruby.cpu_ruby_ports))

2
configs/example/rubytest.py
View file

@ -92,7 +92,7 @@ tester = RubyTester(checks_to_complete = options.checks,
# #
system = System(physmem = PhysicalMemory()) system = System(physmem = PhysicalMemory())
system.ruby = Ruby.create_system(options, system.physmem) system.ruby = Ruby.create_system(options, system)
assert(options.num_cpus == len(system.ruby.cpu_ruby_ports)) assert(options.num_cpus == len(system.ruby.cpu_ruby_ports))

25
configs/ruby/MESI_CMP_directory.py
View file

@ -47,7 +47,7 @@ class L2Cache(RubyCache):
def define_options(parser): def define_options(parser):
return return
def create_system(options, phys_mem, piobus, dma_devices): def create_system(options, system, piobus, dma_devices):
if buildEnv['PROTOCOL'] != 'MESI_CMP_directory': if buildEnv['PROTOCOL'] != 'MESI_CMP_directory':
panic("This script requires the MESI_CMP_directory protocol to be built.") panic("This script requires the MESI_CMP_directory protocol to be built.")
@ -81,8 +81,8 @@ def create_system(options, phys_mem, piobus, dma_devices):
cpu_seq = RubySequencer(version = i, cpu_seq = RubySequencer(version = i,
icache = l1i_cache, icache = l1i_cache,
dcache = l1d_cache, dcache = l1d_cache,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
if piobus != None: if piobus != None:
cpu_seq.pio_port = piobus.port cpu_seq.pio_port = piobus.port
@ -92,7 +92,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
L1IcacheMemory = l1i_cache, L1IcacheMemory = l1i_cache,
L1DcacheMemory = l1d_cache, L1DcacheMemory = l1d_cache,
l2_select_num_bits = \ l2_select_num_bits = \
math.log(options.num_l2caches, 2)) math.log(options.num_l2caches,
2))
exec("system.l1_cntrl%d = l1_cntrl" % i)
# #
# Add controllers and sequencers to the appropriate lists # Add controllers and sequencers to the appropriate lists
# #
@ -109,9 +113,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
l2_cntrl = L2Cache_Controller(version = i, l2_cntrl = L2Cache_Controller(version = i,
L2cacheMemory = l2_cache) L2cacheMemory = l2_cache)
exec("system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl) l2_cntrl_nodes.append(l2_cntrl)
phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1 phys_mem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
mem_module_size = phys_mem_size / options.num_dirs mem_module_size = phys_mem_size / options.num_dirs
for i in xrange(options.num_dirs): for i in xrange(options.num_dirs):
@ -127,9 +133,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
dir_cntrl = Directory_Controller(version = i, dir_cntrl = Directory_Controller(version = i,
directory = \ directory = \
RubyDirectoryMemory(version = i, RubyDirectoryMemory(version = i,
size = dir_size), size = \
dir_size),
memBuffer = mem_cntrl) memBuffer = mem_cntrl)
exec("system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl) dir_cntrl_nodes.append(dir_cntrl)
for i, dma_device in enumerate(dma_devices): for i, dma_device in enumerate(dma_devices):
@ -137,13 +145,14 @@ def create_system(options, phys_mem, piobus, dma_devices):
# Create the Ruby objects associated with the dma controller # Create the Ruby objects associated with the dma controller
# #
dma_seq = DMASequencer(version = i, dma_seq = DMASequencer(version = i,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
dma_cntrl = DMA_Controller(version = i, dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq) dma_sequencer = dma_seq)
dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma
exec("system.dma_cntrl%d = dma_cntrl" % i)
dma_cntrl_nodes.append(dma_cntrl) dma_cntrl_nodes.append(dma_cntrl)
all_cntrls = l1_cntrl_nodes + \ all_cntrls = l1_cntrl_nodes + \

27
configs/ruby/MI_example.py
View file

@ -40,7 +40,7 @@ class Cache(RubyCache):
def define_options(parser): def define_options(parser):
return return
def create_system(options, phys_mem, piobus, dma_devices): def create_system(options, system, piobus, dma_devices):
if buildEnv['PROTOCOL'] != 'MI_example': if buildEnv['PROTOCOL'] != 'MI_example':
panic("This script requires the MI_example protocol to be built.") panic("This script requires the MI_example protocol to be built.")
@ -76,8 +76,8 @@ def create_system(options, phys_mem, piobus, dma_devices):
cpu_seq = RubySequencer(version = i, cpu_seq = RubySequencer(version = i,
icache = cache, icache = cache,
dcache = cache, dcache = cache,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
if piobus != None: if piobus != None:
cpu_seq.pio_port = piobus.port cpu_seq.pio_port = piobus.port
@ -85,13 +85,16 @@ def create_system(options, phys_mem, piobus, dma_devices):
l1_cntrl = L1Cache_Controller(version = i, l1_cntrl = L1Cache_Controller(version = i,
sequencer = cpu_seq, sequencer = cpu_seq,
cacheMemory = cache) cacheMemory = cache)
exec("system.l1_cntrl%d = l1_cntrl" % i)
# #
# Add controllers and sequencers to the appropriate lists # Add controllers and sequencers to the appropriate lists
# #
cpu_sequencers.append(cpu_seq) cpu_sequencers.append(cpu_seq)
l1_cntrl_nodes.append(l1_cntrl) l1_cntrl_nodes.append(l1_cntrl)
phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1 phys_mem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
mem_module_size = phys_mem_size / options.num_dirs mem_module_size = phys_mem_size / options.num_dirs
for i in xrange(options.num_dirs): for i in xrange(options.num_dirs):
@ -106,12 +109,15 @@ def create_system(options, phys_mem, piobus, dma_devices):
dir_cntrl = Directory_Controller(version = i, dir_cntrl = Directory_Controller(version = i,
directory = \ directory = \
RubyDirectoryMemory(version = i, RubyDirectoryMemory( \
size = dir_size, version = i,
use_map = options.use_map, size = dir_size,
map_levels = options.map_levels), use_map = options.use_map,
map_levels = \
options.map_levels),
memBuffer = mem_cntrl) memBuffer = mem_cntrl)
exec("system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl) dir_cntrl_nodes.append(dir_cntrl)
for i, dma_device in enumerate(dma_devices): for i, dma_device in enumerate(dma_devices):
@ -119,12 +125,13 @@ def create_system(options, phys_mem, piobus, dma_devices):
# Create the Ruby objects associated with the dma controller # Create the Ruby objects associated with the dma controller
# #
dma_seq = DMASequencer(version = i, dma_seq = DMASequencer(version = i,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
dma_cntrl = DMA_Controller(version = i, dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq) dma_sequencer = dma_seq)
exec("system.dma_cntrl%d = dma_cntrl" % i)
dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma
dma_cntrl_nodes.append(dma_cntrl) dma_cntrl_nodes.append(dma_cntrl)

24
configs/ruby/MOESI_CMP_directory.py
View file

@ -47,7 +47,7 @@ class L2Cache(RubyCache):
def define_options(parser): def define_options(parser):
return return
def create_system(options, phys_mem, piobus, dma_devices): def create_system(options, system, piobus, dma_devices):
if buildEnv['PROTOCOL'] != 'MOESI_CMP_directory': if buildEnv['PROTOCOL'] != 'MOESI_CMP_directory':
panic("This script requires the MOESI_CMP_directory protocol to be built.") panic("This script requires the MOESI_CMP_directory protocol to be built.")
@ -81,8 +81,8 @@ def create_system(options, phys_mem, piobus, dma_devices):
cpu_seq = RubySequencer(version = i, cpu_seq = RubySequencer(version = i,
icache = l1i_cache, icache = l1i_cache,
dcache = l1d_cache, dcache = l1d_cache,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
if piobus != None: if piobus != None:
cpu_seq.pio_port = piobus.port cpu_seq.pio_port = piobus.port
@ -92,7 +92,10 @@ def create_system(options, phys_mem, piobus, dma_devices):
L1IcacheMemory = l1i_cache, L1IcacheMemory = l1i_cache,
L1DcacheMemory = l1d_cache, L1DcacheMemory = l1d_cache,
l2_select_num_bits = \ l2_select_num_bits = \
math.log(options.num_l2caches, 2)) math.log(options.num_l2caches,
2))
exec("system.l1_cntrl%d = l1_cntrl" % i)
# #
# Add controllers and sequencers to the appropriate lists # Add controllers and sequencers to the appropriate lists
# #
@ -109,9 +112,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
l2_cntrl = L2Cache_Controller(version = i, l2_cntrl = L2Cache_Controller(version = i,
L2cacheMemory = l2_cache) L2cacheMemory = l2_cache)
exec("system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl) l2_cntrl_nodes.append(l2_cntrl)
phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1 phys_mem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
mem_module_size = phys_mem_size / options.num_dirs mem_module_size = phys_mem_size / options.num_dirs
for i in xrange(options.num_dirs): for i in xrange(options.num_dirs):
@ -127,9 +132,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
dir_cntrl = Directory_Controller(version = i, dir_cntrl = Directory_Controller(version = i,
directory = \ directory = \
RubyDirectoryMemory(version = i, RubyDirectoryMemory(version = i,
size = dir_size), size = \
dir_size),
memBuffer = mem_cntrl) memBuffer = mem_cntrl)
exec("system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl) dir_cntrl_nodes.append(dir_cntrl)
for i, dma_device in enumerate(dma_devices): for i, dma_device in enumerate(dma_devices):
@ -137,12 +144,13 @@ def create_system(options, phys_mem, piobus, dma_devices):
# Create the Ruby objects associated with the dma controller # Create the Ruby objects associated with the dma controller
# #
dma_seq = DMASequencer(version = i, dma_seq = DMASequencer(version = i,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
dma_cntrl = DMA_Controller(version = i, dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq) dma_sequencer = dma_seq)
exec("system.dma_cntrl%d = dma_cntrl" % i)
dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma
dma_cntrl_nodes.append(dma_cntrl) dma_cntrl_nodes.append(dma_cntrl)

29
configs/ruby/MOESI_CMP_token.py
View file

@ -52,7 +52,7 @@ def define_options(parser):
parser.add_option("--disable-dyn-timeouts", action="store_true", parser.add_option("--disable-dyn-timeouts", action="store_true",
help="Token_CMP: disable dyanimc timeouts, use fixed latency instead") help="Token_CMP: disable dyanimc timeouts, use fixed latency instead")
def create_system(options, phys_mem, piobus, dma_devices): def create_system(options, system, piobus, dma_devices):
if buildEnv['PROTOCOL'] != 'MOESI_CMP_token': if buildEnv['PROTOCOL'] != 'MOESI_CMP_token':
panic("This script requires the MOESI_CMP_token protocol to be built.") panic("This script requires the MOESI_CMP_token protocol to be built.")
@ -92,8 +92,8 @@ def create_system(options, phys_mem, piobus, dma_devices):
cpu_seq = RubySequencer(version = i, cpu_seq = RubySequencer(version = i,
icache = l1i_cache, icache = l1i_cache,
dcache = l1d_cache, dcache = l1d_cache,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
if piobus != None: if piobus != None:
cpu_seq.pio_port = piobus.port cpu_seq.pio_port = piobus.port
@ -103,14 +103,17 @@ def create_system(options, phys_mem, piobus, dma_devices):
L1IcacheMemory = l1i_cache, L1IcacheMemory = l1i_cache,
L1DcacheMemory = l1d_cache, L1DcacheMemory = l1d_cache,
l2_select_num_bits = \ l2_select_num_bits = \
math.log(options.num_l2caches, 2), math.log(options.num_l2caches,
2),
N_tokens = n_tokens, N_tokens = n_tokens,
retry_threshold = options.l1_retries, retry_threshold = \
options.l1_retries,
fixed_timeout_latency = \ fixed_timeout_latency = \
options.timeout_latency, options.timeout_latency,
dynamic_timeout_enabled = \ dynamic_timeout_enabled = \
not options.disable_dyn_timeouts) not options.disable_dyn_timeouts)
exec("system.l1_cntrl%d = l1_cntrl" % i)
# #
# Add controllers and sequencers to the appropriate lists # Add controllers and sequencers to the appropriate lists
# #
@ -128,9 +131,11 @@ def create_system(options, phys_mem, piobus, dma_devices):
L2cacheMemory = l2_cache, L2cacheMemory = l2_cache,
N_tokens = n_tokens) N_tokens = n_tokens)
exec("system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl) l2_cntrl_nodes.append(l2_cntrl)
phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1 phys_mem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
mem_module_size = phys_mem_size / options.num_dirs mem_module_size = phys_mem_size / options.num_dirs
for i in xrange(options.num_dirs): for i in xrange(options.num_dirs):
@ -146,11 +151,14 @@ def create_system(options, phys_mem, piobus, dma_devices):
dir_cntrl = Directory_Controller(version = i, dir_cntrl = Directory_Controller(version = i,
directory = \ directory = \
RubyDirectoryMemory(version = i, RubyDirectoryMemory(version = i,
size = dir_size), size = \
dir_size),
memBuffer = mem_cntrl, memBuffer = mem_cntrl,
l2_select_num_bits = \ l2_select_num_bits = \
math.log(options.num_l2caches, 2)) math.log(options.num_l2caches,
2))
exec("system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl) dir_cntrl_nodes.append(dir_cntrl)
for i, dma_device in enumerate(dma_devices): for i, dma_device in enumerate(dma_devices):
@ -158,12 +166,13 @@ def create_system(options, phys_mem, piobus, dma_devices):
# Create the Ruby objects associated with the dma controller # Create the Ruby objects associated with the dma controller
# #
dma_seq = DMASequencer(version = i, dma_seq = DMASequencer(version = i,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
dma_cntrl = DMA_Controller(version = i, dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq) dma_sequencer = dma_seq)
exec("system.dma_cntrl%d = dma_cntrl" % i)
dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma
dma_cntrl_nodes.append(dma_cntrl) dma_cntrl_nodes.append(dma_cntrl)

27
configs/ruby/MOESI_hammer.py
View file

@ -46,7 +46,7 @@ class L2Cache(RubyCache):
def define_options(parser): def define_options(parser):
return return
def create_system(options, phys_mem, piobus, dma_devices): def create_system(options, system, piobus, dma_devices):
if buildEnv['PROTOCOL'] != 'MOESI_hammer': if buildEnv['PROTOCOL'] != 'MOESI_hammer':
panic("This script requires the MOESI_hammer protocol to be built.") panic("This script requires the MOESI_hammer protocol to be built.")
@ -81,8 +81,8 @@ def create_system(options, phys_mem, piobus, dma_devices):
cpu_seq = RubySequencer(version = i, cpu_seq = RubySequencer(version = i,
icache = l1i_cache, icache = l1i_cache,
dcache = l1d_cache, dcache = l1d_cache,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
if piobus != None: if piobus != None:
cpu_seq.pio_port = piobus.port cpu_seq.pio_port = piobus.port
@ -92,13 +92,16 @@ def create_system(options, phys_mem, piobus, dma_devices):
L1IcacheMemory = l1i_cache, L1IcacheMemory = l1i_cache,
L1DcacheMemory = l1d_cache, L1DcacheMemory = l1d_cache,
L2cacheMemory = l2_cache) L2cacheMemory = l2_cache)
exec("system.l1_cntrl%d = l1_cntrl" % i)
# #
# Add controllers and sequencers to the appropriate lists # Add controllers and sequencers to the appropriate lists
# #
cpu_sequencers.append(cpu_seq) cpu_sequencers.append(cpu_seq)
l1_cntrl_nodes.append(l1_cntrl) l1_cntrl_nodes.append(l1_cntrl)
phys_mem_size = long(phys_mem.range.second) - long(phys_mem.range.first) + 1 phys_mem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
mem_module_size = phys_mem_size / options.num_dirs mem_module_size = phys_mem_size / options.num_dirs
for i in xrange(options.num_dirs): for i in xrange(options.num_dirs):
@ -113,12 +116,15 @@ def create_system(options, phys_mem, piobus, dma_devices):
dir_cntrl = Directory_Controller(version = i, dir_cntrl = Directory_Controller(version = i,
directory = \ directory = \
RubyDirectoryMemory(version = i, RubyDirectoryMemory( \
size = dir_size, version = i,
use_map = options.use_map, size = dir_size,
map_levels = options.map_levels), use_map = options.use_map,
map_levels = \
options.map_levels),
memBuffer = mem_cntrl) memBuffer = mem_cntrl)
exec("system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl) dir_cntrl_nodes.append(dir_cntrl)
for i, dma_device in enumerate(dma_devices): for i, dma_device in enumerate(dma_devices):
@ -126,12 +132,13 @@ def create_system(options, phys_mem, piobus, dma_devices):
# Create the Ruby objects associated with the dma controller # Create the Ruby objects associated with the dma controller
# #
dma_seq = DMASequencer(version = i, dma_seq = DMASequencer(version = i,
physMemPort = phys_mem.port, physMemPort = system.physmem.port,
physmem = phys_mem) physmem = system.physmem)
dma_cntrl = DMA_Controller(version = i, dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq) dma_sequencer = dma_seq)
exec("system.dma_cntrl%d = dma_cntrl" % i)
dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma
dma_cntrl_nodes.append(dma_cntrl) dma_cntrl_nodes.append(dma_cntrl)

7
configs/ruby/Ruby.py
View file

@ -52,13 +52,13 @@ def define_options(parser):
exec "import %s" % protocol exec "import %s" % protocol
eval("%s.define_options(parser)" % protocol) eval("%s.define_options(parser)" % protocol)
def create_system(options, physmem, piobus = None, dma_devices = []): def create_system(options, system, piobus = None, dma_devices = []):
protocol = buildEnv['PROTOCOL'] protocol = buildEnv['PROTOCOL']
exec "import %s" % protocol exec "import %s" % protocol
try: try:
(cpu_sequencers, dir_cntrls, all_cntrls) = \ (cpu_sequencers, dir_cntrls, all_cntrls) = \
eval("%s.create_system(options, physmem, piobus, dma_devices)" \ eval("%s.create_system(options, system, piobus, dma_devices)" \
% protocol) % protocol)
except: except:
print "Error: could not create sytem for ruby protocol %s" % protocol print "Error: could not create sytem for ruby protocol %s" % protocol
@ -91,7 +91,8 @@ def create_system(options, physmem, piobus = None, dma_devices = []):
total_mem_size = MemorySize('0B') total_mem_size = MemorySize('0B')
for dir_cntrl in dir_cntrls: for dir_cntrl in dir_cntrls:
total_mem_size.value += dir_cntrl.directory.size.value total_mem_size.value += dir_cntrl.directory.size.value
physmem_size = long(physmem.range.second) - long(physmem.range.first) + 1 physmem_size = long(system.physmem.range.second) - \
long(system.physmem.range.first) + 1
assert(total_mem_size.value == physmem_size) assert(total_mem_size.value == physmem_size)
ruby_profiler = RubyProfiler(num_of_sequencers = len(cpu_sequencers)) ruby_profiler = RubyProfiler(num_of_sequencers = len(cpu_sequencers))