It's about time that this was done. ozone used the predictor too and it was cumbersome in the SCons code.
Anyway, you did a move here, but this isn't being recorded because you're not generating git style diffs. If you could add: [diff] git = 1 to your .hgrc, that will fix the problem for the future. You should refresh all of your diffs once you've added that flag. I'm pretty sure that this won't find the move and that you'll have to redo the move to get it right. Are there any other moves that you've done. Nate On Thu, Apr 9, 2009 at 10:54 PM, Korey Sewell <[email protected]> wrote: > # HG changeset patch > # User Korey Sewell <[email protected]> > # Date 1239342519 14400 > # Node ID 98211627847247ccd203e243c38e579a2e443b2b > # Parent ca55bb800d298db29634293b637e2e6a5eb31b3d > allow InOrder and O3CPU to be compiled at the same time: need to make branch > prediction filed shared by both models > > diff -r ca55bb800d29 -r 982116278472 src/cpu/2bit_local_pred.cc > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/src/cpu/2bit_local_pred.cc Fri Apr 10 01:48:39 2009 -0400 > @@ -0,0 +1,146 @@ > +/* > + * 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 ca55bb800d29 -r 982116278472 src/cpu/SConscript > --- a/src/cpu/SConscript Fri Apr 10 01:48:39 2009 -0400 > +++ b/src/cpu/SConscript Fri Apr 10 01:48:39 2009 -0400 > @@ -126,6 +126,12 @@ Source('thread_context.cc') > 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') > + > if env['FULL_SYSTEM']: > SimObject('IntrControl.py') > > diff -r ca55bb800d29 -r 982116278472 src/cpu/btb.cc > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/src/cpu/btb.cc Fri Apr 10 01:48:39 2009 -0400 > @@ -0,0 +1,134 @@ > +/* > + * 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, unsigned 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, unsigned 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, unsigned tid) > +{ > + unsigned btb_idx = getIndex(inst_PC); > + > + assert(btb_idx < numEntries); > + > + btb[btb_idx].tid = tid; > + btb[btb_idx].valid = true; > + btb[btb_idx].target = target; > + btb[btb_idx].tag = getTag(inst_PC); > +} > diff -r ca55bb800d29 -r 982116278472 src/cpu/inorder/SConscript > --- a/src/cpu/inorder/SConscript Fri Apr 10 01:48:39 2009 -0400 > +++ b/src/cpu/inorder/SConscript Fri Apr 10 01:48:39 2009 -0400 > @@ -35,7 +35,6 @@ if 'InOrderCPU' in env['CPU_MODELS']: > SimObject('InOrderTrace.py') > > TraceFlag('ResReqCount') > - TraceFlag('FreeList') > TraceFlag('InOrderStage') > TraceFlag('InOrderStall') > TraceFlag('InOrderCPU') > @@ -81,10 +80,6 @@ if 'InOrderCPU' in env['CPU_MODELS']: > Source('resources/mult_div_unit.cc') > Source('resource_pool.cc') > Source('reg_dep_map.cc') > - Source('../o3/btb.cc') > - Source('../o3/tournament_pred.cc') > - Source('../o3/2bit_local_pred.cc') > - Source('../o3/ras.cc') > Source('thread_context.cc') > Source('cpu.cc') > > diff -r ca55bb800d29 -r 982116278472 src/cpu/o3/2bit_local_pred.cc > --- a/src/cpu/o3/2bit_local_pred.cc Fri Apr 10 01:48:39 2009 -0400 > +++ /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 ca55bb800d29 -r 982116278472 src/cpu/o3/SConscript > --- a/src/cpu/o3/SConscript Fri Apr 10 01:48:39 2009 -0400 > +++ b/src/cpu/o3/SConscript Fri Apr 10 01:48:39 2009 -0400 > @@ -33,11 +33,6 @@ Import('*') > Import('*') > > if 'O3CPU' in env['CPU_MODELS'] or 'OzoneCPU' in env['CPU_MODELS']: > - Source('2bit_local_pred.cc') > - Source('btb.cc') > - Source('ras.cc') > - Source('tournament_pred.cc') > - > TraceFlag('CommitRate') > TraceFlag('IEW') > TraceFlag('IQ') > diff -r ca55bb800d29 -r 982116278472 src/cpu/o3/btb.cc > --- a/src/cpu/o3/btb.cc Fri Apr 10 01:48:39 2009 -0400 > +++ /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, unsigned 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, unsigned 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, unsigned tid) > -{ > - unsigned btb_idx = getIndex(inst_PC); > - > - assert(btb_idx < numEntries); > - > - btb[btb_idx].tid = tid; > - btb[btb_idx].valid = true; > - btb[btb_idx].target = target; > - btb[btb_idx].tag = getTag(inst_PC); > -} > diff -r ca55bb800d29 -r 982116278472 src/cpu/o3/ras.cc > --- a/src/cpu/o3/ras.cc Fri Apr 10 01:48:39 2009 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,84 +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 "cpu/o3/ras.hh" > - > -void > -ReturnAddrStack::init(unsigned _numEntries) > -{ > - numEntries = _numEntries; > - usedEntries = 0; > - tos = 0; > - > - addrStack.resize(numEntries); > - > - for (int i = 0; i < numEntries; ++i) > - addrStack[i] = 0; > -} > - > -void > -ReturnAddrStack::reset() > -{ > - usedEntries = 0; > - tos = 0; > - for (int i = 0; i < numEntries; ++i) > - addrStack[i] = 0; > -} > - > -void > -ReturnAddrStack::push(const Addr &return_addr) > -{ > - incrTos(); > - > - addrStack[tos] = return_addr; > - > - if (usedEntries != numEntries) { > - ++usedEntries; > - } > -} > - > -void > -ReturnAddrStack::pop() > -{ > - if (usedEntries > 0) { > - --usedEntries; > - } > - > - decrTos(); > -} > - > -void > -ReturnAddrStack::restore(unsigned top_entry_idx, > - const Addr &restored_target) > -{ > - tos = top_entry_idx; > - > - addrStack[tos] = restored_target; > -} > diff -r ca55bb800d29 -r 982116278472 src/cpu/o3/tournament_pred.cc > --- a/src/cpu/o3/tournament_pred.cc Fri Apr 10 01:48:39 2009 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,297 +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 "cpu/o3/tournament_pred.hh" > - > -TournamentBP::TournamentBP(unsigned _localPredictorSize, > - unsigned _localCtrBits, > - unsigned _localHistoryTableSize, > - unsigned _localHistoryBits, > - unsigned _globalPredictorSize, > - unsigned _globalCtrBits, > - unsigned _globalHistoryBits, > - unsigned _choicePredictorSize, > - unsigned _choiceCtrBits, > - unsigned _instShiftAmt) > - : localPredictorSize(_localPredictorSize), > - localCtrBits(_localCtrBits), > - localHistoryTableSize(_localHistoryTableSize), > - localHistoryBits(_localHistoryBits), > - globalPredictorSize(_globalPredictorSize), > - globalCtrBits(_globalCtrBits), > - globalHistoryBits(_globalHistoryBits), > - choicePredictorSize(_globalPredictorSize), > - choiceCtrBits(_choiceCtrBits), > - instShiftAmt(_instShiftAmt) > -{ > - if (!isPowerOf2(localPredictorSize)) { > - fatal("Invalid local predictor size!\n"); > - } > - > - //Setup the array of counters for the local predictor > - localCtrs.resize(localPredictorSize); > - > - for (int i = 0; i < localPredictorSize; ++i) > - localCtrs[i].setBits(localCtrBits); > - > - localPredictorMask = floorPow2(localPredictorSize) - 1; > - > - if (!isPowerOf2(localHistoryTableSize)) { > - fatal("Invalid local history table size!\n"); > - } > - > - //Setup the history table for the local table > - localHistoryTable.resize(localHistoryTableSize); > - > - for (int i = 0; i < localHistoryTableSize; ++i) > - localHistoryTable[i] = 0; > - > - // Setup the local history mask > - localHistoryMask = (1 << localHistoryBits) - 1; > - > - if (!isPowerOf2(globalPredictorSize)) { > - fatal("Invalid global predictor size!\n"); > - } > - > - //Setup the array of counters for the global predictor > - globalCtrs.resize(globalPredictorSize); > - > - for (int i = 0; i < globalPredictorSize; ++i) > - globalCtrs[i].setBits(globalCtrBits); > - > - //Clear the global history > - globalHistory = 0; > - // Setup the global history mask > - globalHistoryMask = (1 << globalHistoryBits) - 1; > - > - if (!isPowerOf2(choicePredictorSize)) { > - fatal("Invalid choice predictor size!\n"); > - } > - > - //Setup the array of counters for the choice predictor > - choiceCtrs.resize(choicePredictorSize); > - > - for (int i = 0; i < choicePredictorSize; ++i) > - choiceCtrs[i].setBits(choiceCtrBits); > - > - // @todo: Allow for different thresholds between the predictors. > - threshold = (1 << (localCtrBits - 1)) - 1; > - threshold = threshold / 2; > -} > - > -inline > -unsigned > -TournamentBP::calcLocHistIdx(Addr &branch_addr) > -{ > - // Get low order bits after removing instruction offset. > - return (branch_addr >> instShiftAmt) & (localHistoryTableSize - 1); > -} > - > -inline > -void > -TournamentBP::updateGlobalHistTaken() > -{ > - globalHistory = (globalHistory << 1) | 1; > - globalHistory = globalHistory & globalHistoryMask; > -} > - > -inline > -void > -TournamentBP::updateGlobalHistNotTaken() > -{ > - globalHistory = (globalHistory << 1); > - globalHistory = globalHistory & globalHistoryMask; > -} > - > -inline > -void > -TournamentBP::updateLocalHistTaken(unsigned local_history_idx) > -{ > - localHistoryTable[local_history_idx] = > - (localHistoryTable[local_history_idx] << 1) | 1; > -} > - > -inline > -void > -TournamentBP::updateLocalHistNotTaken(unsigned local_history_idx) > -{ > - localHistoryTable[local_history_idx] = > - (localHistoryTable[local_history_idx] << 1); > -} > - > -bool > -TournamentBP::lookup(Addr &branch_addr, void * &bp_history) > -{ > - bool local_prediction; > - unsigned local_history_idx; > - unsigned local_predictor_idx; > - > - bool global_prediction; > - bool choice_prediction; > - > - //Lookup in the local predictor to get its branch prediction > - local_history_idx = calcLocHistIdx(branch_addr); > - local_predictor_idx = localHistoryTable[local_history_idx] > - & localPredictorMask; > - local_prediction = localCtrs[local_predictor_idx].read() > threshold; > - > - //Lookup in the global predictor to get its branch prediction > - global_prediction = globalCtrs[globalHistory].read() > threshold; > - > - //Lookup in the choice predictor to see which one to use > - choice_prediction = choiceCtrs[globalHistory].read() > threshold; > - > - // Create BPHistory and pass it back to be recorded. > - BPHistory *history = new BPHistory; > - history->globalHistory = globalHistory; > - history->localPredTaken = local_prediction; > - history->globalPredTaken = global_prediction; > - history->globalUsed = choice_prediction; > - bp_history = (void *)history; > - > - assert(globalHistory < globalPredictorSize && > - local_history_idx < localHistoryTableSize && > - local_predictor_idx < localPredictorSize); > - > - // Commented code is for doing speculative update of counters and > - // all histories. > - if (choice_prediction) { > - if (global_prediction) { > -// updateHistoriesTaken(local_history_idx); > -// globalCtrs[globalHistory].increment(); > -// localCtrs[local_history_idx].increment(); > - updateGlobalHistTaken(); > - return true; > - } else { > -// updateHistoriesNotTaken(local_history_idx); > -// globalCtrs[globalHistory].decrement(); > -// localCtrs[local_history_idx].decrement(); > - updateGlobalHistNotTaken(); > - return false; > - } > - } else { > - if (local_prediction) { > -// updateHistoriesTaken(local_history_idx); > -// globalCtrs[globalHistory].increment(); > -// localCtrs[local_history_idx].increment(); > - updateGlobalHistTaken(); > - return true; > - } else { > -// updateHistoriesNotTaken(local_history_idx); > -// globalCtrs[globalHistory].decrement(); > -// localCtrs[local_history_idx].decrement(); > - updateGlobalHistNotTaken(); > - return false; > - } > - } > -} > - > -void > -TournamentBP::uncondBr(void * &bp_history) > -{ > - // Create BPHistory and pass it back to be recorded. > - BPHistory *history = new BPHistory; > - history->globalHistory = globalHistory; > - history->localPredTaken = true; > - history->globalPredTaken = true; > - bp_history = static_cast<void *>(history); > - > - updateGlobalHistTaken(); > -} > - > -void > -TournamentBP::update(Addr &branch_addr, bool taken, void *bp_history) > -{ > - unsigned local_history_idx; > - unsigned local_predictor_idx; > - unsigned local_predictor_hist; > - > - // Get the local predictor's current prediction > - local_history_idx = calcLocHistIdx(branch_addr); > - local_predictor_hist = localHistoryTable[local_history_idx]; > - local_predictor_idx = local_predictor_hist & localPredictorMask; > - > - // Update the choice predictor to tell it which one was correct if > - // there was a prediction. > - if (bp_history) { > - BPHistory *history = static_cast<BPHistory *>(bp_history); > - if (history->localPredTaken != history->globalPredTaken) { > - // If the local prediction matches the actual outcome, > - // decerement the counter. Otherwise increment the > - // counter. > - if (history->localPredTaken == taken) { > - choiceCtrs[globalHistory].decrement(); > - } else if (history->globalPredTaken == taken){ > - choiceCtrs[globalHistory].increment(); > - } > - } > - > - // We're done with this history, now delete it. > - delete history; > - } > - > - assert(globalHistory < globalPredictorSize && > - local_history_idx < localHistoryTableSize && > - local_predictor_idx < localPredictorSize); > - > - // Update the counters and local history with the proper > - // resolution of the branch. Global history is updated > - // speculatively and restored upon squash() calls, so it does not > - // need to be updated. > - if (taken) { > - localCtrs[local_predictor_idx].increment(); > - globalCtrs[globalHistory].increment(); > - > - updateLocalHistTaken(local_history_idx); > - } else { > - localCtrs[local_predictor_idx].decrement(); > - globalCtrs[globalHistory].decrement(); > - > - updateLocalHistNotTaken(local_history_idx); > - } > -} > - > -void > -TournamentBP::squash(void *bp_history) > -{ > - BPHistory *history = static_cast<BPHistory *>(bp_history); > - > - // Restore global history to state prior to this branch. > - globalHistory = history->globalHistory; > - > - // Delete this BPHistory now that we're done with it. > - delete history; > -} > - > -#ifdef DEBUG > -int > -TournamentBP::BPHistory::newCount = 0; > -#endif > diff -r ca55bb800d29 -r 982116278472 src/cpu/ras.cc > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/src/cpu/ras.cc Fri Apr 10 01:48:39 2009 -0400 > @@ -0,0 +1,84 @@ > +/* > + * 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 "cpu/o3/ras.hh" > + > +void > +ReturnAddrStack::init(unsigned _numEntries) > +{ > + numEntries = _numEntries; > + usedEntries = 0; > + tos = 0; > + > + addrStack.resize(numEntries); > + > + for (int i = 0; i < numEntries; ++i) > + addrStack[i] = 0; > +} > + > +void > +ReturnAddrStack::reset() > +{ > + usedEntries = 0; > + tos = 0; > + for (int i = 0; i < numEntries; ++i) > + addrStack[i] = 0; > +} > + > +void > +ReturnAddrStack::push(const Addr &return_addr) > +{ > + incrTos(); > + > + addrStack[tos] = return_addr; > + > + if (usedEntries != numEntries) { > + ++usedEntries; > + } > +} > + > +void > +ReturnAddrStack::pop() > +{ > + if (usedEntries > 0) { > + --usedEntries; > + } > + > + decrTos(); > +} > + > +void > +ReturnAddrStack::restore(unsigned top_entry_idx, > + const Addr &restored_target) > +{ > + tos = top_entry_idx; > + > + addrStack[tos] = restored_target; > +} > diff -r ca55bb800d29 -r 982116278472 src/cpu/tournament_pred.cc > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/src/cpu/tournament_pred.cc Fri Apr 10 01:48:39 2009 -0400 > @@ -0,0 +1,297 @@ > +/* > + * 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 "cpu/o3/tournament_pred.hh" > + > +TournamentBP::TournamentBP(unsigned _localPredictorSize, > + unsigned _localCtrBits, > + unsigned _localHistoryTableSize, > + unsigned _localHistoryBits, > + unsigned _globalPredictorSize, > + unsigned _globalCtrBits, > + unsigned _globalHistoryBits, > + unsigned _choicePredictorSize, > + unsigned _choiceCtrBits, > + unsigned _instShiftAmt) > + : localPredictorSize(_localPredictorSize), > + localCtrBits(_localCtrBits), > + localHistoryTableSize(_localHistoryTableSize), > + localHistoryBits(_localHistoryBits), > + globalPredictorSize(_globalPredictorSize), > + globalCtrBits(_globalCtrBits), > + globalHistoryBits(_globalHistoryBits), > + choicePredictorSize(_globalPredictorSize), > + choiceCtrBits(_choiceCtrBits), > + instShiftAmt(_instShiftAmt) > +{ > + if (!isPowerOf2(localPredictorSize)) { > + fatal("Invalid local predictor size!\n"); > + } > + > + //Setup the array of counters for the local predictor > + localCtrs.resize(localPredictorSize); > + > + for (int i = 0; i < localPredictorSize; ++i) > + localCtrs[i].setBits(localCtrBits); > + > + localPredictorMask = floorPow2(localPredictorSize) - 1; > + > + if (!isPowerOf2(localHistoryTableSize)) { > + fatal("Invalid local history table size!\n"); > + } > + > + //Setup the history table for the local table > + localHistoryTable.resize(localHistoryTableSize); > + > + for (int i = 0; i < localHistoryTableSize; ++i) > + localHistoryTable[i] = 0; > + > + // Setup the local history mask > + localHistoryMask = (1 << localHistoryBits) - 1; > + > + if (!isPowerOf2(globalPredictorSize)) { > + fatal("Invalid global predictor size!\n"); > + } > + > + //Setup the array of counters for the global predictor > + globalCtrs.resize(globalPredictorSize); > + > + for (int i = 0; i < globalPredictorSize; ++i) > + globalCtrs[i].setBits(globalCtrBits); > + > + //Clear the global history > + globalHistory = 0; > + // Setup the global history mask > + globalHistoryMask = (1 << globalHistoryBits) - 1; > + > + if (!isPowerOf2(choicePredictorSize)) { > + fatal("Invalid choice predictor size!\n"); > + } > + > + //Setup the array of counters for the choice predictor > + choiceCtrs.resize(choicePredictorSize); > + > + for (int i = 0; i < choicePredictorSize; ++i) > + choiceCtrs[i].setBits(choiceCtrBits); > + > + // @todo: Allow for different thresholds between the predictors. > + threshold = (1 << (localCtrBits - 1)) - 1; > + threshold = threshold / 2; > +} > + > +inline > +unsigned > +TournamentBP::calcLocHistIdx(Addr &branch_addr) > +{ > + // Get low order bits after removing instruction offset. > + return (branch_addr >> instShiftAmt) & (localHistoryTableSize - 1); > +} > + > +inline > +void > +TournamentBP::updateGlobalHistTaken() > +{ > + globalHistory = (globalHistory << 1) | 1; > + globalHistory = globalHistory & globalHistoryMask; > +} > + > +inline > +void > +TournamentBP::updateGlobalHistNotTaken() > +{ > + globalHistory = (globalHistory << 1); > + globalHistory = globalHistory & globalHistoryMask; > +} > + > +inline > +void > +TournamentBP::updateLocalHistTaken(unsigned local_history_idx) > +{ > + localHistoryTable[local_history_idx] = > + (localHistoryTable[local_history_idx] << 1) | 1; > +} > + > +inline > +void > +TournamentBP::updateLocalHistNotTaken(unsigned local_history_idx) > +{ > + localHistoryTable[local_history_idx] = > + (localHistoryTable[local_history_idx] << 1); > +} > + > +bool > +TournamentBP::lookup(Addr &branch_addr, void * &bp_history) > +{ > + bool local_prediction; > + unsigned local_history_idx; > + unsigned local_predictor_idx; > + > + bool global_prediction; > + bool choice_prediction; > + > + //Lookup in the local predictor to get its branch prediction > + local_history_idx = calcLocHistIdx(branch_addr); > + local_predictor_idx = localHistoryTable[local_history_idx] > + & localPredictorMask; > + local_prediction = localCtrs[local_predictor_idx].read() > threshold; > + > + //Lookup in the global predictor to get its branch prediction > + global_prediction = globalCtrs[globalHistory].read() > threshold; > + > + //Lookup in the choice predictor to see which one to use > + choice_prediction = choiceCtrs[globalHistory].read() > threshold; > + > + // Create BPHistory and pass it back to be recorded. > + BPHistory *history = new BPHistory; > + history->globalHistory = globalHistory; > + history->localPredTaken = local_prediction; > + history->globalPredTaken = global_prediction; > + history->globalUsed = choice_prediction; > + bp_history = (void *)history; > + > + assert(globalHistory < globalPredictorSize && > + local_history_idx < localHistoryTableSize && > + local_predictor_idx < localPredictorSize); > + > + // Commented code is for doing speculative update of counters and > + // all histories. > + if (choice_prediction) { > + if (global_prediction) { > +// updateHistoriesTaken(local_history_idx); > +// globalCtrs[globalHistory].increment(); > +// localCtrs[local_history_idx].increment(); > + updateGlobalHistTaken(); > + return true; > + } else { > +// updateHistoriesNotTaken(local_history_idx); > +// globalCtrs[globalHistory].decrement(); > +// localCtrs[local_history_idx].decrement(); > + updateGlobalHistNotTaken(); > + return false; > + } > + } else { > + if (local_prediction) { > +// updateHistoriesTaken(local_history_idx); > +// globalCtrs[globalHistory].increment(); > +// localCtrs[local_history_idx].increment(); > + updateGlobalHistTaken(); > + return true; > + } else { > +// updateHistoriesNotTaken(local_history_idx); > +// globalCtrs[globalHistory].decrement(); > +// localCtrs[local_history_idx].decrement(); > + updateGlobalHistNotTaken(); > + return false; > + } > + } > +} > + > +void > +TournamentBP::uncondBr(void * &bp_history) > +{ > + // Create BPHistory and pass it back to be recorded. > + BPHistory *history = new BPHistory; > + history->globalHistory = globalHistory; > + history->localPredTaken = true; > + history->globalPredTaken = true; > + bp_history = static_cast<void *>(history); > + > + updateGlobalHistTaken(); > +} > + > +void > +TournamentBP::update(Addr &branch_addr, bool taken, void *bp_history) > +{ > + unsigned local_history_idx; > + unsigned local_predictor_idx; > + unsigned local_predictor_hist; > + > + // Get the local predictor's current prediction > + local_history_idx = calcLocHistIdx(branch_addr); > + local_predictor_hist = localHistoryTable[local_history_idx]; > + local_predictor_idx = local_predictor_hist & localPredictorMask; > + > + // Update the choice predictor to tell it which one was correct if > + // there was a prediction. > + if (bp_history) { > + BPHistory *history = static_cast<BPHistory *>(bp_history); > + if (history->localPredTaken != history->globalPredTaken) { > + // If the local prediction matches the actual outcome, > + // decerement the counter. Otherwise increment the > + // counter. > + if (history->localPredTaken == taken) { > + choiceCtrs[globalHistory].decrement(); > + } else if (history->globalPredTaken == taken){ > + choiceCtrs[globalHistory].increment(); > + } > + } > + > + // We're done with this history, now delete it. > + delete history; > + } > + > + assert(globalHistory < globalPredictorSize && > + local_history_idx < localHistoryTableSize && > + local_predictor_idx < localPredictorSize); > + > + // Update the counters and local history with the proper > + // resolution of the branch. Global history is updated > + // speculatively and restored upon squash() calls, so it does not > + // need to be updated. > + if (taken) { > + localCtrs[local_predictor_idx].increment(); > + globalCtrs[globalHistory].increment(); > + > + updateLocalHistTaken(local_history_idx); > + } else { > + localCtrs[local_predictor_idx].decrement(); > + globalCtrs[globalHistory].decrement(); > + > + updateLocalHistNotTaken(local_history_idx); > + } > +} > + > +void > +TournamentBP::squash(void *bp_history) > +{ > + BPHistory *history = static_cast<BPHistory *>(bp_history); > + > + // Restore global history to state prior to this branch. > + globalHistory = history->globalHistory; > + > + // Delete this BPHistory now that we're done with it. > + delete history; > +} > + > +#ifdef DEBUG > +int > +TournamentBP::BPHistory::newCount = 0; > +#endif > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev > > _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
