diff options
Diffstat (limited to 'configs/ruby')
-rw-r--r-- | configs/ruby/MESI_CMP_directory.py | 13 | ||||
-rw-r--r-- | configs/ruby/MI_example.py | 13 | ||||
-rw-r--r-- | configs/ruby/MOESI_CMP_directory.py | 13 | ||||
-rw-r--r-- | configs/ruby/MOESI_CMP_token.py | 13 | ||||
-rw-r--r-- | configs/ruby/MOESI_hammer.py | 13 | ||||
-rw-r--r-- | configs/ruby/Network_test.py | 13 | ||||
-rw-r--r-- | configs/ruby/Ruby.py | 3 |
7 files changed, 67 insertions, 14 deletions
diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py index c265bd4cb..4128f87ad 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_CMP_directory.py @@ -144,13 +144,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): system.memories.unproxy(system))) mem_module_size = phys_mem_size / options.num_dirs + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index 0514a7240..6bbd35ea7 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -109,13 +109,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): system.memories.unproxy(system))) mem_module_size = phys_mem_size / options.num_dirs + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system. + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index f53758d71..81d04914c 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -139,13 +139,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): system.memories.unproxy(system))) mem_module_size = phys_mem_size / options.num_dirs + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system. + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index f3ad05a92..9c2598a1d 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -160,13 +160,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): system.memories.unproxy(system))) mem_module_size = phys_mem_size / options.num_dirs + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index 30fb0f0b7..11ea579ea 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -158,13 +158,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): else: pf_start_bit = block_size_bits + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index c1a1f9509..c4df4dddb 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -107,13 +107,22 @@ def create_system(options, system, piobus, dma_ports, ruby_system): system.memories.unproxy(system))) mem_module_size = phys_mem_size / options.num_dirs + # Run each of the ruby memory controllers at a ratio of the frequency of + # the ruby system. + # clk_divider value is a fix to pass regression. + ruby_system.memctrl_clk_domain = DerivedClockDomain( + clk_domain=ruby_system.clk_domain, + clk_divider=3) + for i in xrange(options.num_dirs): # # Create the Ruby objects associated with the directory controller # - mem_cntrl = RubyMemoryControl(version = i, - ruby_system = ruby_system) + mem_cntrl = RubyMemoryControl( + clk_domain = ruby_system.memctrl_clk_domain, + version = i, + ruby_system = ruby_system) dir_size = MemorySize('0B') dir_size.value = mem_module_size diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 5c5e84197..a35ef4f09 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -95,8 +95,7 @@ def create_topology(controllers, options): def create_system(options, system, piobus = None, dma_ports = []): - system.ruby = RubySystem(clock = options.ruby_clock, - stats_filename = options.ruby_stats, + system.ruby = RubySystem(stats_filename = options.ruby_stats, no_mem_vec = options.use_map) ruby = system.ruby |