Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : f12cecd1359770061b52e9f57f2aaa809e61115c
This commit is contained in:
commit
b6fa376790
1 changed files with 4 additions and 4 deletions
|
@ -34,14 +34,14 @@ if 'SYSTEM' not in env:
|
||||||
|
|
||||||
if env['SYSTEM'] == 'Simple':
|
if env['SYSTEM'] == 'Simple':
|
||||||
from SimpleConfig import *
|
from SimpleConfig import *
|
||||||
BaseCPU.workload = parent.workload
|
BaseCPU.workload = Parent.workload
|
||||||
SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ]
|
SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ]
|
||||||
root = SimpleStandAlone
|
root = SimpleStandAlone()
|
||||||
elif env['SYSTEM'] == 'Detailed':
|
elif env['SYSTEM'] == 'Detailed':
|
||||||
from DetailedConfig import *
|
from DetailedConfig import *
|
||||||
BaseCPU.workload = parent.workload
|
BaseCPU.workload = Parent.workload
|
||||||
DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ]
|
DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ]
|
||||||
root = DetailedStandAlone
|
root = DetailedStandAlone()
|
||||||
else:
|
else:
|
||||||
panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n")
|
panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue