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.

diff --git a/src/cpu/DummyChecker.py b/src/cpu/DummyChecker.py
index e75f7057ee25c76756ff812e0cf5a2d64c385b9f..3bf021a149c564241eb2cdb4b24073533c594c87 100644 (file)
--- 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 d2dc8e95b05e3131b3021472d4801dd248b26119..f21a038c42dd174381dc4b342c28b03890f7ee27 100644 (file)
--- 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")