248bd2bb62
cpu/o3/2bit_local_pred.cc:
Branch predictor cleanup/fixup. Rename this to LocalBP.
cpu/o3/2bit_local_pred.hh:
Rename to LocalBP, update to support changes to BPredUnit, include comments.
cpu/o3/alpha_cpu_builder.cc:
Support extra parameters to the branch predictor. Now it takes in a parameter to tell it which branch predictor it is using, the local or the tournament predictor.
cpu/o3/alpha_params.hh:
Add in extra parameter for the branch predictor type.
cpu/o3/bpred_unit.cc:
Branch predictor fixup/cleanup. Rename it to BPredUnit.
cpu/o3/bpred_unit.hh:
Branch predictor fixup/cleanup. Now supports both the local and tournament predictors, and stores the branch predictor update state.
cpu/o3/bpred_unit_impl.hh:
Branch predictor overhaul. Now supports both the local and tournament predictors.
cpu/o3/cpu_policy.hh:
cpu/ozone/ozone_impl.hh:
cpu/ozone/simple_impl.hh:
Reflect the class name change.
cpu/o3/decode_impl.hh:
Be sure to set the predicted target as well so we don't squash twice.
cpu/o3/tournament_pred.cc:
cpu/o3/tournament_pred.hh:
Fixes to the tournament predictor.
cpu/ozone/simple_params.hh:
Include parameter for the branch predictor type.
python/m5/objects/AlphaFullCPU.py:
python/m5/objects/OzoneCPU.py:
Include the parameter for the branch predictor type.
--HG--
extra : convert_revision : 34afebb3b40b47accb12558e439ee4cb03df5e64
75 lines
2.7 KiB
C++
75 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 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.
|
|
*/
|
|
|
|
#ifndef __CPU_OZONE_OZONE_IMPL_HH__
|
|
#define __CPU_OZONE_OZONE_IMPL_HH__
|
|
|
|
#include "arch/alpha/isa_traits.hh"
|
|
#include "cpu/o3/bpred_unit.hh"
|
|
#include "cpu/ozone/back_end.hh"
|
|
#include "cpu/ozone/front_end.hh"
|
|
#include "cpu/ozone/inst_queue.hh"
|
|
#include "cpu/ozone/lsq_unit.hh"
|
|
#include "cpu/ozone/lw_lsq.hh"
|
|
#include "cpu/ozone/lw_back_end.hh"
|
|
#include "cpu/ozone/null_predictor.hh"
|
|
#include "cpu/ozone/dyn_inst.hh"
|
|
#include "cpu/ozone/simple_params.hh"
|
|
|
|
template <class Impl>
|
|
class OzoneCPU;
|
|
|
|
template <class Impl>
|
|
class OzoneDynInst;
|
|
|
|
struct OzoneImpl {
|
|
typedef SimpleParams Params;
|
|
typedef OzoneCPU<OzoneImpl> OzoneCPU;
|
|
typedef OzoneCPU FullCPU;
|
|
|
|
// Would like to put these into their own area.
|
|
// typedef NullPredictor BranchPred;
|
|
typedef BPredUnit<OzoneImpl> BranchPred;
|
|
typedef FrontEnd<OzoneImpl> FrontEnd;
|
|
// Will need IQ, LSQ eventually
|
|
typedef LWBackEnd<OzoneImpl> BackEnd;
|
|
|
|
typedef InstQueue<OzoneImpl> InstQueue;
|
|
typedef OzoneLWLSQ<OzoneImpl> LdstQueue;
|
|
|
|
typedef OzoneDynInst<OzoneImpl> DynInst;
|
|
typedef RefCountingPtr<DynInst> DynInstPtr;
|
|
|
|
typedef uint64_t IssueStruct;
|
|
|
|
enum {
|
|
MaxThreads = 1
|
|
};
|
|
};
|
|
|
|
#endif // __CPU_OZONE_OZONE_IMPL_HH__
|