66a67,71
> # client system CPU is always simple... note this is an assignment of
> # a class, not an instance.
> ClientCPUClass = AtomicSimpleCPU
> client_mem_mode = 'atomic'
>
68,70c73,74
< cpu = DerivO3CPU()
< cpu2 = DerivO3CPU()
< mem_mode = 'timing'
---
> ServerCPUClass = DerivO3CPU
> server_mem_mode = 'timing'
72,74c76,77
< cpu = TimingSimpleCPU()
< cpu2 = TimingSimpleCPU()
< mem_mode = 'timing'
---
> ServerCPUClass = TimingSimpleCPU
> server_mem_mode = 'timing'
76,78c79,80
< cpu = AtomicSimpleCPU()
< cpu2 = AtomicSimpleCPU()
< mem_mode = 'atomic'
---
> ServerCPUClass = AtomicSimpleCPU
> server_mem_mode = 'atomic'
80,83c82,83
< cpu.clock = '2GHz'
< cpu2.clock = '2GHz'
< cpu.cpu_id = 0
< cpu2.cpu_id = 0
---
> ServerCPUClass.clock = '2GHz'
> ClientCPUClass.clock = '2GHz'
86c86,88
< if options.benchmark not in Benchmarks:
---
> try:
> bm = Benchmarks[options.benchmark]
> except KeyError:
90,91d91
<
< bm = Benchmarks[options.benchmark]
94c94
< bm = [Machine(), Machine()]
---
> bm = [SysConfig(), SysConfig()]
96c96
< bm = [Machine()]
---
> bm = [SysConfig()]
97a98,102
> server_sys = makeLinuxAlphaSystem(server_mem_mode, bm[0])
> server_sys.cpu = ServerCPUClass(cpu_id=0)
> server_sys.cpu.connectMemPorts(server_sys.membus)
> server_sys.cpu.mem = server_sys.physmem
>
99,107c104,108
< s1 = makeLinuxAlphaSystem(mem_mode, bm[0])
< s1.cpu = cpu
< cpu.connectMemPorts(s1.membus)
< cpu.mem = s1.physmem
< s2 = makeLinuxAlphaSystem(mem_mode, bm[1])
< s2.cpu = cpu2
< cpu2.connectMemPorts(s2.membus)
< cpu2.mem = s2.physmem
< root = makeDualRoot(s1, s2, options.etherdump)
---
> client_sys = makeLinuxAlphaSystem(client_mem_mode, bm[1])
> client_sys.cpu = ClientCPUClass(cpu_id=0)
> client_sys.cpu.connectMemPorts(client_sys.membus)
> client_sys.cpu.mem = client_sys.physmem
> root = makeDualRoot(server_sys, client_sys, options.etherdump)
109,113c110
< root = Root(clock = '1THz',
< system = makeLinuxAlphaSystem(mem_mode, bm[0]))
< root.system.cpu = cpu
< cpu.connectMemPorts(root.system.membus)
< cpu.mem = root.system.physmem
---
> root = Root(clock = '1THz', system = server_sys)