30a31,33
> from m5.defines import buildEnv
> from m5.util import addToPath
> import os, optparse, sys
31a35,36
> if buildEnv['FULL_SYSTEM']:
> panic("This script requires system-emulation mode (*_SE).")
32a38,63
> # Get paths we might need
> config_path = os.path.dirname(os.path.abspath(__file__))
> config_root = os.path.dirname(config_path)
> m5_root = os.path.dirname(config_root)
> addToPath(config_root+'/configs/common')
> addToPath(config_root+'/configs/ruby')
>
> import Ruby
>
> parser = optparse.OptionParser()
>
> #
> # Set the default cache size and associativity to be very small to encourage
> # races between requests and writebacks.
> #
> parser.add_option("--l1d_size", type="string", default="256B")
> parser.add_option("--l1i_size", type="string", default="256B")
> parser.add_option("--l2_size", type="string", default="512B")
> parser.add_option("--l1d_assoc", type="int", default=2)
> parser.add_option("--l1i_assoc", type="int", default=2)
> parser.add_option("--l2_assoc", type="int", default=2)
>
> execfile(os.path.join(config_root, "configs/common", "Options.py"))
>
> (options, args) = parser.parse_args()
>
37,39c68,70
< import ruby_config
< ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores)
<
---
> # overwrite options.num_cpus with the nb_cores value
> options.num_cpus = nb_cores
>
41,43c72,74
< system = System(cpu = cpus, funcmem = PhysicalMemory(),
< physmem = ruby_memory,
< membus = Bus(clock="500GHz", width=16))
---
> system = System(cpu = cpus,
> funcmem = PhysicalMemory(),
> physmem = PhysicalMemory())
45,47c76
< for cpu in cpus:
< cpu.test = system.membus.port
< cpu.functional = system.funcmem.port
---
> system.ruby = Ruby.create_system(options, system.physmem)
49c78
< system.physmem.port = system.membus.port
---
> assert(len(cpus) == len(system.ruby.cpu_ruby_ports))
50a80,87
> for (i, ruby_port) in enumerate(system.ruby.cpu_ruby_ports):
> #
> # Tie the cpu test and functional ports to the ruby cpu ports and
> # physmem, respectively
> #
> cpus[i].test = ruby_port.port
> cpus[i].functional = system.funcmem.port
>