diff options
| author | Gabe Black <gabeblack@google.com> | 2017-04-27 20:47:10 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2017-05-06 20:49:10 +0000 |
| commit | 306dea1eb84b9a2076adb626c269d796d0e4bc10 (patch) | |
| tree | a701cb21532b43d84fdffff0b2308036d8ffc21a /configs/common/Options.py | |
| parent | 8020c689f9d9c77585ef9c5f8c627f1f2a7368f8 (diff) | |
| download | gem5-306dea1eb84b9a2076adb626c269d796d0e4bc10.tar.xz | |
config: Remove support for CPU aliases.
This was added for backwards compatability, but it adds a decent amount
of complexity.
The table below shows what CPU class name to use in place of a given
alias.
+==========+========================================================+
| Alias | CPU class |
+==========+========================================================+
| timing | TimingSimpleCPU |
| atomic | AtomicSimpleCPU |
| minor | MinorCPU |
| detailed | DrivO3CPU |
| kvm | ArmKvmCPU, ArmV8KvmCPU or X86KvmCPU, depending on arch |
| trace | TraceCPU |
+==========+========================================================+
Change-Id: I251c4f64b7869c6b64dd25b36967ae240f01ef08
Reviewed-on: https://gem5-review.googlesource.com/2940
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/common/Options.py')
| -rw-r--r-- | configs/common/Options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py index 9af15ff2f..052c6a8d3 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -135,7 +135,7 @@ def addCommonOptions(parser): parser.add_option("--list-cpu-types", action="callback", callback=_listCpuTypes, help="List available CPU types") - parser.add_option("--cpu-type", type="choice", default="atomic", + parser.add_option("--cpu-type", type="choice", default="AtomicSimpleCPU", choices=CpuConfig.cpu_names(), help = "type of cpu to run with") parser.add_option("--checker", action="store_true"); @@ -253,7 +253,7 @@ def addCommonOptions(parser): parser.add_option("--work-cpus-checkpoint-count", action="store", type="int", help="checkpoint and exit when active cpu count is reached") parser.add_option("--restore-with-cpu", action="store", type="choice", - default="atomic", choices=CpuConfig.cpu_names(), + default="AtomicSimpleCPU", choices=CpuConfig.cpu_names(), help = "cpu type for restoring from a checkpoint") |