arch/alpha/alpha_linux_process.cc:
Added using directive for AlphaISA namespace
arch/alpha/alpha_memory.hh:
arch/alpha/isa/branch.isa:
cpu/pc_event.hh:
Added typedefs for Addr
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
Added using directive for AlphaISA
arch/alpha/ev5.hh:
Added an include of arch/alpha/isa_traits.hh, and a using directive for the AlphaISA namespace.
arch/alpha/faults.hh:
Added a typedef for the Addr type, and changed the formatting of the faults slightly.
arch/alpha/isa/main.isa:
Untemplatized StaticInst, added a using for namespace AlphaISA to show up in decoder.cc and the exec.ccs, relocated makeNop to decoder.hh
arch/alpha/isa/mem.isa:
Untemplatized StaticInst and StaticInstPtr
arch/alpha/isa/pal.isa:
cpu/base_dyn_inst.cc:
Untemplatized StaticInstPtr
arch/alpha/isa_traits.hh:
Changed variables to be externs instead of static since they are part of a namespace and not a class.
arch/alpha/stacktrace.cc:
Untemplatized StaticInstPtr, and added a using directive for AlphaISA.
arch/alpha/stacktrace.hh:
Added some typedefs for Addr and MachInst, and untemplatized StaticInstPtr
arch/alpha/vtophys.cc:
Added a using directive for AlphaISA
arch/alpha/vtophys.hh:
Added the AlphaISA namespace specifier where needed
arch/isa_parser.py:
Changed the placement of the definition of the decodeInst function to be outside the namespaceInst namespace.
base/loader/object_file.hh:
cpu/o3/bpred_unit.hh:
Added a typedef for Addr
base/loader/symtab.hh:
Added a typedef for Addr, and added a TheISA to Addr in another typedef
base/remote_gdb.cc:
Added a using namespace TheISA, and untemplatized StaticInstPtr
base/remote_gdb.hh:
Added typedefs for Addr and MachInst
cpu/base.cc:
Added TheISA specifier to some variables exported from the isa.
cpu/base.hh:
Added a typedef for Addr, and TheISA to some variables from the ISA
cpu/base_dyn_inst.hh:
Untemplatized StaticInstPtr, and added TheISA specifier to some variables from the ISA.
cpu/exec_context.hh:
Added some typedefs for types from the isa, and added TheISA specifier to some variables from the isa
cpu/exetrace.hh:
Added typedefs for some types from the ISA, and untemplatized StaticInstPtr
cpu/memtest/memtest.cc:
cpu/o3/btb.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/isa_fake.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/platform.cc:
dev/sinic.cc:
dev/uart8250.cc:
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/system_events.cc:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64_events.cc:
sim/process.cc:
sim/pseudo_inst.cc:
sim/system.cc:
Added using namespace TheISA
cpu/memtest/memtest.hh:
cpu/trace/opt_cpu.hh:
cpu/trace/reader/itx_reader.hh:
dev/ide_disk.hh:
dev/pcidev.hh:
dev/platform.hh:
dev/tsunami.hh:
sim/system.hh:
sim/vptr.hh:
Added typedef for Addr
cpu/o3/2bit_local_pred.hh:
Changed the include to use arch/isa_traits.hh instead of arch/alpha/isa_traits.hh. Added typedef for Addr
cpu/o3/alpha_cpu.hh:
Added typedefs for Addr and IntReg
cpu/o3/alpha_cpu_impl.hh:
Added this-> to setNextPC to fix a problem since it didn't depend on template parameters any more. Removed "typename" where it was no longer needed.
cpu/o3/alpha_dyn_inst.hh:
Cleaned up some typedefs, and untemplatized StaticInst
cpu/o3/alpha_dyn_inst_impl.hh:
untemplatized StaticInstPtr
cpu/o3/alpha_impl.hh:
Fixed up a typedef of MachInst
cpu/o3/bpred_unit_impl.hh:
Added a using TheISA::MachInst to a function
cpu/o3/btb.hh:
Changed an include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr
cpu/o3/commit.hh:
Removed a typedef of Impl::ISA as ISA, since TheISA takes care of this now.
cpu/o3/cpu.cc:
Cleaned up namespace issues
cpu/o3/cpu.hh:
Cleaned up namespace usage
cpu/o3/decode.hh:
Removed typedef of ISA, and changed it to TheISA
cpu/o3/fetch.hh:
Fized up typedefs, and changed ISA to TheISA
cpu/o3/free_list.hh:
Changed include of arch/alpha/isa_traits.hh to arch/isa_traits.hh
cpu/o3/iew.hh:
Removed typedef of ISA
cpu/o3/iew_impl.hh:
Added TheISA namespace specifier to MachInst
cpu/o3/ras.hh:
Changed include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr.
cpu/o3/regfile.hh:
Changed ISA to TheISA, and added some typedefs for Addr, IntReg, FloatReg, and MiscRegFile
cpu/o3/rename.hh:
Changed ISA to TheISA, and added a typedef for RegIndex
cpu/o3/rename_map.hh:
Added an include for arch/isa_traits.hh, and a typedef for RegIndex
cpu/o3/rob.hh:
Added a typedef for RegIndex
cpu/o3/store_set.hh:
cpu/o3/tournament_pred.hh:
Changed an include of arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef of Addr
cpu/ozone/cpu.hh:
Changed ISA into TheISA, and untemplatized StaticInst
cpu/pc_event.cc:
Added namespace specifier TheISA to Addr types
cpu/profile.hh:
kern/kernel_stats.hh:
Added typedef for Addr, and untemplatized StaticInstPtr
cpu/simple/cpu.cc:
Changed using directive from LittleEndianGuest to AlphaISA, which will contain both namespaces. Added TheISA where needed, and untemplatized StaticInst
cpu/simple/cpu.hh:
Added a typedef for MachInst, and untemplatized StaticInst
cpu/static_inst.cc:
Untemplatized StaticInst
cpu/static_inst.hh:
Untemplatized StaticInst by using the TheISA namespace
dev/alpha_console.cc:
Added using namespace AlphaISA
dev/simple_disk.hh:
Added typedef for Addr and fixed up some formatting
dev/sinicreg.hh:
Added TheISA namespace specifier where needed
dev/tsunami.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Added using namespace TheISA. It might be better for it to be AlphaISA
dev/tsunami_cchip.cc:
Added typedef for TheISA. It might be better for it to be AlphaISA
kern/linux/aligned.hh:
sim/pseudo_inst.hh:
Added TheISA namespace specifier to Addr
kern/linux/linux_threadinfo.hh:
Added typedef for Addr, and TheISA namespace specifier to StackPointerReg
kern/tru64/mbuf.hh:
Added TheISA to Addr type in structs
sim/process.hh:
Added typedefs of Addr, RegFile, and MachInst
sim/syscall_emul.cc:
Added using namespace TheISA, and a cast of VMPageSize to the int type
sim/syscall_emul.hh:
Added typecast for Addr, and TheISA namespace specifier for where needed
--HG--
extra : convert_revision : 91d4f6ca33a73b21c1f1771d74bfdea3b80eff45
225 lines
6.7 KiB
C++
225 lines
6.7 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
// Todo: SMT fetch,
|
|
// Add a way to get a stage's current status.
|
|
|
|
#ifndef __CPU_O3_CPU_SIMPLE_FETCH_HH__
|
|
#define __CPU_O3_CPU_SIMPLE_FETCH_HH__
|
|
|
|
#include "base/statistics.hh"
|
|
#include "base/timebuf.hh"
|
|
#include "cpu/pc_event.hh"
|
|
#include "mem/mem_interface.hh"
|
|
#include "sim/eventq.hh"
|
|
|
|
/**
|
|
* SimpleFetch class to fetch a single instruction each cycle. SimpleFetch
|
|
* will stall if there's an Icache miss, but otherwise assumes a one cycle
|
|
* Icache hit.
|
|
*/
|
|
|
|
template <class Impl>
|
|
class SimpleFetch
|
|
{
|
|
public:
|
|
/** Typedefs from Impl. */
|
|
typedef typename Impl::CPUPol CPUPol;
|
|
typedef typename Impl::DynInst DynInst;
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
typedef typename Impl::FullCPU FullCPU;
|
|
typedef typename Impl::Params Params;
|
|
|
|
typedef typename CPUPol::BPredUnit BPredUnit;
|
|
typedef typename CPUPol::FetchStruct FetchStruct;
|
|
typedef typename CPUPol::TimeStruct TimeStruct;
|
|
|
|
/** Typedefs from ISA. */
|
|
typedef TheISA::MachInst MachInst;
|
|
typedef TheISA::Addr Addr;
|
|
|
|
public:
|
|
enum Status {
|
|
Running,
|
|
Idle,
|
|
Squashing,
|
|
Blocked,
|
|
IcacheMissStall,
|
|
IcacheMissComplete
|
|
};
|
|
|
|
// May eventually need statuses on a per thread basis.
|
|
Status _status;
|
|
|
|
bool stalled;
|
|
|
|
public:
|
|
class CacheCompletionEvent : public Event
|
|
{
|
|
private:
|
|
SimpleFetch *fetch;
|
|
|
|
public:
|
|
CacheCompletionEvent(SimpleFetch *_fetch);
|
|
|
|
virtual void process();
|
|
virtual const char *description();
|
|
};
|
|
|
|
public:
|
|
/** SimpleFetch constructor. */
|
|
SimpleFetch(Params ¶ms);
|
|
|
|
void regStats();
|
|
|
|
void setCPU(FullCPU *cpu_ptr);
|
|
|
|
void setTimeBuffer(TimeBuffer<TimeStruct> *time_buffer);
|
|
|
|
void setFetchQueue(TimeBuffer<FetchStruct> *fq_ptr);
|
|
|
|
void processCacheCompletion();
|
|
|
|
private:
|
|
/**
|
|
* Looks up in the branch predictor to see if the next PC should be
|
|
* either next PC+=MachInst or a branch target.
|
|
* @param next_PC Next PC variable passed in by reference. It is
|
|
* expected to be set to the current PC; it will be updated with what
|
|
* the next PC will be.
|
|
* @return Whether or not a branch was predicted as taken.
|
|
*/
|
|
bool lookupAndUpdateNextPC(DynInstPtr &inst, Addr &next_PC);
|
|
|
|
/**
|
|
* Fetches the cache line that contains fetch_PC. Returns any
|
|
* fault that happened. Puts the data into the class variable
|
|
* cacheData.
|
|
* @param fetch_PC The PC address that is being fetched from.
|
|
* @return Any fault that occured.
|
|
*/
|
|
Fault * fetchCacheLine(Addr fetch_PC);
|
|
|
|
inline void doSquash(const Addr &new_PC);
|
|
|
|
void squashFromDecode(const Addr &new_PC, const InstSeqNum &seq_num);
|
|
|
|
public:
|
|
// Figure out PC vs next PC and how it should be updated
|
|
void squash(const Addr &new_PC);
|
|
|
|
void tick();
|
|
|
|
void fetch();
|
|
|
|
// Align an address (typically a PC) to the start of an I-cache block.
|
|
// We fold in the PISA 64- to 32-bit conversion here as well.
|
|
Addr icacheBlockAlignPC(Addr addr)
|
|
{
|
|
addr = TheISA::realPCToFetchPC(addr);
|
|
return (addr & ~(cacheBlkMask));
|
|
}
|
|
|
|
private:
|
|
/** Pointer to the FullCPU. */
|
|
FullCPU *cpu;
|
|
|
|
/** Time buffer interface. */
|
|
TimeBuffer<TimeStruct> *timeBuffer;
|
|
|
|
/** Wire to get decode's information from backwards time buffer. */
|
|
typename TimeBuffer<TimeStruct>::wire fromDecode;
|
|
|
|
/** Wire to get rename's information from backwards time buffer. */
|
|
typename TimeBuffer<TimeStruct>::wire fromRename;
|
|
|
|
/** Wire to get iew's information from backwards time buffer. */
|
|
typename TimeBuffer<TimeStruct>::wire fromIEW;
|
|
|
|
/** Wire to get commit's information from backwards time buffer. */
|
|
typename TimeBuffer<TimeStruct>::wire fromCommit;
|
|
|
|
/** Internal fetch instruction queue. */
|
|
TimeBuffer<FetchStruct> *fetchQueue;
|
|
|
|
//Might be annoying how this name is different than the queue.
|
|
/** Wire used to write any information heading to decode. */
|
|
typename TimeBuffer<FetchStruct>::wire toDecode;
|
|
|
|
/** Icache interface. */
|
|
MemInterface *icacheInterface;
|
|
|
|
/** BPredUnit. */
|
|
BPredUnit branchPred;
|
|
|
|
/** Memory request used to access cache. */
|
|
MemReqPtr memReq;
|
|
|
|
/** Decode to fetch delay, in ticks. */
|
|
unsigned decodeToFetchDelay;
|
|
|
|
/** Rename to fetch delay, in ticks. */
|
|
unsigned renameToFetchDelay;
|
|
|
|
/** IEW to fetch delay, in ticks. */
|
|
unsigned iewToFetchDelay;
|
|
|
|
/** Commit to fetch delay, in ticks. */
|
|
unsigned commitToFetchDelay;
|
|
|
|
/** The width of fetch in instructions. */
|
|
unsigned fetchWidth;
|
|
|
|
/** Cache block size. */
|
|
int cacheBlkSize;
|
|
|
|
/** Mask to get a cache block's address. */
|
|
Addr cacheBlkMask;
|
|
|
|
/** The cache line being fetched. */
|
|
uint8_t *cacheData;
|
|
|
|
/** Size of instructions. */
|
|
int instSize;
|
|
|
|
/** Icache stall statistics. */
|
|
Counter lastIcacheStall;
|
|
|
|
Stats::Scalar<> icacheStallCycles;
|
|
Stats::Scalar<> fetchedInsts;
|
|
Stats::Scalar<> predictedBranches;
|
|
Stats::Scalar<> fetchCycles;
|
|
Stats::Scalar<> fetchSquashCycles;
|
|
Stats::Scalar<> fetchBlockedCycles;
|
|
Stats::Scalar<> fetchedCacheLines;
|
|
|
|
Stats::Distribution<> fetch_nisn_dist;
|
|
};
|
|
|
|
#endif //__CPU_O3_CPU_SIMPLE_FETCH_HH__
|