From a8480fe1c34db25ae8acb5f79d571bc924e0daeb Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 19 Aug 2013 03:52:27 -0400 Subject: config: Move the memory instantiation outside FSConfig This patch moves the instantiation of the memory controller outside FSConfig and instead relies on the mem_ranges to pass the information to the caller (e.g. fs.py or one of the regression scripts). The main motivation for this change is to expose the structural composition of the memory system and allow more tuning and configuration without adding a large number of options to the makeSystem functions. The patch updates the relevant example scripts to maintain the current functionality. As the order that ports are connected to the memory bus changes (in certain regresisons), some bus stats are shuffled around. For example, what used to be layer 0 is now layer 1. Going forward, options will be added to support the addition of multi-channel memory controllers. --- configs/ruby/MESI_CMP_directory.py | 3 +-- configs/ruby/MI_example.py | 3 +-- configs/ruby/MOESI_CMP_directory.py | 3 +-- configs/ruby/MOESI_CMP_token.py | 3 +-- configs/ruby/MOESI_hammer.py | 3 +-- configs/ruby/Network_test.py | 3 +-- configs/ruby/Ruby.py | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) (limited to 'configs/ruby') diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py index e263b4e5a..8cd74cde6 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_CMP_directory.py @@ -140,8 +140,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index 896a01a61..44687e493 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -105,8 +105,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index bc1f7d641..33c62f7a3 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -135,8 +135,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 4ede788a8..43b9f97e8 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -156,8 +156,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index da8b004ee..124845ab8 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -131,8 +131,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index d7b04cd31..6dfcc0b59 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -103,8 +103,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + 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 diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index a35ef4f09..b6cc7a5e8 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -183,8 +183,7 @@ def create_system(options, system, piobus = None, dma_ports = []): total_mem_size.value += dir_cntrl.directory.size.value dir_cntrl.directory.numa_high_bit = numa_bit - phys_mem_size = sum(map(lambda mem: mem.range.size(), - system.memories.unproxy(system))) + phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) assert(total_mem_size.value == phys_mem_size) ruby_profiler = RubyProfiler(ruby_system = ruby, -- cgit v1.2.3