s/pktuest/request/ (all in comments)
--HG-- extra : convert_revision : 7ce779242a15245a20322c0b6c40d02c8ddd15ad
This commit is contained in:
parent
199084b339
commit
1b21d9ba5e
7 changed files with 49 additions and 49 deletions
2
src/mem/cache/cache_impl.hh
vendored
2
src/mem/cache/cache_impl.hh
vendored
|
@ -596,7 +596,7 @@ Cache<TagStore,Buffering,Coherence>::probe(PacketPtr &pkt, bool update,
|
|||
} else if (!blk && !(pkt->flags & SATISFIED)) {
|
||||
// update the cache state and statistics
|
||||
if (mshr || !writes.empty()){
|
||||
// Can't handle it, return pktuest unsatisfied.
|
||||
// Can't handle it, return request unsatisfied.
|
||||
panic("Atomic access ran into outstanding MSHR's or WB's!");
|
||||
}
|
||||
if (!pkt->req->isUncacheable()) {
|
||||
|
|
18
src/mem/cache/miss/blocking_buffer.hh
vendored
18
src/mem/cache/miss/blocking_buffer.hh
vendored
|
@ -128,8 +128,8 @@ public:
|
|||
}
|
||||
|
||||
/**
|
||||
* Selects a outstanding pktuest to service.
|
||||
* @return The pktuest to service, NULL if none found.
|
||||
* Selects a outstanding request to service.
|
||||
* @return The request to service, NULL if none found.
|
||||
*/
|
||||
PacketPtr getPacket();
|
||||
|
||||
|
@ -147,7 +147,7 @@ public:
|
|||
void restoreOrigCmd(PacketPtr &pkt);
|
||||
|
||||
/**
|
||||
* Marks a pktuest as in service (sent on the bus). This can have side
|
||||
* Marks a request as in service (sent on the bus). This can have side
|
||||
* effect since storage for no response commands is deallocated once they
|
||||
* are successfully sent.
|
||||
* @param pkt The request that was sent on the bus.
|
||||
|
@ -155,14 +155,14 @@ public:
|
|||
void markInService(PacketPtr &pkt, MSHR* mshr);
|
||||
|
||||
/**
|
||||
* Frees the resources of the pktuest and unblock the cache.
|
||||
* Frees the resources of the request and unblock the cache.
|
||||
* @param pkt The request that has been satisfied.
|
||||
* @param time The time when the pktuest is satisfied.
|
||||
* @param time The time when the request is satisfied.
|
||||
*/
|
||||
void handleResponse(PacketPtr &pkt, Tick time);
|
||||
|
||||
/**
|
||||
* Removes all outstanding pktuests for a given thread number. If a request
|
||||
* Removes all outstanding requests for a given thread number. If a request
|
||||
* has been sent to the bus, this function removes all of its targets.
|
||||
* @param threadNum The thread number of the requests to squash.
|
||||
*/
|
||||
|
@ -220,14 +220,14 @@ public:
|
|||
int size, uint8_t *data, bool compressed);
|
||||
|
||||
/**
|
||||
* Perform a writeback pktuest.
|
||||
* Perform a writeback request.
|
||||
* @param pkt The writeback request.
|
||||
*/
|
||||
void doWriteback(PacketPtr &pkt);
|
||||
|
||||
/**
|
||||
* Returns true if there are outstanding pktuests.
|
||||
* @return True if there are outstanding pktuests.
|
||||
* Returns true if there are outstanding requests.
|
||||
* @return True if there are outstanding requests.
|
||||
*/
|
||||
bool havePending()
|
||||
{
|
||||
|
|
22
src/mem/cache/miss/miss_queue.hh
vendored
22
src/mem/cache/miss/miss_queue.hh
vendored
|
@ -77,7 +77,7 @@ class MissQueue
|
|||
/** The block size of the parent cache. */
|
||||
int blkSize;
|
||||
|
||||
/** Increasing order number assigned to each incoming pktuest. */
|
||||
/** Increasing order number assigned to each incoming request. */
|
||||
uint64_t order;
|
||||
|
||||
bool prefetchMiss;
|
||||
|
@ -212,7 +212,7 @@ class MissQueue
|
|||
void setPrefetcher(BasePrefetcher *_prefetcher);
|
||||
|
||||
/**
|
||||
* Handle a cache miss properly. Either allocate an MSHR for the pktuest,
|
||||
* Handle a cache miss properly. Either allocate an MSHR for the request,
|
||||
* or forward it through the write buffer.
|
||||
* @param pkt The request that missed in the cache.
|
||||
* @param blk_size The block size of the cache.
|
||||
|
@ -232,8 +232,8 @@ class MissQueue
|
|||
PacketPtr &target);
|
||||
|
||||
/**
|
||||
* Selects a outstanding pktuest to service.
|
||||
* @return The pktuest to service, NULL if none found.
|
||||
* Selects a outstanding request to service.
|
||||
* @return The request to service, NULL if none found.
|
||||
*/
|
||||
PacketPtr getPacket();
|
||||
|
||||
|
@ -251,7 +251,7 @@ class MissQueue
|
|||
void restoreOrigCmd(PacketPtr &pkt);
|
||||
|
||||
/**
|
||||
* Marks a pktuest as in service (sent on the bus). This can have side
|
||||
* Marks a request as in service (sent on the bus). This can have side
|
||||
* effect since storage for no response commands is deallocated once they
|
||||
* are successfully sent.
|
||||
* @param pkt The request that was sent on the bus.
|
||||
|
@ -259,14 +259,14 @@ class MissQueue
|
|||
void markInService(PacketPtr &pkt, MSHR* mshr);
|
||||
|
||||
/**
|
||||
* Collect statistics and free resources of a satisfied pktuest.
|
||||
* Collect statistics and free resources of a satisfied request.
|
||||
* @param pkt The request that has been satisfied.
|
||||
* @param time The time when the pktuest is satisfied.
|
||||
* @param time The time when the request is satisfied.
|
||||
*/
|
||||
void handleResponse(PacketPtr &pkt, Tick time);
|
||||
|
||||
/**
|
||||
* Removes all outstanding pktuests for a given thread number. If a request
|
||||
* Removes all outstanding requests for a given thread number. If a request
|
||||
* has been sent to the bus, this function removes all of its targets.
|
||||
* @param threadNum The thread number of the requests to squash.
|
||||
*/
|
||||
|
@ -313,14 +313,14 @@ class MissQueue
|
|||
int size, uint8_t *data, bool compressed);
|
||||
|
||||
/**
|
||||
* Perform the given writeback pktuest.
|
||||
* Perform the given writeback request.
|
||||
* @param pkt The writeback request.
|
||||
*/
|
||||
void doWriteback(PacketPtr &pkt);
|
||||
|
||||
/**
|
||||
* Returns true if there are outstanding pktuests.
|
||||
* @return True if there are outstanding pktuests.
|
||||
* Returns true if there are outstanding requests.
|
||||
* @return True if there are outstanding requests.
|
||||
*/
|
||||
bool havePending();
|
||||
|
||||
|
|
20
src/mem/cache/miss/mshr.hh
vendored
20
src/mem/cache/miss/mshr.hh
vendored
|
@ -44,7 +44,7 @@ class MSHR;
|
|||
|
||||
/**
|
||||
* Miss Status and handling Register. This class keeps all the information
|
||||
* needed to handle a cache miss including a list of target pktuests.
|
||||
* needed to handle a cache miss including a list of target requests.
|
||||
*/
|
||||
class MSHR {
|
||||
public:
|
||||
|
@ -63,15 +63,15 @@ class MSHR {
|
|||
Addr addr;
|
||||
/** Adress space id of the miss. */
|
||||
short asid;
|
||||
/** True if the pktuest has been sent to the bus. */
|
||||
/** True if the request has been sent to the bus. */
|
||||
bool inService;
|
||||
/** Thread number of the miss. */
|
||||
int threadNum;
|
||||
/** The pktuest that is forwarded to the next level of the hierarchy. */
|
||||
/** The request that is forwarded to the next level of the hierarchy. */
|
||||
PacketPtr pkt;
|
||||
/** The number of currently allocated targets. */
|
||||
short ntargets;
|
||||
/** The original pktuesting command. */
|
||||
/** The original requesting command. */
|
||||
Packet::Command originalCmd;
|
||||
/** Order number of assigned by the miss queue. */
|
||||
uint64_t order;
|
||||
|
@ -88,24 +88,24 @@ class MSHR {
|
|||
Iterator allocIter;
|
||||
|
||||
private:
|
||||
/** List of all pktuests that match the address */
|
||||
/** List of all requests that match the address */
|
||||
TargetList targets;
|
||||
|
||||
public:
|
||||
/**
|
||||
* Allocate a miss to this MSHR.
|
||||
* @param cmd The pktuesting command.
|
||||
* @param cmd The requesting command.
|
||||
* @param addr The address of the miss.
|
||||
* @param asid The address space id of the miss.
|
||||
* @param size The number of bytes to pktuest.
|
||||
* @param size The number of bytes to request.
|
||||
* @param pkt The original miss.
|
||||
*/
|
||||
void allocate(Packet::Command cmd, Addr addr, int size,
|
||||
PacketPtr &pkt);
|
||||
|
||||
/**
|
||||
* Allocate this MSHR as a buffer for the given pktuest.
|
||||
* @param target The memory pktuest to buffer.
|
||||
* Allocate this MSHR as a buffer for the given request.
|
||||
* @param target The memory request to buffer.
|
||||
*/
|
||||
void allocateAsBuffer(PacketPtr &target);
|
||||
|
||||
|
@ -115,7 +115,7 @@ public:
|
|||
void deallocate();
|
||||
|
||||
/**
|
||||
* Add a pktuest to the list of targets.
|
||||
* Add a request to the list of targets.
|
||||
* @param target The target.
|
||||
*/
|
||||
void allocateTarget(PacketPtr &target);
|
||||
|
|
26
src/mem/cache/miss/mshr_queue.hh
vendored
26
src/mem/cache/miss/mshr_queue.hh
vendored
|
@ -39,7 +39,7 @@
|
|||
#include "mem/cache/miss/mshr.hh"
|
||||
|
||||
/**
|
||||
* A Class for maintaining a list of pending and allocated memory pktuests.
|
||||
* A Class for maintaining a list of pending and allocated memory requests.
|
||||
*/
|
||||
class MSHRQueue {
|
||||
private:
|
||||
|
@ -55,7 +55,7 @@ class MSHRQueue {
|
|||
// Parameters
|
||||
/**
|
||||
* The total number of MSHRs in this queue. This number is set as the
|
||||
* number of MSHRs pktuested plus (numReserve - 1). This allows for
|
||||
* number of MSHRs requested plus (numReserve - 1). This allows for
|
||||
* the same number of effective MSHRs while still maintaining the reserve.
|
||||
*/
|
||||
const int numMSHRs;
|
||||
|
@ -103,14 +103,14 @@ class MSHRQueue {
|
|||
bool findMatches(Addr addr, std::vector<MSHR*>& matches) const;
|
||||
|
||||
/**
|
||||
* Find any pending pktuests that overlap the given request.
|
||||
* Find any pending requests that overlap the given request.
|
||||
* @param pkt The request to find.
|
||||
* @return A pointer to the earliest matching MSHR.
|
||||
*/
|
||||
MSHR* findPending(PacketPtr &pkt) const;
|
||||
|
||||
/**
|
||||
* Allocates a new MSHR for the pktuest and size. This places the request
|
||||
* Allocates a new MSHR for the request and size. This places the request
|
||||
* as the first target in the MSHR.
|
||||
* @param pkt The request to handle.
|
||||
* @param size The number in bytes to fetch from memory.
|
||||
|
@ -121,12 +121,12 @@ class MSHRQueue {
|
|||
MSHR* allocate(PacketPtr &pkt, int size = 0);
|
||||
|
||||
/**
|
||||
* Allocate a read pktuest for the given address, and places the given
|
||||
* Allocate a read request for the given address, and places the given
|
||||
* target on the target list.
|
||||
* @param addr The address to fetch.
|
||||
* @param asid The address space for the fetch.
|
||||
* @param size The number of bytes to pktuest.
|
||||
* @param target The first target for the pktuest.
|
||||
* @param size The number of bytes to request.
|
||||
* @param target The first target for the request.
|
||||
* @return Pointer to the new MSHR.
|
||||
*/
|
||||
MSHR* allocateFetch(Addr addr, int size, PacketPtr &target);
|
||||
|
@ -135,7 +135,7 @@ class MSHRQueue {
|
|||
* Allocate a target list for the given address.
|
||||
* @param addr The address to fetch.
|
||||
* @param asid The address space for the fetch.
|
||||
* @param size The number of bytes to pktuest.
|
||||
* @param size The number of bytes to request.
|
||||
* @return Pointer to the new MSHR.
|
||||
*/
|
||||
MSHR* allocateTargetList(Addr addr, int size);
|
||||
|
@ -181,14 +181,14 @@ class MSHRQueue {
|
|||
void markInService(MSHR* mshr);
|
||||
|
||||
/**
|
||||
* Mark an in service mshr as pending, used to resend a pktuest.
|
||||
* Mark an in service mshr as pending, used to resend a request.
|
||||
* @param mshr The MSHR to resend.
|
||||
* @param cmd The command to resend.
|
||||
*/
|
||||
void markPending(MSHR* mshr, Packet::Command cmd);
|
||||
|
||||
/**
|
||||
* Squash outstanding pktuests with the given thread number. If a request
|
||||
* Squash outstanding requests with the given thread number. If a request
|
||||
* is in service, just squashes the targets.
|
||||
* @param threadNum The thread to squash.
|
||||
*/
|
||||
|
@ -196,7 +196,7 @@ class MSHRQueue {
|
|||
|
||||
/**
|
||||
* Returns true if the pending list is not empty.
|
||||
* @return True if there are outstanding pktuests.
|
||||
* @return True if there are outstanding requests.
|
||||
*/
|
||||
bool havePending() const
|
||||
{
|
||||
|
@ -213,8 +213,8 @@ class MSHRQueue {
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns the pktuest at the head of the pendingList.
|
||||
* @return The next pktuest to service.
|
||||
* Returns the request at the head of the pendingList.
|
||||
* @return The next request to service.
|
||||
*/
|
||||
PacketPtr getReq() const
|
||||
{
|
||||
|
|
8
src/mem/cache/tags/split.hh
vendored
8
src/mem/cache/tags/split.hh
vendored
|
@ -71,13 +71,13 @@ class Split : public BaseTags
|
|||
|
||||
Addr blkMask;
|
||||
|
||||
/** Number of NIC pktuests that hit in the NIC partition */
|
||||
/** Number of NIC requests that hit in the NIC partition */
|
||||
Stats::Scalar<> NR_NP_hits;
|
||||
/** Number of NIC pktuests that hit in the CPU partition */
|
||||
/** Number of NIC requests that hit in the CPU partition */
|
||||
Stats::Scalar<> NR_CP_hits;
|
||||
/** Number of CPU pktuests that hit in the NIC partition */
|
||||
/** Number of CPU requests that hit in the NIC partition */
|
||||
Stats::Scalar<> CR_NP_hits;
|
||||
/** Number of CPU pktuests that hit in the CPU partition */
|
||||
/** Number of CPU requests that hit in the CPU partition */
|
||||
Stats::Scalar<> CR_CP_hits;
|
||||
/** The number of nic replacements (i.e. misses) */
|
||||
Stats::Scalar<> nic_repl;
|
||||
|
|
2
src/mem/cache/tags/split_blk.hh
vendored
2
src/mem/cache/tags/split_blk.hh
vendored
|
@ -47,7 +47,7 @@ class SplitBlk : public CacheBlk {
|
|||
bool isTouched;
|
||||
/** Has this block been used after being brought in? (for LIFO partition) */
|
||||
bool isUsed;
|
||||
/** is this blk a NIC block? (i.e. pktuested by the NIC) */
|
||||
/** is this blk a NIC block? (i.e. requested by the NIC) */
|
||||
bool isNIC;
|
||||
/** timestamp of the arrival of this block into the cache */
|
||||
Tick ts;
|
||||
|
|
Loading…
Reference in a new issue