From 67273d65ed6cb5577e1d3c3923450611b41583e3 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 22 Jan 2020 21:16:29 -0800 Subject: [PATCH] configs: Remove mentions of alpha from the configs. Change-Id: I09117b52c0c87679eaa72dbb79545dd1e77732b1 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24647 Tested-by: kokoro Maintainer: Jason Lowe-Power Reviewed-by: Bobby R. Bruce --- configs/common/Benchmarks.py | 2 -- configs/common/FSConfig.py | 61 +----------------------------------- configs/common/cpu2000.py | 4 +-- configs/example/fs.py | 10 ++---- configs/example/se.py | 5 +-- 5 files changed, 6 insertions(+), 76 deletions(-) diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index 9ed321ccf..2961eebbb 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -57,8 +57,6 @@ class SysConfig: def disks(self): if self.disknames: return [disk(diskname) for diskname in self.disknames] - elif buildEnv['TARGET_ISA'] == 'alpha': - return [env.get('LINUX_IMAGE', disk('linux-latest.img'))] elif buildEnv['TARGET_ISA'] == 'x86': return [env.get('LINUX_IMAGE', disk('x86root.img'))] elif buildEnv['TARGET_ISA'] == 'arm': diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index f21b1ecf5..61532a3ff 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -49,8 +49,7 @@ from .Benchmarks import * from . import ObjectList # Populate to reflect supported os types per target ISA -os_types = { 'alpha' : [ 'linux' ], - 'mips' : [ 'linux' ], +os_types = { 'mips' : [ 'linux' ], 'sparc' : [ 'linux' ], 'x86' : [ 'linux' ], 'arm' : [ 'linux', @@ -99,64 +98,6 @@ def makeCowDisks(disk_paths): disks.append(disk) return disks -def makeLinuxAlphaSystem(mem_mode, mdesc=None, ruby=False, cmdline=None): - - class BaseTsunami(Tsunami): - ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) - ide = IdeController(disks=Parent.disks, - pci_func=0, pci_dev=0, pci_bus=0) - - self = LinuxAlphaSystem() - if not mdesc: - # generic system - mdesc = SysConfig() - self.readfile = mdesc.script() - - self.tsunami = BaseTsunami() - - # Create the io bus to connect all device ports - self.iobus = IOXBar() - self.tsunami.attachIO(self.iobus) - - self.tsunami.ide.pio = self.iobus.master - - self.tsunami.ethernet.pio = self.iobus.master - - if ruby: - # Store the dma devices for later connection to dma ruby ports. - # Append an underscore to dma_ports to avoid the SimObjectVector check. - self._dma_ports = [self.tsunami.ide.dma, self.tsunami.ethernet.dma] - else: - self.membus = MemBus() - - # By default the bridge responds to all addresses above the I/O - # base address (including the PCI config space) - IO_address_space_base = 0x80000000000 - self.bridge = Bridge(delay='50ns', - ranges = [AddrRange(IO_address_space_base, Addr.max)]) - self.bridge.master = self.iobus.slave - self.bridge.slave = self.membus.master - - self.tsunami.ide.dma = self.iobus.slave - self.tsunami.ethernet.dma = self.iobus.slave - - self.system_port = self.membus.slave - - self.mem_ranges = [AddrRange(mdesc.mem())] - self.disks = makeCowDisks(mdesc.disks()) - self.simple_disk = SimpleDisk(disk=RawDiskImage( - image_file = mdesc.disks()[0], read_only = True)) - self.intrctrl = IntrControl() - self.mem_mode = mem_mode - self.terminal = Terminal() - self.pal = binary('ts_osfpal') - self.console = binary('console') - if not cmdline: - cmdline = 'root=/dev/hda1 console=ttyS0' - self.boot_osflags = fillInCmdline(mdesc, cmdline) - - return self - def makeSparcSystem(mem_mode, mdesc=None, cmdline=None): # Constants from iob.cc and uart8250.cc iob_man_addr = 0x9800000000 diff --git a/configs/common/cpu2000.py b/configs/common/cpu2000.py index 730a47878..a5478e849 100644 --- a/configs/common/cpu2000.py +++ b/configs/common/cpu2000.py @@ -666,7 +666,7 @@ class vortex(Benchmark): stdin = None def __init__(self, isa, os, input_set): - if (isa in ('alpha', 'arm', 'thumb', 'aarch64')): + if (isa in ('arm', 'thumb', 'aarch64')): self.endian = 'lendian' elif (isa == 'sparc' or isa == 'sparc32'): self.endian = 'bendian' @@ -751,7 +751,7 @@ if __name__ == '__main__': for bench in all: for input_set in 'ref', 'test', 'train': print('class: %s' % bench.__name__) - x = bench('alpha', 'tru64', input_set) + x = bench('x86', 'linux', input_set) print('%s: %s' % (x, input_set)) pprint(x.makeProcessArgs()) print() diff --git a/configs/example/fs.py b/configs/example/fs.py index c9ae60e35..13225a2ab 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -81,10 +81,7 @@ def cmd_line_template(): def build_test_system(np): cmdline = cmd_line_template() - if buildEnv['TARGET_ISA'] == "alpha": - test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0], options.ruby, - cmdline=cmdline) - elif buildEnv['TARGET_ISA'] == "mips": + if buildEnv['TARGET_ISA'] == "mips": test_sys = makeLinuxMipsSystem(test_mem_mode, bm[0], cmdline=cmdline) elif buildEnv['TARGET_ISA'] == "sparc": test_sys = makeSparcSystem(test_mem_mode, bm[0], cmdline=cmdline) @@ -243,10 +240,7 @@ def build_drive_system(np): DriveMemClass = SimpleMemory cmdline = cmd_line_template() - if buildEnv['TARGET_ISA'] == 'alpha': - drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1], - cmdline=cmdline) - elif buildEnv['TARGET_ISA'] == 'mips': + if buildEnv['TARGET_ISA'] == 'mips': drive_sys = makeLinuxMipsSystem(drive_mem_mode, bm[1], cmdline=cmdline) elif buildEnv['TARGET_ISA'] == 'sparc': drive_sys = makeSparcSystem(drive_mem_mode, bm[1], cmdline=cmdline) diff --git a/configs/example/se.py b/configs/example/se.py index 1d4de1a85..5847faf48 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -143,10 +143,7 @@ if options.bench: for app in apps: try: - if buildEnv['TARGET_ISA'] == 'alpha': - exec("workload = %s('alpha', 'tru64', '%s')" % ( - app, options.spec_input)) - elif buildEnv['TARGET_ISA'] == 'arm': + if buildEnv['TARGET_ISA'] == 'arm': exec("workload = %s('arm_%s', 'linux', '%s')" % ( app, options.arm_iset, options.spec_input)) else: -- 2.30.2