diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/boot/nat-netperf-maerts-client.rcS | 1 | ||||
| -rw-r--r-- | configs/boot/netperf-maerts-client.rcS | 2 | ||||
| -rw-r--r-- | configs/common/FSConfig.py | 5 | ||||
| -rw-r--r-- | configs/example/fs.py | 13 |
4 files changed, 15 insertions, 6 deletions
diff --git a/configs/boot/nat-netperf-maerts-client.rcS b/configs/boot/nat-netperf-maerts-client.rcS index 863766a6b..d8a6d4dc4 100644 --- a/configs/boot/nat-netperf-maerts-client.rcS +++ b/configs/boot/nat-netperf-maerts-client.rcS @@ -41,7 +41,6 @@ eval $SHORT echo "netperf benchmark" echo $LONG -/sbin/m5 ivlb 1 /sbin/m5 resetstats /sbin/m5 dumpresetstats 200000000 2000000000 /sbin/m5 checkpoint 200000000 2000000000 diff --git a/configs/boot/netperf-maerts-client.rcS b/configs/boot/netperf-maerts-client.rcS index 3270d0058..7766713aa 100644 --- a/configs/boot/netperf-maerts-client.rcS +++ b/configs/boot/netperf-maerts-client.rcS @@ -21,7 +21,7 @@ echo "100000" > /proc/sys/net/core/netdev_max_backlog echo -n "waiting for server..." /usr/bin/netcat -c -l -p 8000 -BINARY=/benchmarks/netperf/netperf +BINARY=/benchmarks/netperf-bin/netperf TEST="TCP_MAERTS" SHORT_ARGS="-l -100k" LONG_ARGS="-k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144" diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 1c0a56362..eb74346c8 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -89,17 +89,18 @@ def makeSparcSystem(mem_mode, mdesc = None): self.bridge = Bridge() self.t1000 = T1000() self.t1000.attachIO(self.iobus) - self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem()), zero = True) + self.physmem = PhysicalMemory(range = AddrRange('64MB'), zero = True) + self.physmem2 = PhysicalMemory(range = AddrRange(Addr('2GB'), size ='256MB'), zero = True) self.bridge.side_a = self.iobus.port self.bridge.side_b = self.membus.port self.physmem.port = self.membus.port + self.physmem2.port = self.membus.port self.rom.port = self.membus.port self.nvram.port = self.membus.port self.hypervisor_desc.port = self.membus.port self.partition_desc.port = self.membus.port self.intrctrl = IntrControl() self.mem_mode = mem_mode - self.kernel = binary('vmlinux') self.reset_bin = binary('reset.bin') self.hypervisor_bin = binary('q.bin') diff --git a/configs/example/fs.py b/configs/example/fs.py index a70a60b97..d479d717e 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -92,7 +92,13 @@ else: else: bm = [SysConfig()] -test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0]) +if m5.build_env['TARGET_ISA'] == "alpha": + test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0]) +elif m5.build_env['TARGET_ISA'] == "sparc": + test_sys = makeSparcSystem(test_mem_mode, bm[0]) +else: + m5.panic("incapable of building non-alpha or non-sparc full system!") + np = options.num_cpus if options.l2cache: @@ -113,7 +119,10 @@ for i in xrange(np): test_sys.cpu[i].connectMemPorts(test_sys.membus) if len(bm) == 2: - drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1]) + if m5.build_env['TARGET_ISA'] == 'alpha': + drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1]) + elif m5.build_env['TARGET_ISA'] == 'sparc': + drive_sys = makeSparcSystem(drive_mem_mode, bm[1]) drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectMemPorts(drive_sys.membus) root = makeDualRoot(test_sys, drive_sys, options.etherdump) |