2fb632dbda
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
254 lines
6.4 KiB
C++
254 lines
6.4 KiB
C++
#include "cpu/beta_cpu/store_set.hh"
|
|
#include "base/trace.hh"
|
|
|
|
StoreSet::StoreSet(int _SSIT_size, int _LFST_size)
|
|
: SSIT_size(_SSIT_size), LFST_size(_LFST_size)
|
|
{
|
|
DPRINTF(StoreSet, "StoreSet: Creating store set object.\n");
|
|
DPRINTF(StoreSet, "StoreSet: SSIT size: %i, LFST size: %i.\n",
|
|
SSIT_size, LFST_size);
|
|
|
|
SSIT = new SSID[SSIT_size];
|
|
|
|
validSSIT.resize(SSIT_size);
|
|
|
|
for (int i = 0; i < SSIT_size; ++i)
|
|
validSSIT[i] = false;
|
|
|
|
LFST = new InstSeqNum[LFST_size];
|
|
|
|
validLFST.resize(LFST_size);
|
|
|
|
SSCounters = new int[LFST_size];
|
|
|
|
for (int i = 0; i < LFST_size; ++i)
|
|
{
|
|
validLFST[i] = false;
|
|
SSCounters[i] = 0;
|
|
}
|
|
|
|
index_mask = SSIT_size - 1;
|
|
|
|
offset_bits = 2;
|
|
}
|
|
|
|
void
|
|
StoreSet::violation(Addr store_PC, Addr load_PC)
|
|
{
|
|
int load_index = calcIndex(load_PC);
|
|
int store_index = calcIndex(store_PC);
|
|
|
|
assert(load_index < SSIT_size && store_index < SSIT_size);
|
|
|
|
bool valid_load_SSID = validSSIT[load_index];
|
|
bool valid_store_SSID = validSSIT[store_index];
|
|
|
|
if (!valid_load_SSID && !valid_store_SSID) {
|
|
// Calculate a new SSID here.
|
|
SSID new_set = calcSSID(load_PC);
|
|
|
|
validSSIT[load_index] = true;
|
|
|
|
SSIT[load_index] = new_set;
|
|
|
|
validSSIT[store_index] = true;
|
|
|
|
SSIT[store_index] = new_set;
|
|
|
|
assert(new_set < LFST_size);
|
|
|
|
SSCounters[new_set]++;
|
|
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Neither load nor store had a valid "
|
|
"storeset, creating a new one: %i for load %#x, store %#x\n",
|
|
new_set, load_PC, store_PC);
|
|
} else if (valid_load_SSID && !valid_store_SSID) {
|
|
SSID load_SSID = SSIT[load_index];
|
|
|
|
validSSIT[store_index] = true;
|
|
|
|
SSIT[store_index] = load_SSID;
|
|
|
|
assert(load_SSID < LFST_size);
|
|
|
|
SSCounters[load_SSID]++;
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Load had a valid store set. Adding "
|
|
"store to that set: %i for load %#x, store %#x\n",
|
|
load_SSID, load_PC, store_PC);
|
|
} else if (!valid_load_SSID && valid_store_SSID) {
|
|
SSID store_SSID = SSIT[store_index];
|
|
|
|
validSSIT[load_index] = true;
|
|
|
|
SSIT[load_index] = store_SSID;
|
|
|
|
// Because we are having a load point to an already existing set,
|
|
// the size of the store set is not incremented.
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Store had a valid store set: %i for "
|
|
"load %#x, store %#x\n",
|
|
store_SSID, load_PC, store_PC);
|
|
} else {
|
|
SSID load_SSID = SSIT[load_index];
|
|
SSID store_SSID = SSIT[store_index];
|
|
|
|
assert(load_SSID < LFST_size && store_SSID < LFST_size);
|
|
|
|
int load_SS_size = SSCounters[load_SSID];
|
|
int store_SS_size = SSCounters[store_SSID];
|
|
|
|
// If the load has the bigger store set, then assign the store
|
|
// to the same store set as the load. Otherwise vice-versa.
|
|
if (load_SS_size > store_SS_size) {
|
|
SSIT[store_index] = load_SSID;
|
|
|
|
SSCounters[load_SSID]++;
|
|
SSCounters[store_SSID]--;
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Load had bigger store set: %i; "
|
|
"for load %#x, store %#x\n",
|
|
load_SSID, load_PC, store_PC);
|
|
} else {
|
|
SSIT[load_index] = store_SSID;
|
|
|
|
SSCounters[store_SSID]++;
|
|
SSCounters[load_SSID]--;
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Store had bigger store set: %i; "
|
|
"for load %#x, store %#x\n",
|
|
store_SSID, load_PC, store_PC);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
StoreSet::insertLoad(Addr load_PC, InstSeqNum load_seq_num)
|
|
{
|
|
// Does nothing.
|
|
return;
|
|
}
|
|
|
|
void
|
|
StoreSet::insertStore(Addr store_PC, InstSeqNum store_seq_num)
|
|
{
|
|
int index = calcIndex(store_PC);
|
|
|
|
int store_SSID;
|
|
|
|
assert(index < SSIT_size);
|
|
|
|
if (!validSSIT[index]) {
|
|
// Do nothing if there's no valid entry.
|
|
return;
|
|
} else {
|
|
store_SSID = SSIT[index];
|
|
|
|
assert(store_SSID < LFST_size);
|
|
|
|
// Update the last store that was fetched with the current one.
|
|
LFST[store_SSID] = store_seq_num;
|
|
|
|
validLFST[store_SSID] = 1;
|
|
|
|
DPRINTF(StoreSet, "Store %#x updated the LFST, SSID: %i\n",
|
|
store_PC, store_SSID);
|
|
}
|
|
}
|
|
|
|
InstSeqNum
|
|
StoreSet::checkInst(Addr PC)
|
|
{
|
|
int index = calcIndex(PC);
|
|
|
|
int inst_SSID;
|
|
|
|
assert(index < SSIT_size);
|
|
|
|
if (!validSSIT[index]) {
|
|
DPRINTF(StoreSet, "Inst %#x with index %i had no SSID\n",
|
|
PC, index);
|
|
|
|
// Return 0 if there's no valid entry.
|
|
return 0;
|
|
} else {
|
|
inst_SSID = SSIT[index];
|
|
|
|
assert(inst_SSID < LFST_size);
|
|
|
|
if (!validLFST[inst_SSID]) {
|
|
|
|
DPRINTF(StoreSet, "Inst %#x with index %i and SSID %i had no "
|
|
"dependency\n", PC, index, inst_SSID);
|
|
|
|
return 0;
|
|
} else {
|
|
DPRINTF(StoreSet, "Inst %#x with index %i and SSID %i had LFST "
|
|
"inum of %i\n", PC, index, inst_SSID, LFST[inst_SSID]);
|
|
|
|
return LFST[inst_SSID];
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
StoreSet::issued(Addr issued_PC, InstSeqNum issued_seq_num, bool is_store)
|
|
{
|
|
// This only is updated upon a store being issued.
|
|
if (!is_store) {
|
|
return;
|
|
}
|
|
|
|
int index = calcIndex(issued_PC);
|
|
|
|
int store_SSID;
|
|
|
|
assert(index < SSIT_size);
|
|
|
|
// Make sure the SSIT still has a valid entry for the issued store.
|
|
if (!validSSIT[index]) {
|
|
return;
|
|
}
|
|
|
|
store_SSID = SSIT[index];
|
|
|
|
assert(store_SSID < LFST_size);
|
|
|
|
// If the last fetched store in the store set refers to the store that
|
|
// was just issued, then invalidate the entry.
|
|
if (validLFST[store_SSID] && LFST[store_SSID] == issued_seq_num) {
|
|
DPRINTF(StoreSet, "StoreSet: store invalidated itself in LFST.\n");
|
|
validLFST[store_SSID] = false;
|
|
}
|
|
}
|
|
|
|
void
|
|
StoreSet::squash(InstSeqNum squashed_num)
|
|
{
|
|
// Not really sure how to do this well.
|
|
// Generally this is small enough that it should be okay; short circuit
|
|
// evaluation should take care of invalid entries.
|
|
|
|
DPRINTF(StoreSet, "StoreSet: Squashing until inum %i\n",
|
|
squashed_num);
|
|
|
|
for (int i = 0; i < LFST_size; ++i) {
|
|
if (validLFST[i] && LFST[i] < squashed_num) {
|
|
validLFST[i] = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
StoreSet::clear()
|
|
{
|
|
for (int i = 0; i < SSIT_size; ++i) {
|
|
validSSIT[i] = false;
|
|
}
|
|
|
|
for (int i = 0; i < LFST_size; ++i) {
|
|
validLFST[i] = false;
|
|
}
|
|
}
|
|
|