diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-06-04 23:08:49 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-06-04 23:08:49 -0400 |
| commit | b6fa3767905a54bb085a9e405cad0cffdeff2b5e (patch) | |
| tree | fa6d44adf68d2c8f285cd8f81460863993037653 | |
| parent | 5a94e6f2cc6ed8480063da68d20274ced2930925 (diff) | |
| parent | ed743cb3b0cd842650853f1e4df69b46512acb9b (diff) | |
| download | gem5-b6fa3767905a54bb085a9e405cad0cffdeff2b5e.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision : f12cecd1359770061b52e9f57f2aaa809e61115c
| -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") |