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
115 lines
3.3 KiB
C++
115 lines
3.3 KiB
C++
#ifndef __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|
|
#define __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|
|
|
|
// For Addr type.
|
|
#include "arch/alpha/isa_traits.hh"
|
|
#include "cpu/beta_cpu/sat_counter.hh"
|
|
|
|
class TournamentBP
|
|
{
|
|
public:
|
|
/**
|
|
* Default branch predictor constructor.
|
|
*/
|
|
TournamentBP(unsigned local_predictor_size,
|
|
unsigned local_ctr_bits,
|
|
unsigned local_history_table_size,
|
|
unsigned local_history_bits,
|
|
unsigned global_predictor_size,
|
|
unsigned global_history_bits,
|
|
unsigned global_ctr_bits,
|
|
unsigned choice_predictor_size,
|
|
unsigned choice_ctr_bits,
|
|
unsigned instShiftAmt);
|
|
|
|
/**
|
|
* 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.
|
|
* @return Whether or not the branch is taken.
|
|
*/
|
|
bool lookup(Addr &branch_addr);
|
|
|
|
/**
|
|
* 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(Addr &branch_addr, unsigned global_history, bool taken);
|
|
|
|
inline unsigned readGlobalHist() { return global_history; }
|
|
|
|
private:
|
|
|
|
inline bool getPrediction(uint8_t &count);
|
|
|
|
inline unsigned calcLocHistIdx(Addr &branch_addr);
|
|
|
|
inline void updateHistoriesTaken(unsigned local_history_idx);
|
|
|
|
inline void updateHistoriesNotTaken(unsigned local_history_idx);
|
|
|
|
/** Local counters. */
|
|
SatCounter *local_ctrs;
|
|
|
|
/** Size of the local predictor. */
|
|
unsigned local_predictor_size;
|
|
|
|
/** Number of bits of the local predictor's counters. */
|
|
unsigned local_ctr_bits;
|
|
|
|
/** Array of local history table entries. */
|
|
unsigned *local_history_table;
|
|
|
|
/** Size of the local history table. */
|
|
unsigned local_history_table_size;
|
|
|
|
/** Number of bits for each entry of the local history table.
|
|
* @todo Doesn't this come from the size of the local predictor?
|
|
*/
|
|
unsigned local_history_bits;
|
|
|
|
/** Mask to get the proper local history. */
|
|
unsigned localHistoryMask;
|
|
|
|
|
|
/** Array of counters that make up the global predictor. */
|
|
SatCounter *global_ctrs;
|
|
|
|
/** Size of the global predictor. */
|
|
unsigned global_predictor_size;
|
|
|
|
/** Number of bits of the global predictor's counters. */
|
|
unsigned global_ctr_bits;
|
|
|
|
/** Global history register. */
|
|
unsigned global_history;
|
|
|
|
/** Number of bits for the global history. */
|
|
unsigned global_history_bits;
|
|
|
|
/** Mask to get the proper global history. */
|
|
unsigned globalHistoryMask;
|
|
|
|
|
|
/** Array of counters that make up the choice predictor. */
|
|
SatCounter *choice_ctrs;
|
|
|
|
/** Size of the choice predictor (identical to the global predictor). */
|
|
unsigned choice_predictor_size;
|
|
|
|
/** Number of bits of the choice predictor's counters. */
|
|
unsigned choice_ctr_bits;
|
|
|
|
/** Number of bits to shift the instruction over to get rid of the word
|
|
* offset.
|
|
*/
|
|
unsigned instShiftAmt;
|
|
|
|
/** Threshold for the counter value; above the threshold is taken,
|
|
* equal to or below the threshold is not taken.
|
|
*/
|
|
unsigned threshold;
|
|
};
|
|
|
|
#endif // __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|