From 4b2e28307d0a1c2b31e403e8e394261eb363a7a9 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 20 Jun 2018 14:23:59 +0100 Subject: arch-arm: Don't fail to initialise PMU if BP is missing The branch predictor currently assumes that each CPU has a branch predictor. This isn't true in some cases (e.g., KVM, Atomic). Change-Id: I61e80dca940c2dadba1b812449691c9dba1c06d9 Reviewed-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/11520 Maintainer: Giacomo Travaglini --- src/arch/arm/ArmPMU.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/arch/arm/ArmPMU.py b/src/arch/arm/ArmPMU.py index a87c20b4a..9da3de28a 100644 --- a/src/arch/arm/ArmPMU.py +++ b/src/arch/arm/ArmPMU.py @@ -115,8 +115,9 @@ class ArmPMU(SimObject): sharing the PMU (e.g., when switching between CPU models). """ - bpred = cpu.branchPred if cpu and not isNullPointer(cpu.branchPred) \ - else None + bpred = getattr(cpu, "branchPred", None) if cpu else None + if bpred is not None and isNullPointer(bpred): + bpred = None self.addEvent(SoftwareIncrement(self,0x00)) # 0x01: L1I_CACHE_REFILL -- cgit v1.2.3