diff options
| author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-02-15 17:40:08 -0500 |
|---|---|---|
| committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-02-15 17:40:08 -0500 |
| commit | 7f1263f1446b789e9f88685ae763ba575e81e454 (patch) | |
| tree | 1d85759bb1afa6dd98bc8c4a6a88ba55612349f3 | |
| parent | 7cd1fd4324bc1f465a9f96a447d240ab697febd2 (diff) | |
| download | gem5-7f1263f1446b789e9f88685ae763ba575e81e454.tar.xz | |
cpu: Make checker CPUs inherit from CheckerCPU in the Python hierarchy
Checker CPUs currently don't inherit from the CheckerCPU in the Python
object hierarchy. This has two consequences:
* It makes CPU model discovery from the Python world somewhat
complicated as there is no way of testing if a CPU is a checker.
* Parameters are duplicated in the checker configuration
specification.
This changeset makes all checker CPUs inherit from the base checker
CPU class.
| -rw-r--r-- | src/cpu/DummyChecker.py | 4 | ||||
| -rw-r--r-- | src/cpu/o3/O3Checker.py | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/cpu/DummyChecker.py b/src/cpu/DummyChecker.py index e75f7057e..3bf021a14 100644 --- a/src/cpu/DummyChecker.py +++ b/src/cpu/DummyChecker.py @@ -36,8 +36,8 @@ # Authors: Geoffrey Blake from m5.params import * -from BaseCPU import BaseCPU +from CheckerCPU import CheckerCPU -class DummyChecker(BaseCPU): +class DummyChecker(CheckerCPU): type = 'DummyChecker' cxx_header = 'cpu/dummy_checker.hh' diff --git a/src/cpu/o3/O3Checker.py b/src/cpu/o3/O3Checker.py index d2dc8e95b..f21a038c4 100644 --- a/src/cpu/o3/O3Checker.py +++ b/src/cpu/o3/O3Checker.py @@ -27,14 +27,8 @@ # Authors: Nathan Binkert from m5.params import * -from BaseCPU import BaseCPU +from CheckerCPU import CheckerCPU -class O3Checker(BaseCPU): +class O3Checker(CheckerCPU): type = 'O3Checker' cxx_header = 'cpu/o3/checker.hh' - - exitOnError = Param.Bool(False, "Exit on an error") - updateOnError = Param.Bool(False, - "Update the checker with the main CPU's state on an error") - warnOnlyOnLoadError = Param.Bool(True, - "If a load result is incorrect, only print a warning and do not exit") |