30a31
>
31a33
> from m5.defines import buildEnv
33c35
< m5.AddToPath('../common')
---
> from m5.util import *
34a37,38
> addToPath('../common')
>
85c89
< m5.fatal("Error: Can't specify both --fast-forward and --checkpoint-restore")
---
> fatal("Can't specify both --fast-forward and --checkpoint-restore")
88c92
< m5.fatal("Error: Must specify --caches when using --standard-switch")
---
> fatal("Must specify --caches when using --standard-switch")
110c114
< if not m5.build_env['FULL_SYSTEM']:
---
> if not buildEnv['FULL_SYSTEM']:
129c133
< if not m5.build_env['FULL_SYSTEM']:
---
> if not buildEnv['FULL_SYSTEM']:
144c148
< m5.fatal('simpoint not found')
---
> fatal('simpoint not found')
177c181
< m5.fatal('no simpoint for testsys.cpu[%d].workload[0]', i)
---
> fatal('no simpoint for testsys.cpu[%d].workload[0]', i)
197c201
< m5.fatal("checkpoint dir %s does not exist!", cptdir)
---
> fatal("checkpoint dir %s does not exist!", cptdir)
203,204c207
< m5.fatal("Unable to find checkpoint directory %s",
< checkpoint_dir)
---
> fatal("Unable to find checkpoint directory %s", checkpoint_dir)
212c215
< m5.fatal('Unable to find simpoint')
---
> fatal('Unable to find simpoint')
220,221c223,224
< m5.fatal("Unable to find checkpoint directory %s.%s",
< options.bench, options.checkpoint_restore)
---
> fatal("Unable to find checkpoint directory %s.%s",
> options.bench, options.checkpoint_restore)
240c243
< m5.fatal('Checkpoint %d not found', cpt_num)
---
> fatal('Checkpoint %d not found', cpt_num)