sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

params: Convert the CPU objects to use the auto generated param structs.

Browse source 
A whole bunch of stuff has been converted to use the new params stuff, but
the CPU wasn't one of them.  While we're at it, make some things a bit
more stylish. Most of the work was done by Gabe, I just cleaned stuff up
a bit more at the end.
This commit is contained in:
Nathan Binkert 2008-08-11 12:22:16 -07:00
parent 3448a12208
commit ee62a0fec8
61 changed files with 335 additions and 1047 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/arch/mips/regfile/misc_regfile.cc
View file

@ -40,6 +40,8 @@
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/exetrace.hh" #include "cpu/exetrace.hh"
#include "params/DerivO3CPU.hh"
using namespace std; using namespace std;
std::string MiscRegFile::miscRegNames[NumMiscRegs] = std::string MiscRegFile::miscRegNames[NumMiscRegs] =
@ -170,11 +172,12 @@ void
MiscRegFile::reset(std::string core_name, unsigned num_threads, MiscRegFile::reset(std::string core_name, unsigned num_threads,
unsigned num_vpes, BaseCPU *_cpu) unsigned num_vpes, BaseCPU *_cpu)
{ {
DPRINTF(MipsPRA, "Resetting CP0 State with %i TCs and %i VPEs\n", DPRINTF(MipsPRA, "Resetting CP0 State with %i TCs and %i VPEs\n",
num_threads, num_vpes); num_threads, num_vpes);
cpu = _cpu; cpu = _cpu;
const BaseCPU::Params *p = _cpu->params;
TheISA::CoreSpecific &cp = cpu->coreParams;
// Do Default CP0 initialization HERE // Do Default CP0 initialization HERE
// Do Initialization for MT cores here (eventually use // Do Initialization for MT cores here (eventually use
@ -183,10 +186,10 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
DPRINTF(MipsPRA, "Initializing CP0 State.... "); DPRINTF(MipsPRA, "Initializing CP0 State.... ");
MiscReg ProcID = readRegNoEffect(PRId); MiscReg ProcID = readRegNoEffect(PRId);
replaceBits(ProcID,PRIdCoOp_HI,PRIdCoOp_LO,p->coreParams.CP0_PRId_CompanyOptions); replaceBits(ProcID,PRIdCoOp_HI,PRIdCoOp_LO,cp.CP0_PRId_CompanyOptions);
replaceBits(ProcID,PRIdCoID_HI,PRIdCoID_LO,p->coreParams.CP0_PRId_CompanyID); replaceBits(ProcID,PRIdCoID_HI,PRIdCoID_LO,cp.CP0_PRId_CompanyID);
replaceBits(ProcID,PRIdProc_ID_HI,PRIdProc_ID_LO,p->coreParams.CP0_PRId_ProcessorID); replaceBits(ProcID,PRIdProc_ID_HI,PRIdProc_ID_LO,cp.CP0_PRId_ProcessorID);
replaceBits(ProcID,PRIdRev_HI,PRIdRev_LO,p->coreParams.CP0_PRId_Revision); replaceBits(ProcID,PRIdRev_HI,PRIdRev_LO,cp.CP0_PRId_Revision);
setRegNoEffect(PRId,ProcID); setRegNoEffect(PRId,ProcID);
// Now, create Write Mask for ProcID register // Now, create Write Mask for ProcID register
MiscReg ProcID_Mask = 0; // Read-Only register MiscReg ProcID_Mask = 0; // Read-Only register
@ -195,11 +198,11 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Config // Config
MiscReg cfg = readRegNoEffect(Config); MiscReg cfg = readRegNoEffect(Config);
replaceBits(cfg, Config_BE_HI, Config_BE_LO, p->coreParams.CP0_Config_BE); replaceBits(cfg, Config_BE_HI, Config_BE_LO, cp.CP0_Config_BE);
replaceBits(cfg, Config_AT_HI, Config_AT_LO, p->coreParams.CP0_Config_AT); replaceBits(cfg, Config_AT_HI, Config_AT_LO, cp.CP0_Config_AT);
replaceBits(cfg, Config_AR_HI, Config_AR_LO, p->coreParams.CP0_Config_AR); replaceBits(cfg, Config_AR_HI, Config_AR_LO, cp.CP0_Config_AR);
replaceBits(cfg, Config_MT_HI, Config_MT_LO, p->coreParams.CP0_Config_MT); replaceBits(cfg, Config_MT_HI, Config_MT_LO, cp.CP0_Config_MT);
replaceBits(cfg, Config_VI_HI, Config_VI_LO, p->coreParams.CP0_Config_VI); replaceBits(cfg, Config_VI_HI, Config_VI_LO, cp.CP0_Config_VI);
replaceBits(cfg, Config_M, 1); replaceBits(cfg, Config_M, 1);
setRegNoEffect(Config, cfg); setRegNoEffect(Config, cfg);
// Now, create Write Mask for Config register // Now, create Write Mask for Config register
@ -209,20 +212,20 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Config1 // Config1
MiscReg cfg1 = readRegNoEffect(Config1); MiscReg cfg1 = readRegNoEffect(Config1);
replaceBits(cfg1, Config1_MMUSize_HI, Config1_MMUSize_LO, p->coreParams.CP0_Config1_MMU); replaceBits(cfg1, Config1_MMUSize_HI, Config1_MMUSize_LO, cp.CP0_Config1_MMU);
replaceBits(cfg1, Config1_IS_HI, Config1_IS_LO, p->coreParams.CP0_Config1_IS); replaceBits(cfg1, Config1_IS_HI, Config1_IS_LO, cp.CP0_Config1_IS);
replaceBits(cfg1, Config1_IL_HI, Config1_IL_LO, p->coreParams.CP0_Config1_IL); replaceBits(cfg1, Config1_IL_HI, Config1_IL_LO, cp.CP0_Config1_IL);
replaceBits(cfg1, Config1_IA_HI, Config1_IA_LO, p->coreParams.CP0_Config1_IA); replaceBits(cfg1, Config1_IA_HI, Config1_IA_LO, cp.CP0_Config1_IA);
replaceBits(cfg1, Config1_DS_HI, Config1_DS_LO, p->coreParams.CP0_Config1_DS); replaceBits(cfg1, Config1_DS_HI, Config1_DS_LO, cp.CP0_Config1_DS);
replaceBits(cfg1, Config1_DL_HI, Config1_DL_LO, p->coreParams.CP0_Config1_DL); replaceBits(cfg1, Config1_DL_HI, Config1_DL_LO, cp.CP0_Config1_DL);
replaceBits(cfg1, Config1_DA_HI, Config1_DA_LO, p->coreParams.CP0_Config1_DA); replaceBits(cfg1, Config1_DA_HI, Config1_DA_LO, cp.CP0_Config1_DA);
replaceBits(cfg1, Config1_FP_HI, Config1_FP_LO, p->coreParams.CP0_Config1_FP); replaceBits(cfg1, Config1_FP_HI, Config1_FP_LO, cp.CP0_Config1_FP);
replaceBits(cfg1, Config1_EP_HI, Config1_EP_LO, p->coreParams.CP0_Config1_EP); replaceBits(cfg1, Config1_EP_HI, Config1_EP_LO, cp.CP0_Config1_EP);
replaceBits(cfg1, Config1_WR_HI, Config1_WR_LO, p->coreParams.CP0_Config1_WR); replaceBits(cfg1, Config1_WR_HI, Config1_WR_LO, cp.CP0_Config1_WR);
replaceBits(cfg1, Config1_MD_HI, Config1_MD_LO, p->coreParams.CP0_Config1_MD); replaceBits(cfg1, Config1_MD_HI, Config1_MD_LO, cp.CP0_Config1_MD);
replaceBits(cfg1, Config1_C2_HI, Config1_C2_LO, p->coreParams.CP0_Config1_C2); replaceBits(cfg1, Config1_C2_HI, Config1_C2_LO, cp.CP0_Config1_C2);
replaceBits(cfg1, Config1_PC_HI, Config1_PC_LO, p->coreParams.CP0_Config1_PC); replaceBits(cfg1, Config1_PC_HI, Config1_PC_LO, cp.CP0_Config1_PC);
replaceBits(cfg1, Config1_M, p->coreParams.CP0_Config1_M); replaceBits(cfg1, Config1_M, cp.CP0_Config1_M);
setRegNoEffect(Config1, cfg1); setRegNoEffect(Config1, cfg1);
// Now, create Write Mask for Config register // Now, create Write Mask for Config register
MiscReg cfg1_Mask = 0; // Read Only Register MiscReg cfg1_Mask = 0; // Read Only Register
@ -231,15 +234,15 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Config2 // Config2
MiscReg cfg2 = readRegNoEffect(Config2); MiscReg cfg2 = readRegNoEffect(Config2);
replaceBits(cfg2, Config2_TU_HI, Config2_TU_LO, p->coreParams.CP0_Config2_TU); replaceBits(cfg2, Config2_TU_HI, Config2_TU_LO, cp.CP0_Config2_TU);
replaceBits(cfg2, Config2_TS_HI, Config2_TS_LO, p->coreParams.CP0_Config2_TS); replaceBits(cfg2, Config2_TS_HI, Config2_TS_LO, cp.CP0_Config2_TS);
replaceBits(cfg2, Config2_TL_HI, Config2_TL_LO, p->coreParams.CP0_Config2_TL); replaceBits(cfg2, Config2_TL_HI, Config2_TL_LO, cp.CP0_Config2_TL);
replaceBits(cfg2, Config2_TA_HI, Config2_TA_LO, p->coreParams.CP0_Config2_TA); replaceBits(cfg2, Config2_TA_HI, Config2_TA_LO, cp.CP0_Config2_TA);
replaceBits(cfg2, Config2_SU_HI, Config2_SU_LO, p->coreParams.CP0_Config2_SU); replaceBits(cfg2, Config2_SU_HI, Config2_SU_LO, cp.CP0_Config2_SU);
replaceBits(cfg2, Config2_SS_HI, Config2_SS_LO, p->coreParams.CP0_Config2_SS); replaceBits(cfg2, Config2_SS_HI, Config2_SS_LO, cp.CP0_Config2_SS);
replaceBits(cfg2, Config2_SL_HI, Config2_SL_LO, p->coreParams.CP0_Config2_SL); replaceBits(cfg2, Config2_SL_HI, Config2_SL_LO, cp.CP0_Config2_SL);
replaceBits(cfg2, Config2_SA_HI, Config2_SA_LO, p->coreParams.CP0_Config2_SA); replaceBits(cfg2, Config2_SA_HI, Config2_SA_LO, cp.CP0_Config2_SA);
replaceBits(cfg2, Config2_M, p->coreParams.CP0_Config2_M); replaceBits(cfg2, Config2_M, cp.CP0_Config2_M);
setRegNoEffect(Config2, cfg2); setRegNoEffect(Config2, cfg2);
// Now, create Write Mask for Config register // Now, create Write Mask for Config register
MiscReg cfg2_Mask = 0x7000F000; // Read Only Register MiscReg cfg2_Mask = 0x7000F000; // Read Only Register
@ -248,14 +251,14 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Config3 // Config3
MiscReg cfg3 = readRegNoEffect(Config3); MiscReg cfg3 = readRegNoEffect(Config3);
replaceBits(cfg3, Config3_DSPP_HI, Config3_DSPP_LO, p->coreParams.CP0_Config3_DSPP); replaceBits(cfg3, Config3_DSPP_HI, Config3_DSPP_LO, cp.CP0_Config3_DSPP);
replaceBits(cfg3, Config3_LPA_HI, Config3_LPA_LO, p->coreParams.CP0_Config3_LPA); replaceBits(cfg3, Config3_LPA_HI, Config3_LPA_LO, cp.CP0_Config3_LPA);
replaceBits(cfg3, Config3_VEIC_HI, Config3_VEIC_LO, p->coreParams.CP0_Config3_VEIC); replaceBits(cfg3, Config3_VEIC_HI, Config3_VEIC_LO, cp.CP0_Config3_VEIC);
replaceBits(cfg3, Config3_VINT_HI, Config3_VINT_LO, p->coreParams.CP0_Config3_VInt); replaceBits(cfg3, Config3_VINT_HI, Config3_VINT_LO, cp.CP0_Config3_VInt);
replaceBits(cfg3, Config3_SP_HI, Config3_SP_LO, p->coreParams.CP0_Config3_SP); replaceBits(cfg3, Config3_SP_HI, Config3_SP_LO, cp.CP0_Config3_SP);
replaceBits(cfg3, Config3_MT_HI, Config3_MT_LO, p->coreParams.CP0_Config3_MT); replaceBits(cfg3, Config3_MT_HI, Config3_MT_LO, cp.CP0_Config3_MT);
replaceBits(cfg3, Config3_SM_HI, Config3_SM_LO, p->coreParams.CP0_Config3_SM); replaceBits(cfg3, Config3_SM_HI, Config3_SM_LO, cp.CP0_Config3_SM);
replaceBits(cfg3, Config3_TL_HI, Config3_TL_LO, p->coreParams.CP0_Config3_TL); replaceBits(cfg3, Config3_TL_HI, Config3_TL_LO, cp.CP0_Config3_TL);
setRegNoEffect(Config3, cfg3); setRegNoEffect(Config3, cfg3);
// Now, create Write Mask for Config register // Now, create Write Mask for Config register
MiscReg cfg3_Mask = 0; // Read Only Register MiscReg cfg3_Mask = 0; // Read Only Register
@ -264,7 +267,7 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// EBase - CPUNum // EBase - CPUNum
MiscReg EB = readRegNoEffect(EBase); MiscReg EB = readRegNoEffect(EBase);
replaceBits(EB, EBase_CPUNum_HI, EBase_CPUNum_LO, p->coreParams.CP0_EBase_CPUNum); replaceBits(EB, EBase_CPUNum_HI, EBase_CPUNum_LO, cp.CP0_EBase_CPUNum);
replaceBits(EB, 31, 31, 1); replaceBits(EB, 31, 31, 1);
setRegNoEffect(EBase, EB); setRegNoEffect(EBase, EB);
// Now, create Write Mask for Config register // Now, create Write Mask for Config register
@ -275,7 +278,7 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// SRS Control - HSS (Highest Shadow Set) // SRS Control - HSS (Highest Shadow Set)
MiscReg SC = readRegNoEffect(SRSCtl); MiscReg SC = readRegNoEffect(SRSCtl);
replaceBits(SC, SRSCtl_HSS_HI,SRSCtl_HSS_LO,p->coreParams.CP0_SrsCtl_HSS); replaceBits(SC, SRSCtl_HSS_HI,SRSCtl_HSS_LO,cp.CP0_SrsCtl_HSS);
setRegNoEffect(SRSCtl, SC); setRegNoEffect(SRSCtl, SC);
// Now, create Write Mask for the SRS Ctl register // Now, create Write Mask for the SRS Ctl register
MiscReg SC_Mask = 0x0000F3C0; MiscReg SC_Mask = 0x0000F3C0;
@ -284,8 +287,8 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// IntCtl - IPTI, IPPCI // IntCtl - IPTI, IPPCI
MiscReg IC = readRegNoEffect(IntCtl); MiscReg IC = readRegNoEffect(IntCtl);
replaceBits(IC, IntCtl_IPTI_HI,IntCtl_IPTI_LO,p->coreParams.CP0_IntCtl_IPTI); replaceBits(IC, IntCtl_IPTI_HI,IntCtl_IPTI_LO,cp.CP0_IntCtl_IPTI);
replaceBits(IC, IntCtl_IPPCI_HI,IntCtl_IPPCI_LO,p->coreParams.CP0_IntCtl_IPPCI); replaceBits(IC, IntCtl_IPPCI_HI,IntCtl_IPPCI_LO,cp.CP0_IntCtl_IPPCI);
setRegNoEffect(IntCtl, IC); setRegNoEffect(IntCtl, IC);
// Now, create Write Mask for the IntCtl register // Now, create Write Mask for the IntCtl register
MiscReg IC_Mask = 0x000003E0; MiscReg IC_Mask = 0x000003E0;
@ -294,7 +297,7 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Watch Hi - M - FIXME (More than 1 Watch register) // Watch Hi - M - FIXME (More than 1 Watch register)
MiscReg WHi = readRegNoEffect(WatchHi0); MiscReg WHi = readRegNoEffect(WatchHi0);
replaceBits(WHi, WatchHi_M, p->coreParams.CP0_WatchHi_M); replaceBits(WHi, WatchHi_M, cp.CP0_WatchHi_M);
setRegNoEffect(WatchHi0, WHi); setRegNoEffect(WatchHi0, WHi);
// Now, create Write Mask for the IntCtl register // Now, create Write Mask for the IntCtl register
MiscReg wh_Mask = 0x7FFF0FFF; MiscReg wh_Mask = 0x7FFF0FFF;
@ -303,8 +306,8 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// Perf Ctr - M - FIXME (More than 1 PerfCnt Pair) // Perf Ctr - M - FIXME (More than 1 PerfCnt Pair)
MiscReg PCtr = readRegNoEffect(PerfCnt0); MiscReg PCtr = readRegNoEffect(PerfCnt0);
replaceBits(PCtr, PerfCntCtl_M, p->coreParams.CP0_PerfCtr_M); replaceBits(PCtr, PerfCntCtl_M, cp.CP0_PerfCtr_M);
replaceBits(PCtr, PerfCntCtl_W, p->coreParams.CP0_PerfCtr_W); replaceBits(PCtr, PerfCntCtl_W, cp.CP0_PerfCtr_W);
setRegNoEffect(PerfCnt0, PCtr); setRegNoEffect(PerfCnt0, PCtr);
// Now, create Write Mask for the IntCtl register // Now, create Write Mask for the IntCtl register
MiscReg pc_Mask = 0x00007FF; MiscReg pc_Mask = 0x00007FF;
@ -322,7 +325,7 @@ MiscRegFile::reset(std::string core_name, unsigned num_threads,
// PageGrain // PageGrain
MiscReg pagegrain = readRegNoEffect(PageGrain); MiscReg pagegrain = readRegNoEffect(PageGrain);
replaceBits(pagegrain,PageGrain_ESP,p->coreParams.CP0_Config3_SP); replaceBits(pagegrain,PageGrain_ESP,cp.CP0_Config3_SP);
setRegNoEffect(PageGrain, pagegrain); setRegNoEffect(PageGrain, pagegrain);
// Now, create Write Mask for the IntCtl register // Now, create Write Mask for the IntCtl register
MiscReg pg_Mask = 0x10000000; MiscReg pg_Mask = 0x10000000;

11
src/cpu/BaseCPU.py
View file

@ -26,7 +26,7 @@
# #
# Authors: Nathan Binkert # Authors: Nathan Binkert
from m5.SimObject import SimObject from MemObject import MemObject
from m5.params import * from m5.params import *
from m5.proxy import * from m5.proxy import *
from m5 import build_env from m5 import build_env
@ -48,14 +48,21 @@ elif build_env['TARGET_ISA'] == 'mips':
elif build_env['TARGET_ISA'] == 'arm': elif build_env['TARGET_ISA'] == 'arm':
from ArmTLB import ArmTLB, ArmDTB, ArmITB, ArmUTB from ArmTLB import ArmTLB, ArmDTB, ArmITB, ArmUTB
class BaseCPU(SimObject): class BaseCPU(MemObject):
type = 'BaseCPU' type = 'BaseCPU'
abstract = True abstract = True
system = Param.System(Parent.any, "system object") system = Param.System(Parent.any, "system object")
cpu_id = Param.Int("CPU identifier") cpu_id = Param.Int("CPU identifier")
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")
checker = Param.BaseCPU("checker CPU")
if build_env['FULL_SYSTEM']: if build_env['FULL_SYSTEM']:
profile = Param.Latency('0ns', "trace the kernel stack")
do_quiesce = Param.Bool(True, "enable quiesce instructions") do_quiesce = Param.Bool(True, "enable quiesce instructions")
do_checkpoint_insts = Param.Bool(True, do_checkpoint_insts = Param.Bool(True,
"enable checkpoint pseudo instructions") "enable checkpoint pseudo instructions")

44
src/cpu/CheckerCPU.py Normal file
View file

@ -0,0 +1,44 @@
# Copyright (c) 2007 The Regents of The University of Michigan
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer;
# redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution;
# neither the name of the copyright holders nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Nathan Binkert
from m5.params import *
from m5 import build_env
from BaseCPU import BaseCPU
class CheckerCPU(BaseCPU):
type = 'CheckerCPU'
abstract = True
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(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")
if build_env['FULL_SYSTEM']:
profile = Param.Latency('0ns', "trace the kernel stack")

1
src/cpu/SConscript
View file

@ -71,6 +71,7 @@ temp_cpu_list = env['CPU_MODELS'][:]
if env['USE_CHECKER']: if env['USE_CHECKER']:
temp_cpu_list.append('CheckerCPU') temp_cpu_list.append('CheckerCPU')
SimObject('CheckerCPU.py')
# Generate header. # Generate header.
def gen_cpu_exec_signatures(target, source, env): def gen_cpu_exec_signatures(target, source, env):

49
src/cpu/base.cc
View file

@ -37,17 +37,17 @@
#include "base/loader/symtab.hh" #include "base/loader/symtab.hh"
#include "base/misc.hh" #include "base/misc.hh"
#include "base/output.hh" #include "base/output.hh"
#include "base/trace.hh"
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/cpuevent.hh" #include "cpu/cpuevent.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
#include "cpu/profile.hh" #include "cpu/profile.hh"
#include "params/BaseCPU.hh"
#include "sim/sim_exit.hh" #include "sim/sim_exit.hh"
#include "sim/process.hh" #include "sim/process.hh"
#include "sim/sim_events.hh" #include "sim/sim_events.hh"
#include "sim/system.hh" #include "sim/system.hh"
#include "base/trace.hh"
// Hack // Hack
#include "sim/stat_control.hh" #include "sim/stat_control.hh"
@ -95,13 +95,13 @@ CPUProgressEvent::description() const
#if FULL_SYSTEM #if FULL_SYSTEM
BaseCPU::BaseCPU(Params *p) BaseCPU::BaseCPU(Params *p)
: MemObject(makeParams(p->name)), clock(p->clock), instCnt(0), : MemObject(p), clock(p->clock), instCnt(0),
params(p), number_of_threads(p->numberOfThreads), system(p->system), number_of_threads(p->numThreads), system(p->system),
phase(p->phase) phase(p->phase)
#else #else
BaseCPU::BaseCPU(Params *p) BaseCPU::BaseCPU(Params *p)
: MemObject(makeParams(p->name)), clock(p->clock), params(p), : MemObject(p), clock(p->clock),
number_of_threads(p->numberOfThreads), system(p->system), number_of_threads(p->numThreads), system(p->system),
phase(p->phase) phase(p->phase)
#endif #endif
{ {
@ -166,34 +166,25 @@ BaseCPU::BaseCPU(Params *p)
} }
functionTracingEnabled = false; functionTracingEnabled = false;
if (p->functionTrace) { if (p->function_trace) {
functionTraceStream = simout.find(csprintf("ftrace.%s", name())); functionTraceStream = simout.find(csprintf("ftrace.%s", name()));
currentFunctionStart = currentFunctionEnd = 0; currentFunctionStart = currentFunctionEnd = 0;
functionEntryTick = p->functionTraceStart; functionEntryTick = p->function_trace_start;
if (p->functionTraceStart == 0) { if (p->function_trace_start == 0) {
functionTracingEnabled = true; functionTracingEnabled = true;
} else { } else {
new EventWrapper<BaseCPU, &BaseCPU::enableFunctionTrace>(this, new EventWrapper<BaseCPU,
p->functionTraceStart, &BaseCPU::enableFunctionTrace>(
true); this, p->function_trace_start, true);
} }
} }
#if FULL_SYSTEM #if FULL_SYSTEM
profileEvent = NULL; profileEvent = NULL;
if (params->profile) if (params()->profile)
profileEvent = new ProfileEvent(this, params->profile); profileEvent = new ProfileEvent(this, params()->profile);
#endif #endif
tracer = params->tracer; tracer = params()->tracer;
}
BaseCPU::Params::Params()
{
#if FULL_SYSTEM
profile = false;
#endif
checker = NULL;
tracer = NULL;
} }
void void
@ -209,7 +200,7 @@ BaseCPU::~BaseCPU()
void void
BaseCPU::init() BaseCPU::init()
{ {
if (!params->deferRegistration) if (!params()->defer_registration)
registerThreadContexts(); registerThreadContexts();
} }
@ -217,13 +208,13 @@ void
BaseCPU::startup() BaseCPU::startup()
{ {
#if FULL_SYSTEM #if FULL_SYSTEM
if (!params->deferRegistration && profileEvent) if (!params()->defer_registration && profileEvent)
profileEvent->schedule(curTick); profileEvent->schedule(curTick);
#endif #endif
if (params->progress_interval) { if (params()->progress_interval) {
new CPUProgressEvent(&mainEventQueue, new CPUProgressEvent(&mainEventQueue,
ticks(params->progress_interval), ticks(params()->progress_interval),
this); this);
} }
} }
@ -281,7 +272,7 @@ BaseCPU::registerThreadContexts()
ThreadContext *tc = threadContexts[i]; ThreadContext *tc = threadContexts[i];
#if FULL_SYSTEM #if FULL_SYSTEM
int id = params->cpu_id; int id = params()->cpu_id;
if (id != -1) if (id != -1)
id += i; id += i;

40
src/cpu/base.hh
View file

@ -45,6 +45,7 @@
#include "arch/interrupts.hh" #include "arch/interrupts.hh"
#endif #endif
class BaseCPUParams;
class BranchPred; class BranchPred;
class CheckerCPU; class CheckerCPU;
class ThreadContext; class ThreadContext;
@ -162,40 +163,9 @@ class BaseCPU : public MemObject
ThreadContext *getContext(int tn) { return threadContexts[tn]; } ThreadContext *getContext(int tn) { return threadContexts[tn]; }
public: public:
struct Params typedef BaseCPUParams Params;
{ const Params *params() const
std::string name; { return reinterpret_cast<const Params *>(_params); }
int numberOfThreads;
bool deferRegistration;
Counter max_insts_any_thread;
Counter max_insts_all_threads;
Counter max_loads_any_thread;
Counter max_loads_all_threads;
Tick clock;
bool functionTrace;
Tick functionTraceStart;
System *system;
int cpu_id;
Trace::InstTracer * tracer;
Tick phase;
#if FULL_SYSTEM
Tick profile;
bool do_statistics_insts;
bool do_checkpoint_insts;
bool do_quiesce;
#endif
Tick progress_interval;
BaseCPU *checker;
TheISA::CoreSpecific coreParams; //ISA-Specific Params That Set Up State in Core
Params();
};
const Params *params;
BaseCPU(Params *params); BaseCPU(Params *params);
virtual ~BaseCPU(); virtual ~BaseCPU();
@ -221,6 +191,8 @@ class BaseCPU : public MemObject
*/ */
int number_of_threads; int number_of_threads;
TheISA::CoreSpecific coreParams; //ISA-Specific Params That Set Up State in Core
/** /**
* Vector of per-thread instruction-based event queues. Used for * Vector of per-thread instruction-based event queues. Used for
* scheduling events based on number of instructions committed by * scheduling events based on number of instructions committed by

17
src/cpu/checker/cpu.hh
View file

@ -65,6 +65,7 @@ class Process;
#endif // FULL_SYSTEM #endif // FULL_SYSTEM
template <class> template <class>
class BaseDynInst; class BaseDynInst;
class CheckerCPUParams;
class ThreadContext; class ThreadContext;
class MemInterface; class MemInterface;
class Checkpoint; class Checkpoint;
@ -96,20 +97,10 @@ class CheckerCPU : public BaseCPU
public: public:
virtual void init(); virtual void init();
struct Params : public BaseCPU::Params
{
#if FULL_SYSTEM
TheISA::ITB *itb;
TheISA::DTB *dtb;
#else
Process *process;
#endif
bool exitOnError;
bool updateOnError;
bool warnOnlyOnLoadError;
};
public: public:
typedef CheckerCPUParams Params;
const Params *params() const
{ return reinterpret_cast<const Params *>(_params); }
CheckerCPU(Params *p); CheckerCPU(Params *p);
virtual ~CheckerCPU(); virtual ~CheckerCPU();

6
src/cpu/o3/O3CPU.py
View file

@ -38,10 +38,7 @@ if build_env['USE_CHECKER']:
class DerivO3CPU(BaseCPU): class DerivO3CPU(BaseCPU):
type = 'DerivO3CPU' type = 'DerivO3CPU'
activity = Param.Unsigned(0, "Initial count") activity = Param.Unsigned(0, "Initial count")
numThreads = Param.Unsigned(1, "number of HW thread contexts")
if build_env['FULL_SYSTEM']:
profile = Param.Latency('0ns', "trace the kernel stack")
if build_env['USE_CHECKER']: if build_env['USE_CHECKER']:
if not build_env['FULL_SYSTEM']: if not build_env['FULL_SYSTEM']:
checker = Param.BaseCPU(O3Checker(workload=Parent.workload, checker = Param.BaseCPU(O3Checker(workload=Parent.workload,
@ -134,9 +131,6 @@ class DerivO3CPU(BaseCPU):
instShiftAmt = Param.Unsigned(2, "Number of bits to shift instructions by") instShiftAmt = Param.Unsigned(2, "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")
smtNumFetchingThreads = Param.Unsigned(1, "SMT Number of Fetching Threads") smtNumFetchingThreads = Param.Unsigned(1, "SMT Number of Fetching Threads")
smtFetchPolicy = Param.String('SingleThread', "SMT Fetch policy") smtFetchPolicy = Param.String('SingleThread', "SMT Fetch policy")
smtLSQPolicy = Param.String('Partitioned', "SMT LSQ Sharing Policy") smtLSQPolicy = Param.String('Partitioned', "SMT LSQ Sharing Policy")

4
src/cpu/o3/alpha/cpu.hh
View file

@ -37,6 +37,7 @@
#include "cpu/o3/cpu.hh" #include "cpu/o3/cpu.hh"
#include "sim/byteswap.hh" #include "sim/byteswap.hh"
class DerivO3CPUParams;
class EndQuiesceEvent; class EndQuiesceEvent;
namespace Kernel { namespace Kernel {
class Statistics; class Statistics;
@ -58,10 +59,9 @@ class AlphaO3CPU : public FullO3CPU<Impl>
public: public:
typedef O3ThreadState<Impl> ImplState; typedef O3ThreadState<Impl> ImplState;
typedef O3ThreadState<Impl> Thread; typedef O3ThreadState<Impl> Thread;
typedef typename Impl::Params Params;
/** Constructs an AlphaO3CPU with the given parameters. */ /** Constructs an AlphaO3CPU with the given parameters. */
AlphaO3CPU(Params *params); AlphaO3CPU(DerivO3CPUParams *params);
/** Registers statistics. */ /** Registers statistics. */
void regStats(); void regStats();

132
src/cpu/o3/alpha/cpu_builder.cc
View file

@ -34,14 +34,13 @@
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/o3/alpha/cpu.hh" #include "cpu/o3/alpha/cpu.hh"
#include "cpu/o3/alpha/impl.hh" #include "cpu/o3/alpha/impl.hh"
#include "cpu/o3/alpha/params.hh"
#include "cpu/o3/fu_pool.hh" #include "cpu/o3/fu_pool.hh"
#include "params/DerivO3CPU.hh" #include "params/DerivO3CPU.hh"
class DerivO3CPU : public AlphaO3CPU<AlphaSimpleImpl> class DerivO3CPU : public AlphaO3CPU<AlphaSimpleImpl>
{ {
public: public:
DerivO3CPU(AlphaSimpleParams *p) DerivO3CPU(DerivO3CPUParams *p)
: AlphaO3CPU<AlphaSimpleImpl>(p) : AlphaO3CPU<AlphaSimpleImpl>(p)
{ } { }
}; };
@ -49,8 +48,6 @@ class DerivO3CPU : public AlphaO3CPU<AlphaSimpleImpl>
DerivO3CPU * DerivO3CPU *
DerivO3CPUParams::create() DerivO3CPUParams::create()
{ {
DerivO3CPU *cpu;
#if FULL_SYSTEM #if FULL_SYSTEM
// Full-system only supports a single thread for the moment. // Full-system only supports a single thread for the moment.
int actual_num_threads = 1; int actual_num_threads = 1;
@ -65,135 +62,18 @@ DerivO3CPUParams::create()
} }
#endif #endif
AlphaSimpleParams *params = new AlphaSimpleParams; numThreads = actual_num_threads;
params->clock = clock;
params->phase = phase;
params->tracer = tracer;
params->name = name;
params->numberOfThreads = actual_num_threads;
params->cpu_id = cpu_id;
params->activity = activity;
params->itb = itb;
params->dtb = dtb;
params->system = system;
#if FULL_SYSTEM
params->profile = profile;
params->do_quiesce = do_quiesce;
params->do_checkpoint_insts = do_checkpoint_insts;
params->do_statistics_insts = do_statistics_insts;
#else
params->workload = workload;
#endif // FULL_SYSTEM
#if USE_CHECKER
params->checker = checker;
#endif
params->max_insts_any_thread = max_insts_any_thread;
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
params->progress_interval = progress_interval;
//
// Caches
//
params->cachePorts = cachePorts;
params->decodeToFetchDelay = decodeToFetchDelay;
params->renameToFetchDelay = renameToFetchDelay;
params->iewToFetchDelay = iewToFetchDelay;
params->commitToFetchDelay = commitToFetchDelay;
params->fetchWidth = fetchWidth;
params->renameToDecodeDelay = renameToDecodeDelay;
params->iewToDecodeDelay = iewToDecodeDelay;
params->commitToDecodeDelay = commitToDecodeDelay;
params->fetchToDecodeDelay = fetchToDecodeDelay;
params->decodeWidth = decodeWidth;
params->iewToRenameDelay = iewToRenameDelay;
params->commitToRenameDelay = commitToRenameDelay;
params->decodeToRenameDelay = decodeToRenameDelay;
params->renameWidth = renameWidth;
params->commitToIEWDelay = commitToIEWDelay;
params->renameToIEWDelay = renameToIEWDelay;
params->issueToExecuteDelay = issueToExecuteDelay;
params->dispatchWidth = dispatchWidth;
params->issueWidth = issueWidth;
params->wbWidth = wbWidth;
params->wbDepth = wbDepth;
params->fuPool = fuPool;
params->iewToCommitDelay = iewToCommitDelay;
params->renameToROBDelay = renameToROBDelay;
params->commitWidth = commitWidth;
params->squashWidth = squashWidth;
params->trapLatency = trapLatency;
params->backComSize = backComSize;
params->forwardComSize = forwardComSize;
params->predType = predType;
params->localPredictorSize = localPredictorSize;
params->localCtrBits = localCtrBits;
params->localHistoryTableSize = localHistoryTableSize;
params->localHistoryBits = localHistoryBits;
params->globalPredictorSize = globalPredictorSize;
params->globalCtrBits = globalCtrBits;
params->globalHistoryBits = globalHistoryBits;
params->choicePredictorSize = choicePredictorSize;
params->choiceCtrBits = choiceCtrBits;
params->BTBEntries = BTBEntries;
params->BTBTagSize = BTBTagSize;
params->RASSize = RASSize;
params->LQEntries = LQEntries;
params->SQEntries = SQEntries;
params->SSITSize = SSITSize;
params->LFSTSize = LFSTSize;
params->numPhysIntRegs = numPhysIntRegs;
params->numPhysFloatRegs = numPhysFloatRegs;
params->numIQEntries = numIQEntries;
params->numROBEntries = numROBEntries;
params->smtNumFetchingThreads = smtNumFetchingThreads;
// Default smtFetchPolicy to "RoundRobin", if necessary. // Default smtFetchPolicy to "RoundRobin", if necessary.
std::string round_robin_policy = "RoundRobin"; std::string round_robin_policy = "RoundRobin";
std::string single_thread = "SingleThread"; std::string single_thread = "SingleThread";
if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0) if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0)
params->smtFetchPolicy = round_robin_policy; smtFetchPolicy = round_robin_policy;
else else
params->smtFetchPolicy = smtFetchPolicy; smtFetchPolicy = smtFetchPolicy;
params->smtIQPolicy = smtIQPolicy; instShiftAmt = 2;
params->smtLSQPolicy = smtLSQPolicy;
params->smtLSQThreshold = smtLSQThreshold;
params->smtROBPolicy = smtROBPolicy;
params->smtROBThreshold = smtROBThreshold;
params->smtCommitPolicy = smtCommitPolicy;
params->instShiftAmt = 2; return new DerivO3CPU(this);
params->deferRegistration = defer_registration;
params->functionTrace = function_trace;
params->functionTraceStart = function_trace_start;
cpu = new DerivO3CPU(params);
return cpu;
} }

