497cc2d373
The Minor and o3 cpu models share the branch prediction code. Minor relies on the BPredUnit::squash() function to update the branch predictor tables on a branch mispre- diction. This is fine because Minor executes in-order, so the update is on the correct path. However, this causes the branch predictor to be updated on out-of-order branch mispredictions when using the o3 model, which should not be the case. This patch guards against speculative update of the branch prediction tables. On a branch misprediction, BPredUnit::squash() calls BpredUnit::update(..., squashed = true). The underlying branch predictor tests against the value of squashed. If it is true, it restores any speculatively updated internal state it might have (e.g., global/local branch history), then returns. If false, it updates its prediction tables. Previously, exist- ing predictors did not test against the "squashed" parameter. To accomodate for this change, the Minor model must now call BPredUnit::squash() then BPredUnit::update(..., squashed = false) on branch mispredictions. Before, calling BpredUnit::squash() performed the prediction tables update. The effect is a slight MPKI improvement when using the o3 model. A further patch should perform the same modifications for the indirect target predictor and BTB (less critical). Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
131 lines
4.9 KiB
C++
131 lines
4.9 KiB
C++
/*
|
|
* Copyright (c) 2011, 2014 ARM Limited
|
|
* All rights reserved
|
|
*
|
|
* The license below extends only to copyright in the software and shall
|
|
* not be construed as granting a license to any other intellectual
|
|
* property including but not limited to intellectual property relating
|
|
* to a hardware implementation of the functionality of the software
|
|
* licensed hereunder. You may use the software subject to the license
|
|
* terms below provided that you ensure that this notice is replicated
|
|
* unmodified and in its entirety in all distributions of the software,
|
|
* modified or unmodified, in source code or in binary form.
|
|
*
|
|
* 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
|
|
* Timothy M. Jones
|
|
*/
|
|
|
|
#ifndef __CPU_PRED_2BIT_LOCAL_PRED_HH__
|
|
#define __CPU_PRED_2BIT_LOCAL_PRED_HH__
|
|
|
|
#include <vector>
|
|
|
|
#include "base/types.hh"
|
|
#include "cpu/pred/bpred_unit.hh"
|
|
#include "cpu/pred/sat_counter.hh"
|
|
#include "params/LocalBP.hh"
|
|
|
|
/**
|
|
* Implements a local predictor that uses the PC to index into a table of
|
|
* counters. Note that any time a pointer to the bp_history is given, it
|
|
* should be NULL using this predictor because it does not have any branch
|
|
* predictor state that needs to be recorded or updated; the update can be
|
|
* determined solely by the branch being taken or not taken.
|
|
*/
|
|
class LocalBP : public BPredUnit
|
|
{
|
|
public:
|
|
/**
|
|
* Default branch predictor constructor.
|
|
*/
|
|
LocalBP(const LocalBPParams *params);
|
|
|
|
virtual void uncondBranch(ThreadID tid, Addr pc, void * &bp_history);
|
|
|
|
/**
|
|
* Looks up the given address in the branch predictor and returns
|
|
* a true/false value as to whether it is taken.
|
|
* @param branch_addr The address of the branch to look up.
|
|
* @param bp_history Pointer to any bp history state.
|
|
* @return Whether or not the branch is taken.
|
|
*/
|
|
bool lookup(ThreadID tid, Addr branch_addr, void * &bp_history);
|
|
|
|
/**
|
|
* Updates the branch predictor to Not Taken if a BTB entry is
|
|
* invalid or not found.
|
|
* @param branch_addr The address of the branch to look up.
|
|
* @param bp_history Pointer to any bp history state.
|
|
* @return Whether or not the branch is taken.
|
|
*/
|
|
void btbUpdate(ThreadID tid, Addr branch_addr, void * &bp_history);
|
|
|
|
/**
|
|
* Updates the branch predictor with the actual result of a branch.
|
|
* @param branch_addr The address of the branch to update.
|
|
* @param taken Whether or not the branch was taken.
|
|
*/
|
|
void update(ThreadID tid, Addr branch_addr, bool taken, void *bp_history,
|
|
bool squashed);
|
|
|
|
void squash(ThreadID tid, void *bp_history)
|
|
{ assert(bp_history == NULL); }
|
|
|
|
void reset();
|
|
|
|
private:
|
|
/**
|
|
* Returns the taken/not taken prediction given the value of the
|
|
* counter.
|
|
* @param count The value of the counter.
|
|
* @return The prediction based on the counter value.
|
|
*/
|
|
inline bool getPrediction(uint8_t &count);
|
|
|
|
/** Calculates the local index based on the PC. */
|
|
inline unsigned getLocalIndex(Addr &PC);
|
|
|
|
/** Array of counters that make up the local predictor. */
|
|
std::vector<SatCounter> localCtrs;
|
|
|
|
/** Size of the local predictor. */
|
|
unsigned localPredictorSize;
|
|
|
|
/** Number of sets. */
|
|
unsigned localPredictorSets;
|
|
|
|
/** Number of bits of the local predictor's counters. */
|
|
unsigned localCtrBits;
|
|
|
|
/** Mask to get index bits. */
|
|
unsigned indexMask;
|
|
};
|
|
|
|
#endif // __CPU_PRED_2BIT_LOCAL_PRED_HH__
|