2005-02-26 00:00:49 +01:00
|
|
|
#ifndef __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|
|
|
|
#define __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|
Check in of various updates to the CPU. Mainly adds in stats, improves
branch prediction, and makes memory dependence work properly.
SConscript:
Added return address stack, tournament predictor.
cpu/base_cpu.cc:
Added debug break and print statements.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
Comment out possibly unneeded variables.
cpu/beta_cpu/2bit_local_pred.cc:
2bit predictor no longer speculatively updates itself.
cpu/beta_cpu/alpha_dyn_inst.hh:
Comment formatting.
cpu/beta_cpu/alpha_full_cpu.hh:
Formatting
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Added new parameters for branch predictors, and IQ parameters.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Register stats.
cpu/beta_cpu/alpha_params.hh:
Added parameters for IQ, branch predictors, and store sets.
cpu/beta_cpu/bpred_unit.cc:
Removed one class.
cpu/beta_cpu/bpred_unit.hh:
Add in RAS, stats. Changed branch predictor unit functionality
so that it holds a history of past branches so it can update, and also
hold a proper history of the RAS so it can be restored on branch
mispredicts.
cpu/beta_cpu/bpred_unit_impl.hh:
Added in stats, history of branches, RAS. Now bpred unit actually
modifies the instruction's predicted next PC.
cpu/beta_cpu/btb.cc:
Add in sanity checks.
cpu/beta_cpu/comm.hh:
Add in communication where needed, remove it where it's not.
cpu/beta_cpu/commit.hh:
cpu/beta_cpu/rename.hh:
cpu/beta_cpu/rename_impl.hh:
Add in stats.
cpu/beta_cpu/commit_impl.hh:
Stats, update what is sent back on branch mispredict.
cpu/beta_cpu/cpu_policy.hh:
Change the bpred unit being used.
cpu/beta_cpu/decode.hh:
cpu/beta_cpu/decode_impl.hh:
Stats.
cpu/beta_cpu/fetch.hh:
Stats, change squash so it can handle squashes from decode differently
than squashes from commit.
cpu/beta_cpu/fetch_impl.hh:
Add in stats. Change how a cache line is fetched. Update to work with
caches. Also have separate functions for different behavior if squash
is coming from decode vs commit.
cpu/beta_cpu/free_list.hh:
Remove some old comments.
cpu/beta_cpu/full_cpu.cc:
cpu/beta_cpu/full_cpu.hh:
Added function to remove instructions from back of instruction list
until a certain sequence number.
cpu/beta_cpu/iew.hh:
Stats, separate squashing behavior due to branches vs memory.
cpu/beta_cpu/iew_impl.hh:
Stats, separate squashing behavior for branches vs memory.
cpu/beta_cpu/inst_queue.cc:
Debug stuff
cpu/beta_cpu/inst_queue.hh:
Stats, change how mem dep unit works, debug stuff
cpu/beta_cpu/inst_queue_impl.hh:
Stats, change how mem dep unit works, debug stuff. Also add in
parameters that used to be hardcoded.
cpu/beta_cpu/mem_dep_unit.hh:
cpu/beta_cpu/mem_dep_unit_impl.hh:
Add in stats, change how memory dependence unit works. It now holds
the memory instructions that are waiting for their memory dependences
to resolve. It provides which instructions are ready directly to the
IQ.
cpu/beta_cpu/regfile.hh:
Fix up sanity checks.
cpu/beta_cpu/rename_map.cc:
Fix loop variable type.
cpu/beta_cpu/rob_impl.hh:
Remove intermediate DynInstPtr
cpu/beta_cpu/store_set.cc:
Add in debugging statements.
cpu/beta_cpu/store_set.hh:
Reorder function arguments to match the rest of the calls.
--HG--
extra : convert_revision : aabf9b1fecd1d743265dfc3b174d6159937c6f44
2004-10-22 00:02:36 +02:00
|
|
|
|
|
|
|
// For Addr type.
|
|
|
|
#include "arch/alpha/isa_traits.hh"
|
2005-02-26 00:00:49 +01:00
|
|
|
#include "cpu/beta_cpu/sat_counter.hh"
|
Check in of various updates to the CPU. Mainly adds in stats, improves
branch prediction, and makes memory dependence work properly.
SConscript:
Added return address stack, tournament predictor.
cpu/base_cpu.cc:
Added debug break and print statements.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
Comment out possibly unneeded variables.
cpu/beta_cpu/2bit_local_pred.cc:
2bit predictor no longer speculatively updates itself.
cpu/beta_cpu/alpha_dyn_inst.hh:
Comment formatting.
cpu/beta_cpu/alpha_full_cpu.hh:
Formatting
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Added new parameters for branch predictors, and IQ parameters.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Register stats.
cpu/beta_cpu/alpha_params.hh:
Added parameters for IQ, branch predictors, and store sets.
cpu/beta_cpu/bpred_unit.cc:
Removed one class.
cpu/beta_cpu/bpred_unit.hh:
Add in RAS, stats. Changed branch predictor unit functionality
so that it holds a history of past branches so it can update, and also
hold a proper history of the RAS so it can be restored on branch
mispredicts.
cpu/beta_cpu/bpred_unit_impl.hh:
Added in stats, history of branches, RAS. Now bpred unit actually
modifies the instruction's predicted next PC.
cpu/beta_cpu/btb.cc:
Add in sanity checks.
cpu/beta_cpu/comm.hh:
Add in communication where needed, remove it where it's not.
cpu/beta_cpu/commit.hh:
cpu/beta_cpu/rename.hh:
cpu/beta_cpu/rename_impl.hh:
Add in stats.
cpu/beta_cpu/commit_impl.hh:
Stats, update what is sent back on branch mispredict.
cpu/beta_cpu/cpu_policy.hh:
Change the bpred unit being used.
cpu/beta_cpu/decode.hh:
cpu/beta_cpu/decode_impl.hh:
Stats.
cpu/beta_cpu/fetch.hh:
Stats, change squash so it can handle squashes from decode differently
than squashes from commit.
cpu/beta_cpu/fetch_impl.hh:
Add in stats. Change how a cache line is fetched. Update to work with
caches. Also have separate functions for different behavior if squash
is coming from decode vs commit.
cpu/beta_cpu/free_list.hh:
Remove some old comments.
cpu/beta_cpu/full_cpu.cc:
cpu/beta_cpu/full_cpu.hh:
Added function to remove instructions from back of instruction list
until a certain sequence number.
cpu/beta_cpu/iew.hh:
Stats, separate squashing behavior due to branches vs memory.
cpu/beta_cpu/iew_impl.hh:
Stats, separate squashing behavior for branches vs memory.
cpu/beta_cpu/inst_queue.cc:
Debug stuff
cpu/beta_cpu/inst_queue.hh:
Stats, change how mem dep unit works, debug stuff
cpu/beta_cpu/inst_queue_impl.hh:
Stats, change how mem dep unit works, debug stuff. Also add in
parameters that used to be hardcoded.
cpu/beta_cpu/mem_dep_unit.hh:
cpu/beta_cpu/mem_dep_unit_impl.hh:
Add in stats, change how memory dependence unit works. It now holds
the memory instructions that are waiting for their memory dependences
to resolve. It provides which instructions are ready directly to the
IQ.
cpu/beta_cpu/regfile.hh:
Fix up sanity checks.
cpu/beta_cpu/rename_map.cc:
Fix loop variable type.
cpu/beta_cpu/rob_impl.hh:
Remove intermediate DynInstPtr
cpu/beta_cpu/store_set.cc:
Add in debugging statements.
cpu/beta_cpu/store_set.hh:
Reorder function arguments to match the rest of the calls.
--HG--
extra : convert_revision : aabf9b1fecd1d743265dfc3b174d6159937c6f44
2004-10-22 00:02:36 +02:00
|
|
|
|
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
2005-02-26 00:00:49 +01:00
|
|
|
#endif // __CPU_BETA_CPU_TOURNAMENT_PRED_HH__
|