984c2a4ff6
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge src/cpu/checker/o3_cpu_builder.cc: src/cpu/o3/alpha_cpu.hh: src/cpu/o3/alpha_cpu_impl.hh: src/cpu/o3/alpha_dyn_inst_impl.hh: src/cpu/o3/bpred_unit.cc: src/cpu/o3/commit.hh: src/cpu/o3/fetch_impl.hh: src/cpu/o3/lsq_unit.hh: src/cpu/o3/lsq_unit_impl.hh: src/cpu/o3/thread_state.hh: Hand merge. --HG-- rename : cpu/activity.cc => src/cpu/activity.cc rename : cpu/activity.hh => src/cpu/activity.hh rename : cpu/base_dyn_inst.cc => src/cpu/base_dyn_inst.cc rename : cpu/checker/cpu.hh => src/cpu/checker/cpu.hh rename : cpu/checker/cpu_builder.cc => src/cpu/checker/cpu_builder.cc rename : cpu/checker/exec_context.hh => src/cpu/checker/exec_context.hh rename : cpu/checker/o3_cpu_builder.cc => src/cpu/checker/o3_cpu_builder.cc rename : cpu/o3/2bit_local_pred.cc => src/cpu/o3/2bit_local_pred.cc rename : cpu/o3/2bit_local_pred.hh => src/cpu/o3/2bit_local_pred.hh rename : cpu/o3/alpha_cpu.hh => src/cpu/o3/alpha_cpu.hh rename : cpu/o3/alpha_cpu_builder.cc => src/cpu/o3/alpha_cpu_builder.cc rename : cpu/o3/alpha_cpu_impl.hh => src/cpu/o3/alpha_cpu_impl.hh rename : cpu/o3/alpha_dyn_inst.hh => src/cpu/o3/alpha_dyn_inst.hh rename : cpu/o3/alpha_dyn_inst_impl.hh => src/cpu/o3/alpha_dyn_inst_impl.hh rename : cpu/o3/alpha_params.hh => src/cpu/o3/alpha_params.hh rename : cpu/o3/bpred_unit.cc => src/cpu/o3/bpred_unit.cc rename : cpu/o3/bpred_unit.hh => src/cpu/o3/bpred_unit.hh rename : cpu/o3/bpred_unit_impl.hh => src/cpu/o3/bpred_unit_impl.hh rename : cpu/o3/comm.hh => src/cpu/o3/comm.hh rename : cpu/o3/commit.hh => src/cpu/o3/commit.hh rename : cpu/o3/commit_impl.hh => src/cpu/o3/commit_impl.hh rename : cpu/o3/cpu.hh => src/cpu/o3/cpu.hh rename : cpu/o3/cpu_policy.hh => src/cpu/o3/cpu_policy.hh rename : cpu/o3/decode.hh => src/cpu/o3/decode.hh rename : cpu/o3/decode_impl.hh => src/cpu/o3/decode_impl.hh rename : cpu/o3/dep_graph.hh => src/cpu/o3/dep_graph.hh rename : cpu/o3/fetch.hh => src/cpu/o3/fetch.hh rename : cpu/o3/fetch_impl.hh => src/cpu/o3/fetch_impl.hh rename : cpu/o3/fu_pool.cc => src/cpu/o3/fu_pool.cc rename : cpu/o3/fu_pool.hh => src/cpu/o3/fu_pool.hh rename : cpu/o3/iew.hh => src/cpu/o3/iew.hh rename : cpu/o3/iew_impl.hh => src/cpu/o3/iew_impl.hh rename : cpu/o3/inst_queue.hh => src/cpu/o3/inst_queue.hh rename : cpu/o3/inst_queue_impl.hh => src/cpu/o3/inst_queue_impl.hh rename : cpu/o3/lsq.hh => src/cpu/o3/lsq.hh rename : cpu/o3/lsq_unit.hh => src/cpu/o3/lsq_unit.hh rename : cpu/o3/lsq_unit_impl.hh => src/cpu/o3/lsq_unit_impl.hh rename : cpu/o3/mem_dep_unit.hh => src/cpu/o3/mem_dep_unit.hh rename : cpu/o3/mem_dep_unit_impl.hh => src/cpu/o3/mem_dep_unit_impl.hh rename : cpu/o3/rename.hh => src/cpu/o3/rename.hh rename : cpu/o3/rename_impl.hh => src/cpu/o3/rename_impl.hh rename : cpu/o3/rename_map.hh => src/cpu/o3/rename_map.hh rename : cpu/o3/rob.hh => src/cpu/o3/rob.hh rename : cpu/o3/store_set.cc => src/cpu/o3/store_set.cc rename : cpu/o3/store_set.hh => src/cpu/o3/store_set.hh rename : cpu/o3/thread_state.hh => src/cpu/o3/thread_state.hh rename : cpu/o3/tournament_pred.cc => src/cpu/o3/tournament_pred.cc rename : cpu/o3/tournament_pred.hh => src/cpu/o3/tournament_pred.hh rename : cpu/ozone/cpu_builder.cc => src/cpu/ozone/cpu_builder.cc rename : cpu/ozone/ozone_impl.hh => src/cpu/ozone/ozone_impl.hh rename : cpu/ozone/simple_impl.hh => src/cpu/ozone/simple_impl.hh rename : cpu/ozone/simple_params.hh => src/cpu/ozone/simple_params.hh rename : python/m5/objects/AlphaFullCPU.py => src/python/m5/objects/AlphaFullCPU.py rename : python/m5/objects/OzoneCPU.py => src/python/m5/objects/OzoneCPU.py extra : convert_revision : b7be30474dd03dd3970e737a9d0489aeb2ead84f
146 lines
4.6 KiB
C++
146 lines
4.6 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.
|
|
*
|
|
* Authors: Kevin Lim
|
|
*/
|
|
|
|
#include "base/intmath.hh"
|
|
#include "base/misc.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;
|
|
}
|