derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu: De-templatize the O3 LSQ.

Browse Source 
Change-Id: I7821fe971c0c38b77e730b4c40fb9fb204c6e7fd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42111
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
This commit is contained in:
Gabe Black
2021-03-03 03:47:23 -08:00
parent da4c0590ee
commit 9722ce0075
8 changed files with 1457 additions and 1597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/o3/cpu.hh
View File

@@ -119,7 +119,7 @@ class FullO3CPU : public BaseO3CPU
};
BaseMMU *mmu;
using LSQRequest = typename LSQ<Impl>::LSQRequest;
using LSQRequest = LSQ::LSQRequest;
/** Overall CPU status. */
Status _status;

2
src/cpu/o3/dyn_inst.hh
View File

@@ -396,7 +396,7 @@ class BaseO3DynInst : public ExecContext, public RefCounted
* Saved memory request (needed when the DTB address translation is
* delayed due to a hw page table walk).
*/
typename ::LSQ<O3CPUImpl>::LSQ::LSQRequest *savedReq;
LSQ::LSQRequest *savedReq;
/////////////////////// Checker //////////////////////
// Need a copy of main request pointer to verify on writes.

2
src/cpu/o3/iew.hh
View File

@@ -354,7 +354,7 @@ class DefaultIEW
InstructionQueue instQueue;
/** Load / store queue. */
LSQ<Impl> ldstQueue;
LSQ ldstQueue;
/** Pointer to the functional unit pool. */
FUPool *fuPool;

1407
src/cpu/o3/lsq.cc
View File

File diff suppressed because it is too large Load Diff

102
src/cpu/o3/lsq.hh
View File

@@ -70,7 +70,6 @@ class DefaultIEW;
class LSQUnit;
template <class Impl>
class LSQ
{
public:
@@ -83,40 +82,36 @@ class LSQ
LSQRequest* _request;
/** Default constructor. */
LSQSenderState(LSQRequest* request, bool isLoad_)
: _request(request), mainPkt(nullptr), pendingPacket(nullptr),
outstanding(0), isLoad(isLoad_), needWB(isLoad_), isSplit(false),
pktToSend(false), deleted(false)
{ }
public:
LSQSenderState(LSQRequest* request, bool is_load);
public:
/** Instruction which initiated the access to memory. */
O3DynInstPtr inst;
/** The main packet from a split load, used during writeback. */
PacketPtr mainPkt;
PacketPtr mainPkt = nullptr;
/** A second packet from a split store that needs sending. */
PacketPtr pendingPacket;
PacketPtr pendingPacket = nullptr;
/** Number of outstanding packets to complete. */
uint8_t outstanding;
uint8_t outstanding = 0;
/** Whether or not it is a load. */
bool isLoad;
bool isLoad = false;
/** Whether or not the instruction will need to writeback. */
bool needWB;
bool needWB = false;
/** Whether or not this access is split in two. */
bool isSplit;
bool isSplit = false;
/** Whether or not there is a packet that needs sending. */
bool pktToSend;
bool pktToSend = false;
/** Has the request been deleted?
* LSQ entries can be squashed before the response comes back. in that
* case the SenderState knows.
*/
bool deleted;
bool deleted = false;
ContextID contextId();
/** Completes a packet and returns whether the access is finished. */
inline bool isComplete() { return outstanding == 0; }
inline void deleteRequest() { deleted = true; }
inline bool alive() { return !deleted; }
bool isComplete() { return outstanding == 0; }
void deleteRequest() { deleted = true; }
bool alive() { return !deleted; }
LSQRequest* request() { return _request; }
virtual void complete() = 0;
void writebackDone() { _request->writebackDone(); }
@@ -130,15 +125,12 @@ class LSQ
protected:
/** Pointer to LSQ. */
LSQ<Impl> *lsq;
FullO3CPU<Impl> *cpu;
LSQ *lsq;
FullO3CPU<O3CPUImpl> *cpu;
public:
/** Default constructor. */
DcachePort(LSQ<Impl> *_lsq, FullO3CPU<Impl>* _cpu)
: RequestPort(_cpu->name() + ".dcache_port", _cpu), lsq(_lsq),
cpu(_cpu)
{ }
DcachePort(LSQ *_lsq, FullO3CPU<O3CPUImpl> *_cpu);
protected:
@@ -148,7 +140,8 @@ class LSQ
virtual bool recvTimingResp(PacketPtr pkt);
virtual void recvTimingSnoopReq(PacketPtr pkt);
virtual void recvFunctionalSnoop(PacketPtr pkt)
virtual void
recvFunctionalSnoop(PacketPtr pkt)
{
// @todo: Is there a need for potential invalidation here?
}
@@ -640,8 +633,8 @@ class LSQ
protected:
/* Given that we are inside templates, children need explicit
* declaration of the names in the parent class. */
using Flag = typename LSQRequest::Flag;
using State = typename LSQRequest::State;
using Flag = LSQRequest::Flag;
using State = LSQRequest::State;
using LSQRequest::_addr;
using LSQRequest::_fault;
using LSQRequest::_flags;
@@ -674,7 +667,7 @@ class LSQ
LSQRequest(port, inst, isLoad, addr, size, flags_, data, res,
std::move(amo_op)) {}
inline virtual ~SingleDataRequest() {}
virtual ~SingleDataRequest() {}
virtual void initiateTranslation();
virtual void finish(const Fault &fault, const RequestPtr &req,
ThreadContext* tc, BaseTLB::Mode mode);
@@ -691,27 +684,27 @@ class LSQ
// of encapsulating hardware transactional memory command requests
class HtmCmdRequest : public SingleDataRequest
{
protected:
/* Given that we are inside templates, children need explicit
* declaration of the names in the parent class. */
using Flag = typename LSQRequest::Flag;
using State = typename LSQRequest::State;
using LSQRequest::_addr;
using LSQRequest::_size;
using LSQRequest::_byteEnable;
using LSQRequest::_requests;
using LSQRequest::_inst;
using LSQRequest::_taskId;
using LSQRequest::flags;
using LSQRequest::setState;
public:
HtmCmdRequest(LSQUnit* port, const O3DynInstPtr& inst,
const Request::Flags& flags_);
inline virtual ~HtmCmdRequest() {}
virtual void initiateTranslation();
virtual void finish(const Fault &fault, const RequestPtr &req,
ThreadContext* tc, BaseTLB::Mode mode);
virtual std::string name() const { return "HtmCmdRequest"; }
protected:
/* Given that we are inside templates, children need explicit
* declaration of the names in the parent class. */
using Flag = LSQRequest::Flag;
using State = LSQRequest::State;
using LSQRequest::_addr;
using LSQRequest::_size;
using LSQRequest::_byteEnable;
using LSQRequest::_requests;
using LSQRequest::_inst;
using LSQRequest::_taskId;
using LSQRequest::flags;
using LSQRequest::setState;
public:
HtmCmdRequest(LSQUnit* port, const O3DynInstPtr& inst,
const Request::Flags& flags_);
virtual ~HtmCmdRequest() {}
virtual void initiateTranslation();
virtual void finish(const Fault &fault, const RequestPtr &req,
ThreadContext* tc, BaseTLB::Mode mode);
virtual std::string name() const { return "HtmCmdRequest"; }
};
class SplitDataRequest : public LSQRequest
@@ -719,8 +712,8 @@ class LSQ
protected:
/* Given that we are inside templates, children need explicit
* declaration of the names in the parent class. */
using Flag = typename LSQRequest::Flag;
using State = typename LSQRequest::State;
using Flag = LSQRequest::Flag;
using State = LSQRequest::State;
using LSQRequest::_addr;
using LSQRequest::_data;
using LSQRequest::_fault;
@@ -791,9 +784,8 @@ class LSQ
};
/** Constructs an LSQ with the given parameters. */
LSQ(FullO3CPU<Impl> *cpu_ptr, DefaultIEW<Impl> *iew_ptr,
LSQ(FullO3CPU<O3CPUImpl> *cpu_ptr, DefaultIEW<O3CPUImpl> *iew_ptr,
const DerivO3CPUParams &params);
~LSQ() { }
/** Returns the name of the LSQ. */
std::string name() const;
@@ -1002,10 +994,10 @@ class LSQ
const std::vector<bool>& byte_enable);
/** The CPU pointer. */
FullO3CPU<Impl> *cpu;
FullO3CPU<O3CPUImpl> *cpu;
/** The IEW stage pointer. */
DefaultIEW<Impl> *iewStage;
DefaultIEW<O3CPUImpl> *iewStage;
/** Is D-cache blocked? */
bool cacheBlocked() const;

