diff options
| author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:46 -0500 |
|---|---|---|
| committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:46 -0500 |
| commit | 1814a85a055732baf98fd030441bb4c5c5db9bdc (patch) | |
| tree | 33dd6adc62342a55ac3b0f4dbe9fdb9d82faa323 /src/cpu/o3/bpred_unit.hh | |
| parent | 9e8003148f78811e600e51a900f96b71cb525b60 (diff) | |
| download | gem5-1814a85a055732baf98fd030441bb4c5c5db9bdc.tar.xz | |
cpu: Rewrite O3 draining to avoid stopping in microcode
Previously, the O3 CPU could stop in the middle of a microcode
sequence. This patch makes sure that the pipeline stops when it has
committed a normal instruction or exited from a microcode
sequence. Additionally, it makes sure that the pipeline has no
instructions in flight when it is drained, which should make draining
more robust.
Draining is controlled in the commit stage, which checks if the next
PC after a committed instruction is in microcode. If this isn't the
case, it requests a squash of all instructions after that the
instruction that just committed and immediately signals a drain stall
to the fetch stage. The CPU then continues to execute until the
pipeline and all associated buffers are empty.
Diffstat (limited to 'src/cpu/o3/bpred_unit.hh')
| -rw-r--r-- | src/cpu/o3/bpred_unit.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh index c1afb4720..3f83f9bef 100644 --- a/src/cpu/o3/bpred_unit.hh +++ b/src/cpu/o3/bpred_unit.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 ARM Limited + * Copyright (c) 2011-2012 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -88,8 +88,10 @@ class BPredUnit */ void regStats(); - void switchOut(); + /** Perform sanity checks after a drain. */ + void drainSanityCheck() const; + /** Take over execution from another CPU's thread. */ void takeOverFrom(); /** |