commit a923674d629270203730e473d5136f37f752e972
author Giacomo Travaglini <giacomo.travaglini@arm.com> Sun Dec 12 14:59:27 2021 +0000
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Dec 14 09:43:41 2021 +0000
tree a77941410a7d0c8ee61c71c8140d0470ce6f989a
parent 2be95c4470741567954103c732bcf957f1959c4f

arch-arm: Do not squash table walks if translation is partial

As partial translations have been introduced we cannot just
rely on checking if there is a valid translation when looking
for translations to squash.
The translation has to be complete as well.

This is fixing realview-o3-checker regression

Change-Id: I1ad42bd6172207a72f53b7a843c323c0eea88f06
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54043
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
(cherry picked from commit ec891adca9c9430b178562ad498c1699026e5906)
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54103
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>

src/arch/arm/table_walker.cc

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index f94e765..c7b8c3c 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -533,7 +533,8 @@
     unsigned num_squashed = 0;
     ThreadContext *tc = currState->tc;
     while ((num_squashed < numSquashable) && currState &&
-           (currState->transState->squashed() || te)) {
+           (currState->transState->squashed() ||
+            (te && !te->partial))) {
         pendingQueue.pop_front();
         num_squashed++;
         stats.squashedBefore++;