248bd2bb62
cpu/o3/2bit_local_pred.cc:
Branch predictor cleanup/fixup. Rename this to LocalBP.
cpu/o3/2bit_local_pred.hh:
Rename to LocalBP, update to support changes to BPredUnit, include comments.
cpu/o3/alpha_cpu_builder.cc:
Support extra parameters to the branch predictor. Now it takes in a parameter to tell it which branch predictor it is using, the local or the tournament predictor.
cpu/o3/alpha_params.hh:
Add in extra parameter for the branch predictor type.
cpu/o3/bpred_unit.cc:
Branch predictor fixup/cleanup. Rename it to BPredUnit.
cpu/o3/bpred_unit.hh:
Branch predictor fixup/cleanup. Now supports both the local and tournament predictors, and stores the branch predictor update state.
cpu/o3/bpred_unit_impl.hh:
Branch predictor overhaul. Now supports both the local and tournament predictors.
cpu/o3/cpu_policy.hh:
cpu/ozone/ozone_impl.hh:
cpu/ozone/simple_impl.hh:
Reflect the class name change.
cpu/o3/decode_impl.hh:
Be sure to set the predicted target as well so we don't squash twice.
cpu/o3/tournament_pred.cc:
cpu/o3/tournament_pred.hh:
Fixes to the tournament predictor.
cpu/ozone/simple_params.hh:
Include parameter for the branch predictor type.
python/m5/objects/AlphaFullCPU.py:
python/m5/objects/OzoneCPU.py:
Include the parameter for the branch predictor type.
--HG--
extra : convert_revision : 34afebb3b40b47accb12558e439ee4cb03df5e64
90 lines
4.2 KiB
Python
90 lines
4.2 KiB
Python
from m5 import *
|
|
from BaseCPU import BaseCPU
|
|
|
|
class DerivOzoneCPU(BaseCPU):
|
|
type = 'DerivOzoneCPU'
|
|
|
|
numThreads = Param.Unsigned("number of HW thread contexts")
|
|
|
|
if not build_env['FULL_SYSTEM']:
|
|
mem = Param.FunctionalMemory(NULL, "memory")
|
|
|
|
checker = Param.BaseCPU("Checker CPU")
|
|
|
|
width = Param.Unsigned("Width")
|
|
frontEndWidth = Param.Unsigned("Front end width")
|
|
backEndWidth = Param.Unsigned("Back end width")
|
|
backEndSquashLatency = Param.Unsigned("Back end squash latency")
|
|
backEndLatency = Param.Unsigned("Back end latency")
|
|
maxInstBufferSize = Param.Unsigned("Maximum instruction buffer size")
|
|
maxOutstandingMemOps = Param.Unsigned("Maximum number of outstanding memory operations")
|
|
decodeToFetchDelay = Param.Unsigned("Decode to fetch delay")
|
|
renameToFetchDelay = Param.Unsigned("Rename to fetch delay")
|
|
iewToFetchDelay = Param.Unsigned("Issue/Execute/Writeback to fetch "
|
|
"delay")
|
|
commitToFetchDelay = Param.Unsigned("Commit to fetch delay")
|
|
fetchWidth = Param.Unsigned("Fetch width")
|
|
|
|
renameToDecodeDelay = Param.Unsigned("Rename to decode delay")
|
|
iewToDecodeDelay = Param.Unsigned("Issue/Execute/Writeback to decode "
|
|
"delay")
|
|
commitToDecodeDelay = Param.Unsigned("Commit to decode delay")
|
|
fetchToDecodeDelay = Param.Unsigned("Fetch to decode delay")
|
|
decodeWidth = Param.Unsigned("Decode width")
|
|
|
|
iewToRenameDelay = Param.Unsigned("Issue/Execute/Writeback to rename "
|
|
"delay")
|
|
commitToRenameDelay = Param.Unsigned("Commit to rename delay")
|
|
decodeToRenameDelay = Param.Unsigned("Decode to rename delay")
|
|
renameWidth = Param.Unsigned("Rename width")
|
|
|
|
commitToIEWDelay = Param.Unsigned("Commit to "
|
|
"Issue/Execute/Writeback delay")
|
|
renameToIEWDelay = Param.Unsigned("Rename to "
|
|
"Issue/Execute/Writeback delay")
|
|
issueToExecuteDelay = Param.Unsigned("Issue to execute delay (internal "
|
|
"to the IEW stage)")
|
|
issueWidth = Param.Unsigned("Issue width")
|
|
executeWidth = Param.Unsigned("Execute width")
|
|
executeIntWidth = Param.Unsigned("Integer execute width")
|
|
executeFloatWidth = Param.Unsigned("Floating point execute width")
|
|
executeBranchWidth = Param.Unsigned("Branch execute width")
|
|
executeMemoryWidth = Param.Unsigned("Memory execute width")
|
|
|
|
iewToCommitDelay = Param.Unsigned("Issue/Execute/Writeback to commit "
|
|
"delay")
|
|
renameToROBDelay = Param.Unsigned("Rename to reorder buffer delay")
|
|
commitWidth = Param.Unsigned("Commit width")
|
|
squashWidth = Param.Unsigned("Squash width")
|
|
|
|
predType = Param.String("Type of branch predictor ('local', 'tournament')")
|
|
localPredictorSize = Param.Unsigned("Size of local predictor")
|
|
localCtrBits = Param.Unsigned("Bits per counter")
|
|
localHistoryTableSize = Param.Unsigned("Size of local history table")
|
|
localHistoryBits = Param.Unsigned("Bits for the local history")
|
|
globalPredictorSize = Param.Unsigned("Size of global predictor")
|
|
globalCtrBits = Param.Unsigned("Bits per counter")
|
|
globalHistoryBits = Param.Unsigned("Bits of history")
|
|
choicePredictorSize = Param.Unsigned("Size of choice predictor")
|
|
choiceCtrBits = Param.Unsigned("Bits of choice counters")
|
|
|
|
BTBEntries = Param.Unsigned("Number of BTB entries")
|
|
BTBTagSize = Param.Unsigned("Size of the BTB tags, in bits")
|
|
|
|
RASSize = Param.Unsigned("RAS size")
|
|
|
|
LQEntries = Param.Unsigned("Number of load queue entries")
|
|
SQEntries = Param.Unsigned("Number of store queue entries")
|
|
LFSTSize = Param.Unsigned("Last fetched store table size")
|
|
SSITSize = Param.Unsigned("Store set ID table size")
|
|
|
|
numPhysIntRegs = Param.Unsigned("Number of physical integer registers")
|
|
numPhysFloatRegs = Param.Unsigned("Number of physical floating point "
|
|
"registers")
|
|
numIQEntries = Param.Unsigned("Number of instruction queue entries")
|
|
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")
|