Enable MP systems via cmd-line flag in fs.py.
configs/example/fs.py: Add flag for MP server systems. src/python/m5/objects/AlphaConsole.py: src/python/m5/objects/IntrControl.py: Change CPU from 'any' to 'cpu[0]' to work better with MP sytems. tests/configs/tsunami-simple-atomic-dual.py: tests/configs/tsunami-simple-timing-dual.py: Don't need to set console & intrcontrol cpu params anymore (default is fixed now). --HG-- extra : convert_revision : 9417b12b1b395ff7d6a9f2894e4123923c754daf
This commit is contained in:
parent
e51b075a27
commit
05c487ef3c
5 changed files with 8 additions and 11 deletions
|
@ -42,6 +42,7 @@ parser = optparse.OptionParser()
|
|||
|
||||
parser.add_option("-d", "--detailed", action="store_true")
|
||||
parser.add_option("-t", "--timing", action="store_true")
|
||||
parser.add_option("-n", "--num_cpus", type="int", default=1)
|
||||
parser.add_option("-m", "--maxtick", type="int")
|
||||
parser.add_option("--maxtime", type="float")
|
||||
parser.add_option("--dual", action="store_true",
|
||||
|
@ -96,9 +97,11 @@ else:
|
|||
bm = [SysConfig()]
|
||||
|
||||
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
|
||||
np = options.num_cpus
|
||||
server_sys.cpu = [ServerCPUClass(cpu_id=i) for i in xrange(np)]
|
||||
for i in xrange(np):
|
||||
server_sys.cpu[i].connectMemPorts(server_sys.membus)
|
||||
server_sys.cpu[i].mem = server_sys.physmem
|
||||
|
||||
if len(bm) == 2:
|
||||
client_sys = makeLinuxAlphaSystem(client_mem_mode, bm[1])
|
||||
|
|
|
@ -4,7 +4,7 @@ from Device import BasicPioDevice
|
|||
|
||||
class AlphaConsole(BasicPioDevice):
|
||||
type = 'AlphaConsole'
|
||||
cpu = Param.BaseCPU(Parent.any, "Processor")
|
||||
cpu = Param.BaseCPU(Parent.cpu[0], "Processor")
|
||||
disk = Param.SimpleDisk("Simple Disk")
|
||||
sim_console = Param.SimConsole(Parent.any, "The Simulator Console")
|
||||
system = Param.AlphaSystem(Parent.any, "system object")
|
||||
|
|
|
@ -3,4 +3,4 @@ from m5.params import *
|
|||
from m5.proxy import *
|
||||
class IntrControl(SimObject):
|
||||
type = 'IntrControl'
|
||||
cpu = Param.BaseCPU(Parent.any, "the cpu")
|
||||
cpu = Param.BaseCPU(Parent.cpu[0], "the cpu")
|
||||
|
|
|
@ -31,9 +31,6 @@ from m5.objects import *
|
|||
m5.AddToPath('../configs/common')
|
||||
import FSConfig
|
||||
|
||||
AlphaConsole.cpu = Parent.cpu[0]
|
||||
IntrControl.cpu = Parent.cpu[0]
|
||||
|
||||
cpus = [ AtomicSimpleCPU(cpu_id=i) for i in xrange(2) ]
|
||||
system = FSConfig.makeLinuxAlphaSystem('atomic')
|
||||
system.cpu = cpus
|
||||
|
|
|
@ -31,9 +31,6 @@ from m5.objects import *
|
|||
m5.AddToPath('../configs/common')
|
||||
import FSConfig
|
||||
|
||||
AlphaConsole.cpu = Parent.cpu[0]
|
||||
IntrControl.cpu = Parent.cpu[0]
|
||||
|
||||
cpus = [ TimingSimpleCPU(cpu_id=i) for i in xrange(2) ]
|
||||
system = FSConfig.makeLinuxAlphaSystem('timing')
|
||||
system.cpu = cpus
|
||||
|
|
Loading…
Reference in a new issue