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.
This commit is contained in:
Andreas Hansson 2012-08-21 05:49:43 -04:00
parent 5803309574
commit a81c969529
7 changed files with 2 additions and 15 deletions

View file

@ -82,7 +82,7 @@ class BaseCPU(MemObject):
numThreads = Param.Unsigned(1, "number of HW thread contexts") numThreads = Param.Unsigned(1, "number of HW thread contexts")
function_trace = Param.Bool(False, "Enable function trace") 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") checker = Param.BaseCPU(NULL, "checker CPU")

View file

@ -37,5 +37,3 @@ class CheckerCPU(BaseCPU):
"Update the checker with the main CPU's state on an error") "Update the checker with the main CPU's state on an error")
warnOnlyOnLoadError = Param.Bool(True, warnOnlyOnLoadError = Param.Bool(True,
"If a load result is incorrect, only print a warning and do not exit") "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")

View file

@ -62,8 +62,7 @@ class InOrderCPU(BaseCPU):
RASSize = Param.Unsigned(16, "RAS size") RASSize = Param.Unsigned(16, "RAS size")
instShiftAmt = Param.Unsigned(2, "Number of bits to shift instructions by") 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") stageTracing = Param.Bool(False, "Enable tracing of each stage in CPU")
multLatency = Param.Unsigned(1, "Latency for Multiply Operations") multLatency = Param.Unsigned(1, "Latency for Multiply Operations")

View file

@ -36,5 +36,3 @@ class O3Checker(BaseCPU):
"Update the checker with the main CPU's state on an error") "Update the checker with the main CPU's state on an error")
warnOnlyOnLoadError = Param.Bool(True, warnOnlyOnLoadError = Param.Bool(True,
"If a load result is incorrect, only print a warning and do not exit") "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")

View file

@ -113,9 +113,6 @@ class DerivOzoneCPU(BaseCPU):
instShiftAmt = Param.Unsigned("Number of bits to shift instructions by") 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 # If the CheckerCPU is brought back to useability in the OzoneCPU, create a
# function here called addCheckerCpu() to create a non-NULL Checker and # function here called addCheckerCpu() to create a non-NULL Checker and
# connect its TLBs (if needed) # connect its TLBs (if needed)

View file

@ -36,5 +36,3 @@ class OzoneChecker(BaseCPU):
"Update the checker with the main CPU's state on an error") "Update the checker with the main CPU's state on an error")
warnOnlyOnLoadError = Param.Bool(False, warnOnlyOnLoadError = Param.Bool(False,
"If a load result is incorrect, only print a warning and do not exit") "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")

View file

@ -109,6 +109,3 @@ class SimpleOzoneCPU(BaseCPU):
numROBEntries = Param.Unsigned("Number of reorder buffer entries") numROBEntries = Param.Unsigned("Number of reorder buffer entries")
instShiftAmt = Param.Unsigned("Number of bits to shift instructions by") 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")