sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Configs: Fix some bugs we introduced in the simpoints code

Browse source 
--HG--
extra : convert_revision : ef22c11cb3242903a484fc05dc0f96d3e5f9af72
This commit is contained in:
Ali Saidi 2008-02-28 20:39:01 -05:00
parent 19dfde2317
commit 3cb7df428c
2 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
configs/common/Simulation.py
View file

@ -51,7 +51,7 @@ def setCPUClass(options):
test_mem_mode = 'atomic' test_mem_mode = 'atomic'
if not atomic: if not atomic:
if options.checkpoint_restore or options.fast_forward: if options.checkpoint_restore != None or options.fast_forward:
CPUClass = TmpClass CPUClass = TmpClass
class TmpClass(AtomicSimpleCPU): pass class TmpClass(AtomicSimpleCPU): pass
else: else:
@ -87,11 +87,14 @@ def run(options, root, testsys, cpu_class):
for i in xrange(np): for i in xrange(np):
if options.fast_forward: if options.fast_forward:
testsys.cpu[i].max_insts_any_thread = options.fast_forward testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
switch_cpus[i].system = testsys switch_cpus[i].system = testsys
if not m5.build_env['FULL_SYSTEM']: if not m5.build_env['FULL_SYSTEM']:
switch_cpus[i].workload = testsys.cpu[i].workload switch_cpus[i].workload = testsys.cpu[i].workload
switch_cpus[i].clock = testsys.cpu[0].clock switch_cpus[i].clock = testsys.cpu[0].clock
# simulation period
if options.max_inst:
switch_cpus[i].max_insts_any_thread = options.max_inst
testsys.switch_cpus = switch_cpus testsys.switch_cpus = switch_cpus
switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)] switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
@ -112,11 +115,11 @@ def run(options, root, testsys, cpu_class):
switch_cpus_1[i].clock = testsys.cpu[0].clock switch_cpus_1[i].clock = testsys.cpu[0].clock
# if restoring, make atomic cpu simulate only a few instructions # if restoring, make atomic cpu simulate only a few instructions
if options.checkpoint_restore: if options.checkpoint_restore != None:
testsys.cpu[i].max_insts_any_thread = 1 testsys.cpu[i].max_insts_any_thread = 1
# Fast forward to specified location if we are not restoring # Fast forward to specified location if we are not restoring
elif options.fast_forward: elif options.fast_forward:
testsys.cpu[i].max_insts_any_thread = options.fast_forward testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
# Fast forward to a simpoint (warning: time consuming) # Fast forward to a simpoint (warning: time consuming)
elif options.simpoint: elif options.simpoint:
if testsys.cpu[i].workload[0].simpoint == None: if testsys.cpu[i].workload[0].simpoint == None:
@ -147,7 +150,7 @@ def run(options, root, testsys, cpu_class):
switch_cpu_list1 = [(switch_cpus[i], switch_cpus_1[i]) for i in xrange(np)] switch_cpu_list1 = [(switch_cpus[i], switch_cpus_1[i]) for i in xrange(np)]
# set the checkpoint in the cpu before m5.instantiate is called # set the checkpoint in the cpu before m5.instantiate is called
if options.take_checkpoints and \ if options.take_checkpoints != None and \
(options.simpoint or options.at_instruction): (options.simpoint or options.at_instruction):
offset = int(options.take_checkpoints) offset = int(options.take_checkpoints)
# Set an instruction break point # Set an instruction break point
@ -155,7 +158,7 @@ def run(options, root, testsys, cpu_class):
for i in xrange(np): for i in xrange(np):
if testsys.cpu[i].workload[0].simpoint == None: if testsys.cpu[i].workload[0].simpoint == None:
m5.panic('no simpoint for testsys.cpu[%d].workload[0]' % i) m5.panic('no simpoint for testsys.cpu[%d].workload[0]' % i)
checkpoint_inst = testsys.cpu[i].workload[0].simpoint + offset checkpoint_inst = int(testsys.cpu[i].workload[0].simpoint) + offset
testsys.cpu[i].max_insts_any_thread = checkpoint_inst testsys.cpu[i].max_insts_any_thread = checkpoint_inst
# used for output below # used for output below
options.take_checkpoints = checkpoint_inst options.take_checkpoints = checkpoint_inst
@ -166,11 +169,9 @@ def run(options, root, testsys, cpu_class):
for i in xrange(np): for i in xrange(np):
testsys.cpu[i].max_insts_any_thread = offset testsys.cpu[i].max_insts_any_thread = offset
testsys.cpu_switch_list = cpu_switch_list
m5.instantiate(root) m5.instantiate(root)
if options.checkpoint_restore: if options.checkpoint_restore != None:
from os.path import isdir, exists from os.path import isdir, exists
from os import listdir from os import listdir
import re import re
@ -190,11 +191,11 @@ def run(options, root, testsys, cpu_class):
print "Done." print "Done."
elif options.simpoint: elif options.simpoint:
# assume workload 0 has the simpoint # assume workload 0 has the simpoint
if testsys.cpu[i].workload[0].simpoint == None: if testsys.cpu[0].workload[0].simpoint == None:
m5.panic('Unable to find simpoint') m5.panic('Unable to find simpoint')
options.checkpoint_restore += \ options.checkpoint_restore += \
testsys.cpu[0].workload[0].simpoint int(testsys.cpu[0].workload[0].simpoint)
checkpoint_dir = joinpath(cptdir, "cpt.%s.%d" % \ checkpoint_dir = joinpath(cptdir, "cpt.%s.%d" % \
(options.bench, options.checkpoint_restore)) (options.bench, options.checkpoint_restore))
@ -275,16 +276,12 @@ def run(options, root, testsys, cpu_class):
# subsequent periods of <period>. Checkpoint instructions # subsequent periods of <period>. Checkpoint instructions
# received from the benchmark running are ignored and skipped in # received from the benchmark running are ignored and skipped in
# favor of command line checkpoint instructions. # favor of command line checkpoint instructions.
if options.take_checkpoints: if options.take_checkpoints != None :
when, period = options.take_checkpoints.split(",", 1)
when = int(when)
period = int(period)
if options.at_instruction or options.simpoint: if options.at_instruction or options.simpoint:
checkpoint_inst = when checkpoint_inst = int(options.take_checkpoints)
# maintain correct offset if we restored from some instruction # maintain correct offset if we restored from some instruction
if options.checkpoint_restore: if options.checkpoint_restore != None:
checkpoint_inst += options.checkpoint_restore checkpoint_inst += options.checkpoint_restore
print "Creating checkpoint at inst:%d" % (checkpoint_inst) print "Creating checkpoint at inst:%d" % (checkpoint_inst)
@ -305,6 +302,10 @@ def run(options, root, testsys, cpu_class):
if exit_event.getCause() == "user interrupt received": if exit_event.getCause() == "user interrupt received":
exit_cause = exit_event.getCause(); exit_cause = exit_event.getCause();
else: else:
when, period = options.take_checkpoints.split(",", 1)
when = int(when)
period = int(period)
exit_event = m5.simulate(when) exit_event = m5.simulate(when)
while exit_event.getCause() == "checkpoint": while exit_event.getCause() == "checkpoint":
exit_event = m5.simulate(when - m5.curTick()) exit_event = m5.simulate(when - m5.curTick())

