changeset f1076450ab2b in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=f1076450ab2b
description:
move: put predictor includes and cc files into the same place
diffstat:
20 files changed, 1270 insertions(+), 1242 deletions(-)
src/cpu/2bit_local_pred.cc | 146 ---------------
src/cpu/SConscript | 7
src/cpu/btb.cc | 134 -------------
src/cpu/inorder/resources/bpred_unit.hh | 17 -
src/cpu/o3/2bit_local_pred.hh | 110 -----------
src/cpu/o3/bpred_unit.hh | 8
src/cpu/o3/btb.hh | 129 -------------
src/cpu/o3/ras.hh | 100 ----------
src/cpu/o3/tournament_pred.hh | 221 -----------------------
src/cpu/pred/2bit_local.cc | 146 +++++++++++++++
src/cpu/pred/2bit_local.hh | 110 +++++++++++
src/cpu/pred/SConscript | 38 +++
src/cpu/pred/btb.cc | 134 +++++++++++++
src/cpu/pred/btb.hh | 129 +++++++++++++
src/cpu/pred/ras.cc | 84 ++++++++
src/cpu/pred/ras.hh | 100 ++++++++++
src/cpu/pred/tournament.cc | 297 +++++++++++++++++++++++++++++++
src/cpu/pred/tournament.hh | 221 +++++++++++++++++++++++
src/cpu/ras.cc | 84 --------
src/cpu/tournament_pred.cc | 297 -------------------------------
diffs (truncated from 2615 to 300 lines):
diff -r ec76e5c7cdd3 -r f1076450ab2b src/cpu/2bit_local_pred.cc
--- a/src/cpu/2bit_local_pred.cc Thu Jun 04 21:41:46 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
- * 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;
-}
diff -r ec76e5c7cdd3 -r f1076450ab2b src/cpu/SConscript
--- a/src/cpu/SConscript Thu Jun 04 21:41:46 2009 -0700
+++ b/src/cpu/SConscript Thu Jun 04 21:50:20 2009 -0700
@@ -126,13 +126,6 @@
Source('thread_context.cc')
Source('thread_state.cc')
-if 'InOrderCPU' in env['CPU_MODELS'] or 'O3CPU' in env['CPU_MODELS']:
- Source('btb.cc')
- Source('tournament_pred.cc')
- Source('2bit_local_pred.cc')
- Source('ras.cc')
- TraceFlag('FreeList')
-
if env['FULL_SYSTEM']:
SimObject('IntrControl.py')
diff -r ec76e5c7cdd3 -r f1076450ab2b src/cpu/btb.cc
--- a/src/cpu/btb.cc Thu Jun 04 21:41:46 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2004-2005 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/trace.hh"
-#include "cpu/o3/btb.hh"
-
-DefaultBTB::DefaultBTB(unsigned _numEntries,
- unsigned _tagBits,
- unsigned _instShiftAmt)
- : numEntries(_numEntries),
- tagBits(_tagBits),
- instShiftAmt(_instShiftAmt)
-{
- DPRINTF(Fetch, "BTB: Creating BTB object.\n");
-
- if (!isPowerOf2(numEntries)) {
- fatal("BTB entries is not a power of 2!");
- }
-
- btb.resize(numEntries);
-
- for (int i = 0; i < numEntries; ++i) {
- btb[i].valid = false;
- }
-
- idxMask = numEntries - 1;
-
- tagMask = (1 << tagBits) - 1;
-
- tagShiftAmt = instShiftAmt + floorLog2(numEntries);
-}
-
-void
-DefaultBTB::reset()
-{
- for (int i = 0; i < numEntries; ++i) {
- btb[i].valid = false;
- }
-}
-
-inline
-unsigned
-DefaultBTB::getIndex(const Addr &inst_PC)
-{
- // Need to shift PC over by the word offset.
- return (inst_PC >> instShiftAmt) & idxMask;
-}
-
-inline
-Addr
-DefaultBTB::getTag(const Addr &inst_PC)
-{
- return (inst_PC >> tagShiftAmt) & tagMask;
-}
-
-bool
-DefaultBTB::valid(const Addr &inst_PC, ThreadID tid)
-{
- unsigned btb_idx = getIndex(inst_PC);
-
- Addr inst_tag = getTag(inst_PC);
-
- assert(btb_idx < numEntries);
-
- if (btb[btb_idx].valid
- && inst_tag == btb[btb_idx].tag
- && btb[btb_idx].tid == tid) {
- return true;
- } else {
- return false;
- }
-}
-
-// @todo Create some sort of return struct that has both whether or not the
-// address is valid, and also the address. For now will just use addr = 0 to
-// represent invalid entry.
-Addr
-DefaultBTB::lookup(const Addr &inst_PC, ThreadID tid)
-{
- unsigned btb_idx = getIndex(inst_PC);
-
- Addr inst_tag = getTag(inst_PC);
-
- assert(btb_idx < numEntries);
-
- if (btb[btb_idx].valid
- && inst_tag == btb[btb_idx].tag
- && btb[btb_idx].tid == tid) {
- return btb[btb_idx].target;
- } else {
- return 0;
- }
-}
-
-void
-DefaultBTB::update(const Addr &inst_PC, const Addr &target, ThreadID tid)
-{
- unsigned btb_idx = getIndex(inst_PC);
-
- assert(btb_idx < numEntries);
-
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
