34c34
< from Ruby import create_topology
---
> from Ruby import create_topology, create_directories
68d67
< dir_cntrl_nodes = []
146,149d144
< phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges))
< assert(phys_mem_size % options.num_dirs == 0)
< mem_module_size = phys_mem_size / options.num_dirs
<
180,183c175,177
< for i in xrange(options.num_dirs):
< dir_size = MemorySize('0B')
< dir_size.value = mem_module_size
<
---
> dir_cntrl_nodes = create_directories(options, system.mem_ranges,
> ruby_system)
> for dir_cntrl in dir_cntrl_nodes:
187,194c181,183
< dir_cntrl = Directory_Controller(version = i,
< directory = RubyDirectoryMemory(
< version = i, size = dir_size),
< probeFilter = pf,
< probe_filter_enabled = options.pf_on,
< full_bit_dir_enabled = options.dir_on,
< transitions_per_cycle = options.ports,
< ruby_system = ruby_system)
---
> dir_cntrl.probeFilter = pf
> dir_cntrl.probe_filter_enabled = options.pf_on
> dir_cntrl.full_bit_dir_enabled = options.dir_on
199,201d187
< exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
< dir_cntrl_nodes.append(dir_cntrl)
<