summaryrefslogtreecommitdiff
path: root/configs/common
diff options
context:
space:
mode:
authorARM gem5 Developers <none@none>2014-01-24 15:29:34 -0600
committerARM gem5 Developers <none@none>2014-01-24 15:29:34 -0600
commit612f8f074fa1099cf70faf495d46cc647762a031 (patch)
treebd1e99c43bf15292395eadd4b7ae3f5c823545c3 /configs/common
parentf3585c841e964c98911784a187fc4f081a02a0a6 (diff)
downloadgem5-612f8f074fa1099cf70faf495d46cc647762a031.tar.xz
arm: Add support for ARMv8 (AArch64 & AArch32)
Note: AArch64 and AArch32 interworking is not supported. If you use an AArch64 kernel you are restricted to AArch64 user-mode binaries. This will be addressed in a later patch. Note: Virtualization is only supported in AArch32 mode. This will also be fixed in a later patch. Contributors: Giacomo Gabrielli (TrustZone, LPAE, system-level AArch64, AArch64 NEON, validation) Thomas Grocutt (AArch32 Virtualization, AArch64 FP, validation) Mbou Eyole (AArch64 NEON, validation) Ali Saidi (AArch64 Linux support, code integration, validation) Edmund Grimley-Evans (AArch64 FP) William Wang (AArch64 Linux support) Rene De Jong (AArch64 Linux support, performance opt.) Matt Horsnell (AArch64 MP, validation) Matt Evans (device models, code integration, validation) Chris Adeniyi-Jones (AArch64 syscall-emulation) Prakash Ramrakhyani (validation) Dam Sunwoo (validation) Chander Sudanthi (validation) Stephan Diestelhorst (validation) Andreas Hansson (code integration, performance opt.) Eric Van Hensbergen (performance opt.) Gabe Black
Diffstat (limited to 'configs/common')
-rw-r--r--configs/common/FSConfig.py3
-rw-r--r--configs/common/O3_ARM_v7a.py2
-rw-r--r--configs/common/Options.py11
-rw-r--r--configs/common/cpu2000.py2
4 files changed, 15 insertions, 3 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 8905ba2fa..58ad1a7c9 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -242,7 +242,8 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
self.realview = VExpress_ELT()
elif machine_type == "VExpress_EMM":
self.realview = VExpress_EMM()
- self.load_addr_mask = 0xffffffff
+ elif machine_type == "VExpress_EMM64":
+ self.realview = VExpress_EMM64()
else:
print "Unknown Machine Type"
sys.exit(1)
diff --git a/configs/common/O3_ARM_v7a.py b/configs/common/O3_ARM_v7a.py
index aedafaf4d..3b7df9988 100644
--- a/configs/common/O3_ARM_v7a.py
+++ b/configs/common/O3_ARM_v7a.py
@@ -139,7 +139,7 @@ class O3_ARM_v7a_3(DerivO3CPU):
backComSize = 5
forwardComSize = 5
numPhysIntRegs = 128
- numPhysFloatRegs = 128
+ numPhysFloatRegs = 192
numIQEntries = 32
numROBEntries = 40
diff --git a/configs/common/Options.py b/configs/common/Options.py
index 2cca4ef57..209d24357 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -94,6 +94,9 @@ def addCommonOptions(parser):
default="512MB",
help="Specify the physical memory size (single memory)")
+ parser.add_option("-l", "--lpae", action="store_true")
+ parser.add_option("-V", "--virtualisation", action="store_true")
+
# Cache Options
parser.add_option("--caches", action="store_true")
parser.add_option("--l2cache", action="store_true")
@@ -197,6 +200,14 @@ def addCommonOptions(parser):
parser.add_option("--at-instruction", action="store_true", default=False,
help="""Treat value of --checkpoint-restore or --take-checkpoint as a
number of instructions.""")
+ parser.add_option("--spec-input", default="ref", type="choice",
+ choices=["ref", "test", "train", "smred", "mdred",
+ "lgred"],
+ help="Input set size for SPEC CPU2000 benchmarks.")
+ parser.add_option("--arm-iset", default="arm", type="choice",
+ choices=["arm", "thumb", "aarch64"],
+ help="ARM instruction set.")
+
def addSEOptions(parser):
# Benchmark options
diff --git a/configs/common/cpu2000.py b/configs/common/cpu2000.py
index 443399234..5f01d28bf 100644
--- a/configs/common/cpu2000.py
+++ b/configs/common/cpu2000.py
@@ -663,7 +663,7 @@ class vortex(Benchmark):
stdin = None
def __init__(self, isa, os, input_set):
- if (isa == 'alpha' or isa == 'arm'):
+ if (isa in ('alpha', 'arm', 'thumb', 'aarch64')):
self.endian = 'lendian'
elif (isa == 'sparc' or isa == 'sparc32'):
self.endian = 'bendian'