From: Austin Harris Date: Sat, 2 Dec 2017 23:03:28 +0000 (-0600) Subject: config: Fix need to set ISA of switch cpus. X-Git-Tag: v19.0.0.0~2445 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a51576e19c7f63930bc3b59c9a2e0a49cbc0bd81;p=gem5.git config: Fix need to set ISA of switch cpus. Since BaseCPU.createThreads() no longer overrides the BaseCPU.isa parameter, switch_cpus should have the ISA copied. This fixes a fatal error in BaseCPU when restoring from a checkpoint. Change-Id: I4fdcacb76da46bdbe1ce37dcf05c5a6a8a9e5237 Signed-off-by: Austin Harris Reviewed-on: https://gem5-review.googlesource.com/6241 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index c4d5c9644..71a982af9 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -464,6 +464,7 @@ def run(options, root, testsys, cpu_class): switch_cpus[i].clk_domain = testsys.cpu[i].clk_domain switch_cpus[i].progress_interval = \ testsys.cpu[i].progress_interval + switch_cpus[i].isa = testsys.cpu[i].isa # simulation period if options.maxinsts: switch_cpus[i].max_insts_any_thread = options.maxinsts @@ -496,6 +497,7 @@ def run(options, root, testsys, cpu_class): repeat_switch_cpus[i].system = testsys repeat_switch_cpus[i].workload = testsys.cpu[i].workload repeat_switch_cpus[i].clk_domain = testsys.cpu[i].clk_domain + repeat_switch_cpus[i].isa = testsys.cpu[i].isa if options.maxinsts: repeat_switch_cpus[i].max_insts_any_thread = options.maxinsts @@ -525,6 +527,8 @@ def run(options, root, testsys, cpu_class): switch_cpus_1[i].workload = testsys.cpu[i].workload switch_cpus[i].clk_domain = testsys.cpu[i].clk_domain switch_cpus_1[i].clk_domain = testsys.cpu[i].clk_domain + switch_cpus[i].isa = testsys.cpu[i].isa + switch_cpus_1[i].isa = testsys.cpu[i].isa # if restoring, make atomic cpu simulate only a few instructions if options.checkpoint_restore != None: