diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 00:45:10 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 00:45:10 -0400 |
| commit | fb1282de1a39412b45a48cacc4fbea953008e1cd (patch) | |
| tree | 3fc965503e06eedded24a4f89d9765f8d7dc2349 /configs/splash2/run.py | |
| parent | 13c005a8af79a8481879ce099b45a1f98faae165 (diff) | |
| parent | 87d27637aa2e99d5218e2e5dd5b728a3d650a2e7 (diff) | |
| download | gem5-fb1282de1a39412b45a48cacc4fbea953008e1cd.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.my.domain:/z/binkertn/research/m5/head
--HG--
extra : convert_revision : b0c9b044b44a1bfc4cded2ebfa240b799dd4a5a0
Diffstat (limited to 'configs/splash2/run.py')
| -rw-r--r-- | configs/splash2/run.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configs/splash2/run.py b/configs/splash2/run.py index 2ecdf3fc1..ebbe14939 100644 --- a/configs/splash2/run.py +++ b/configs/splash2/run.py @@ -34,14 +34,14 @@ if 'SYSTEM' not in env: if env['SYSTEM'] == 'Simple': from SimpleConfig import * - BaseCPU.workload = parent.workload + BaseCPU.workload = Parent.workload SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ] - root = SimpleStandAlone + root = SimpleStandAlone() elif env['SYSTEM'] == 'Detailed': from DetailedConfig import * - BaseCPU.workload = parent.workload + BaseCPU.workload = Parent.workload DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ] - root = DetailedStandAlone + root = DetailedStandAlone() else: panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n") |