From: Jose Marinho <jose.marinho@arm.com>
Date: Tue, 17 Oct 2017 15:39:54 +0000 (+0100)
Subject: arch-arm: Ensure counters keep events on checkpoint resume
X-Git-Tag: v19.0.0.0~2541
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ec997fb73eab01229909f0c91f7ff5456f7250a;p=gem5.git

arch-arm: Ensure counters keep events on checkpoint resume

Events were not being attached to counters after a checkpoint resume.
By not storing the enable private variable from the stored state the
recreation of the event to counter association is automatically carried.
The enable state is stored in the reg_pmcnten.

Change-Id: I46344df0882a9050c900efb2e8996d64dbfbf297
Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/5761
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
---

diff --git a/src/arch/arm/pmu.cc b/src/arch/arm/pmu.cc
index f1ff6cbbc..baf0d1948 100644
--- a/src/arch/arm/pmu.cc
+++ b/src/arch/arm/pmu.cc
@@ -579,7 +579,6 @@ PMU::CounterState::serialize(CheckpointOut &cp) const
 {
     SERIALIZE_SCALAR(eventId);
     SERIALIZE_SCALAR(value);
-    SERIALIZE_SCALAR(enabled);
     SERIALIZE_SCALAR(overflow64);
 }
 
@@ -588,7 +587,6 @@ PMU::CounterState::unserialize(CheckpointIn &cp)
 {
     UNSERIALIZE_SCALAR(eventId);
     UNSERIALIZE_SCALAR(value);
-    UNSERIALIZE_SCALAR(enabled);
     UNSERIALIZE_SCALAR(overflow64);
 }