diff options
Diffstat (limited to 'configs/ruby/Network_test.py')
| -rw-r--r-- | configs/ruby/Network_test.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index fe1559f53..75ec9099e 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -69,6 +69,8 @@ def create_system(options, system, piobus, dma_devices): # controller constructors are called before the network constructor # + cntrl_count = 0 + for i in xrange(options.num_cpus): # # First create the Ruby objects associated with this cpu @@ -91,6 +93,7 @@ def create_system(options, system, piobus, dma_devices): cpu_seq.pio_port = piobus.port l1_cntrl = L1Cache_Controller(version = i, + cntrl_id = cntrl_count, sequencer = cpu_seq, cacheMemory = cache) @@ -101,6 +104,8 @@ def create_system(options, system, piobus, dma_devices): cpu_sequencers.append(cpu_seq) l1_cntrl_nodes.append(l1_cntrl) + cntrl_count += 1 + phys_mem_size = long(system.physmem.range.second) - \ long(system.physmem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs @@ -116,6 +121,7 @@ def create_system(options, system, piobus, dma_devices): dir_size.value = mem_module_size dir_cntrl = Directory_Controller(version = i, + cntrl_id = cntrl_count, directory = \ RubyDirectoryMemory(version = i, size = dir_size), @@ -124,6 +130,8 @@ def create_system(options, system, piobus, dma_devices): exec("system.dir_cntrl%d = dir_cntrl" % i) dir_cntrl_nodes.append(dir_cntrl) + cntrl_count += 1 + all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes return (cpu_sequencers, dir_cntrl_nodes, all_cntrls) |