summaryrefslogtreecommitdiff
path: root/src/cpu/o3/lsq.hh
diff options
context:
space:
mode:
authorGabor Dozsa <gabor.dozsa@arm.com>2018-11-15 17:21:57 +0000
committerGiacomo Gabrielli <giacomo.gabrielli@arm.com>2019-07-28 16:28:43 +0000
commit5a9fb5a2bffe37bbfc525137946e6bc0809f6578 (patch)
tree49fb4e98c3ed00567fea35fd2869c94c8f2fc24e /src/cpu/o3/lsq.hh
parentfc7cb70a7231bb7a92413d1f8b43c9f4ef6c8690 (diff)
downloadgem5-5a9fb5a2bffe37bbfc525137946e6bc0809f6578.tar.xz
cpu-o3: Fix too strict assert condition in writeback()
The assert() in the LSQ writeback() only allowed ReExec faults. However, a SplitRequest which completed the translation in PartialFault state (i.e. any but the very first cacheline translation failed) may end up here. The assert() condition is extended accordingly. The patch also removes the superfluous/unused Complete/Squashed states from the LSQ request. (The completion of the request is recorded in the flags still.) Change-Id: Ie575f4d3b4d5295585828ad8c7d3f4c7c1fe15d0 Signed-off-by: Gabor Dozsa <gabor.dozsa@arm.com> Reviewed-by: Giacomo Gabrielli <giacomo.gabrielli@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19174 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/cpu/o3/lsq.hh')
-rw-r--r--src/cpu/o3/lsq.hh2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 6f7820113..4701a8c9a 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -223,8 +223,6 @@ class LSQ
NotIssued,
Translation,
Request,
- Complete,
- Squashed,
Fault,
PartialFault,
};