diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2010-01-22 17:23:21 -0600 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2010-01-22 17:23:21 -0600 |
| commit | 589218168c5ae1ed143372e43dbc468369a1bb8f (patch) | |
| tree | 5e5154c08e7def83b49b16769c213b0e78ea41fb /tests/configs | |
| parent | 1c448e2ab00acb05d368c9de62c5cf08e64c6213 (diff) | |
| parent | f7de30ab1a9e1655de8bf7d4c15007a682a2a629 (diff) | |
| download | gem5-589218168c5ae1ed143372e43dbc468369a1bb8f.tar.xz | |
Automated merge with ssh://hg@m5sim.org/m5
Diffstat (limited to 'tests/configs')
| -rw-r--r-- | tests/configs/memtest-ruby.py | 5 | ||||
| -rw-r--r-- | tests/configs/ruby_config.py | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/configs/memtest-ruby.py b/tests/configs/memtest-ruby.py index c564ec600..d2be2791e 100644 --- a/tests/configs/memtest-ruby.py +++ b/tests/configs/memtest-ruby.py @@ -35,10 +35,7 @@ nb_cores = 8 cpus = [ MemTest() for i in xrange(nb_cores) ] import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", - cores = nb_cores, - cache_size = 256, - cache_assoc = 2) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores) # system simulated system = System(cpu = cpus, funcmem = PhysicalMemory(), diff --git a/tests/configs/ruby_config.py b/tests/configs/ruby_config.py index fec7bd36c..190337e67 100644 --- a/tests/configs/ruby_config.py +++ b/tests/configs/ruby_config.py @@ -8,10 +8,11 @@ from m5.params import * def generate(config_file, cores=1, memories=1, memory_size=1024, \ cache_size=32768, cache_assoc=8, dmas=1, - ruby_tick='1t', ports_per_cpu=2): + ruby_tick='1t', ports_per_cpu=2, protocol='MOESI_CMP_directory'): default = joinpath(dirname(__file__), '../../src/mem/ruby/config') ruby_config = os.environ.get('RUBY_CONFIG', default) args = [ "ruby", "-I", ruby_config, joinpath(ruby_config, "print_cfg.rb"), + "-c", str(protocol), "-r", joinpath(ruby_config, config_file), "-p", str(cores), "-m", str(memories), "-s", str(memory_size), "-C", str(cache_size), "-A", str(cache_assoc), "-D", str(dmas)] |