Simulation.py (5369:9358355117b0) Simulation.py (5370:b16ec4d7e77c)
1# Copyright (c) 2006-2008 The Regents of The University of Michigan
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 63 unchanged lines hidden (view full) ---

72
73 if options.checkpoint_dir:
74 cptdir = options.checkpoint_dir
75 elif m5.options.outdir:
76 cptdir = m5.options.outdir
77 else:
78 cptdir = getcwd()
79
1# Copyright (c) 2006-2008 The Regents of The University of Michigan
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 63 unchanged lines hidden (view full) ---

72
73 if options.checkpoint_dir:
74 cptdir = options.checkpoint_dir
75 elif m5.options.outdir:
76 cptdir = m5.options.outdir
77 else:
78 cptdir = getcwd()
79
80 if options.fast_forward and options.checkpoint_restore != None:
81 m5.panic("Error: Can't specify both --fast-forward and --checkpoint-restore")
82
83 if options.standard_switch and not cpu_class:
84 m5.panic("Error: Must specify CPU to switch to for --standard-switch (almost always detailed (-d))")
85
80 np = options.num_cpus
81 max_checkpoints = options.max_checkpoints
82 switch_cpus = None
83
84 if cpu_class:
85 switch_cpus = [cpu_class(defer_registration=True, cpu_id=(np+i))
86 for i in xrange(np)]
87

--- 269 unchanged lines hidden --- 		86 np = options.num_cpus
87 max_checkpoints = options.max_checkpoints
88 switch_cpus = None
89
90 if cpu_class:
91 switch_cpus = [cpu_class(defer_registration=True, cpu_id=(np+i))
92 for i in xrange(np)]
93

--- 269 unchanged lines hidden ---