CPU: Remove overloaded function_trace_start parameter

This patch removes the overloading of the parameter, which seems both
redundant, and possibly incorrect.

The inorder CPU is particularly interesting as it uses a different
name for the parameter, and never make any use of it internally.

diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py
index 8c658b196e5a5e8d886f609fefd842c565182a6c..a4ad2fe5a79e2383232d94b898da7d6562336ed2 100644 (file)
--- a/src/cpu/BaseCPU.py
+++ b/src/cpu/BaseCPU.py
@@ -82,7 +82,7 @@ class BaseCPU(MemObject):
     numThreads = Param.Unsigned(1, "number of HW thread contexts")
 
     function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
+    function_trace_start = Param.Tick(0, "Tick to start function trace")
 
     checker = Param.BaseCPU(NULL, "checker CPU")
 

diff --git a/src/cpu/CheckerCPU.py b/src/cpu/CheckerCPU.py
index c144c467890033c6a46f6ef9435b7a3d174239bb..a6b5da5d77af48ac9c1ca1f126945cae2dcd2ae8 100644 (file)
--- a/src/cpu/CheckerCPU.py
+++ b/src/cpu/CheckerCPU.py
@@ -37,5 +37,3 @@ class CheckerCPU(BaseCPU):
         "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")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")

diff --git a/src/cpu/inorder/InOrderCPU.py b/src/cpu/inorder/InOrderCPU.py
index 2dcd51d459b6ff5c045ae7bbbb5ef2af4885a24b..416b18dd3dc60abe9ae279f1f2c8510d95062337 100644 (file)
--- a/src/cpu/inorder/InOrderCPU.py
+++ b/src/cpu/inorder/InOrderCPU.py
@@ -62,8 +62,7 @@ class InOrderCPU(BaseCPU):
     RASSize = Param.Unsigned(16, "RAS size")
 
     instShiftAmt = Param.Unsigned(2, "Number of bits to shift instructions by")
-    functionTrace = Param.Bool(False, "Enable function trace")
-    functionTraceStart = Param.Tick(0, "Cycle to start function trace")
+
     stageTracing = Param.Bool(False, "Enable tracing of each stage in CPU")
 
     multLatency = Param.Unsigned(1, "Latency for Multiply Operations")

diff --git a/src/cpu/o3/O3Checker.py b/src/cpu/o3/O3Checker.py
index d53e5e5277dc77c997dfc3b5601cb519be19f11f..5021b5ea72a089c1d1a69639186fa4be828c6ee8 100644 (file)
--- a/src/cpu/o3/O3Checker.py
+++ b/src/cpu/o3/O3Checker.py
@@ -36,5 +36,3 @@ class O3Checker(BaseCPU):
         "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")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")

diff --git a/src/cpu/ozone/OzoneCPU.py b/src/cpu/ozone/OzoneCPU.py
index b4f37220c2859674c3e628cd7050e8f6076cc125..298a99d510ab543a205ce0005a5b5b0e7ebb3085 100644 (file)
--- a/src/cpu/ozone/OzoneCPU.py
+++ b/src/cpu/ozone/OzoneCPU.py
@@ -113,9 +113,6 @@ class DerivOzoneCPU(BaseCPU):
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
 
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
-
     # If the CheckerCPU is brought back to useability in the OzoneCPU, create a
     # function here called addCheckerCpu() to create a non-NULL Checker and
     # connect its TLBs (if needed)

diff --git a/src/cpu/ozone/OzoneChecker.py b/src/cpu/ozone/OzoneChecker.py
index bbe46db18b83fd581f0e9be2eaedf3d7ef6fe869..9134612d0e7b8c1c65d4e77e953684b0fbce0f09 100644 (file)
--- a/src/cpu/ozone/OzoneChecker.py
+++ b/src/cpu/ozone/OzoneChecker.py
@@ -36,5 +36,3 @@ class OzoneChecker(BaseCPU):
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(False,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")

diff --git a/src/cpu/ozone/SimpleOzoneCPU.py b/src/cpu/ozone/SimpleOzoneCPU.py
index d79418b27f4f1d32de2f028f513c7a337657e282..ae122413d8ebdae787852094322fcbd0aafc0e7f 100644 (file)
--- a/src/cpu/ozone/SimpleOzoneCPU.py
+++ b/src/cpu/ozone/SimpleOzoneCPU.py
@@ -109,6 +109,3 @@ class SimpleOzoneCPU(BaseCPU):
     numROBEntries = Param.Unsigned("Number of reorder buffer entries")
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
-
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")