diff options
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 2 | ||||
| -rw-r--r-- | src/cpu/o3/cpu.cc | 2 | ||||
| -rw-r--r-- | src/cpu/o3/iew_impl.hh | 2 | ||||
| -rw-r--r-- | src/cpu/o3/rob_impl.hh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index 91e8e7681..5ca15f611 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -561,7 +561,7 @@ DefaultCommit<Impl>::squashAll(ThreadID tid) // then use one older sequence number. // Hopefully this doesn't mess things up. Basically I want to squash // all instructions of this thread. - InstSeqNum squashed_inst = rob->isEmpty() ? + InstSeqNum squashed_inst = rob->isEmpty(tid) ? lastCommitedSeqNum[tid] : rob->readHeadInst(tid)->seqNum - 1; // All younger instructions will be squashed. Set the sequence diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 710482d3c..f87e6a923 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -1640,7 +1640,7 @@ FullO3CPU<Impl>::removeInstsNotInROB(ThreadID tid) if (instList.empty()) { return; - } else if (rob.isEmpty(/*tid*/)) { + } else if (rob.isEmpty(tid)) { DPRINTF(O3CPU, "ROB is empty, squashing all insts.\n"); end_it = instList.begin(); rob_empty = true; diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh index 9cfbb3cfc..927a8d5a6 100644 --- a/src/cpu/o3/iew_impl.hh +++ b/src/cpu/o3/iew_impl.hh @@ -1598,7 +1598,7 @@ DefaultIEW<Impl>::tick() toRename->iewInfo[tid].usedIQ = true; toRename->iewInfo[tid].freeIQEntries = - instQueue.numFreeEntries(); + instQueue.numFreeEntries(tid); toRename->iewInfo[tid].usedLSQ = true; toRename->iewInfo[tid].freeLSQEntries = ldstQueue.numFreeEntries(tid); diff --git a/src/cpu/o3/rob_impl.hh b/src/cpu/o3/rob_impl.hh index c047981a7..61d6bd11b 100644 --- a/src/cpu/o3/rob_impl.hh +++ b/src/cpu/o3/rob_impl.hh @@ -486,7 +486,7 @@ template <class Impl> void ROB<Impl>::squash(InstSeqNum squash_num, ThreadID tid) { - if (isEmpty()) { + if (isEmpty(tid)) { DPRINTF(ROB, "Does not need to squash due to being empty " "[sn:%i]\n", squash_num); |