5c4714c1a9
SConscript:
Include new files.
arch/alpha/isa_desc:
Make the eaCompPtr and memAccPtr non-const so that execute() can be called on them.
arch/alpha/isa_traits.hh:
Add enum for total number of data registers.
arch/isa_parser.py:
base/traceflags.py:
Include new light-weight OoO CPU model.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
Changes to abstract more away from the base dyn inst class.
cpu/beta_cpu/2bit_local_pred.cc:
cpu/beta_cpu/2bit_local_pred.hh:
cpu/beta_cpu/tournament_pred.cc:
cpu/beta_cpu/tournament_pred.hh:
Remove redundant SatCounter class.
cpu/beta_cpu/alpha_dyn_inst.cc:
cpu/beta_cpu/alpha_full_cpu.cc:
cpu/beta_cpu/alpha_full_cpu.hh:
cpu/beta_cpu/bpred_unit.cc:
cpu/beta_cpu/inst_queue.cc:
cpu/beta_cpu/mem_dep_unit.cc:
cpu/beta_cpu/ras.cc:
cpu/beta_cpu/rename_map.cc:
cpu/beta_cpu/rename_map.hh:
cpu/beta_cpu/rob.cc:
Fix for gcc-3.4
cpu/beta_cpu/alpha_dyn_inst.hh:
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
Fixes for gcc-3.4.
Include more variables and functions that are specific to AlphaDynInst which were once in BaseDynInst.
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Make params match the current params inherited from BaseCPU.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Fixes for gcc-3.4
cpu/beta_cpu/full_cpu.cc:
Use new params pointer in BaseCPU.
Fix for gcc-3.4.
cpu/beta_cpu/full_cpu.hh:
Use new params class from BaseCPU.
cpu/beta_cpu/iew_impl.hh:
Remove unused function.
cpu/simple_cpu/simple_cpu.cc:
Remove unused global variable.
cpu/static_inst.hh:
Include OoODynInst for new lightweight OoO CPU
--HG--
extra : convert_revision : 34d9f2e64ca0313377391e0d059bf09c040286fa
106 lines
2.9 KiB
C++
106 lines
2.9 KiB
C++
#include "base/trace.hh"
|
|
#include "cpu/beta_cpu/2bit_local_pred.hh"
|
|
|
|
DefaultBP::DefaultBP(unsigned _localPredictorSize,
|
|
unsigned _localCtrBits,
|
|
unsigned _instShiftAmt)
|
|
: localPredictorSize(_localPredictorSize),
|
|
localCtrBits(_localCtrBits),
|
|
instShiftAmt(_instShiftAmt)
|
|
{
|
|
// Should do checks here to make sure sizes are correct (powers of 2).
|
|
|
|
// Setup the index mask.
|
|
indexMask = localPredictorSize - 1;
|
|
|
|
DPRINTF(Fetch, "Branch predictor: index mask: %#x\n", indexMask);
|
|
|
|
// Setup the array of counters for the local predictor.
|
|
localCtrs = new SatCounter[localPredictorSize];
|
|
|
|
for (int i = 0; i < localPredictorSize; ++i)
|
|
localCtrs[i].setBits(_localCtrBits);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: local predictor size: %i\n",
|
|
localPredictorSize);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: local counter bits: %i\n", localCtrBits);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: instruction shift amount: %i\n",
|
|
instShiftAmt);
|
|
}
|
|
|
|
inline
|
|
bool
|
|
DefaultBP::getPrediction(uint8_t &count)
|
|
{
|
|
// Get the MSB of the count
|
|
return (count >> (localCtrBits - 1));
|
|
}
|
|
|
|
inline
|
|
unsigned
|
|
DefaultBP::getLocalIndex(Addr &branch_addr)
|
|
{
|
|
return (branch_addr >> instShiftAmt) & indexMask;
|
|
}
|
|
|
|
bool
|
|
DefaultBP::lookup(Addr &branch_addr)
|
|
{
|
|
bool taken;
|
|
uint8_t local_prediction;
|
|
unsigned local_predictor_idx = getLocalIndex(branch_addr);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: Looking up index %#x\n",
|
|
local_predictor_idx);
|
|
|
|
assert(local_predictor_idx < localPredictorSize);
|
|
|
|
local_prediction = localCtrs[local_predictor_idx].read();
|
|
|
|
DPRINTF(Fetch, "Branch predictor: prediction is %i.\n",
|
|
(int)local_prediction);
|
|
|
|
taken = getPrediction(local_prediction);
|
|
|
|
#if 0
|
|
// Speculative update.
|
|
if (taken) {
|
|
DPRINTF(Fetch, "Branch predictor: Branch updated as taken.\n");
|
|
localCtrs[local_predictor_idx].increment();
|
|
} else {
|
|
DPRINTF(Fetch, "Branch predictor: Branch updated as not taken.\n");
|
|
localCtrs[local_predictor_idx].decrement();
|
|
}
|
|
#endif
|
|
|
|
return taken;
|
|
}
|
|
|
|
void
|
|
DefaultBP::update(Addr &branch_addr, bool taken)
|
|
{
|
|
unsigned local_predictor_idx;
|
|
|
|
// Update the local predictor.
|
|
local_predictor_idx = getLocalIndex(branch_addr);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: Looking up index %#x\n",
|
|
local_predictor_idx);
|
|
|
|
assert(local_predictor_idx < localPredictorSize);
|
|
|
|
// Increment or decrement twice to undo speculative update, then
|
|
// properly update
|
|
if (taken) {
|
|
DPRINTF(Fetch, "Branch predictor: Branch updated as taken.\n");
|
|
localCtrs[local_predictor_idx].increment();
|
|
// localCtrs[local_predictor_idx].increment();
|
|
} else {
|
|
DPRINTF(Fetch, "Branch predictor: Branch updated as not taken.\n");
|
|
localCtrs[local_predictor_idx].decrement();
|
|
// localCtrs[local_predictor_idx].decrement();
|
|
}
|
|
}
|