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

mem-cache: Return entry in StridePrefetcher::pcTableHit()

Browse Source 
Return a pointer to the entry instead of returning a
boolean and passing a pointer reference. As a side
effect, change the name of the function to be more
descriptive of the functionality.

Change-Id: Iad44979e98031754c1d0857b1790c0eaf77e9765
Signed-off-by: Daniel <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/14356
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
This commit is contained in:
Daniel
2018-11-13 20:59:50 +01:00
committed by Daniel Carvalho
parent 67e45b872a
commit 359a2ef709
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mem/cache/prefetch/stride.cc vendored
View File

@@ -115,10 +115,10 @@ StridePrefetcher::calculatePrefetch(const PacketPtr &pkt,
bool is_secure = pkt->isSecure();
MasterID master_id = useMasterId ? pkt->req->masterId() : 0;
// Lookup pc-based information
StrideEntry *entry;
// Search for entry in the pc table
StrideEntry *entry = findEntry(pc, is_secure, master_id);
if (pcTableHit(pc, is_secure, master_id, entry)) {
if (entry != nullptr) {
// Hit in table
int new_stride = pkt_addr - entry->lastAddr;
bool stride_match = (new_stride == entry->stride);
@@ -198,22 +198,20 @@ StridePrefetcher::pcTableVictim(Addr pc, int master_id)
return &pcTable[master_id][set][way];
}
inline bool
StridePrefetcher::pcTableHit(Addr pc, bool is_secure, int master_id,
StrideEntry* &entry)
inline StridePrefetcher::StrideEntry*
StridePrefetcher::findEntry(Addr pc, bool is_secure, int master_id)
{
int set = pcHash(pc);
StrideEntry* set_entries = pcTable[master_id][set];
for (int way = 0; way < pcTableAssoc; way++) {
StrideEntry* entry = &set_entries[way];
// Search ways for match
if (set_entries[way].instAddr == pc &&
set_entries[way].isSecure == is_secure) {
if ((entry->instAddr == pc) && (entry->isSecure == is_secure)) {
DPRINTF(HWPrefetch, "Lookup hit table[%d][%d].\n", set, way);
entry = &set_entries[way];
return true;
return entry;
}
}
return false;
return nullptr;
}
StridePrefetcher*

11
src/mem/cache/prefetch/stride.hh vendored
View File

@@ -110,7 +110,16 @@ class StridePrefetcher : public QueuedPrefetcher
};
PCTable pcTable;
bool pcTableHit(Addr pc, bool is_secure, int master_id, StrideEntry* &entry);
/**
* Search for an entry in the pc table.
*
* @param pc The PC to look for.
* @param is_secure True if the target memory space is secure.
* @param master_id The context.
* @return Pointer to the entry.
*/
StrideEntry* findEntry(Addr pc, bool is_secure, int master_id);
StrideEntry* pcTableVictim(Addr pc, int master_id);
Addr pcHash(Addr pc) const;