summaryrefslogtreecommitdiff
path: root/configs/example
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-27 16:32:26 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-27 16:32:26 -0400
commita6fd29ddf9b2b40d5b1beb425ab2f043cc97a911 (patch)
tree8fd634053fcd64cc4f5dccd742de2557b400e915 /configs/example
parent3922b2e076e50a624e129d19a7e7811341c9e4fd (diff)
downloadgem5-a6fd29ddf9b2b40d5b1beb425ab2f043cc97a911.tar.xz
factor out common run code from se.py and fs.py.
configs/example/fs.py: factor out common code. configs/example/se.py: factor out common code --HG-- extra : convert_revision : 72a1f653c84eae1b7d281e0a5e60ee116ad6b27d
Diffstat (limited to 'configs/example')
-rw-r--r--configs/example/fs.py169
-rw-r--r--configs/example/se.py205
2 files changed, 28 insertions, 346 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index a9daf63be..ec3be835a 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -34,6 +34,7 @@ m5.AddToPath('../common')
from FSConfig import *
from SysPaths import *
from Benchmarks import *
+import Simulation
if not m5.build_env['FULL_SYSTEM']:
m5.panic("This script requires full-system mode (ALPHA_FS).")
@@ -48,40 +49,13 @@ parser.add_option("-b", "--benchmark", action="store", type="string",
help="Specify the benchmark to run. Available benchmarks: %s"\
% DefinedBenchmarks)
-# system options
-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("--caches", action="store_true")
-
-# Run duration options
-parser.add_option("-m", "--maxtick", type="int")
-parser.add_option("--maxtime", type="float")
-
# Metafile options
parser.add_option("--etherdump", action="store", type="string", dest="etherdump",
help="Specify the filename to dump a pcap capture of the" \
"ethernet traffic")
-# Checkpointing options
-###Note that performing checkpointing via python script files will override
-###checkpoint instructions built into binaries.
-parser.add_option("--take_checkpoints", action="store", type="string",
- help="<M,N> will take checkpoint at cycle M and every N cycles \
- thereafter")
-parser.add_option("--max_checkpoints", action="store", type="int",
- help="the maximum number of checkpoints to drop",
- default=5)
-parser.add_option("--checkpoint_dir", action="store", type="string",
- help="Place all checkpoints in this absolute directory")
-parser.add_option("-r", "--checkpoint_restore", action="store", type="int",
- help="restore from checkpoint <N>")
-# CPU Switching - default switch model goes from a checkpoint
-# to a timing simple CPU with caches to warm up, then to detailed CPU for
-# data measurement
-parser.add_option("-s", "--standard_switch", action="store_true",
- help="switch from one cpu mode to another")
+execfile("Options.py")
(options, args) = parser.parse_args()
@@ -89,14 +63,6 @@ if args:
print "Error: script doesn't take any positional arguments"
sys.exit(1)
-class MyCache(BaseCache):
- assoc = 2
- block_size = 64
- latency = 1
- mshrs = 10
- tgts_per_mshr = 5
- protocol = CoherenceProtocol(protocol='moesi')
-
# driver system CPU is always simple... note this is an assignment of
# a class, not an instance.
DriveCPUClass = AtomicSimpleCPU
@@ -134,8 +100,8 @@ np = options.num_cpus
test_sys.cpu = [TestCPUClass(cpu_id=i) for i in xrange(np)]
for i in xrange(np):
if options.caches and not options.standard_switch:
- test_sys.cpu[i].addPrivateSplitL1Caches(MyCache(size = '32kB'),
- MyCache(size = '64kB'))
+ test_sys.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
+ L2Cache(size = '64kB'))
test_sys.cpu[i].connectMemPorts(test_sys.membus)
test_sys.cpu[i].mem = test_sys.physmem
@@ -151,129 +117,4 @@ else:
print "Error I don't know how to create more than 2 systems."
sys.exit(1)
-if options.standard_switch:
- switch_cpus = [TimingSimpleCPU(defer_registration=True, cpu_id=(np+i) for i in xrange(np))]
- switch_cpus1 = [DerivO3CPU(defer_registration=True, cpu_id=(2*np+i) for i in xrange(np))]
- for i in xrange(np):
- switch_cpus[i].system = test_sys
- switch_cpus1[i].system = test_sys
- switch_cpus[i].clock = TestCPUClass.clock
- switch_cpus1[i].clock = TestCPUClass.clock
- if options.caches:
- switch_cpus[i].addPrivateSplitL1Caches(MyCache(size = '32kB'),
- MyCache(size = '64kB'))
-
- switch_cpus[i].mem = test_sys.physmem
- switch_cpus1[i].mem = test_sys.physmem
- switch_cpus[i].connectMemPorts(test_sys.membus)
- root.switch_cpus = switch_cpus
- root.switch_cpus1 = switch_cpus1
- switch_cpu_list = [(test_sys.cpu[i], switch_cpus[i]) for i in xrange(np)]
- switch_cpu_list1 = [(switch_cpus[i], switch_cpus1[i]) for i in xrange(np)]
-
-m5.instantiate(root)
-
-if options.checkpoint_dir:
- cptdir = options.checkpoint_dir
-else:
- cptdir = getcwd()
-
-if options.checkpoint_restore:
- from os.path import isdir
- from os import listdir, getcwd
- import re
-
- if not isdir(cptdir):
- m5.panic("checkpoint dir %s does not exist!" % cptdir)
-
- dirs = listdir(cptdir)
- expr = re.compile('cpt.([0-9]*)')
- cpts = []
- for dir in dirs:
- match = expr.match(dir)
- if match:
- cpts.append(match.group(1))
-
- cpts.sort(lambda a,b: cmp(long(a), long(b)))
-
- if options.checkpoint_restore > len(cpts):
- m5.panic('Checkpoint %d not found' % options.checkpoint_restore)
-
- m5.restoreCheckpoint(root, "/".join([cptdir, "cpt.%s" % cpts[options.checkpoint_restore - 1]]))
-
-if options.standard_switch:
- exit_event = m5.simulate(1000)
- ## when you change to Timing (or Atomic), you halt the system given
- ## as argument. When you are finished with the system changes
- ## (including switchCpus), you must resume the system manually.
- ## You DON'T need to resume after just switching CPUs if you haven't
- ## changed anything on the system level.
- m5.changeToTiming(test_sys)
- m5.switchCpus(switch_cpu_list)
- m5.resume(test_sys)
-
- exit_event = m5.simulate(500000000000)
- m5.switchCpus(switch_cpu_list1)
-
-if options.maxtick:
- maxtick = options.maxtick
-elif options.maxtime:
- simtime = int(options.maxtime * root.clock.value)
- print "simulating for: ", simtime
- maxtick = simtime
-else:
- maxtick = -1
-
-num_checkpoints = 0
-
-exit_cause = ''
-
-if options.take_checkpoints:
- [when, period] = options.take_checkpoints.split(",", 1)
- when = int(when)
- period = int(period)
-
- exit_event = m5.simulate(when)
- while exit_event.getCause() == "checkpoint":
- exit_event = m5.simulate(when - m5.curTick())
-
- if exit_event.getCause() == "simulate() limit reached":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
-
- sim_ticks = when
- exit_cause = "maximum %d checkpoints dropped" % options.max_checkpoints
- while num_checkpoints < options.max_checkpoints:
- if (sim_ticks + period) > maxtick and maxtick != -1:
- exit_event = m5.simulate(maxtick - sim_ticks)
- exit_cause = exit_event.getCause()
- break
- else:
- exit_event = m5.simulate(period)
- sim_ticks += period
- while exit_event.getCause() == "checkpoint":
- exit_event = m5.simulate(period - m5.curTick())
- if exit_event.getCause() == "simulate() limit reached":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
-
-else: #no checkpoints being taken via this script
- exit_event = m5.simulate(maxtick)
-
- while exit_event.getCause() == "checkpoint":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
- if num_checkpoints == options.max_checkpoints:
- exit_cause = "maximum %d checkpoints dropped" % options.max_checkpoints
- break
-
- if maxtick == -1:
- exit_event = m5.simulate(maxtick)
- else:
- exit_event = m5.simulate(maxtick - m5.curTick())
-
- exit_cause = exit_event.getCause()
-
-if exit_cause == '':
- exit_cause = exit_event.getCause()
-print 'Exiting @ cycle', m5.curTick(), 'because ', exit_cause
+Simulation.run(options, root, test_sys)
diff --git a/configs/example/se.py b/configs/example/se.py
index 2e63e27da..e4fe93294 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -34,6 +34,7 @@ import m5
from m5.objects import *
import os, optparse, sys
m5.AddToPath('../common')
+import Simulation
parser = optparse.OptionParser()
@@ -47,34 +48,7 @@ parser.add_option("-o", "--options", default="",
parser.add_option("-i", "--input", default="",
help="A file of input to give to the binary.")
-# System options
-parser.add_option("-d", "--detailed", action="store_true")
-parser.add_option("-t", "--timing", action="store_true")
-parser.add_option("--caches", action="store_true")
-
-# Run duration options
-parser.add_option("-m", "--maxtick", type="int")
-parser.add_option("--maxtime", type="float")
-
-#Checkpointing options
-###Note that performing checkpointing via python script files will override
-###checkpoint instructions built into binaries.
-parser.add_option("--take_checkpoints", action="store", type="string",
- help="<M,N> will take checkpoint at cycle M and every N cycles \
- thereafter")
-parser.add_option("--max_checkpoints", action="store", type="int",
- help="the maximum number of checkpoints to drop",
- default=5)
-parser.add_option("--checkpoint_dir", action="store", type="string",
- help="Place all checkpoints in this absolute directory")
-parser.add_option("-r", "--checkpoint_restore", action="store", type="int",
- help="restore from checkpoint <N>")
-
-#CPU Switching - default switch model generally goes from a checkpoint
-#to a timing simple CPU with caches to warm up, then to detailed CPU for
-#data measurement
-parser.add_option("-s", "--standard_switch", action="store_true",
- help="switch from one cpu mode to another")
+execfile("Options.py")
(options, args) = parser.parse_args()
@@ -82,13 +56,6 @@ if args:
print "Error: script doesn't take any positional arguments"
sys.exit(1)
-class MyCache(BaseCache):
- assoc = 2
- block_size = 64
- latency = 1
- mshrs = 10
- tgts_per_mshr = 5
-
process = LiveProcess()
process.executable = options.cmd
process.cmd = options.cmd + " " + options.options
@@ -117,159 +84,33 @@ if options.detailed:
if options.timing:
- cpu = TimingSimpleCPU()
+ CPUClass = TimingSimpleCPU
+ test_mem_mode = 'timing'
elif options.detailed:
- cpu = DerivO3CPU()
-else:
- cpu = AtomicSimpleCPU()
-
-cpu.workload = process
-cpu.cpu_id = 0
-
-system = System(cpu = cpu,
- physmem = PhysicalMemory(range=AddrRange("512MB")),
- 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:
- system.cpu.addPrivateSplitL1Caches(MyCache(size = '32kB'),
- MyCache(size = '64kB'))
-
-root = Root(system = system)
-
-if options.timing or options.detailed:
- root.system.mem_mode = 'timing'
-
-if options.standard_switch:
- switch_cpu = TimingSimpleCPU(defer_registration=True, cpu_id=1)
- switch_cpu1 = DerivO3CPU(defer_registration=True, cpu_id=2)
- switch_cpu.system = system
- switch_cpu1.system = system
- switch_cpu.clock = cpu.clock
- switch_cpu1.clock = cpu.clock
- if options.caches:
- switch_cpu.addPrivateSplitL1Caches(MyCache(size = '32kB'),
- MyCache(size = '64kB'))
-
- switch_cpu.workload = process
- switch_cpu1.workload = process
- switch_cpu.mem = system.physmem
- switch_cpu1.mem = system.physmem
- switch_cpu.connectMemPorts(system.membus)
- root.switch_cpu = switch_cpu
- root.switch_cpu1 = switch_cpu1
- switch_cpu_list = [(system.cpu, switch_cpu)]
- switch_cpu_list1 = [(switch_cpu, switch_cpu1)]
-
-# instantiate configuration
-m5.instantiate(root)
-
-if options.checkpoint_dir:
- cptdir = options.checkpoint_dir
+ CPUClass = DerivO3CPU
+ test_mem_mode = 'timing'
else:
- cptdir = getcwd()
-
-if options.checkpoint_restore:
- from os.path import isdir
- from os import listdir, getcwd
- import re
-
- if not isdir(cptdir):
- m5.panic("checkpoint dir %s does not exist!" % cptdir)
+ CPUClass = AtomicSimpleCPU
+ test_mem_mode = 'atomic'
- dirs = listdir(cptdir)
- expr = re.compile('cpt.([0-9]*)')
- cpts = []
- for dir in dirs:
- match = expr.match(dir)
- if match:
- cpts.append(match.group(1))
+CPUClass.clock = '2GHz'
- cpts.sort(lambda a,b: cmp(long(a), long(b)))
+np = options.num_cpus
- if options.checkpoint_restore > len(cpts):
- m5.panic('Checkpoint %d not found' % options.checkpoint_restore)
-
- print "restoring checkpoint from ","/".join([cptdir, "cpt.%s" % cpts[options.checkpoint_restore - 1]])
- m5.restoreCheckpoint(root, "/".join([cptdir, "cpt.%s" % cpts[options.checkpoint_restore - 1]]))
-
-if options.standard_switch:
- exit_event = m5.simulate(10000)
- ## when you change to Timing (or Atomic), you halt the system given
- ## as argument. When you are finished with the system changes
- ## (including switchCpus), you must resume the system manually.
- ## You DON'T need to resume after just switching CPUs if you haven't
- ## changed anything on the system level.
- m5.changeToTiming(system)
- m5.switchCpus(switch_cpu_list)
- m5.resume(system)
-
- exit_event = m5.simulate(500000000000)
- m5.switchCpus(switch_cpu_list1)
-
-if options.maxtick:
- maxtick = options.maxtick
-elif options.maxtime:
- simtime = int(options.maxtime * root.clock.value)
- print "simulating for: ", simtime
- maxtick = simtime
-else:
- maxtick = -1
-
-num_checkpoints = 0
-
-exit_cause = ''
-
-if options.take_checkpoints:
- [when, period] = options.take_checkpoints.split(",", 1)
- when = int(when)
- period = int(period)
-
- exit_event = m5.simulate(when)
- while exit_event.getCause() == "checkpoint":
- exit_event = m5.simulate(when - m5.curTick())
-
- if exit_event.getCause() == "simulate() limit reached":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
-
- sim_ticks = when
- exit_cause = "maximum %d checkpoints dropped" % options.max_checkpoints
- while num_checkpoints < options.max_checkpoints:
- if (sim_ticks + period) > maxtick and maxtick != -1:
- exit_event = m5.simulate(maxtick - sim_ticks)
- exit_cause = exit_event.getCause()
- break
- else:
- exit_event = m5.simulate(period)
- sim_ticks += period
- while exit_event.getCause() == "checkpoint":
- exit_event = m5.simulate(period - m5.curTick())
- if exit_event.getCause() == "simulate() limit reached":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
-
-else: #no checkpoints being taken via this script
- exit_event = m5.simulate(maxtick)
-
- while exit_event.getCause() == "checkpoint":
- m5.checkpoint(root, cptdir + "cpt.%d")
- num_checkpoints += 1
- if num_checkpoints == options.max_checkpoints:
- exit_cause = "maximum %d checkpoints dropped" % options.max_checkpoints
- break
-
- if maxtick == -1:
- exit_event = m5.simulate(maxtick)
- else:
- exit_event = m5.simulate(maxtick - m5.curTick())
+system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
+ physmem = PhysicalMemory(range=AddrRange("512MB")),
+ membus = Bus(), mem_mode = test_mem_mode)
- exit_cause = exit_event.getCause()
+system.physmem.port = system.membus.port
-if exit_cause == '':
- exit_cause = exit_event.getCause()
-print 'Exiting @ cycle', m5.curTick(), 'because ', exit_cause
+for i in xrange(np):
+ if options.caches and not options.standard_switch:
+ system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
+ L2Cache(size = '64kB'))
+ system.cpu[i].connectMemPorts(system.membus)
+ system.cpu[i].mem = system.physmem
+ system.cpu[i].workload = process
+root = Root(system = system)
+Simulation.run(options, root, system)