From: Kevin Lim Date: Fri, 21 Jul 2006 20:08:17 +0000 (-0400) Subject: Merge ktlim@zizzer:/bk/newmem X-Git-Tag: m5_2.0_beta1~64 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1;p=gem5.git Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge configs/test/fs.py: Hand merge. --HG-- extra : convert_revision : 78f7c46084f66d52ddfe0386fd7c08de8017331e --- db5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1 diff --cc configs/test/fs.py index 7e89b7dd4,bb97d2c64..5468c5924 --- a/configs/test/fs.py +++ b/configs/test/fs.py @@@ -100,10 -36,12 +37,12 @@@ else if options.dual: root = DualRoot( - MyLinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')), - MyLinuxAlphaSystem(readfile=script('netperf-server.rcS'))) + MyLinuxAlphaSystem(cpu, mem_mode, linux_image), + MyLinuxAlphaSystem(cpu2, mem_mode, linux_image)) + root.client.readfile = script('netperf-stream-nt-client.rcS') + root.server.readfile = script('netperf-server.rcS') else: - root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem()) - root = TsunamiRoot(clock = '2GHz', system = MyLinuxAlphaSystem(cpu, mem_mode, linux_image)) ++ root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem(cpu, mem_mode, linux_image)) m5.instantiate(root)