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

cpu: Fix o3 SMT IQCount bug

Browse Source 
Commmitted by: Nilay Vaish <nilay@cs.wisc.edu>
This commit is contained in:
Andrew Lukefahr
2014-10-11 16:16:02 -05:00
parent 19ca35737d
commit 8e07b36d2b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpu/o3/fetch_impl.hh
View File

@@ -1511,7 +1511,9 @@ template<class Impl>
ThreadID
DefaultFetch<Impl>::iqCount()
{
std::priority_queue<unsigned> PQ;
//sorted from lowest->highest
std::priority_queue<unsigned,vector<unsigned>,
std::greater<unsigned> > PQ;
std::map<unsigned, ThreadID> threadMap;
list<ThreadID>::iterator threads = activeThreads->begin();
@@ -1521,6 +1523,8 @@ DefaultFetch<Impl>::iqCount()
ThreadID tid = *threads++;
unsigned iqCount = fromIEW->iewInfo[tid].iqCount;
//we can potentially get tid collisions if two threads
//have the same iqCount, but this should be rare.
PQ.push(iqCount);
threadMap[iqCount] = tid;
}
@@ -1544,7 +1548,9 @@ template<class Impl>
ThreadID
DefaultFetch<Impl>::lsqCount()
{
std::priority_queue<unsigned> PQ;
//sorted from lowest->highest
std::priority_queue<unsigned,vector<unsigned>,
std::greater<unsigned> > PQ;
std::map<unsigned, ThreadID> threadMap;
list<ThreadID>::iterator threads = activeThreads->begin();
@@ -1554,6 +1560,8 @@ DefaultFetch<Impl>::lsqCount()
ThreadID tid = *threads++;
unsigned ldstqCount = fromIEW->iewInfo[tid].ldstqCount;
//we can potentially get tid collisions if two threads
//have the same iqCount, but this should be rare.
PQ.push(ldstqCount);
threadMap[ldstqCount] = tid;
}