6
src/cpu/o3/alpha/cpu_impl.hh
View file

@ -40,7 +40,6 @@
#include "sim/stats.hh" #include "sim/stats.hh"
#include "cpu/o3/alpha/cpu.hh" #include "cpu/o3/alpha/cpu.hh"
#include "cpu/o3/alpha/params.hh"
#include "cpu/o3/alpha/thread_context.hh" #include "cpu/o3/alpha/thread_context.hh"
#include "cpu/o3/comm.hh" #include "cpu/o3/comm.hh"
#include "cpu/o3/thread_state.hh" #include "cpu/o3/thread_state.hh"
@ -54,8 +53,11 @@
#include "sim/system.hh" #include "sim/system.hh"
#endif #endif
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
AlphaO3CPU<Impl>::AlphaO3CPU(Params *params) : FullO3CPU<Impl>(this, params) AlphaO3CPU<Impl>::AlphaO3CPU(DerivO3CPUParams *params) :
FullO3CPU<Impl>(this, params)
{ {
DPRINTF(O3CPU, "Creating AlphaO3CPU object.\n"); DPRINTF(O3CPU, "Creating AlphaO3CPU object.\n");

4
src/cpu/o3/alpha/impl.hh
View file

@ -33,7 +33,6 @@
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
#include "cpu/o3/alpha/params.hh"
#include "cpu/o3/cpu_policy.hh" #include "cpu/o3/cpu_policy.hh"
@ -77,9 +76,6 @@ struct AlphaSimpleImpl
*/ */
typedef O3CPU CPUType; typedef O3CPU CPUType;
/** The Params to be passed to each stage. */
typedef AlphaSimpleParams Params;
enum { enum {
MaxWidth = 8, MaxWidth = 8,
MaxThreads = 4 MaxThreads = 4

61
src/cpu/o3/alpha/params.hh
View file

@ -1,61 +0,0 @@
/*
* Copyright (c) 2004-2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Kevin Lim
*/
#ifndef __CPU_O3_ALPHA_PARAMS_HH__
#define __CPU_O3_ALPHA_PARAMS_HH__
#include "cpu/o3/cpu.hh"
#include "cpu/o3/params.hh"
//Forward declarations
namespace AlphaISA
{
class DTB;
class ITB;
}
class MemObject;
class Process;
class System;
/**
* This file defines the parameters that will be used for the AlphaO3CPU.
* This must be defined externally so that the Impl can have a params class
* defined that it can pass to all of the individual stages.
*/
class AlphaSimpleParams : public O3Params
{
public:
AlphaISA::ITB *itb;
AlphaISA::DTB *dtb;
};
#endif // __CPU_O3_ALPHA_PARAMS_HH__

5
src/cpu/o3/bpred_unit.hh
View file

@ -43,6 +43,8 @@
#include <list> #include <list>
class DerivO3CPUParams;
/** /**
* Basically a wrapper class to hold both the branch predictor * Basically a wrapper class to hold both the branch predictor
* and the BTB. * and the BTB.
@ -51,7 +53,6 @@ template<class Impl>
class BPredUnit class BPredUnit
{ {
private: private:
typedef typename Impl::Params Params;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
enum PredType { enum PredType {
@ -66,7 +67,7 @@ class BPredUnit
/** /**
* @param params The params object, that has the size of the BP and BTB. * @param params The params object, that has the size of the BP and BTB.
*/ */
BPredUnit(Params *params); BPredUnit(DerivO3CPUParams *params);
/** /**
* Registers statistics. * Registers statistics.

4
src/cpu/o3/bpred_unit_impl.hh
View file

@ -34,8 +34,10 @@
#include "base/traceflags.hh" #include "base/traceflags.hh"
#include "cpu/o3/bpred_unit.hh" #include "cpu/o3/bpred_unit.hh"
#include "params/DerivO3CPU.hh"
template<class Impl> template<class Impl>
BPredUnit<Impl>::BPredUnit(Params *params) BPredUnit<Impl>::BPredUnit(DerivO3CPUParams *params)
: BTB(params->BTBEntries, : BTB(params->BTBEntries,
params->BTBTagSize, params->BTBTagSize,
params->instShiftAmt) params->instShiftAmt)

5
src/cpu/o3/commit.hh
View file

@ -37,6 +37,8 @@
#include "cpu/exetrace.hh" #include "cpu/exetrace.hh"
#include "cpu/inst_seq.hh" #include "cpu/inst_seq.hh"
class DerivO3CPUParams;
template <class> template <class>
class O3ThreadState; class O3ThreadState;
@ -69,7 +71,6 @@ class DefaultCommit
// Typedefs from the Impl. // Typedefs from the Impl.
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::Params Params;
typedef typename Impl::CPUPol CPUPol; typedef typename Impl::CPUPol CPUPol;
typedef typename CPUPol::RenameMap RenameMap; typedef typename CPUPol::RenameMap RenameMap;
@ -136,7 +137,7 @@ class DefaultCommit
public: public:
/** Construct a DefaultCommit with the given parameters. */ /** Construct a DefaultCommit with the given parameters. */
DefaultCommit(O3CPU *_cpu, Params *params); DefaultCommit(O3CPU *_cpu, DerivO3CPUParams *params);
/** Returns the name of the DefaultCommit. */ /** Returns the name of the DefaultCommit. */
std::string name() const; std::string name() const;

6
src/cpu/o3/commit_impl.hh
View file

@ -46,6 +46,8 @@
#include "cpu/checker/cpu.hh" #include "cpu/checker/cpu.hh"
#endif #endif
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
DefaultCommit<Impl>::TrapEvent::TrapEvent(DefaultCommit<Impl> *_commit, DefaultCommit<Impl>::TrapEvent::TrapEvent(DefaultCommit<Impl> *_commit,
unsigned _tid) unsigned _tid)
@ -71,7 +73,7 @@ DefaultCommit<Impl>::TrapEvent::description() const
} }
template <class Impl> template <class Impl>
DefaultCommit<Impl>::DefaultCommit(O3CPU *_cpu, Params *params) DefaultCommit<Impl>::DefaultCommit(O3CPU *_cpu, DerivO3CPUParams *params)
: cpu(_cpu), : cpu(_cpu),
squashCounter(0), squashCounter(0),
iewToCommitDelay(params->iewToCommitDelay), iewToCommitDelay(params->iewToCommitDelay),
@ -80,7 +82,7 @@ DefaultCommit<Impl>::DefaultCommit(O3CPU *_cpu, Params *params)
fetchToCommitDelay(params->commitToFetchDelay), fetchToCommitDelay(params->commitToFetchDelay),
renameWidth(params->renameWidth), renameWidth(params->renameWidth),
commitWidth(params->commitWidth), commitWidth(params->commitWidth),
numThreads(params->numberOfThreads), numThreads(params->numThreads),
drainPending(false), drainPending(false),
switchedOut(false), switchedOut(false),
trapLatency(params->trapLatency) trapLatency(params->trapLatency)

14
src/cpu/o3/cpu.cc
View file

@ -52,9 +52,11 @@
#include "cpu/checker/cpu.hh" #include "cpu/checker/cpu.hh"
#endif #endif
class BaseCPUParams;
using namespace TheISA; using namespace TheISA;
BaseO3CPU::BaseO3CPU(Params *params) BaseO3CPU::BaseO3CPU(BaseCPUParams *params)
: BaseCPU(params), cpu_id(0) : BaseCPU(params), cpu_id(0)
{ {
} }
@ -147,7 +149,7 @@ FullO3CPU<Impl>::DeallocateContextEvent::description() const
} }
template <class Impl> template <class Impl>
FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, Params *params) FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, DerivO3CPUParams *params)
: BaseO3CPU(params), : BaseO3CPU(params),
itb(params->itb), itb(params->itb),
dtb(params->dtb), dtb(params->dtb),
@ -162,16 +164,16 @@ FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, Params *params)
regFile(o3_cpu, params->numPhysIntRegs, regFile(o3_cpu, params->numPhysIntRegs,
params->numPhysFloatRegs), params->numPhysFloatRegs),
freeList(params->numberOfThreads, freeList(params->numThreads,
TheISA::NumIntRegs, params->numPhysIntRegs, TheISA::NumIntRegs, params->numPhysIntRegs,
TheISA::NumFloatRegs, params->numPhysFloatRegs), TheISA::NumFloatRegs, params->numPhysFloatRegs),
rob(o3_cpu, rob(o3_cpu,
params->numROBEntries, params->squashWidth, params->numROBEntries, params->squashWidth,
params->smtROBPolicy, params->smtROBThreshold, params->smtROBPolicy, params->smtROBThreshold,
params->numberOfThreads), params->numThreads),
scoreboard(params->numberOfThreads, scoreboard(params->numThreads,
TheISA::NumIntRegs, params->numPhysIntRegs, TheISA::NumIntRegs, params->numPhysIntRegs,
TheISA::NumFloatRegs, params->numPhysFloatRegs, TheISA::NumFloatRegs, params->numPhysFloatRegs,
TheISA::NumMiscRegs * number_of_threads, TheISA::NumMiscRegs * number_of_threads,
@ -192,7 +194,7 @@ FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, Params *params)
physmem(system->physmem), physmem(system->physmem),
#endif // FULL_SYSTEM #endif // FULL_SYSTEM
drainCount(0), drainCount(0),
deferRegistration(params->deferRegistration), deferRegistration(params->defer_registration),
numThreads(number_of_threads) numThreads(number_of_threads)
{ {
if (!deferRegistration) { if (!deferRegistration) {

11
src/cpu/o3/cpu.hh
View file

@ -53,6 +53,8 @@
//#include "cpu/o3/thread_context.hh" //#include "cpu/o3/thread_context.hh"
#include "sim/process.hh" #include "sim/process.hh"
#include "params/DerivO3CPU.hh"
template <class> template <class>
class Checker; class Checker;
class ThreadContext; class ThreadContext;
@ -63,13 +65,13 @@ class Checkpoint;
class MemObject; class MemObject;
class Process; class Process;
class BaseCPUParams;
class BaseO3CPU : public BaseCPU class BaseO3CPU : public BaseCPU
{ {
//Stuff that's pretty ISA independent will go here. //Stuff that's pretty ISA independent will go here.
public: public:
typedef BaseCPU::Params Params; BaseO3CPU(BaseCPUParams *params);
BaseO3CPU(Params *params);
void regStats(); void regStats();
@ -96,7 +98,6 @@ class FullO3CPU : public BaseO3CPU
typedef typename Impl::CPUPol CPUPolicy; typedef typename Impl::CPUPol CPUPolicy;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::Params Params;
typedef O3ThreadState<Impl> Thread; typedef O3ThreadState<Impl> Thread;
@ -256,7 +257,7 @@ class FullO3CPU : public BaseO3CPU
public: public:
/** Constructs a CPU with the given parameters. */ /** Constructs a CPU with the given parameters. */
FullO3CPU(O3CPU *o3_cpu, Params *params); FullO3CPU(O3CPU *o3_cpu, DerivO3CPUParams *params);
/** Destructor. */ /** Destructor. */
~FullO3CPU(); ~FullO3CPU();

5
src/cpu/o3/decode.hh
View file

@ -36,6 +36,8 @@
#include "base/statistics.hh" #include "base/statistics.hh"
#include "base/timebuf.hh" #include "base/timebuf.hh"
class DerivO3CPUParams;
/** /**
* DefaultDecode class handles both single threaded and SMT * DefaultDecode class handles both single threaded and SMT
* decode. Its width is specified by the parameters; each cycles it * decode. Its width is specified by the parameters; each cycles it
@ -50,7 +52,6 @@ class DefaultDecode
// Typedefs from the Impl. // Typedefs from the Impl.
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::Params Params;
typedef typename Impl::CPUPol CPUPol; typedef typename Impl::CPUPol CPUPol;
// Typedefs from the CPU policy. // Typedefs from the CPU policy.
@ -86,7 +87,7 @@ class DefaultDecode
public: public:
/** DefaultDecode constructor. */ /** DefaultDecode constructor. */
DefaultDecode(O3CPU *_cpu, Params *params); DefaultDecode(O3CPU *_cpu, DerivO3CPUParams *params);
/** Returns the name of decode. */ /** Returns the name of decode. */
std::string name() const; std::string name() const;

6
src/cpu/o3/decode_impl.hh
View file

@ -30,15 +30,17 @@
#include "cpu/o3/decode.hh" #include "cpu/o3/decode.hh"
#include "params/DerivO3CPU.hh"
template<class Impl> template<class Impl>
DefaultDecode<Impl>::DefaultDecode(O3CPU *_cpu, Params *params) DefaultDecode<Impl>::DefaultDecode(O3CPU *_cpu, DerivO3CPUParams *params)
: cpu(_cpu), : cpu(_cpu),
renameToDecodeDelay(params->renameToDecodeDelay), renameToDecodeDelay(params->renameToDecodeDelay),
iewToDecodeDelay(params->iewToDecodeDelay), iewToDecodeDelay(params->iewToDecodeDelay),
commitToDecodeDelay(params->commitToDecodeDelay), commitToDecodeDelay(params->commitToDecodeDelay),
fetchToDecodeDelay(params->fetchToDecodeDelay), fetchToDecodeDelay(params->fetchToDecodeDelay),
decodeWidth(params->decodeWidth), decodeWidth(params->decodeWidth),
numThreads(params->numberOfThreads) numThreads(params->numThreads)
{ {
_status = Inactive; _status = Inactive;

5
src/cpu/o3/fetch.hh
View file

@ -41,6 +41,8 @@
#include "mem/port.hh" #include "mem/port.hh"
#include "sim/eventq.hh" #include "sim/eventq.hh"
class DerivO3CPUParams;
/** /**
* DefaultFetch class handles both single threaded and SMT fetch. Its * DefaultFetch class handles both single threaded and SMT fetch. Its
* width is specified by the parameters; each cycle it tries to fetch * width is specified by the parameters; each cycle it tries to fetch
@ -58,7 +60,6 @@ class DefaultFetch
typedef typename Impl::DynInst DynInst; typedef typename Impl::DynInst DynInst;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::Params Params;
/** Typedefs from the CPU policy. */ /** Typedefs from the CPU policy. */
typedef typename CPUPol::BPredUnit BPredUnit; typedef typename CPUPol::BPredUnit BPredUnit;
@ -160,7 +161,7 @@ class DefaultFetch
public: public:
/** DefaultFetch constructor. */ /** DefaultFetch constructor. */
DefaultFetch(O3CPU *_cpu, Params *params); DefaultFetch(O3CPU *_cpu, DerivO3CPUParams *params);
/** Returns the name of fetch. */ /** Returns the name of fetch. */
std::string name() const; std::string name() const;

6
src/cpu/o3/fetch_impl.hh
View file

@ -51,6 +51,8 @@
#include "sim/system.hh" #include "sim/system.hh"
#endif // FULL_SYSTEM #endif // FULL_SYSTEM
#include "params/DerivO3CPU.hh"
template<class Impl> template<class Impl>
void void
DefaultFetch<Impl>::IcachePort::setPeer(Port *port) DefaultFetch<Impl>::IcachePort::setPeer(Port *port)
@ -111,7 +113,7 @@ DefaultFetch<Impl>::IcachePort::recvRetry()
} }
template<class Impl> template<class Impl>
DefaultFetch<Impl>::DefaultFetch(O3CPU *_cpu, Params *params) DefaultFetch<Impl>::DefaultFetch(O3CPU *_cpu, DerivO3CPUParams *params)
: cpu(_cpu), : cpu(_cpu),
branchPred(params), branchPred(params),
predecoder(NULL), predecoder(NULL),
@ -123,7 +125,7 @@ DefaultFetch<Impl>::DefaultFetch(O3CPU *_cpu, Params *params)
cacheBlocked(false), cacheBlocked(false),
retryPkt(NULL), retryPkt(NULL),
retryTid(-1), retryTid(-1),
numThreads(params->numberOfThreads), numThreads(params->numThreads),
numFetchingThreads(params->smtNumFetchingThreads), numFetchingThreads(params->smtNumFetchingThreads),
interruptPending(false), interruptPending(false),
drainPending(false), drainPending(false),

4
src/cpu/o3/iew.hh
View file

@ -41,6 +41,7 @@
#include "cpu/o3/scoreboard.hh" #include "cpu/o3/scoreboard.hh"
#include "cpu/o3/lsq.hh" #include "cpu/o3/lsq.hh"
class DerivO3CPUParams;
class FUPool; class FUPool;
/** /**
@ -70,7 +71,6 @@ class DefaultIEW
typedef typename Impl::CPUPol CPUPol; typedef typename Impl::CPUPol CPUPol;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::Params Params;
typedef typename CPUPol::IQ IQ; typedef typename CPUPol::IQ IQ;
typedef typename CPUPol::RenameMap RenameMap; typedef typename CPUPol::RenameMap RenameMap;
@ -115,7 +115,7 @@ class DefaultIEW
public: public:
/** Constructs a DefaultIEW with the given parameters. */ /** Constructs a DefaultIEW with the given parameters. */
DefaultIEW(O3CPU *_cpu, Params *params); DefaultIEW(O3CPU *_cpu, DerivO3CPUParams *params);
/** Returns the name of the DefaultIEW stage. */ /** Returns the name of the DefaultIEW stage. */
std::string name() const; std::string name() const;

5
src/cpu/o3/iew_impl.hh
View file

@ -37,9 +37,10 @@
#include "base/timebuf.hh" #include "base/timebuf.hh"
#include "cpu/o3/fu_pool.hh" #include "cpu/o3/fu_pool.hh"
#include "cpu/o3/iew.hh" #include "cpu/o3/iew.hh"
#include "params/DerivO3CPU.hh"
template<class Impl> template<class Impl>
DefaultIEW<Impl>::DefaultIEW(O3CPU *_cpu, Params *params) DefaultIEW<Impl>::DefaultIEW(O3CPU *_cpu, DerivO3CPUParams *params)
: issueToExecQueue(params->backComSize, params->forwardComSize), : issueToExecQueue(params->backComSize, params->forwardComSize),
cpu(_cpu), cpu(_cpu),
instQueue(_cpu, this, params), instQueue(_cpu, this, params),
@ -52,7 +53,7 @@ DefaultIEW<Impl>::DefaultIEW(O3CPU *_cpu, Params *params)
issueWidth(params->issueWidth), issueWidth(params->issueWidth),
wbOutstanding(0), wbOutstanding(0),
wbWidth(params->wbWidth), wbWidth(params->wbWidth),
numThreads(params->numberOfThreads), numThreads(params->numThreads),
switchedOut(false) switchedOut(false)
{ {
_status = Active; _status = Active;

5
src/cpu/o3/inst_queue.hh
View file

@ -41,8 +41,10 @@
#include "cpu/inst_seq.hh" #include "cpu/inst_seq.hh"
#include "cpu/o3/dep_graph.hh" #include "cpu/o3/dep_graph.hh"
#include "cpu/op_class.hh" #include "cpu/op_class.hh"
#include "sim/eventq.hh"
#include "sim/host.hh" #include "sim/host.hh"
class DerivO3CPUParams;
class FUPool; class FUPool;
class MemInterface; class MemInterface;
@ -70,7 +72,6 @@ class InstructionQueue
//Typedefs from the Impl. //Typedefs from the Impl.
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::Params Params;
typedef typename Impl::CPUPol::IEW IEW; typedef typename Impl::CPUPol::IEW IEW;
typedef typename Impl::CPUPol::MemDepUnit MemDepUnit; typedef typename Impl::CPUPol::MemDepUnit MemDepUnit;
@ -110,7 +111,7 @@ class InstructionQueue
}; };
/** Constructs an IQ. */ /** Constructs an IQ. */
InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params); InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params);
/** Destructs the IQ. */ /** Destructs the IQ. */
~InstructionQueue(); ~InstructionQueue();

6
src/cpu/o3/inst_queue_impl.hh
View file

@ -37,6 +37,8 @@
#include "enums/OpClass.hh" #include "enums/OpClass.hh"
#include "sim/core.hh" #include "sim/core.hh"
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
InstructionQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst, InstructionQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst,
int fu_idx, int fu_idx,
@ -65,7 +67,7 @@ InstructionQueue<Impl>::FUCompletion::description() const
template <class Impl> template <class Impl>
InstructionQueue<Impl>::InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr, InstructionQueue<Impl>::InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr,
Params *params) DerivO3CPUParams *params)
: cpu(cpu_ptr), : cpu(cpu_ptr),
iewStage(iew_ptr), iewStage(iew_ptr),
fuPool(params->fuPool), fuPool(params->fuPool),
@ -79,7 +81,7 @@ InstructionQueue<Impl>::InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr,
switchedOut = false; switchedOut = false;
numThreads = params->numberOfThreads; numThreads = params->numThreads;
// Set the number of physical registers as the number of int + float // Set the number of physical registers as the number of int + float
numPhysRegs = numPhysIntRegs + numPhysFloatRegs; numPhysRegs = numPhysIntRegs + numPhysFloatRegs;

3
src/cpu/o3/isa_specific.hh
View file

@ -33,17 +33,14 @@
#if THE_ISA == ALPHA_ISA #if THE_ISA == ALPHA_ISA
#include "cpu/o3/alpha/cpu.hh" #include "cpu/o3/alpha/cpu.hh"
#include "cpu/o3/alpha/impl.hh" #include "cpu/o3/alpha/impl.hh"
#include "cpu/o3/alpha/params.hh"
#include "cpu/o3/alpha/dyn_inst.hh" #include "cpu/o3/alpha/dyn_inst.hh"
#elif THE_ISA == MIPS_ISA #elif THE_ISA == MIPS_ISA
#include "cpu/o3/mips/cpu.hh" #include "cpu/o3/mips/cpu.hh"
#include "cpu/o3/mips/impl.hh" #include "cpu/o3/mips/impl.hh"
#include "cpu/o3/mips/params.hh"
#include "cpu/o3/mips/dyn_inst.hh" #include "cpu/o3/mips/dyn_inst.hh"
#elif THE_ISA == SPARC_ISA #elif THE_ISA == SPARC_ISA
#include "cpu/o3/sparc/cpu.hh" #include "cpu/o3/sparc/cpu.hh"
#include "cpu/o3/sparc/impl.hh" #include "cpu/o3/sparc/impl.hh"
#include "cpu/o3/sparc/params.hh"
#include "cpu/o3/sparc/dyn_inst.hh" #include "cpu/o3/sparc/dyn_inst.hh"
#else #else
#error "ISA-specific header files O3CPU not defined ISA" #error "ISA-specific header files O3CPU not defined ISA"

5
src/cpu/o3/lsq.hh
View file

@ -40,10 +40,11 @@
#include "mem/port.hh" #include "mem/port.hh"
#include "sim/sim_object.hh" #include "sim/sim_object.hh"
class DerivO3CPUParams;
template <class Impl> template <class Impl>
class LSQ { class LSQ {
public: public:
typedef typename Impl::Params Params;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::CPUPol::IEW IEW; typedef typename Impl::CPUPol::IEW IEW;
@ -57,7 +58,7 @@ class LSQ {
}; };
/** Constructs an LSQ with the given parameters. */ /** Constructs an LSQ with the given parameters. */
LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params); LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params);
/** Returns the name of the LSQ. */ /** Returns the name of the LSQ. */
std::string name() const; std::string name() const;

6
src/cpu/o3/lsq_impl.hh
View file

@ -34,6 +34,8 @@
#include "cpu/o3/lsq.hh" #include "cpu/o3/lsq.hh"
#include "params/DerivO3CPU.hh"
template<class Impl> template<class Impl>
void void
LSQ<Impl>::DcachePort::setPeer(Port *port) LSQ<Impl>::DcachePort::setPeer(Port *port)
@ -111,11 +113,11 @@ LSQ<Impl>::DcachePort::recvRetry()
} }
template <class Impl> template <class Impl>
LSQ<Impl>::LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params) LSQ<Impl>::LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params)
: cpu(cpu_ptr), iewStage(iew_ptr), dcachePort(this), : cpu(cpu_ptr), iewStage(iew_ptr), dcachePort(this),
LQEntries(params->LQEntries), LQEntries(params->LQEntries),
SQEntries(params->SQEntries), SQEntries(params->SQEntries),
numThreads(params->numberOfThreads), numThreads(params->numThreads),
retryTid(-1) retryTid(-1)
{ {
dcachePort.snoopRangeSent = false; dcachePort.snoopRangeSent = false;

8
src/cpu/o3/lsq_unit.hh
View file

@ -46,6 +46,8 @@
#include "mem/packet.hh" #include "mem/packet.hh"
#include "mem/port.hh" #include "mem/port.hh"
class DerivO3CPUParams;
/** /**
* Class that implements the actual LQ and SQ for each specific * Class that implements the actual LQ and SQ for each specific
* thread. Both are circular queues; load entries are freed upon * thread. Both are circular queues; load entries are freed upon
@ -63,7 +65,6 @@ class LSQUnit {
protected: protected:
typedef TheISA::IntReg IntReg; typedef TheISA::IntReg IntReg;
public: public:
typedef typename Impl::Params Params;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::CPUPol::IEW IEW; typedef typename Impl::CPUPol::IEW IEW;
@ -75,8 +76,9 @@ class LSQUnit {
LSQUnit(); LSQUnit();
/** Initializes the LSQ unit with the specified number of entries. */ /** Initializes the LSQ unit with the specified number of entries. */
void init(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params, LSQ *lsq_ptr, void init(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params,
unsigned maxLQEntries, unsigned maxSQEntries, unsigned id); LSQ *lsq_ptr, unsigned maxLQEntries, unsigned maxSQEntries,
unsigned id);
/** Returns the name of the LSQ unit. */ /** Returns the name of the LSQ unit. */
std::string name() const; std::string name() const;

5
src/cpu/o3/lsq_unit_impl.hh
View file

@ -112,8 +112,9 @@ LSQUnit<Impl>::LSQUnit()
template<class Impl> template<class Impl>
void void
LSQUnit<Impl>::init(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params, LSQ *lsq_ptr, LSQUnit<Impl>::init(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params,
unsigned maxLQEntries, unsigned maxSQEntries, unsigned id) LSQ *lsq_ptr, unsigned maxLQEntries, unsigned maxSQEntries,
unsigned id)
{ {
cpu = cpu_ptr; cpu = cpu_ptr;
iewStage = iew_ptr; iewStage = iew_ptr;

7
src/cpu/o3/mem_dep_unit.hh
View file

@ -48,6 +48,8 @@ struct SNHash {
} }
}; };
class DerivO3CPUParams;
template <class Impl> template <class Impl>
class InstructionQueue; class InstructionQueue;
@ -65,14 +67,13 @@ class InstructionQueue;
template <class MemDepPred, class Impl> template <class MemDepPred, class Impl>
class MemDepUnit { class MemDepUnit {
public: public:
typedef typename Impl::Params Params;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
/** Empty constructor. Must call init() prior to using in this case. */ /** Empty constructor. Must call init() prior to using in this case. */
MemDepUnit(); MemDepUnit();
/** Constructs a MemDepUnit with given parameters. */ /** Constructs a MemDepUnit with given parameters. */
MemDepUnit(Params *params); MemDepUnit(DerivO3CPUParams *params);
/** Frees up any memory allocated. */ /** Frees up any memory allocated. */
~MemDepUnit(); ~MemDepUnit();
@ -81,7 +82,7 @@ class MemDepUnit {
std::string name() const; std::string name() const;
/** Initializes the unit with parameters and a thread id. */ /** Initializes the unit with parameters and a thread id. */
void init(Params *params, int tid); void init(DerivO3CPUParams *params, int tid);
/** Registers statistics. */ /** Registers statistics. */
void regStats(); void regStats();

6
src/cpu/o3/mem_dep_unit_impl.hh
View file

@ -33,6 +33,8 @@
#include "cpu/o3/inst_queue.hh" #include "cpu/o3/inst_queue.hh"
#include "cpu/o3/mem_dep_unit.hh" #include "cpu/o3/mem_dep_unit.hh"
#include "params/DerivO3CPU.hh"
template <class MemDepPred, class Impl> template <class MemDepPred, class Impl>
MemDepUnit<MemDepPred, Impl>::MemDepUnit() MemDepUnit<MemDepPred, Impl>::MemDepUnit()
: loadBarrier(false), loadBarrierSN(0), storeBarrier(false), : loadBarrier(false), loadBarrierSN(0), storeBarrier(false),
@ -41,7 +43,7 @@ MemDepUnit<MemDepPred, Impl>::MemDepUnit()
} }
template <class MemDepPred, class Impl> template <class MemDepPred, class Impl>
MemDepUnit<MemDepPred, Impl>::MemDepUnit(Params *params) MemDepUnit<MemDepPred, Impl>::MemDepUnit(DerivO3CPUParams *params)
: depPred(params->SSITSize, params->LFSTSize), loadBarrier(false), : depPred(params->SSITSize, params->LFSTSize), loadBarrier(false),
loadBarrierSN(0), storeBarrier(false), storeBarrierSN(0), iqPtr(NULL) loadBarrierSN(0), storeBarrier(false), storeBarrierSN(0), iqPtr(NULL)
{ {
@ -82,7 +84,7 @@ MemDepUnit<MemDepPred, Impl>::name() const
template <class MemDepPred, class Impl> template <class MemDepPred, class Impl>
void void
MemDepUnit<MemDepPred, Impl>::init(Params *params, int tid) MemDepUnit<MemDepPred, Impl>::init(DerivO3CPUParams *params, int tid)
{ {
DPRINTF(MemDepUnit, "Creating MemDepUnit %i object.\n",tid); DPRINTF(MemDepUnit, "Creating MemDepUnit %i object.\n",tid);

4
src/cpu/o3/mips/cpu.hh
View file

@ -39,6 +39,7 @@
#include "sim/byteswap.hh" #include "sim/byteswap.hh"
#include "sim/faults.hh" #include "sim/faults.hh"
class DerivO3CPUParams;
class EndQuiesceEvent; class EndQuiesceEvent;
namespace Kernel { namespace Kernel {
class Statistics; class Statistics;
@ -60,10 +61,9 @@ class MipsO3CPU : public FullO3CPU<Impl>
public: public:
typedef O3ThreadState<Impl> ImplState; typedef O3ThreadState<Impl> ImplState;
typedef O3ThreadState<Impl> Thread; typedef O3ThreadState<Impl> Thread;
typedef typename Impl::Params Params;
/** Constructs an MipsO3CPU with the given parameters. */ /** Constructs an MipsO3CPU with the given parameters. */
MipsO3CPU(Params *params); MipsO3CPU(DerivO3CPUParams *params);
/** Registers statistics. */ /** Registers statistics. */
void regStats(); void regStats();

122
src/cpu/o3/mips/cpu_builder.cc
View file

@ -35,14 +35,13 @@
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/o3/mips/cpu.hh" #include "cpu/o3/mips/cpu.hh"
#include "cpu/o3/mips/impl.hh" #include "cpu/o3/mips/impl.hh"
#include "cpu/o3/mips/params.hh"
#include "cpu/o3/fu_pool.hh" #include "cpu/o3/fu_pool.hh"
#include "params/DerivO3CPU.hh" #include "params/DerivO3CPU.hh"
class DerivO3CPU : public MipsO3CPU<MipsSimpleImpl> class DerivO3CPU : public MipsO3CPU<MipsSimpleImpl>
{ {
public: public:
DerivO3CPU(MipsSimpleParams *p) DerivO3CPU(DerivO3CPUParams *p)
: MipsO3CPU<MipsSimpleImpl>(p) : MipsO3CPU<MipsSimpleImpl>(p)
{ } { }
}; };
@ -50,8 +49,10 @@ class DerivO3CPU : public MipsO3CPU<MipsSimpleImpl>
DerivO3CPU * DerivO3CPU *
DerivO3CPUParams::create() DerivO3CPUParams::create()
{ {
DerivO3CPU *cpu; #if FULL_SYSTEM
// Full-system only supports a single thread for the moment.
int actual_num_threads = 1;
#else
// In non-full-system mode, we infer the number of threads from // In non-full-system mode, we infer the number of threads from
// the workload if it's not explicitly specified. // the workload if it's not explicitly specified.
int actual_num_threads = int actual_num_threads =
@ -60,123 +61,20 @@ DerivO3CPUParams::create()
if (workload.size() == 0) { if (workload.size() == 0) {
fatal("Must specify at least one workload!"); fatal("Must specify at least one workload!");
} }
MipsSimpleParams *params = new MipsSimpleParams;
params->clock = clock;
params->phase = phase;
params->tracer = tracer;
params->name = name;
params->numberOfThreads = actual_num_threads;
params->cpu_id = cpu_id;
params->activity = activity;
params->workload = workload;
#if USE_CHECKER
params->checker = checker;
#endif #endif
params->max_insts_any_thread = max_insts_any_thread; numThreads = actual_num_threads;
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
//
// Caches
//
params->cachePorts = cachePorts;
params->decodeToFetchDelay = decodeToFetchDelay;
params->renameToFetchDelay = renameToFetchDelay;
params->iewToFetchDelay = iewToFetchDelay;
params->commitToFetchDelay = commitToFetchDelay;
params->fetchWidth = fetchWidth;
params->renameToDecodeDelay = renameToDecodeDelay;
params->iewToDecodeDelay = iewToDecodeDelay;
params->commitToDecodeDelay = commitToDecodeDelay;
params->fetchToDecodeDelay = fetchToDecodeDelay;
params->decodeWidth = decodeWidth;
params->iewToRenameDelay = iewToRenameDelay;
params->commitToRenameDelay = commitToRenameDelay;
params->decodeToRenameDelay = decodeToRenameDelay;
params->renameWidth = renameWidth;
params->commitToIEWDelay = commitToIEWDelay;
params->renameToIEWDelay = renameToIEWDelay;
params->issueToExecuteDelay = issueToExecuteDelay;
params->dispatchWidth = dispatchWidth;
params->issueWidth = issueWidth;
params->wbWidth = wbWidth;
params->wbDepth = wbDepth;
params->fuPool = fuPool;
params->iewToCommitDelay = iewToCommitDelay;
params->renameToROBDelay = renameToROBDelay;
params->commitWidth = commitWidth;
params->squashWidth = squashWidth;
params->trapLatency = trapLatency;
params->backComSize = backComSize;
params->forwardComSize = forwardComSize;
params->predType = predType;
params->localPredictorSize = localPredictorSize;
params->localCtrBits = localCtrBits;
params->localHistoryTableSize = localHistoryTableSize;
params->localHistoryBits = localHistoryBits;
params->globalPredictorSize = globalPredictorSize;
params->globalCtrBits = globalCtrBits;
params->globalHistoryBits = globalHistoryBits;
params->choicePredictorSize = choicePredictorSize;
params->choiceCtrBits = choiceCtrBits;
params->BTBEntries = BTBEntries;
params->BTBTagSize = BTBTagSize;
params->RASSize = RASSize;
params->LQEntries = LQEntries;
params->SQEntries = SQEntries;
params->SSITSize = SSITSize;
params->LFSTSize = LFSTSize;
params->numPhysIntRegs = numPhysIntRegs;
params->numPhysFloatRegs = numPhysFloatRegs;
params->numIQEntries = numIQEntries;
params->numROBEntries = numROBEntries;
params->smtNumFetchingThreads = smtNumFetchingThreads;
// Default smtFetchPolicy to "RoundRobin", if necessary. // Default smtFetchPolicy to "RoundRobin", if necessary.
std::string round_robin_policy = "RoundRobin"; std::string round_robin_policy = "RoundRobin";
std::string single_thread = "SingleThread"; std::string single_thread = "SingleThread";
if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0) if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0)
params->smtFetchPolicy = round_robin_policy; smtFetchPolicy = round_robin_policy;
else else
params->smtFetchPolicy = smtFetchPolicy; smtFetchPolicy = smtFetchPolicy;
params->smtIQPolicy = smtIQPolicy; instShiftAmt = 2;
params->smtLSQPolicy = smtLSQPolicy;
params->smtLSQThreshold = smtLSQThreshold;
params->smtROBPolicy = smtROBPolicy;
params->smtROBThreshold = smtROBThreshold;
params->smtCommitPolicy = smtCommitPolicy;
params->instShiftAmt = 2; return new DerivO3CPU(this);
params->deferRegistration = defer_registration;
params->functionTrace = function_trace;
params->functionTraceStart = function_trace_start;
cpu = new DerivO3CPU(params);
return cpu;
} }

5
src/cpu/o3/mips/cpu_impl.hh
View file

@ -40,13 +40,14 @@
#include "sim/stats.hh" #include "sim/stats.hh"
#include "cpu/o3/mips/cpu.hh" #include "cpu/o3/mips/cpu.hh"
#include "cpu/o3/mips/params.hh"
#include "cpu/o3/mips/thread_context.hh" #include "cpu/o3/mips/thread_context.hh"
#include "cpu/o3/comm.hh" #include "cpu/o3/comm.hh"
#include "cpu/o3/thread_state.hh" #include "cpu/o3/thread_state.hh"
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
MipsO3CPU<Impl>::MipsO3CPU(Params *params) MipsO3CPU<Impl>::MipsO3CPU(DerivO3CPUParams *params)
: FullO3CPU<Impl>(this, params) : FullO3CPU<Impl>(this, params)
{ {
DPRINTF(O3CPU, "Creating MipsO3CPU object.\n"); DPRINTF(O3CPU, "Creating MipsO3CPU object.\n");

4
src/cpu/o3/mips/impl.hh
View file

@ -34,7 +34,6 @@
#include "arch/mips/isa_traits.hh" #include "arch/mips/isa_traits.hh"
#include "cpu/o3/mips/params.hh"
#include "cpu/o3/cpu_policy.hh" #include "cpu/o3/cpu_policy.hh"
@ -78,9 +77,6 @@ struct MipsSimpleImpl
*/ */
typedef O3CPU CPUType; typedef O3CPU CPUType;
/** The Params to be passed to each stage. */
typedef MipsSimpleParams Params;
enum { enum {
MaxWidth = 8, MaxWidth = 8,
MaxThreads = 4 MaxThreads = 4

64
src/cpu/o3/mips/params.hh
View file

@ -1,64 +0,0 @@
/*
* Copyright (c) 2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Kevin Lim
* Korey Sewell
*/
#ifndef __CPU_O3_MIPS_PARAMS_HH__
#define __CPU_O3_MIPS_PARAMS_HH__
#include "cpu/o3/cpu.hh"
#include "cpu/o3/params.hh"
//Forward declarations
namespace MipsISA
{
class MipsDTB;
class MipsITB;
}
class MemObject;
class Process;
class System;
/**
* This file defines the parameters that will be used for the MipsO3CPU.
* This must be defined externally so that the Impl can have a params class
* defined that it can pass to all of the individual stages.
*/
class MipsSimpleParams : public O3Params
{
public:
MipsSimpleParams() {}
//Full System Paramater Objects place here
MipsISA::ITB *itb;
MipsISA::DTB *dtb;
};
#endif // __CPU_O3_MIPS_PARAMS_HH__

180
src/cpu/o3/params.hh
View file

@ -1,180 +0,0 @@
/*
* Copyright (c) 2004-2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Kevin Lim
*/
#ifndef __CPU_O3_PARAMS_HH__
#define __CPU_O3_PARAMS_HH__
#include "cpu/o3/cpu.hh"
//Forward declarations
class FUPool;
/**
* This file defines the parameters that will be used for the O3CPU.
* This must be defined externally so that the Impl can have a params class
* defined that it can pass to all of the individual stages.
*/
class O3Params : public BaseO3CPU::Params
{
public:
unsigned activity;
//
// Pointers to key objects
//
#if !FULL_SYSTEM
std::vector<Process *> workload;
Process *process;
#endif // FULL_SYSTEM
BaseCPU *checker;
//
// Caches
//
// MemInterface *icacheInterface;
// MemInterface *dcacheInterface;
unsigned cachePorts;
//
// Fetch
//
unsigned decodeToFetchDelay;
unsigned renameToFetchDelay;
unsigned iewToFetchDelay;
unsigned commitToFetchDelay;
unsigned fetchWidth;
//
// Decode
//
unsigned renameToDecodeDelay;
unsigned iewToDecodeDelay;
unsigned commitToDecodeDelay;
unsigned fetchToDecodeDelay;
unsigned decodeWidth;
//
// Rename
//
unsigned iewToRenameDelay;
unsigned commitToRenameDelay;
unsigned decodeToRenameDelay;
unsigned renameWidth;
//
// IEW
//
unsigned commitToIEWDelay;
unsigned renameToIEWDelay;
unsigned issueToExecuteDelay;
unsigned dispatchWidth;
unsigned issueWidth;
unsigned wbWidth;
unsigned wbDepth;
FUPool *fuPool;
//
// Commit
//
unsigned iewToCommitDelay;
unsigned renameToROBDelay;
unsigned commitWidth;
unsigned squashWidth;
Tick trapLatency;
Tick fetchTrapLatency;
//
// Timebuffer sizes
//
unsigned backComSize;
unsigned forwardComSize;
//
// Branch predictor (BP, BTB, RAS)
//
std::string predType;
unsigned localPredictorSize;
unsigned localCtrBits;
unsigned localHistoryTableSize;
unsigned localHistoryBits;
unsigned globalPredictorSize;
unsigned globalCtrBits;
unsigned globalHistoryBits;
unsigned choicePredictorSize;
unsigned choiceCtrBits;
unsigned BTBEntries;
unsigned BTBTagSize;
unsigned RASSize;
//
// Load store queue
//
unsigned LQEntries;
unsigned SQEntries;
//
// Memory dependence
//
unsigned SSITSize;
unsigned LFSTSize;
//
// Miscellaneous
//
unsigned numPhysIntRegs;
unsigned numPhysFloatRegs;
unsigned numIQEntries;
unsigned numROBEntries;
//SMT Parameters
unsigned smtNumFetchingThreads;
std::string smtFetchPolicy;
std::string smtIQPolicy;
unsigned smtIQThreshold;
std::string smtLSQPolicy;
unsigned smtLSQThreshold;
std::string smtCommitPolicy;
std::string smtROBPolicy;
unsigned smtROBThreshold;
// Probably can get this from somewhere.
unsigned instShiftAmt;
};
#endif // __CPU_O3_ALPHA_PARAMS_HH__

1
src/cpu/o3/regfile.hh
View file

@ -33,6 +33,7 @@
#define __CPU_O3_REGFILE_HH__ #define __CPU_O3_REGFILE_HH__
#include "arch/isa_traits.hh" #include "arch/isa_traits.hh"
#include "arch/regfile.hh"
#include "arch/types.hh" #include "arch/types.hh"
#include "base/trace.hh" #include "base/trace.hh"
#include "config/full_system.hh" #include "config/full_system.hh"

5
src/cpu/o3/rename.hh
View file

@ -36,6 +36,8 @@
#include "base/statistics.hh" #include "base/statistics.hh"
#include "base/timebuf.hh" #include "base/timebuf.hh"
class DerivO3CPUParams;
/** /**
* DefaultRename handles both single threaded and SMT rename. Its * DefaultRename handles both single threaded and SMT rename. Its
* width is specified by the parameters; each cycle it tries to rename * width is specified by the parameters; each cycle it tries to rename
@ -56,7 +58,6 @@ class DefaultRename
typedef typename Impl::CPUPol CPUPol; typedef typename Impl::CPUPol CPUPol;
typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::DynInstPtr DynInstPtr;
typedef typename Impl::O3CPU O3CPU; typedef typename Impl::O3CPU O3CPU;
typedef typename Impl::Params Params;
// Typedefs from the CPUPol // Typedefs from the CPUPol
typedef typename CPUPol::DecodeStruct DecodeStruct; typedef typename CPUPol::DecodeStruct DecodeStruct;
@ -107,7 +108,7 @@ class DefaultRename
public: public:
/** DefaultRename constructor. */ /** DefaultRename constructor. */
DefaultRename(O3CPU *_cpu, Params *params); DefaultRename(O3CPU *_cpu, DerivO3CPUParams *params);
/** Returns the name of rename. */ /** Returns the name of rename. */
std::string name() const; std::string name() const;

5
src/cpu/o3/rename_impl.hh
View file

@ -35,9 +35,10 @@
#include "arch/regfile.hh" #include "arch/regfile.hh"
#include "config/full_system.hh" #include "config/full_system.hh"
#include "cpu/o3/rename.hh" #include "cpu/o3/rename.hh"
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
DefaultRename<Impl>::DefaultRename(O3CPU *_cpu, Params *params) DefaultRename<Impl>::DefaultRename(O3CPU *_cpu, DerivO3CPUParams *params)
: cpu(_cpu), : cpu(_cpu),
iewToRenameDelay(params->iewToRenameDelay), iewToRenameDelay(params->iewToRenameDelay),
decodeToRenameDelay(params->decodeToRenameDelay), decodeToRenameDelay(params->decodeToRenameDelay),
@ -46,7 +47,7 @@ DefaultRename<Impl>::DefaultRename(O3CPU *_cpu, Params *params)
commitWidth(params->commitWidth), commitWidth(params->commitWidth),
resumeSerialize(false), resumeSerialize(false),
resumeUnblocking(false), resumeUnblocking(false),
numThreads(params->numberOfThreads), numThreads(params->numThreads),
maxPhysicalRegs(params->numPhysIntRegs + params->numPhysFloatRegs) maxPhysicalRegs(params->numPhysIntRegs + params->numPhysFloatRegs)
{ {
_status = Inactive; _status = Inactive;

4
src/cpu/o3/sparc/cpu.hh
View file

@ -37,6 +37,7 @@
#include "cpu/o3/cpu.hh" #include "cpu/o3/cpu.hh"
#include "sim/byteswap.hh" #include "sim/byteswap.hh"
class DerivO3CPUParams;
class EndQuiesceEvent; class EndQuiesceEvent;
namespace Kernel { namespace Kernel {
class Statistics; class Statistics;
@ -58,10 +59,9 @@ class SparcO3CPU : public FullO3CPU<Impl>
public: public:
typedef O3ThreadState<Impl> ImplState; typedef O3ThreadState<Impl> ImplState;
typedef O3ThreadState<Impl> Thread; typedef O3ThreadState<Impl> Thread;
typedef typename Impl::Params Params;
/** Constructs an AlphaO3CPU with the given parameters. */ /** Constructs an AlphaO3CPU with the given parameters. */
SparcO3CPU(Params *params); SparcO3CPU(DerivO3CPUParams *params);
/** Registers statistics. */ /** Registers statistics. */
void regStats(); void regStats();

132
src/cpu/o3/sparc/cpu_builder.cc
View file

@ -35,14 +35,13 @@
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/o3/sparc/cpu.hh" #include "cpu/o3/sparc/cpu.hh"
#include "cpu/o3/sparc/impl.hh" #include "cpu/o3/sparc/impl.hh"
#include "cpu/o3/sparc/params.hh"
#include "cpu/o3/fu_pool.hh" #include "cpu/o3/fu_pool.hh"
#include "params/DerivO3CPU.hh" #include "params/DerivO3CPU.hh"
class DerivO3CPU : public SparcO3CPU<SparcSimpleImpl> class DerivO3CPU : public SparcO3CPU<SparcSimpleImpl>
{ {
public: public:
DerivO3CPU(SparcSimpleParams *p) DerivO3CPU(DerivO3CPUParams *p)
: SparcO3CPU<SparcSimpleImpl>(p) : SparcO3CPU<SparcSimpleImpl>(p)
{ } { }
}; };
@ -50,8 +49,6 @@ class DerivO3CPU : public SparcO3CPU<SparcSimpleImpl>
DerivO3CPU * DerivO3CPU *
DerivO3CPUParams::create() DerivO3CPUParams::create()
{ {
DerivO3CPU *cpu;
#if FULL_SYSTEM #if FULL_SYSTEM
// Full-system only supports a single thread for the moment. // Full-system only supports a single thread for the moment.
int actual_num_threads = 1; int actual_num_threads = 1;
@ -66,135 +63,18 @@ DerivO3CPUParams::create()
} }
#endif #endif
SparcSimpleParams *params = new SparcSimpleParams; numThreads = actual_num_threads;
params->clock = clock;
params->phase = phase;
params->tracer = tracer;
params->name = name;
params->numberOfThreads = actual_num_threads;
params->cpu_id = cpu_id;
params->activity = activity;
params->itb = itb;
params->dtb = dtb;
params->system = system;
#if FULL_SYSTEM
params->profile = profile;
params->do_quiesce = do_quiesce;
params->do_checkpoint_insts = do_checkpoint_insts;
params->do_statistics_insts = do_statistics_insts;
#else
params->workload = workload;
#endif // FULL_SYSTEM
#if USE_CHECKER
params->checker = checker;
#endif
params->max_insts_any_thread = max_insts_any_thread;
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
params->progress_interval = progress_interval;
//
// Caches
//
params->cachePorts = cachePorts;
params->decodeToFetchDelay = decodeToFetchDelay;
params->renameToFetchDelay = renameToFetchDelay;
params->iewToFetchDelay = iewToFetchDelay;
params->commitToFetchDelay = commitToFetchDelay;
params->fetchWidth = fetchWidth;
params->renameToDecodeDelay = renameToDecodeDelay;
params->iewToDecodeDelay = iewToDecodeDelay;
params->commitToDecodeDelay = commitToDecodeDelay;
params->fetchToDecodeDelay = fetchToDecodeDelay;
params->decodeWidth = decodeWidth;
params->iewToRenameDelay = iewToRenameDelay;
params->commitToRenameDelay = commitToRenameDelay;
params->decodeToRenameDelay = decodeToRenameDelay;
params->renameWidth = renameWidth;
params->commitToIEWDelay = commitToIEWDelay;
params->renameToIEWDelay = renameToIEWDelay;
params->issueToExecuteDelay = issueToExecuteDelay;
params->dispatchWidth = dispatchWidth;
params->issueWidth = issueWidth;
params->wbWidth = wbWidth;
params->wbDepth = wbDepth;
params->fuPool = fuPool;
params->iewToCommitDelay = iewToCommitDelay;
params->renameToROBDelay = renameToROBDelay;
params->commitWidth = commitWidth;
params->squashWidth = squashWidth;
params->trapLatency = trapLatency;
params->backComSize = backComSize;
params->forwardComSize = forwardComSize;
params->predType = predType;
params->localPredictorSize = localPredictorSize;
params->localCtrBits = localCtrBits;
params->localHistoryTableSize = localHistoryTableSize;
params->localHistoryBits = localHistoryBits;
params->globalPredictorSize = globalPredictorSize;
params->globalCtrBits = globalCtrBits;
params->globalHistoryBits = globalHistoryBits;
params->choicePredictorSize = choicePredictorSize;
params->choiceCtrBits = choiceCtrBits;
params->BTBEntries = BTBEntries;
params->BTBTagSize = BTBTagSize;
params->RASSize = RASSize;
params->LQEntries = LQEntries;
params->SQEntries = SQEntries;
params->SSITSize = SSITSize;
params->LFSTSize = LFSTSize;
params->numPhysIntRegs = numPhysIntRegs;
params->numPhysFloatRegs = numPhysFloatRegs;
params->numIQEntries = numIQEntries;
params->numROBEntries = numROBEntries;
params->smtNumFetchingThreads = smtNumFetchingThreads;
// Default smtFetchPolicy to "RoundRobin", if necessary. // Default smtFetchPolicy to "RoundRobin", if necessary.
std::string round_robin_policy = "RoundRobin"; std::string round_robin_policy = "RoundRobin";
std::string single_thread = "SingleThread"; std::string single_thread = "SingleThread";
if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0) if (actual_num_threads > 1 && single_thread.compare(smtFetchPolicy) == 0)
params->smtFetchPolicy = round_robin_policy; smtFetchPolicy = round_robin_policy;
else else
params->smtFetchPolicy = smtFetchPolicy; smtFetchPolicy = smtFetchPolicy;
params->smtIQPolicy = smtIQPolicy; instShiftAmt = 2;
params->smtLSQPolicy = smtLSQPolicy;
params->smtLSQThreshold = smtLSQThreshold;
params->smtROBPolicy = smtROBPolicy;
params->smtROBThreshold = smtROBThreshold;
params->smtCommitPolicy = smtCommitPolicy;
params->instShiftAmt = 2; return new DerivO3CPU(this);
params->deferRegistration = defer_registration;
params->functionTrace = function_trace;
params->functionTraceStart = function_trace_start;
cpu = new DerivO3CPU(params);
return cpu;
} }

6
src/cpu/o3/sparc/cpu_impl.hh
View file

@ -41,7 +41,6 @@
#include "sim/stats.hh" #include "sim/stats.hh"
#include "cpu/o3/sparc/cpu.hh" #include "cpu/o3/sparc/cpu.hh"
#include "cpu/o3/sparc/params.hh"
#include "cpu/o3/sparc/thread_context.hh" #include "cpu/o3/sparc/thread_context.hh"
#include "cpu/o3/comm.hh" #include "cpu/o3/comm.hh"
#include "cpu/o3/thread_state.hh" #include "cpu/o3/thread_state.hh"
@ -54,8 +53,11 @@
#include "sim/system.hh" #include "sim/system.hh"
#endif #endif
#include "params/DerivO3CPU.hh"
template <class Impl> template <class Impl>
SparcO3CPU<Impl>::SparcO3CPU(Params *params) : FullO3CPU<Impl>(this, params) SparcO3CPU<Impl>::SparcO3CPU(DerivO3CPUParams *params) :
FullO3CPU<Impl>(this, params)
{ {
DPRINTF(O3CPU, "Creating SparcO3CPU object.\n"); DPRINTF(O3CPU, "Creating SparcO3CPU object.\n");

4
src/cpu/o3/sparc/impl.hh
View file

@ -33,7 +33,6 @@
#include "arch/sparc/isa_traits.hh" #include "arch/sparc/isa_traits.hh"
#include "cpu/o3/sparc/params.hh"
#include "cpu/o3/cpu_policy.hh" #include "cpu/o3/cpu_policy.hh"
@ -77,9 +76,6 @@ struct SparcSimpleImpl
*/ */
typedef O3CPU CPUType; typedef O3CPU CPUType;
/** The Params to be passed to each stage. */
typedef SparcSimpleParams Params;
enum { enum {
MaxWidth = 8, MaxWidth = 8,
MaxThreads = 4 MaxThreads = 4

61
src/cpu/o3/sparc/params.hh
View file

@ -1,61 +0,0 @@
/*
* Copyright (c) 2004-2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Gabe Black
*/
#ifndef __CPU_O3_SPARC_PARAMS_HH__
#define __CPU_O3_SPARC_PARAMS_HH__
#include "cpu/o3/cpu.hh"
#include "cpu/o3/params.hh"
//Forward declarations
namespace SparcISA
{
class DTB;
class ITB;
}
class MemObject;
class Process;
class System;
/**
* This file defines the parameters that will be used for the AlphaO3CPU.
* This must be defined externally so that the Impl can have a params class
* defined that it can pass to all of the individual stages.
*/
class SparcSimpleParams : public O3Params
{
public:
SparcISA::ITB *itb;
SparcISA::DTB *dtb;
};
#endif // __CPU_O3_SPARC_PARAMS_HH__

4
src/cpu/o3/thread_state.hh
View file

@ -80,8 +80,8 @@ struct O3ThreadState : public ThreadState {
: ThreadState(_cpu, -1, _thread_num), : ThreadState(_cpu, -1, _thread_num),
cpu(_cpu), inSyscall(0), trapPending(0) cpu(_cpu), inSyscall(0), trapPending(0)
{ {
if (cpu->params->profile) { if (cpu->params()->profile) {
profile = new FunctionProfile(cpu->params->system->kernelSymtab); profile = new FunctionProfile(cpu->params()->system->kernelSymtab);
Callback *cb = Callback *cb =
new MakeCallback<O3ThreadState, new MakeCallback<O3ThreadState,
&O3ThreadState::dumpFuncProfile>(this); &O3ThreadState::dumpFuncProfile>(this);

6
src/cpu/simple/AtomicSimpleCPU.py
View file

@ -28,9 +28,9 @@
from m5.params import * from m5.params import *
from m5 import build_env from m5 import build_env
from BaseCPU import BaseCPU from BaseSimpleCPU import BaseSimpleCPU
class AtomicSimpleCPU(BaseCPU): class AtomicSimpleCPU(BaseSimpleCPU):
type = 'AtomicSimpleCPU' type = 'AtomicSimpleCPU'
width = Param.Int(1, "CPU width") width = Param.Int(1, "CPU width")
simulate_data_stalls = Param.Bool(False, "Simulate dcache stall cycles") simulate_data_stalls = Param.Bool(False, "Simulate dcache stall cycles")
@ -42,5 +42,5 @@ class AtomicSimpleCPU(BaseCPU):
icache_port = Port("Instruction Port") icache_port = Port("Instruction Port")
dcache_port = Port("Data Port") dcache_port = Port("Data Port")
physmem_port = Port("Physical Memory Port") physmem_port = Port("Physical Memory Port")
_mem_ports = BaseCPU._mem_ports + \ _mem_ports = BaseSimpleCPU._mem_ports + \
['icache_port', 'dcache_port', 'physmem_port'] ['icache_port', 'dcache_port', 'physmem_port']

34
src/cpu/simple/BaseSimpleCPU.py Normal file
View file

@ -0,0 +1,34 @@
# Copyright (c) 2008 The Hewlett-Packard Development Company
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer;
# redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution;
# neither the name of the copyright holders nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Gabe Black
from m5.params import *
from BaseCPU import BaseCPU
class BaseSimpleCPU(BaseCPU):
type = 'BaseSimpleCPU'
abstract = True

1
src/cpu/simple/SConscript
View file

@ -47,3 +47,4 @@ if 'AtomicSimpleCPU' in env['CPU_MODELS'] or \
if need_simple_base: if need_simple_base:
Source('base.cc') Source('base.cc')
SimObject('BaseSimpleCPU.py')

6
src/cpu/simple/TimingSimpleCPU.py
View file

@ -28,9 +28,9 @@
from m5.params import * from m5.params import *
from m5 import build_env from m5 import build_env
from BaseCPU import BaseCPU from BaseSimpleCPU import BaseSimpleCPU
class TimingSimpleCPU(BaseCPU): class TimingSimpleCPU(BaseSimpleCPU):
type = 'TimingSimpleCPU' type = 'TimingSimpleCPU'
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, "Cycle to start function trace")
@ -38,4 +38,4 @@ class TimingSimpleCPU(BaseCPU):
profile = Param.Latency('0ns', "trace the kernel stack") profile = Param.Latency('0ns', "trace the kernel stack")
icache_port = Port("Instruction Port") icache_port = Port("Instruction Port")
dcache_port = Port("Data Port") dcache_port = Port("Data Port")
_mem_ports = BaseCPU._mem_ports + ['icache_port', 'dcache_port'] _mem_ports = BaseSimpleCPU._mem_ports + ['icache_port', 'dcache_port']

37
src/cpu/simple/atomic.cc
View file

@ -152,7 +152,7 @@ AtomicSimpleCPU::DcachePort::setPeer(Port *port)
#endif #endif
} }
AtomicSimpleCPU::AtomicSimpleCPU(Params *p) AtomicSimpleCPU::AtomicSimpleCPU(AtomicSimpleCPUParams *p)
: BaseSimpleCPU(p), tickEvent(this), width(p->width), : BaseSimpleCPU(p), tickEvent(this), width(p->width),
simulate_data_stalls(p->simulate_data_stalls), simulate_data_stalls(p->simulate_data_stalls),
simulate_inst_stalls(p->simulate_inst_stalls), simulate_inst_stalls(p->simulate_inst_stalls),
@ -812,39 +812,10 @@ AtomicSimpleCPU::printAddr(Addr a)
AtomicSimpleCPU * AtomicSimpleCPU *
AtomicSimpleCPUParams::create() AtomicSimpleCPUParams::create()
{ {
AtomicSimpleCPU::Params *params = new AtomicSimpleCPU::Params(); numThreads = 1;
params->name = name; #if !FULL_SYSTEM
params->numberOfThreads = 1;
params->max_insts_any_thread = max_insts_any_thread;
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
params->progress_interval = progress_interval;
params->deferRegistration = defer_registration;
params->phase = phase;
params->clock = clock;
params->functionTrace = function_trace;
params->functionTraceStart = function_trace_start;
params->width = width;
params->simulate_data_stalls = simulate_data_stalls;
params->simulate_inst_stalls = simulate_inst_stalls;
params->system = system;
params->cpu_id = cpu_id;
params->tracer = tracer;
params->itb = itb;
params->dtb = dtb;
#if FULL_SYSTEM
params->profile = profile;
params->do_quiesce = do_quiesce;
params->do_checkpoint_insts = do_checkpoint_insts;
params->do_statistics_insts = do_statistics_insts;
#else
if (workload.size() != 1) if (workload.size() != 1)
panic("only one workload allowed"); panic("only one workload allowed");
params->process = workload[0];
#endif #endif
return new AtomicSimpleCPU(this);
AtomicSimpleCPU *cpu = new AtomicSimpleCPU(params);
return cpu;
} }

9
src/cpu/simple/atomic.hh
View file

@ -32,18 +32,13 @@
#define __CPU_SIMPLE_ATOMIC_HH__ #define __CPU_SIMPLE_ATOMIC_HH__
#include "cpu/simple/base.hh" #include "cpu/simple/base.hh"
#include "params/AtomicSimpleCPU.hh"
class AtomicSimpleCPU : public BaseSimpleCPU class AtomicSimpleCPU : public BaseSimpleCPU
{ {
public: public:
struct Params : public BaseSimpleCPU::Params { AtomicSimpleCPU(AtomicSimpleCPUParams *params);
int width;
bool simulate_data_stalls;
bool simulate_inst_stalls;
};
AtomicSimpleCPU(Params *params);
virtual ~AtomicSimpleCPU(); virtual ~AtomicSimpleCPU();
virtual void init(); virtual void init();

6
src/cpu/simple/base.cc
View file

@ -65,16 +65,18 @@
#include "mem/mem_object.hh" #include "mem/mem_object.hh"
#endif // FULL_SYSTEM #endif // FULL_SYSTEM
#include "params/BaseSimpleCPU.hh"
using namespace std; using namespace std;
using namespace TheISA; using namespace TheISA;
BaseSimpleCPU::BaseSimpleCPU(Params *p) BaseSimpleCPU::BaseSimpleCPU(BaseSimpleCPUParams *p)
: BaseCPU(p), traceData(NULL), thread(NULL), predecoder(NULL) : BaseCPU(p), traceData(NULL), thread(NULL), predecoder(NULL)
{ {
#if FULL_SYSTEM #if FULL_SYSTEM
thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb); thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb);
#else #else
thread = new SimpleThread(this, /* thread_num */ 0, p->process, thread = new SimpleThread(this, /* thread_num */ 0, p->workload[0],
p->itb, p->dtb, /* asid */ 0); p->itb, p->dtb, /* asid */ 0);
#endif // !FULL_SYSTEM #endif // !FULL_SYSTEM

12
src/cpu/simple/base.hh
View file

@ -76,6 +76,8 @@ namespace Trace {
class InstRecord; class InstRecord;
} }
class BaseSimpleCPUParams;
class BaseSimpleCPU : public BaseCPU class BaseSimpleCPU : public BaseCPU
{ {
@ -107,15 +109,7 @@ class BaseSimpleCPU : public BaseCPU
}; };
public: public:
struct Params : public BaseCPU::Params BaseSimpleCPU(BaseSimpleCPUParams *params);
{
TheISA::ITB *itb;
TheISA::DTB *dtb;
#if !FULL_SYSTEM
Process *process;
#endif
};
BaseSimpleCPU(Params *params);
virtual ~BaseSimpleCPU(); virtual ~BaseSimpleCPU();
public: public:

34
src/cpu/simple/timing.cc
View file

@ -104,7 +104,7 @@ TimingSimpleCPU::CpuPort::TickEvent::schedule(PacketPtr _pkt, Tick t)
Event::schedule(t); Event::schedule(t);
} }
TimingSimpleCPU::TimingSimpleCPU(Params *p) TimingSimpleCPU::TimingSimpleCPU(TimingSimpleCPUParams *p)
: BaseSimpleCPU(p), icachePort(this, p->clock), dcachePort(this, p->clock) : BaseSimpleCPU(p), icachePort(this, p->clock), dcachePort(this, p->clock)
{ {
_status = Idle; _status = Idle;
@ -852,36 +852,10 @@ TimingSimpleCPU::printAddr(Addr a)
TimingSimpleCPU * TimingSimpleCPU *
TimingSimpleCPUParams::create() TimingSimpleCPUParams::create()
{ {
TimingSimpleCPU::Params *params = new TimingSimpleCPU::Params(); numThreads = 1;
params->name = name; #if !FULL_SYSTEM
params->numberOfThreads = 1;
params->max_insts_any_thread = max_insts_any_thread;
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
params->progress_interval = progress_interval;
params->deferRegistration = defer_registration;
params->clock = clock;
params->phase = phase;
params->functionTrace = function_trace;
params->functionTraceStart = function_trace_start;
params->system = system;
params->cpu_id = cpu_id;
params->tracer = tracer;
params->itb = itb;
params->dtb = dtb;
#if FULL_SYSTEM
params->profile = profile;
params->do_quiesce = do_quiesce;
params->do_checkpoint_insts = do_checkpoint_insts;
params->do_statistics_insts = do_statistics_insts;
#else
if (workload.size() != 1) if (workload.size() != 1)
panic("only one workload allowed"); panic("only one workload allowed");
params->process = workload[0];
#endif #endif
return new TimingSimpleCPU(this);
TimingSimpleCPU *cpu = new TimingSimpleCPU(params);
return cpu;
} }

7
src/cpu/simple/timing.hh
View file

@ -33,14 +33,13 @@
#include "cpu/simple/base.hh" #include "cpu/simple/base.hh"
#include "params/TimingSimpleCPU.hh"
class TimingSimpleCPU : public BaseSimpleCPU class TimingSimpleCPU : public BaseSimpleCPU
{ {
public: public:
struct Params : public BaseSimpleCPU::Params { TimingSimpleCPU(TimingSimpleCPUParams * params);
};
TimingSimpleCPU(Params *params);
virtual ~TimingSimpleCPU(); virtual ~TimingSimpleCPU();
virtual void init(); virtual void init();

7
src/cpu/simple_thread.cc
View file

@ -37,9 +37,11 @@
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/simple_thread.hh" #include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
#include "params/BaseCPU.hh"
#if FULL_SYSTEM #if FULL_SYSTEM
#include "arch/kernel_stats.hh" #include "arch/kernel_stats.hh"
#include "arch/stacktrace.hh"
#include "base/callback.hh" #include "base/callback.hh"
#include "base/cprintf.hh" #include "base/cprintf.hh"
#include "base/output.hh" #include "base/output.hh"
@ -48,11 +50,10 @@
#include "cpu/quiesce_event.hh" #include "cpu/quiesce_event.hh"
#include "sim/serialize.hh" #include "sim/serialize.hh"
#include "sim/sim_exit.hh" #include "sim/sim_exit.hh"
#include "arch/stacktrace.hh"
#else #else
#include "mem/translating_port.hh"
#include "sim/process.hh" #include "sim/process.hh"
#include "sim/system.hh" #include "sim/system.hh"
#include "mem/translating_port.hh"
#endif #endif
using namespace std; using namespace std;
@ -72,7 +73,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
regs.clear(); regs.clear();
if (cpu->params->profile) { if (cpu->params()->profile) {
profile = new FunctionProfile(system->kernelSymtab); profile = new FunctionProfile(system->kernelSymtab);
Callback *cb = Callback *cb =
new MakeCallback<SimpleThread, new MakeCallback<SimpleThread,

17
src/sim/pseudo_inst.cc
View file

@ -35,12 +35,13 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include "arch/kernel_stats.hh"
#include "arch/vtophys.hh" #include "arch/vtophys.hh"
#include "base/annotate.hh" #include "base/annotate.hh"
#include "cpu/base.hh" #include "cpu/base.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
#include "cpu/quiesce_event.hh" #include "cpu/quiesce_event.hh"
#include "arch/kernel_stats.hh" #include "params/BaseCPU.hh"
#include "sim/pseudo_inst.hh" #include "sim/pseudo_inst.hh"
#include "sim/serialize.hh" #include "sim/serialize.hh"
#include "sim/sim_exit.hh" #include "sim/sim_exit.hh"
@ -67,7 +68,7 @@ arm(ThreadContext *tc)
void void
quiesce(ThreadContext *tc) quiesce(ThreadContext *tc)
{ {
if (!tc->getCpuPtr()->params->do_quiesce) if (!tc->getCpuPtr()->params()->do_quiesce)
return; return;
DPRINTF(Quiesce, "%s: quiesce()\n", tc->getCpuPtr()->name()); DPRINTF(Quiesce, "%s: quiesce()\n", tc->getCpuPtr()->name());
@ -80,7 +81,7 @@ quiesce(ThreadContext *tc)
void void
quiesceNs(ThreadContext *tc, uint64_t ns) quiesceNs(ThreadContext *tc, uint64_t ns)
{ {
if (!tc->getCpuPtr()->params->do_quiesce || ns == 0) if (!tc->getCpuPtr()->params()->do_quiesce || ns == 0)
return; return;
EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent(); EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
@ -100,7 +101,7 @@ quiesceNs(ThreadContext *tc, uint64_t ns)
void void
quiesceCycles(ThreadContext *tc, uint64_t cycles) quiesceCycles(ThreadContext *tc, uint64_t cycles)
{ {
if (!tc->getCpuPtr()->params->do_quiesce || cycles == 0) if (!tc->getCpuPtr()->params()->do_quiesce || cycles == 0)
return; return;
EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent(); EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
@ -181,7 +182,7 @@ loadsymbol(ThreadContext *tc)
void void
resetstats(ThreadContext *tc, Tick delay, Tick period) resetstats(ThreadContext *tc, Tick delay, Tick period)
{ {
if (!tc->getCpuPtr()->params->do_statistics_insts) if (!tc->getCpuPtr()->params()->do_statistics_insts)
return; return;
@ -194,7 +195,7 @@ resetstats(ThreadContext *tc, Tick delay, Tick period)
void void
dumpstats(ThreadContext *tc, Tick delay, Tick period) dumpstats(ThreadContext *tc, Tick delay, Tick period)
{ {
if (!tc->getCpuPtr()->params->do_statistics_insts) if (!tc->getCpuPtr()->params()->do_statistics_insts)
return; return;
@ -219,7 +220,7 @@ addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
void void
dumpresetstats(ThreadContext *tc, Tick delay, Tick period) dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
{ {
if (!tc->getCpuPtr()->params->do_statistics_insts) if (!tc->getCpuPtr()->params()->do_statistics_insts)
return; return;
@ -232,7 +233,7 @@ dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
void void
m5checkpoint(ThreadContext *tc, Tick delay, Tick period) m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
{ {
if (!tc->getCpuPtr()->params->do_checkpoint_insts) if (!tc->getCpuPtr()->params()->do_checkpoint_insts)
return; return;
Tick when = curTick + delay * Clock::Int::ns; Tick when = curTick + delay * Clock::Int::ns;