34c34
< from Ruby import create_topology
---
> from Ruby import create_topology, create_directories
60d59
< dir_cntrl_nodes = []
170,174d168
< 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
<
<
182,193c176,178
< for i in xrange(options.num_dirs):
< dir_size = MemorySize('0B')
< dir_size.value = mem_module_size
<
< dir_cntrl = Directory_Controller(version = i,
< directory = RubyDirectoryMemory(version = i, size = dir_size),
< transitions_per_cycle = options.ports,
< ruby_system = ruby_system)
<
< exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
< dir_cntrl_nodes.append(dir_cntrl)
<
---
> dir_cntrl_nodes = create_directories(options, system.mem_ranges,
> ruby_system)
> for dir_cntrl in dir_cntrl_nodes: