From: Daniel R. Carvalho <odanrc@yahoo.com.br>
Date: Tue, 6 Mar 2018 11:14:39 +0000 (+0100)
Subject: mem-cache: Fix bug generated by 8282
X-Git-Tag: v19.0.0.0~2262
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93f57da4c48913552f984ccfe4b1318782a0e64a;p=gem5.git

mem-cache: Fix bug generated by 8282

Merge 1ae7fced4d32898531a6875a339ef00e43e20e66 generated
a bug in tagsInUse calculation.

Change-Id: I079e327a0a26a7968f2ed8e433dd6e790c80998b
Reviewed-on: https://gem5-review.googlesource.com/8781
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
---

diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh
index 21a250e75..44f68d5fc 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -239,8 +239,6 @@ public:
          uint32_t task_id = pkt->req->taskId();
 
          if (!blk->isTouched) {
-             tagsInUse++;
-             blk->isTouched = true;
              if (!warmedUp && tagsInUse.value() >= warmupBound) {
                  warmedUp = true;
                  warmupCycle = curTick();
@@ -260,6 +258,9 @@ public:
              blk->invalidate();
          }
 
+         // Previous block, if existed, has been removed, and now we have
+         // to insert the new one and mark it as touched
+         tagsInUse++;
          blk->isTouched = true;
 
          // Set tag for new block.  Caller is responsible for setting status.