1528
src/cpu/o3/lsq_impl.hh
View File

File diff suppressed because it is too large Load Diff

2
src/cpu/o3/lsq_unit.cc
View File

@@ -205,7 +205,7 @@ LSQUnit::LSQUnit(uint32_t lqEntries, uint32_t sqEntries)
void
LSQUnit::init(FullO3CPU<O3CPUImpl> *cpu_ptr, DefaultIEW<O3CPUImpl> *iew_ptr,
const DerivO3CPUParams &params, LSQ<O3CPUImpl> *lsq_ptr, unsigned id)
const DerivO3CPUParams &params, LSQ *lsq_ptr, unsigned id)
{
lsqID = id;

9
src/cpu/o3/lsq_unit.hh
View File

@@ -88,8 +88,8 @@ class LSQUnit
public:
static constexpr auto MaxDataBytes = MaxVecRegLenInBytes;
using LSQSenderState = typename LSQ<O3CPUImpl>::LSQSenderState;
using LSQRequest = typename LSQ<O3CPUImpl>::LSQRequest;
using LSQSenderState = LSQ::LSQSenderState;
using LSQRequest = LSQ::LSQRequest;
private:
class LSQEntry
{
@@ -226,8 +226,7 @@ class LSQUnit
/** Initializes the LSQ unit with the specified number of entries. */
void init(FullO3CPU<O3CPUImpl> *cpu_ptr, DefaultIEW<O3CPUImpl> *iew_ptr,
const DerivO3CPUParams &params, LSQ<O3CPUImpl> *lsq_ptr,
unsigned id);
const DerivO3CPUParams &params, LSQ *lsq_ptr, unsigned id);
/** Returns the name of the LSQ unit. */
std::string name() const;
@@ -402,7 +401,7 @@ class LSQUnit
DefaultIEW<O3CPUImpl> *iewStage;
/** Pointer to the LSQ. */
LSQ<O3CPUImpl> *lsq;
LSQ *lsq;
/** Pointer to the dcache port. Used only for sending. */
RequestPort *dcachePort;