diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2008-03-15 22:20:09 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2008-03-15 22:20:09 -0400 |
| commit | 969688154d6283648be85d359710f1af326ffe3a (patch) | |
| tree | 771c09ce5e20ebc1bd39368f52753fca29deeb95 /configs/common | |
| parent | 50946b1673cd48fc9c49f6a615d0e1f80b8cdd87 (diff) | |
| download | gem5-969688154d6283648be85d359710f1af326ffe3a.tar.xz | |
Simpoints: Fix regression bug/Don't set process.simpoint, if simpoint doesn't exist
--HG--
extra : convert_revision : c156c49668815755c4c788f807e8eba32151aa24
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/Simulation.py | 6 | ||||
| -rw-r--r-- | configs/common/cpu2000.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 08e700d87..e604dd0d9 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -128,7 +128,7 @@ def run(options, root, testsys, cpu_class): testsys.cpu[i].max_insts_any_thread = int(options.fast_forward) # Fast forward to a simpoint (warning: time consuming) elif options.simpoint: - if testsys.cpu[i].workload[0].simpoint == None: + if testsys.cpu[i].workload[0].simpoint == 0: m5.panic('simpoint not found') testsys.cpu[i].max_insts_any_thread = \ testsys.cpu[i].workload[0].simpoint @@ -162,7 +162,7 @@ def run(options, root, testsys, cpu_class): # Set an instruction break point if options.simpoint: for i in xrange(np): - if testsys.cpu[i].workload[0].simpoint == None: + if testsys.cpu[i].workload[0].simpoint == 0: m5.panic('no simpoint for testsys.cpu[%d].workload[0]' % i) checkpoint_inst = int(testsys.cpu[i].workload[0].simpoint) + offset testsys.cpu[i].max_insts_any_thread = checkpoint_inst @@ -197,7 +197,7 @@ def run(options, root, testsys, cpu_class): print "Done." elif options.simpoint: # assume workload 0 has the simpoint - if testsys.cpu[0].workload[0].simpoint == None: + if testsys.cpu[0].workload[0].simpoint == 0: m5.panic('Unable to find simpoint') options.checkpoint_restore += \ diff --git a/configs/common/cpu2000.py b/configs/common/cpu2000.py index 7fe15b577..a2e64f822 100644 --- a/configs/common/cpu2000.py +++ b/configs/common/cpu2000.py @@ -140,7 +140,8 @@ class Benchmark(object): process_args['input'] = self.stdin if self.stdout: process_args['output'] = self.stdout - process_args['simpoint'] = self.simpoint + if self.simpoint: + process_args['simpoint'] = self.simpoint # explicit keywords override defaults process_args.update(kwargs) |