diff options
| author | Gabe Black <gabeblack@google.com> | 2017-05-07 23:57:47 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2017-05-09 16:48:30 +0000 |
| commit | 942e2957994fc6779a5540c3b94a8756258e3149 (patch) | |
| tree | d6b721cafc5dbadcf00fc2ca6bf2f8cb59d5c00d /configs/example | |
| parent | 80c391730b6c4c78644717617d766c9679e99c45 (diff) | |
| download | gem5-942e2957994fc6779a5540c3b94a8756258e3149.tar.xz | |
config: Fix up some configs to not use CPU aliases.
Support for CPU aliases were removed recently.
Change-Id: I3c1173dc34170d8639d95e52bf660f248848f77f
Reviewed-on: https://gem5-review.googlesource.com/3100
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs/example')
| -rw-r--r-- | configs/example/apu_se.py | 6 | ||||
| -rw-r--r-- | configs/example/etrace_replay.py | 4 | ||||
| -rw-r--r-- | configs/example/fs.py | 3 | ||||
| -rw-r--r-- | configs/example/se.py | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/configs/example/apu_se.py b/configs/example/apu_se.py index 28ba92ba1..f93442d62 100644 --- a/configs/example/apu_se.py +++ b/configs/example/apu_se.py @@ -181,9 +181,9 @@ if buildEnv['PROTOCOL'] == 'None': fatal("GPU model requires ruby") # Currently the gpu model requires only timing or detailed CPU -if not (options.cpu_type == "timing" or - options.cpu_type == "detailed"): - fatal("GPU model requires timing or detailed CPU") +if not (options.cpu_type == "TimingSimpleCPU" or + options.cpu_type == "DerivO3CPU"): + fatal("GPU model requires TimingSimpleCPU or DerivO3CPU") # This file can support multiple compute units assert(options.num_compute_units >= 1) diff --git a/configs/example/etrace_replay.py b/configs/example/etrace_replay.py index 0b0e37ffd..385a2d15f 100644 --- a/configs/example/etrace_replay.py +++ b/configs/example/etrace_replay.py @@ -65,9 +65,9 @@ if args: numThreads = 1 -if options.cpu_type != "trace": +if options.cpu_type != "TraceCPU": fatal("This is a script for elastic trace replay simulation, use "\ - "--cpu-type=trace\n"); + "--cpu-type=TraceCPU\n"); if options.num_cpus > 1: fatal("This script does not support multi-processor trace replay.\n") diff --git a/configs/example/fs.py b/configs/example/fs.py index 8102edc75..36365afa1 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -147,7 +147,8 @@ def build_test_system(np): if options.ruby: # Check for timing mode because ruby does not support atomic accesses - if not (options.cpu_type == "detailed" or options.cpu_type == "timing"): + if not (options.cpu_type == "DerivO3CPU" or + options.cpu_type == "TimingSimpleCPU"): print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!" sys.exit(1) diff --git a/configs/example/se.py b/configs/example/se.py index b26bc91e5..0fc7d7459 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -115,7 +115,7 @@ def get_processes(options): idx += 1 if options.smt: - assert(options.cpu_type == "detailed") + assert(options.cpu_type == "DerivO3CPU") return multiprocesses, idx else: return multiprocesses, 1 |