61d95de4c8
SConscript:
arch/isa_parser.py:
cpu/base_dyn_inst.cc:
Remove OOO CPU stuff.
arch/alpha/faults.hh:
Add fake memory fault. This will be removed eventually.
arch/alpha/isa_desc:
Change EA comp and Mem accessor to be const StaticInstPtrs.
cpu/base_dyn_inst.hh:
Update read/write calls to use load queue and store queue indices.
cpu/beta_cpu/alpha_dyn_inst.hh:
Change to const StaticInst in the register accessors.
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
Update syscall code with thread numbers.
cpu/beta_cpu/alpha_full_cpu.hh:
Alter some of the full system code so it will compile without errors.
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Created a DerivAlphaFullCPU class so I can instantiate different CPUs that have different template parameters.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Update some of the full system code so it compiles.
cpu/beta_cpu/alpha_params.hh:
cpu/beta_cpu/fetch_impl.hh:
Remove asid.
cpu/beta_cpu/comm.hh:
Remove global history field.
cpu/beta_cpu/commit.hh:
Comment out rename map.
cpu/beta_cpu/commit_impl.hh:
Update some of the full system code so it compiles. Also change it so that it handles memory instructions properly.
cpu/beta_cpu/cpu_policy.hh:
Removed IQ from the IEW template parameter to make it more uniform.
cpu/beta_cpu/decode.hh:
Add debug function.
cpu/beta_cpu/decode_impl.hh:
Slight updates for decode in the case where it causes a squash.
cpu/beta_cpu/fetch.hh:
cpu/beta_cpu/rob.hh:
Comment out unneccessary code.
cpu/beta_cpu/full_cpu.cc:
Changed some of the full system code so it compiles. Updated exec contexts and so forth to hopefully make multithreading easier.
cpu/beta_cpu/full_cpu.hh:
Updated some of the full system code to make it compile.
cpu/beta_cpu/iew.cc:
Removed IQ from template parameter to IEW.
cpu/beta_cpu/iew.hh:
Removed IQ from template parameter to IEW. Updated IEW to recognize the Load/Store queue.
cpu/beta_cpu/iew_impl.hh:
New handling of memory instructions through the Load/Store queue.
cpu/beta_cpu/inst_queue.hh:
Updated comment.
cpu/beta_cpu/inst_queue_impl.hh:
Slightly different handling of memory instructions due to Load/Store queue.
cpu/beta_cpu/regfile.hh:
Updated full system code so it compiles.
cpu/beta_cpu/rob_impl.hh:
Moved some code around; no major functional changes.
cpu/ooo_cpu/ooo_cpu.hh:
Slight updates to OOO CPU; still does not work.
cpu/static_inst.hh:
Remove OOO CPU stuff. Change ea comp and mem acc to return const StaticInst.
kern/kernel_stats.hh:
Extra forward declares added due to compile error.
--HG--
extra : convert_revision : 594a7cdbe57f6c2bda7d08856fcd864604a6238e
141 lines
3.2 KiB
C++
141 lines
3.2 KiB
C++
#ifndef __CPU_BETA_CPU_COMM_HH__
|
|
#define __CPU_BETA_CPU_COMM_HH__
|
|
|
|
#include <stdint.h>
|
|
#include <vector>
|
|
#include "arch/alpha/isa_traits.hh"
|
|
#include "cpu/inst_seq.hh"
|
|
|
|
// Find better place to put this typedef.
|
|
// The impl might be the best place for this.
|
|
typedef short int PhysRegIndex;
|
|
|
|
template<class Impl>
|
|
struct SimpleFetchSimpleDecode {
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
int size;
|
|
|
|
DynInstPtr insts[Impl::MaxWidth];
|
|
};
|
|
|
|
template<class Impl>
|
|
struct SimpleDecodeSimpleRename {
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
int size;
|
|
|
|
DynInstPtr insts[Impl::MaxWidth];
|
|
};
|
|
|
|
template<class Impl>
|
|
struct SimpleRenameSimpleIEW {
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
int size;
|
|
|
|
DynInstPtr insts[Impl::MaxWidth];
|
|
};
|
|
|
|
template<class Impl>
|
|
struct SimpleIEWSimpleCommit {
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
int size;
|
|
|
|
DynInstPtr insts[Impl::MaxWidth];
|
|
|
|
bool squash;
|
|
bool branchMispredict;
|
|
bool branchTaken;
|
|
uint64_t mispredPC;
|
|
uint64_t nextPC;
|
|
InstSeqNum squashedSeqNum;
|
|
};
|
|
|
|
template<class Impl>
|
|
struct IssueStruct {
|
|
typedef typename Impl::DynInstPtr DynInstPtr;
|
|
|
|
int size;
|
|
|
|
DynInstPtr insts[Impl::MaxWidth];
|
|
};
|
|
|
|
struct TimeBufStruct {
|
|
struct decodeComm {
|
|
bool squash;
|
|
bool stall;
|
|
bool predIncorrect;
|
|
uint64_t branchAddr;
|
|
|
|
InstSeqNum doneSeqNum;
|
|
|
|
// Might want to package this kind of branch stuff into a single
|
|
// struct as it is used pretty frequently.
|
|
bool branchMispredict;
|
|
bool branchTaken;
|
|
uint64_t mispredPC;
|
|
uint64_t nextPC;
|
|
};
|
|
|
|
decodeComm decodeInfo;
|
|
|
|
// Rename can't actually tell anything to squash or send a new PC back
|
|
// because it doesn't do anything along those lines. But maybe leave
|
|
// these fields in here to keep the stages mostly orthagonal.
|
|
struct renameComm {
|
|
bool squash;
|
|
bool stall;
|
|
|
|
uint64_t nextPC;
|
|
};
|
|
|
|
renameComm renameInfo;
|
|
|
|
struct iewComm {
|
|
bool stall;
|
|
|
|
// Also eventually include skid buffer space.
|
|
unsigned freeIQEntries;
|
|
};
|
|
|
|
iewComm iewInfo;
|
|
|
|
struct commitComm {
|
|
bool squash;
|
|
bool stall;
|
|
unsigned freeROBEntries;
|
|
|
|
bool branchMispredict;
|
|
bool branchTaken;
|
|
uint64_t mispredPC;
|
|
uint64_t nextPC;
|
|
|
|
// Think of better names here.
|
|
// Will need to be a variety of sizes...
|
|
// Maybe make it a vector, that way only need one object.
|
|
// std::vector<PhysRegIndex> freeRegs;
|
|
|
|
bool robSquashing;
|
|
|
|
// Represents the instruction that has either been retired or
|
|
// squashed. Similar to having a single bus that broadcasts the
|
|
// retired or squashed sequence number.
|
|
InstSeqNum doneSeqNum;
|
|
|
|
// Extra bits of information so that the LDSTQ only updates when it
|
|
// needs to.
|
|
// bool commitIsStore;
|
|
bool commitIsLoad;
|
|
|
|
// Communication specifically to the IQ to tell the IQ that it can
|
|
// schedule a non-speculative instruction.
|
|
InstSeqNum nonSpecSeqNum;
|
|
};
|
|
|
|
commitComm commitInfo;
|
|
};
|
|
|
|
#endif //__CPU_BETA_CPU_COMM_HH__
|