22
configs/example/se.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2006-2007 The Regents of The University of Michigan # Copyright (c) 2006-2008 The Regents of The University of Michigan
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -36,6 +36,7 @@ import os, optparse, sys
m5.AddToPath('../common') m5.AddToPath('../common')
import Simulation import Simulation
from Caches import * from Caches import *
from cpu2000 import *
# Get paths we might need. It's expected this file is in m5/configs/example. # Get paths we might need. It's expected this file is in m5/configs/example.
config_path = os.path.dirname(os.path.abspath(__file__)) config_path = os.path.dirname(os.path.abspath(__file__))
@ -62,9 +63,22 @@ if args:
print "Error: script doesn't take any positional arguments" print "Error: script doesn't take any positional arguments"
sys.exit(1) sys.exit(1)
process = LiveProcess() if options.bench:
process.executable = options.cmd try:
process.cmd = [options.cmd] + options.options.split() if m5.build_env['TARGET_ISA'] != 'alpha':
print >>sys.stderr, "Simpoints code only works for Alpha ISA at this time"
sys.exit(1)
exec("workload = %s('alpha', 'tru64', 'ref')" % options.bench)
process = workload.makeLiveProcess()
except:
print >>sys.stderr, "Unable to find workload for %s" % options.bench
sys.exit(1)
else:
process = LiveProcess()
process.executable = options.cmd
process.cmd = [options.cmd] + options.options.split()
if options.input != "": if options.input != "":
process.input = options.input process.input = options.input