21df09cf7a
cpu/base_dyn_inst.hh: Remove snoop function (did not mean to commit it). cpu/ozone/back_end_impl.hh: Set instruction as having its result ready, not completed. cpu/ozone/cpu.hh: Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost). Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps. Also support the new Checker. cpu/ozone/cpu_builder.cc: Add parameter for maxOutstandingMemOps so it can be set through the config. Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future. cpu/ozone/cpu_impl.hh: Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast. Support switching out/taking over from other CPUs. Correct indexing problem for float registers. cpu/ozone/dyn_inst.hh: Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers. cpu/ozone/dyn_inst_impl.hh: Support waiting on memory operations. Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed. cpu/ozone/front_end.hh: Support switching out. Also record if an interrupt is pending. cpu/ozone/front_end_impl.hh: Support switching out. Also support stalling the front end if an interrupt is pending. cpu/ozone/lw_back_end.hh: Add checker in. Support switching out. Support memory barriers. cpu/ozone/lw_back_end_impl.hh: Lots of changes to get things to work right. Faults, traps, interrupts all wait until all stores have written back (important). Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions. cpu/ozone/lw_lsq.hh: Support switching out. Also use store writeback events in all cases, not just dcache misses. cpu/ozone/lw_lsq_impl.hh: Support switching out. Also use store writeback events in all cases, not just dcache misses. Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results). cpu/ozone/simple_params.hh: Add max outstanding mem ops parameter. python/m5/objects/OzoneCPU.py: Add max outstanding mem ops, checker. --HG-- extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
281 lines
8.2 KiB
C++
281 lines
8.2 KiB
C++
/*
|
|
* Copyright (c) 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.
|
|
*/
|
|
|
|
#ifndef __CPU_OZONE_DYN_INST_HH__
|
|
#define __CPU_OZONE_DYN_INST_HH__
|
|
|
|
#include "arch/isa_traits.hh"
|
|
#include "config/full_system.hh"
|
|
#include "cpu/base_dyn_inst.hh"
|
|
#include "cpu/ozone/cpu.hh" // MUST include this
|
|
#include "cpu/inst_seq.hh"
|
|
#include "cpu/ozone/simple_impl.hh" // Would be nice to not have to include this
|
|
#include "cpu/ozone/ozone_impl.hh"
|
|
|
|
#include <list>
|
|
#include <vector>
|
|
|
|
template <class Impl>
|
|
class OzoneDynInst : public BaseDynInst<Impl>
|
|
{
|
|
public:
|
|
// Typedefs
|
|
typedef typename Impl::FullCPU FullCPU;
|
|
|
|
typedef typename FullCPU::ImplState ImplState;
|
|
|
|
// Typedef for DynInstPtr. This is really just a RefCountingPtr<OoODynInst>.
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
// typedef typename Impl::BranchPred::BPredInfo BPredInfo;
|
|
|
|
typedef TheISA::ExtMachInst ExtMachInst;
|
|
typedef TheISA::MachInst MachInst;
|
|
typedef TheISA::MiscReg MiscReg;
|
|
typedef typename std::list<DynInstPtr>::iterator ListIt;
|
|
|
|
// Note that this is duplicated from the BaseDynInst class; I'm
|
|
// simply not sure the enum would carry through so I could use it
|
|
// in array declarations in this class.
|
|
enum {
|
|
MaxInstSrcRegs = TheISA::MaxInstSrcRegs,
|
|
MaxInstDestRegs = TheISA::MaxInstDestRegs
|
|
};
|
|
|
|
OzoneDynInst(FullCPU *cpu);
|
|
|
|
OzoneDynInst(ExtMachInst inst, Addr PC, Addr Pred_PC,
|
|
InstSeqNum seq_num, FullCPU *cpu);
|
|
|
|
OzoneDynInst(StaticInstPtr inst);
|
|
|
|
~OzoneDynInst();
|
|
|
|
void setSrcInst(DynInstPtr &newSrcInst, int regIdx)
|
|
{ srcInsts[regIdx] = newSrcInst; }
|
|
|
|
bool srcInstReady(int regIdx);
|
|
|
|
void setPrevDestInst(DynInstPtr &oldDestInst, int regIdx)
|
|
{ prevDestInst[regIdx] = oldDestInst; }
|
|
|
|
DynInstPtr &getPrevDestInst(int regIdx)
|
|
{ return prevDestInst[regIdx]; }
|
|
|
|
void addDependent(DynInstPtr &dependent_inst);
|
|
|
|
std::vector<DynInstPtr> &getDependents() { return dependents; }
|
|
std::vector<DynInstPtr> &getMemDeps() { return memDependents; }
|
|
std::list<DynInstPtr> &getMemSrcs() { return srcMemInsts; }
|
|
|
|
void wakeDependents();
|
|
|
|
void wakeMemDependents();
|
|
|
|
void addMemDependent(DynInstPtr &inst) { memDependents.push_back(inst); }
|
|
|
|
void addSrcMemInst(DynInstPtr &inst) { srcMemInsts.push_back(inst); }
|
|
|
|
void markMemInstReady(OzoneDynInst<Impl> *inst);
|
|
|
|
// For now I will remove instructions from the list when they wake
|
|
// up. In the future, you only really need a counter.
|
|
bool memDepReady() { return srcMemInsts.empty(); }
|
|
|
|
// void setBPredInfo(const BPredInfo &bp_info) { bpInfo = bp_info; }
|
|
|
|
// BPredInfo &getBPredInfo() { return bpInfo; }
|
|
|
|
// OzoneXC *thread;
|
|
|
|
private:
|
|
void initInstPtrs();
|
|
|
|
std::vector<DynInstPtr> dependents;
|
|
|
|
std::vector<DynInstPtr> memDependents;
|
|
|
|
std::list<DynInstPtr> srcMemInsts;
|
|
|
|
/** The instruction that produces the value of the source
|
|
* registers. These may be NULL if the value has already been
|
|
* read from the source instruction.
|
|
*/
|
|
DynInstPtr srcInsts[MaxInstSrcRegs];
|
|
|
|
/**
|
|
* Previous rename instruction for this destination.
|
|
*/
|
|
DynInstPtr prevDestInst[MaxInstSrcRegs];
|
|
|
|
// BPredInfo bpInfo;
|
|
|
|
public:
|
|
|
|
Fault initiateAcc();
|
|
|
|
Fault completeAcc();
|
|
/*
|
|
template <class T>
|
|
Fault read(Addr addr, T &data, unsigned flags);
|
|
|
|
template <class T>
|
|
Fault write(T data, Addr addr, unsigned flags, uint64_t *res);
|
|
*/
|
|
// The register accessor methods provide the index of the
|
|
// instruction's operand (e.g., 0 or 1), not the architectural
|
|
// register index, to simplify the implementation of register
|
|
// renaming. We find the architectural register index by indexing
|
|
// into the instruction's own operand index table. Note that a
|
|
// raw pointer to the StaticInst is provided instead of a
|
|
// ref-counted StaticInstPtr to redice overhead. This is fine as
|
|
// long as these methods don't copy the pointer into any long-term
|
|
// storage (which is pretty hard to imagine they would have reason
|
|
// to do).
|
|
|
|
uint64_t readIntReg(const StaticInst *si, int idx)
|
|
{
|
|
return srcInsts[idx]->readIntResult();
|
|
}
|
|
|
|
float readFloatRegSingle(const StaticInst *si, int idx)
|
|
{
|
|
return srcInsts[idx]->readFloatResult();
|
|
}
|
|
|
|
double readFloatRegDouble(const StaticInst *si, int idx)
|
|
{
|
|
return srcInsts[idx]->readDoubleResult();
|
|
}
|
|
|
|
uint64_t readFloatRegInt(const StaticInst *si, int idx)
|
|
{
|
|
return srcInsts[idx]->readIntResult();
|
|
}
|
|
|
|
/** @todo: Make results into arrays so they can handle multiple dest
|
|
* registers.
|
|
*/
|
|
void setIntReg(const StaticInst *si, int idx, uint64_t val)
|
|
{
|
|
BaseDynInst<Impl>::setIntReg(si, idx, val);
|
|
}
|
|
|
|
void setFloatRegSingle(const StaticInst *si, int idx, float val)
|
|
{
|
|
BaseDynInst<Impl>::setFloatRegSingle(si, idx, val);
|
|
}
|
|
|
|
void setFloatRegDouble(const StaticInst *si, int idx, double val)
|
|
{
|
|
BaseDynInst<Impl>::setFloatRegDouble(si, idx, val);
|
|
}
|
|
|
|
void setFloatRegInt(const StaticInst *si, int idx, uint64_t val)
|
|
{
|
|
BaseDynInst<Impl>::setFloatRegInt(si, idx, val);
|
|
}
|
|
|
|
void setIntResult(uint64_t result) { this->instResult.integer = result; }
|
|
void setDoubleResult(double result) { this->instResult.dbl = result; }
|
|
|
|
bool srcsReady();
|
|
bool eaSrcsReady();
|
|
|
|
Fault execute();
|
|
|
|
Fault executeEAComp()
|
|
{ return NoFault; }
|
|
|
|
Fault executeMemAcc()
|
|
{ return this->staticInst->memAccInst()->execute(this, this->traceData); }
|
|
|
|
void clearDependents();
|
|
|
|
void clearMemDependents();
|
|
|
|
public:
|
|
// ISA stuff
|
|
MiscReg readMiscReg(int misc_reg);
|
|
|
|
MiscReg readMiscRegWithEffect(int misc_reg, Fault &fault);
|
|
|
|
Fault setMiscReg(int misc_reg, const MiscReg &val);
|
|
|
|
Fault setMiscRegWithEffect(int misc_reg, const MiscReg &val);
|
|
|
|
#if FULL_SYSTEM
|
|
Fault hwrei();
|
|
int readIntrFlag();
|
|
void setIntrFlag(int val);
|
|
bool inPalMode();
|
|
void trap(Fault fault);
|
|
bool simPalCheck(int palFunc);
|
|
#else
|
|
void syscall();
|
|
#endif
|
|
|
|
ListIt iqIt;
|
|
bool iqItValid;
|
|
};
|
|
|
|
/*
|
|
template<class Impl>
|
|
template<class T>
|
|
inline Fault
|
|
OzoneDynInst<Impl>::read(Addr addr, T &data, unsigned flags)
|
|
{
|
|
Fault fault = this->cpu->read(addr, data, flags, this);
|
|
|
|
if (this->traceData) {
|
|
this->traceData->setAddr(addr);
|
|
this->traceData->setData(data);
|
|
}
|
|
|
|
return fault;
|
|
}
|
|
|
|
template<class Impl>
|
|
template<class T>
|
|
inline Fault
|
|
OzoneDynInst<Impl>::write(T data, Addr addr, unsigned flags, uint64_t *res)
|
|
{
|
|
Fault fault = this->cpu->write(data, addr, flags, res, this);
|
|
|
|
this->storeSize = sizeof(T);
|
|
this->storeData = data;
|
|
|
|
if (this->traceData) {
|
|
this->traceData->setAddr(addr);
|
|
this->traceData->setData(data);
|
|
}
|
|
|
|
return fault;
|
|
}
|
|
*/
|
|
#endif // __CPU_OZONE_DYN_INST_HH__
|