diff options
author | Rekai Gonzalez-Alberquilla <rekai.gonzalezalberquilla@arm.com> | 2016-09-22 10:49:10 +0100 |
---|---|---|
committer | Rekai Gonzalez-Alberquilla <rekai.gonzalezalberquilla@arm.com> | 2016-09-22 10:49:10 +0100 |
commit | ad296b068cf4a0b043988be518994ac6bd7582f0 (patch) | |
tree | 584633dffa6806a93d2c2c1a94b90096e3c50d2e /src/cpu/o3/iew_impl.hh | |
parent | d0ffd2f9b88d6abb29ed861deec12b40bdb7419f (diff) | |
download | gem5-ad296b068cf4a0b043988be518994ac6bd7582f0.tar.xz |
cpu: Fix the O3 CPU Drain
The drain did not wait until stages were ready again. Therefore, as a
result of messages in the TimeBuffer being drain, the state after the
drain was not consistent and asserts fired in some places when the
draining happened after a stage got blocked, but before the notification
arrived to the previous stages.
Change-Id: Ib50b3b40b7f745b62c1eba2931dec76860824c71
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/cpu/o3/iew_impl.hh')
-rw-r--r-- | src/cpu/o3/iew_impl.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh index e02429b14..78b83eba6 100644 --- a/src/cpu/o3/iew_impl.hh +++ b/src/cpu/o3/iew_impl.hh @@ -391,6 +391,7 @@ DefaultIEW<Impl>::isDrained() const DPRINTF(Drain, "%i: Skid buffer not empty.\n", tid); drained = false; } + drained = drained && dispatchStatus[tid] == Running; } // Also check the FU pool as instructions are "stored" in FU |