Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/clean --HG-- extra : convert_revision : cb3f718bdcbd52540747a2696fb37bb4fcfe27a3
This commit is contained in:
commit
2f30c2b4c9
1 changed files with 6 additions and 5 deletions
|
@ -129,14 +129,15 @@ cpu.cpu_id = 0
|
||||||
system = System(cpu = cpu,
|
system = System(cpu = cpu,
|
||||||
physmem = PhysicalMemory(range=AddrRange("512MB")),
|
physmem = PhysicalMemory(range=AddrRange("512MB")),
|
||||||
membus = Bus())
|
membus = Bus())
|
||||||
system.physmem.port = system.membus.port
|
|
||||||
system.cpu.connectMemPorts(system.membus)
|
|
||||||
system.cpu.mem = system.physmem
|
|
||||||
system.cpu.clock = '2GHz'
|
|
||||||
if options.caches and not options.standard_switch:
|
if options.caches and not options.standard_switch:
|
||||||
system.cpu.addPrivateSplitL1Caches(MyCache(size = '32kB'),
|
system.cpu.addPrivateSplitL1Caches(MyCache(size = '32kB'),
|
||||||
MyCache(size = '64kB'))
|
MyCache(size = '64kB'))
|
||||||
|
|
||||||
|
system.physmem.port = system.membus.port
|
||||||
|
system.cpu.connectMemPorts(system.membus)
|
||||||
|
system.cpu.mem = system.physmem
|
||||||
|
system.cpu.clock = '2GHz'
|
||||||
root = Root(system = system)
|
root = Root(system = system)
|
||||||
|
|
||||||
if options.timing or options.detailed:
|
if options.timing or options.detailed:
|
||||||
|
@ -169,7 +170,7 @@ m5.instantiate(root)
|
||||||
if options.checkpoint_dir:
|
if options.checkpoint_dir:
|
||||||
cptdir = options.checkpoint_dir
|
cptdir = options.checkpoint_dir
|
||||||
else:
|
else:
|
||||||
cptdir = getcwd()
|
cptdir = os.getcwd()
|
||||||
|
|
||||||
if options.checkpoint_restore:
|
if options.checkpoint_restore:
|
||||||
from os.path import isdir
|
from os.path import isdir
|
||||||
|
|
Loading…
Reference in a new issue