Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/24647 )
Change subject: configs: Remove mentions of alpha from the configs.
......................................................................
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 <noreply+kok...@google.com>
Maintainer: Jason Lowe-Power <ja...@lowepower.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
---
M configs/common/Benchmarks.py
M configs/common/FSConfig.py
M configs/common/cpu2000.py
M configs/example/fs.py
M configs/example/se.py
5 files changed, 6 insertions(+), 76 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py
index 9ed321c..2961eeb 100644
--- a/configs/common/Benchmarks.py
+++ b/configs/common/Benchmarks.py
@@ -57,8 +57,6 @@
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 f21b1ec..61532a3 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -49,8 +49,7 @@
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 @@
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 730a478..a5478e8 100644
--- a/configs/common/cpu2000.py
+++ b/configs/common/cpu2000.py
@@ -666,7 +666,7 @@
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 @@
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 c9ae60e..13225a2 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -81,10 +81,7 @@
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 @@
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 1d4de1a..5847faf 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -143,10 +143,7 @@
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:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/24647
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I09117b52c0c87679eaa72dbb79545dd1e77732b1
Gerrit-Change-Number: 24647
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Steve Reinhardt <ste...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
