248bd2bb62
cpu/o3/2bit_local_pred.cc: Branch predictor cleanup/fixup. Rename this to LocalBP. cpu/o3/2bit_local_pred.hh: Rename to LocalBP, update to support changes to BPredUnit, include comments. cpu/o3/alpha_cpu_builder.cc: Support extra parameters to the branch predictor. Now it takes in a parameter to tell it which branch predictor it is using, the local or the tournament predictor. cpu/o3/alpha_params.hh: Add in extra parameter for the branch predictor type. cpu/o3/bpred_unit.cc: Branch predictor fixup/cleanup. Rename it to BPredUnit. cpu/o3/bpred_unit.hh: Branch predictor fixup/cleanup. Now supports both the local and tournament predictors, and stores the branch predictor update state. cpu/o3/bpred_unit_impl.hh: Branch predictor overhaul. Now supports both the local and tournament predictors. cpu/o3/cpu_policy.hh: cpu/ozone/ozone_impl.hh: cpu/ozone/simple_impl.hh: Reflect the class name change. cpu/o3/decode_impl.hh: Be sure to set the predicted target as well so we don't squash twice. cpu/o3/tournament_pred.cc: cpu/o3/tournament_pred.hh: Fixes to the tournament predictor. cpu/ozone/simple_params.hh: Include parameter for the branch predictor type. python/m5/objects/AlphaFullCPU.py: python/m5/objects/OzoneCPU.py: Include the parameter for the branch predictor type. --HG-- extra : convert_revision : 34afebb3b40b47accb12558e439ee4cb03df5e64
143 lines
4.5 KiB
C++
143 lines
4.5 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "base/intmath.hh"
|
|
#include "base/trace.hh"
|
|
#include "cpu/o3/2bit_local_pred.hh"
|
|
|
|
LocalBP::LocalBP(unsigned _localPredictorSize,
|
|
unsigned _localCtrBits,
|
|
unsigned _instShiftAmt)
|
|
: localPredictorSize(_localPredictorSize),
|
|
localCtrBits(_localCtrBits),
|
|
instShiftAmt(_instShiftAmt)
|
|
{
|
|
if (!isPowerOf2(localPredictorSize)) {
|
|
fatal("Invalid local predictor size!\n");
|
|
}
|
|
|
|
localPredictorSets = localPredictorSize / localCtrBits;
|
|
|
|
if (!isPowerOf2(localPredictorSets)) {
|
|
fatal("Invalid number of local predictor sets! Check localCtrBits.\n");
|
|
}
|
|
|
|
// Setup the index mask.
|
|
indexMask = localPredictorSets - 1;
|
|
|
|
DPRINTF(Fetch, "Branch predictor: index mask: %#x\n", indexMask);
|
|
|
|
// Setup the array of counters for the local predictor.
|
|
localCtrs.resize(localPredictorSets);
|
|
|
|
for (int i = 0; i < localPredictorSets; ++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);
|
|
}
|
|
|
|
void
|
|
LocalBP::reset()
|
|
{
|
|
for (int i = 0; i < localPredictorSets; ++i) {
|
|
localCtrs[i].reset();
|
|
}
|
|
}
|
|
|
|
bool
|
|
LocalBP::lookup(Addr &branch_addr, void * &bp_history)
|
|
{
|
|
bool taken;
|
|
uint8_t counter_val;
|
|
unsigned local_predictor_idx = getLocalIndex(branch_addr);
|
|
|
|
DPRINTF(Fetch, "Branch predictor: Looking up index %#x\n",
|
|
local_predictor_idx);
|
|
|
|
counter_val = localCtrs[local_predictor_idx].read();
|
|
|
|
DPRINTF(Fetch, "Branch predictor: prediction is %i.\n",
|
|
(int)counter_val);
|
|
|
|
taken = getPrediction(counter_val);
|
|
|
|
#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
|
|
LocalBP::update(Addr &branch_addr, bool taken, void *bp_history)
|
|
{
|
|
assert(bp_history == NULL);
|
|
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);
|
|
|
|
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();
|
|
}
|
|
}
|
|
|
|
inline
|
|
bool
|
|
LocalBP::getPrediction(uint8_t &count)
|
|
{
|
|
// Get the MSB of the count
|
|
return (count >> (localCtrBits - 1));
|
|
}
|
|
|
|
inline
|
|
unsigned
|
|
LocalBP::getLocalIndex(Addr &branch_addr)
|
|
{
|
|
return (branch_addr >> instShiftAmt) & indexMask;
|
|
}
|