commit a586380b32a199b40d1f6f5e14ce7731ee5a3c67
author Ciro Santilli <ciro.santilli@arm.com> Mon Sep 23 15:43:52 2019 +0100
committer Ciro Santilli <ciro.santilli@arm.com> Mon Oct 07 10:26:20 2019 +0000
tree d41535d969748ee586a0ca733229ca21d22353fd
parent e4ed0d84013a36dda19dd93d6b883d7d2984d600

config: skip access to branchPred in ARM KVM

Prevents runtime error:

AttributeError: object 'ArmV8KvmCPU' has no attribute 'branchPred'

Change-Id: Ic5765fd560381cbacc2fa2fd2e6f79d98433c535
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21299
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>

configs/example/fs.py

diff --git a/configs/example/fs.py b/configs/example/fs.py
index e1501e6..9216f70 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -204,14 +204,15 @@
                 test_sys.cpu[i].addSimPointProbe(options.simpoint_interval)
             if options.checker:
                 test_sys.cpu[i].addCheckerCpu()
-            if options.bp_type:
-                bpClass = ObjectList.bp_list.get(options.bp_type)
-                test_sys.cpu[i].branchPred = bpClass()
-            if options.indirect_bp_type:
-                IndirectBPClass = ObjectList.indirect_bp_list.get(
-                    options.indirect_bp_type)
-                test_sys.cpu[i].branchPred.indirectBranchPred = \
-                    IndirectBPClass()
+            if not ObjectList.is_kvm_cpu(TestCPUClass):
+                if options.bp_type:
+                    bpClass = ObjectList.bp_list.get(options.bp_type)
+                    test_sys.cpu[i].branchPred = bpClass()
+                if options.indirect_bp_type:
+                    IndirectBPClass = ObjectList.indirect_bp_list.get(
+                        options.indirect_bp_type)
+                    test_sys.cpu[i].branchPred.indirectBranchPred = \
+                        IndirectBPClass()
             test_sys.cpu[i].createThreads()
 
         # If elastic tracing is enabled when not restoring from checkpoint and