From a586380b32a199b40d1f6f5e14ce7731ee5a3c67 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 23 Sep 2019 15:43:52 +0100 Subject: [PATCH] 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 Maintainer: Jason Lowe-Power Tested-by: kokoro --- configs/example/fs.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/example/fs.py b/configs/example/fs.py index e1501e674..9216f704c 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -204,14 +204,15 @@ def build_test_system(np): 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 -- 2.30.2