configs,stdlib,tests: Remove get_runtime_isa() (#241)
`get_runtime_isa()` has been deprecated for some time. It is a leftover piece of code from when gem5 was compiled to a single ISA and that ISA used to configure the simulated system to use that ISA. Since multi-ISA compilations are possible, `get_runtime_isa()` should not be used. Unless the gem5 binary is compiled to a single ISA, a failure will occur. The new proceedure for specify which ISA to use is by the setting of the correct `BaseCPU` implementation. E.g., `X86SimpleTimingCPU` of `ArmO3CPU`. This patch removes the remaining `get_runtime_isa()` instances and removes the function itself. The `SimpleCore` class has been updated to allow for it's CPU factory to return a class, needed by scripts in "configs/common". The deprecated functionality in the standard library, which allowed for the specifying of an ISA when setting up a processor and/or core has also been removed. Setting an ISA is now manditory. Fixes #216.
This commit is contained in:
@@ -40,7 +40,7 @@ from m5.objects import *
|
||||
from m5.util import addToPath
|
||||
|
||||
from gem5.isas import ISA
|
||||
from gem5.runtime import get_runtime_isa
|
||||
from gem5.runtime import get_supported_isas
|
||||
|
||||
addToPath("../")
|
||||
|
||||
@@ -786,7 +786,7 @@ system.clk_domain = SrcClockDomain(
|
||||
|
||||
if fast_forward:
|
||||
have_kvm_support = "BaseKvmCPU" in globals()
|
||||
if have_kvm_support and get_runtime_isa() == ISA.X86:
|
||||
if have_kvm_support and get_supported_isas().contains(ISA.X86):
|
||||
system.vm = KvmVM()
|
||||
system.m5ops_base = 0xFFFF0000
|
||||
for i in range(len(host_cpu.workload)):
|
||||
@@ -825,7 +825,7 @@ for i in range(args.num_cpus):
|
||||
system.cpu[i].dcache_port = ruby_port.in_ports
|
||||
|
||||
ruby_port.mem_request_port = system.piobus.cpu_side_ports
|
||||
if get_runtime_isa() == ISA.X86:
|
||||
if get_supported_isas().contains(ISA.X86):
|
||||
system.cpu[i].interrupts[0].pio = system.piobus.mem_side_ports
|
||||
system.cpu[i].interrupts[
|
||||
0
|
||||
|
||||
Reference in New Issue
Block a user