From b00949d88bb3185dfa2e27799de7f90e5a449be8 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Fri, 6 Apr 2012 13:46:31 -0400 Subject: MEM: Enable multiple distributed generalized memories This patch removes the assumption on having on single instance of PhysicalMemory, and enables a distributed memory where the individual memories in the system are each responsible for a single contiguous address range. All memories inherit from an AbstractMemory that encompasses the basic behaviuor of a random access memory, and provides untimed access methods. What was previously called PhysicalMemory is now SimpleMemory, and a subclass of AbstractMemory. All future types of memory controllers should inherit from AbstractMemory. To enable e.g. the atomic CPU and RubyPort to access the now distributed memory, the system has a wrapper class, called PhysicalMemory that is aware of all the memories in the system and their associated address ranges. This class thus acts as an infinitely-fast bus and performs address decoding for these "shortcut" accesses. Each memory can specify that it should not be part of the global address map (used e.g. by the functional memories by some testers). Moreover, each memory can be configured to be reported to the OS configuration table, useful for populating ATAG structures, and any potential ACPI tables. Checkpointing support currently assumes that all memories have the same size and organisation when creating and resuming from the checkpoint. A future patch will enable a more flexible re-organisation. --HG-- rename : src/mem/PhysicalMemory.py => src/mem/AbstractMemory.py rename : src/mem/PhysicalMemory.py => src/mem/SimpleMemory.py rename : src/mem/physical.cc => src/mem/abstract_mem.cc rename : src/mem/physical.hh => src/mem/abstract_mem.hh rename : src/mem/physical.cc => src/mem/simple_mem.cc rename : src/mem/physical.hh => src/mem/simple_mem.hh --- configs/ruby/MESI_CMP_directory.py | 5 +++-- configs/ruby/MI_example.py | 5 +++-- configs/ruby/MOESI_CMP_directory.py | 5 +++-- configs/ruby/MOESI_CMP_token.py | 5 +++-- configs/ruby/MOESI_hammer.py | 5 +++-- configs/ruby/Network_test.py | 5 +++-- configs/ruby/Ruby.py | 7 ++++--- 7 files changed, 22 insertions(+), 15 deletions(-) (limited to 'configs/ruby') diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py index 4d490705b..cd503ddc9 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_CMP_directory.py @@ -133,8 +133,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs for i in xrange(options.num_dirs): diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index 1285c4b1d..de82c38f6 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -104,8 +104,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs for i in xrange(options.num_dirs): diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index 5bc23ea72..10eeaf21a 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -132,8 +132,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs for i in xrange(options.num_dirs): diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index f621df767..4da7d7adf 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -155,8 +155,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs for i in xrange(options.num_dirs): diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index 3f9d31482..622296289 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -130,8 +130,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs # diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index ff07c6b4d..b84fabde6 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -105,8 +105,9 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cntrl_count += 1 - phys_mem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 mem_module_size = phys_mem_size / options.num_dirs for i in xrange(options.num_dirs): diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 1911a1eb7..046797a3c 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -172,9 +172,10 @@ 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 - physmem_size = long(system.physmem.range.second) - \ - long(system.physmem.range.first) + 1 - assert(total_mem_size.value == physmem_size) + phys_mem_size = 0 + for mem in system.memories.unproxy(system): + phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1 + assert(total_mem_size.value == phys_mem_size) ruby_profiler = RubyProfiler(ruby_system = ruby, num_of_sequencers = len(cpu_sequencers)) -- cgit v1.2.3