configs: arm realview(64) regressions using VExpress_GEM5_V1

This patch is updating the arm regression configs so that the newer
VExpress_GEM_V1 platform is used instead of the older VExpress_EMM and
VExpress_EMM64.
A new optional kernel_mode argument has been added in order to
distinguish between realview and realview64 platforms. If not provided
the config will assume the machine is running a AArch64 kernel.

Other notable additions:
- DTB autogeneration in regressions
- Using minimal m5exit.squashfs disk image

Change-Id: Ia230565f072fe3eb7756c41876dba4657583f4df
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22687
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 37cf72ededae5fcdb7f478245733758cc4443da0..d1ef6c4a9e75e82422981672959b2d4948ee6925 100644 (file)
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -994,7 +994,7 @@ Interrupts:
 
     def setupBootLoader(self, cur_sys, loc):
         if not cur_sys.boot_loader:
-            cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm') ]
+            cur_sys.boot_loader = [ loc('boot.arm64'), loc('boot.arm') ]
         cur_sys.atags_addr = 0x8000000
         cur_sys.load_offset = 0x80000000
 
@@ -1054,7 +1054,7 @@ class VExpress_GEM5_V2_Base(VExpress_GEM5_Base):
             ]
 
     def setupBootLoader(self, cur_sys, loc):
-        cur_sys.boot_loader = [ loc('boot_emm_v2.arm64') ]
+        cur_sys.boot_loader = [ loc('boot_v2.arm64') ]
         super(VExpress_GEM5_V2_Base,self).setupBootLoader(
                 cur_sys, loc)
 

diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py
index a243f137fd5d35d2372d012b2c353bd31a9c8dba..c074f99cf715e5848d43617b91789024f195e182 100644 (file)
--- a/tests/configs/arm_generic.py
+++ b/tests/configs/arm_generic.py
@@ -73,7 +73,7 @@ class LinuxArmSystemBuilder(object):
     ARM-specific create_system method to a class deriving from one of
     the generic base systems.
     """
-    def __init__(self, machine_type, **kwargs):
+    def __init__(self, machine_type, aarch64_kernel, **kwargs):
         """
         Arguments:
           machine_type -- String describing the platform to simulate
@@ -84,9 +84,21 @@ class LinuxArmSystemBuilder(object):
         self.num_cpus = kwargs.get('num_cpus', 1)
         self.mem_size = kwargs.get('mem_size', '256MB')
         self.use_ruby = kwargs.get('use_ruby', False)
+        self.aarch64_kernel = aarch64_kernel
 
     def create_system(self):
-        sc = SysConfig(None, self.mem_size, None)
+        if self.aarch64_kernel:
+            gem5_kernel = "vmlinux.arm64"
+            disk_image = "m5_exit.squashfs.arm64"
+        else:
+            gem5_kernel = "vmlinux.arm"
+            disk_image = "m5_exit.squashfs.arm"
+
+        default_kernels = {
+            "VExpress_GEM5_V1": gem5_kernel,
+        }
+
+        sc = SysConfig(None, self.mem_size, disk_image, "/dev/sda")
         system = FSConfig.makeArmSystem(self.mem_mode,
                                         self.machine_type, self.num_cpus,
                                         sc, False, ruby=self.use_ruby)
@@ -97,26 +109,21 @@ class LinuxArmSystemBuilder(object):
         system.panic_on_panic = True
         system.panic_on_oops = True
 
-        default_kernels = {
-            "VExpress_EMM": "vmlinux.aarch32.ll_20131205.0-gem5",
-            "VExpress_EMM64": "vmlinux.aarch64.20140821",
-        }
         system.kernel = SysPaths.binary(default_kernels[self.machine_type])
-        default_dtbs = {
-           "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.{}cpu.dtb" \
-             .format(self.num_cpus),
-           "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
-        }
-        system.dtb_filename = SysPaths.binary(default_dtbs[self.machine_type])
 
         self.init_system(system)
+
+        system.generateDtb(m5.options.outdir, 'system.dtb')
         return system
 
 class LinuxArmFSSystem(LinuxArmSystemBuilder,
                        BaseFSSystem):
     """Basic ARM full system builder."""
 
-    def __init__(self, machine_type='VExpress_EMM', **kwargs):
+    def __init__(self,
+                 machine_type='VExpress_GEM5_V1',
+                 aarch64_kernel=True,
+                 **kwargs):
         """Initialize an ARM system that supports full system simulation.
 
         Note: Keyword arguments that are not listed below will be
@@ -126,7 +133,8 @@ class LinuxArmFSSystem(LinuxArmSystemBuilder,
           machine_type -- String describing the platform to simulate
         """
         BaseFSSystem.__init__(self, **kwargs)
-        LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs)
+        LinuxArmSystemBuilder.__init__(
+            self, machine_type, aarch64_kernel, **kwargs)
 
     def create_caches_private(self, cpu):
         # Use the more representative cache configuration
@@ -143,13 +151,21 @@ class LinuxArmFSSystemUniprocessor(LinuxArmSystemBuilder,
     test cases.
     """
 
-    def __init__(self, machine_type='VExpress_EMM', **kwargs):
+    def __init__(self,
+                 machine_type='VExpress_GEM5_V1',
+                 aarch64_kernel=True,
+                 **kwargs):
         BaseFSSystemUniprocessor.__init__(self, **kwargs)
-        LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs)
+        LinuxArmSystemBuilder.__init__(
+            self, machine_type, aarch64_kernel, **kwargs)
 
 class LinuxArmFSSwitcheroo(LinuxArmSystemBuilder, BaseFSSwitcheroo):
     """Uniprocessor ARM system prepared for CPU switching"""
 
-    def __init__(self, machine_type='VExpress_EMM', **kwargs):
+    def __init__(self,
+                 machine_type='VExpress_GEM5_V1',
+                 aarch64_kernel=True,
+                 **kwargs):
         BaseFSSwitcheroo.__init__(self, **kwargs)
-        LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs)
+        LinuxArmSystemBuilder.__init__(
+            self, machine_type, aarch64_kernel, **kwargs)

diff --git a/tests/configs/realview-minor-dual.py b/tests/configs/realview-minor-dual.py
index ea01c245777ad5255490006b968fd26c5e05d5af..84b8a1fe82557a315226db5835165a07f5b925b6 100644 (file)
--- a/tests/configs/realview-minor-dual.py
+++ b/tests/configs/realview-minor-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(mem_mode='timing',
+root = LinuxArmFSSystem(aarch64_kernel=False,
+                        mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=MinorCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview-minor.py b/tests/configs/realview-minor.py
index 486e72e09b3c2a655898cd883c1f18fe5e242588..f62190451d628d664c7c9dd103758821cd83f897 100644 (file)
--- a/tests/configs/realview-minor.py
+++ b/tests/configs/realview-minor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 ARM Limited
+# Copyright (c) 2014, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,6 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=MinorCPU).create_root()

diff --git a/tests/configs/realview-o3-checker.py b/tests/configs/realview-o3-checker.py
index 5bb266ff3ff2013d295d1f662fa74359110b4624..c5c3b7da461bd175d958f212b87d079b19915729 100644 (file)
--- a/tests/configs/realview-o3-checker.py
+++ b/tests/configs/realview-o3-checker.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,7 +39,8 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3,
                                     checker=True).create_root()

diff --git a/tests/configs/realview-o3-dual.py b/tests/configs/realview-o3-dual.py
index 7b035ba7fba66be96289d8a7d2380265de4cda6e..a731c314e8912b287c1a7e58068662ef1db2bc2d 100644 (file)
--- a/tests/configs/realview-o3-dual.py
+++ b/tests/configs/realview-o3-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,7 +39,8 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystem(mem_mode='timing',
+root = LinuxArmFSSystem(aarch64_kernel=False,
+                        mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=O3_ARM_v7a_3,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview-o3.py b/tests/configs/realview-o3.py
index 7212731bde44fbfdb8a7a61f4d3a9a98adc2bd85..1986242456e5a4ef61b9200ce101901dd91ed7c8 100644 (file)
--- a/tests/configs/realview-o3.py
+++ b/tests/configs/realview-o3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,6 +39,7 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3).create_root()

diff --git a/tests/configs/realview-simple-atomic-checkpoint.py b/tests/configs/realview-simple-atomic-checkpoint.py
index 784d17bbb5be4c69fa919f43624f1d51925b2f50..e45ac698f458848bd50322f74eb38b7741857183 100644 (file)
--- a/tests/configs/realview-simple-atomic-checkpoint.py
+++ b/tests/configs/realview-simple-atomic-checkpoint.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 ARM Limited
+# Copyright (c) 2015, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,7 +39,8 @@ from m5.objects import *
 from arm_generic import *
 import checkpoint
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='atomic',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
 

diff --git a/tests/configs/realview-simple-atomic-dual.py b/tests/configs/realview-simple-atomic-dual.py
index 32d66f6afa03664cfe67e9f88107b7075bf11917..479abb4059a0adc4046dcb6caac17e53ade5d080 100644 (file)
--- a/tests/configs/realview-simple-atomic-dual.py
+++ b/tests/configs/realview-simple-atomic-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(mem_mode='atomic',
+root = LinuxArmFSSystem(aarch64_kernel=False,
+                        mem_mode='atomic',
                         mem_class=SimpleMemory,
                         cpu_class=AtomicSimpleCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview-simple-atomic.py b/tests/configs/realview-simple-atomic.py
index b51954879c641d6319250c2b25af9392129d74ab..28cc8dc57f13a07dcc53a843d6b09004dfac4728 100644 (file)
--- a/tests/configs/realview-simple-atomic.py
+++ b/tests/configs/realview-simple-atomic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='atomic',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
 

diff --git a/tests/configs/realview-simple-timing-dual-ruby.py b/tests/configs/realview-simple-timing-dual-ruby.py
index d762fa651c1bc2ced9a5e8b5f351f6669f3e033d..4c35c5e694bd55b9ddc87c73553cc0e334b16f51 100644 (file)
--- a/tests/configs/realview-simple-timing-dual-ruby.py
+++ b/tests/configs/realview-simple-timing-dual-ruby.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 ARM Limited
+# Copyright (c) 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(mem_mode='timing',
+root = LinuxArmFSSystem(aarch64_kernel=False,
+                        mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
                         num_cpus=2,

diff --git a/tests/configs/realview-simple-timing-dual.py b/tests/configs/realview-simple-timing-dual.py
index e875c1f91baeec4bc3e3f4c0d44ba04921d60b7f..cf47e1fe4b58c8032567897eb9c834871d7e3dd1 100644 (file)
--- a/tests/configs/realview-simple-timing-dual.py
+++ b/tests/configs/realview-simple-timing-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(mem_mode='timing',
+root = LinuxArmFSSystem(aarch64_kernel=False,
+                        mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview-simple-timing-ruby.py b/tests/configs/realview-simple-timing-ruby.py
index 41195ef9ac8beb4c84cd1f4d900dc148f1ac001e..191d1185444714d861eb54f82007c170fb76f137 100644 (file)
--- a/tests/configs/realview-simple-timing-ruby.py
+++ b/tests/configs/realview-simple-timing-ruby.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 ARM Limited
+# Copyright (c) 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,8 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU,
                                     use_ruby=True).create_root()

diff --git a/tests/configs/realview-simple-timing.py b/tests/configs/realview-simple-timing.py
index 43a22b39d384f80902338f792894abf95fe73979..4582b708df090a875ce46a36c6a5269172c76068 100644 (file)
--- a/tests/configs/realview-simple-timing.py
+++ b/tests/configs/realview-simple-timing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,6 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU).create_root()

diff --git a/tests/configs/realview-switcheroo-full.py b/tests/configs/realview-switcheroo-full.py
index cdecd252e67a60ac8a9c8a0584382b8178d3f475..9cd7309dea56ec89c681e85c705d5e88ab25c1e4 100644 (file)
--- a/tests/configs/realview-switcheroo-full.py
+++ b/tests/configs/realview-switcheroo-full.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,6 +40,7 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
+    aarch64_kernel=False,
     mem_class=DDR3_1600_8x8,
     cpu_classes=(AtomicSimpleCPU, TimingSimpleCPU, MinorCPU, DerivO3CPU)
     ).create_root()

diff --git a/tests/configs/realview-switcheroo-o3.py b/tests/configs/realview-switcheroo-o3.py
index 54ed0244e090971c02a25fc9a7936424757756f3..767548b77a1306dfbef1d22c386b4bfa0a05dc36 100644 (file)
--- a/tests/configs/realview-switcheroo-o3.py
+++ b/tests/configs/realview-switcheroo-o3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,6 +40,7 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
+    aarch64_kernel=False,
     mem_class=DDR3_1600_8x8,
     cpu_classes=(DerivO3CPU, DerivO3CPU)
     ).create_root()

diff --git a/tests/configs/realview64-minor-dual.py b/tests/configs/realview64-minor-dual.py
index 7a7e21868702949694054f7dd010d14d28cfe15f..936ea982013915266cd2c2268feb0b834f2be1f5 100644 (file)
--- a/tests/configs/realview64-minor-dual.py
+++ b/tests/configs/realview64-minor-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
-                        mem_mode='timing',
+root = LinuxArmFSSystem(mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=MinorCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview64-minor.py b/tests/configs/realview64-minor.py
index 796a36db0950eb66697a67fe6d8e54601c9a9828..772b8a48e39aa16dc33e44f8e762a54568dbdcee 100644 (file)
--- a/tests/configs/realview64-minor.py
+++ b/tests/configs/realview64-minor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 ARM Limited
+# Copyright (c) 2014, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,6 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=MinorCPU).create_root()

diff --git a/tests/configs/realview64-o3-checker.py b/tests/configs/realview64-o3-checker.py
index 5fd50e67757e4c6721208e04205d5fcda7cc68bf..f73046cc8c22aa50dfd3a3b28c9591b12f1c2237 100644 (file)
--- a/tests/configs/realview64-o3-checker.py
+++ b/tests/configs/realview64-o3-checker.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,8 +39,7 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3,
                                     checker=True).create_root()

diff --git a/tests/configs/realview64-o3-dual.py b/tests/configs/realview64-o3-dual.py
index 6c5dc0a2b8f401557780181cb4e7c377b10623db..e8ea3fdd6cac86a15e995ccd97180ccd07f3a87b 100644 (file)
--- a/tests/configs/realview64-o3-dual.py
+++ b/tests/configs/realview64-o3-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,8 +39,7 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
-                        mem_mode='timing',
+root = LinuxArmFSSystem(mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=O3_ARM_v7a_3,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview64-o3.py b/tests/configs/realview64-o3.py
index 2558093e711e5fa6fd3c2b50d233b78ed6d81e43..1286f3522fd444a101f3727c774e66fb684b63f0 100644 (file)
--- a/tests/configs/realview64-o3.py
+++ b/tests/configs/realview64-o3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -39,7 +39,6 @@ from m5.objects import *
 from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3).create_root()

diff --git a/tests/configs/realview64-simple-atomic-checkpoint.py b/tests/configs/realview64-simple-atomic-checkpoint.py
index c90f0f3d41f4afc0969eb158335006b122ee108d..f4fa2492b15e150a335f236d39b1f5349d5322ca 100644 (file)
--- a/tests/configs/realview64-simple-atomic-checkpoint.py
+++ b/tests/configs/realview64-simple-atomic-checkpoint.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 ARM Limited
+# Copyright (c) 2015, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -41,8 +41,7 @@ from m5.objects import *
 from arm_generic import *
 import checkpoint
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='atomic',
+root = LinuxArmFSSystemUniprocessor(mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
 

diff --git a/tests/configs/realview64-simple-atomic-dual.py b/tests/configs/realview64-simple-atomic-dual.py
index 01b3edc6e07d6eeedf8b5ef3eacd13d114ca9214..a0dc044d969c833d86e4d1da74af63918c73e33d 100644 (file)
--- a/tests/configs/realview64-simple-atomic-dual.py
+++ b/tests/configs/realview64-simple-atomic-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
-                        mem_mode='atomic',
+root = LinuxArmFSSystem(mem_mode='atomic',
                         mem_class=SimpleMemory,
                         cpu_class=AtomicSimpleCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview64-simple-atomic.py b/tests/configs/realview64-simple-atomic.py
index 8d9fe0c0654b4908c60ff219cabfa3a3f8308492..9c557bb34a7a8a3224b567fc173c5571152432a3 100644 (file)
--- a/tests/configs/realview64-simple-atomic.py
+++ b/tests/configs/realview64-simple-atomic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='atomic',
+root = LinuxArmFSSystemUniprocessor(mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
 

diff --git a/tests/configs/realview64-simple-timing-dual-ruby.py b/tests/configs/realview64-simple-timing-dual-ruby.py
index 234e9767b5bcb7d6c27df1af95a05c88a927a793..09607500259ceebbdfa76b8b9703b260c9cd6ef9 100644 (file)
--- a/tests/configs/realview64-simple-timing-dual-ruby.py
+++ b/tests/configs/realview64-simple-timing-dual-ruby.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 ARM Limited
+# Copyright (c) 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
-                        mem_mode='timing',
+root = LinuxArmFSSystem(mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
                         num_cpus=2,

diff --git a/tests/configs/realview64-simple-timing-dual.py b/tests/configs/realview64-simple-timing-dual.py
index fe1e67dd1ad5120a707b4550bc7def13e0cce83b..5f2d9f40cfc21e9b8dc1632f5bb4041ff4828971 100644 (file)
--- a/tests/configs/realview64-simple-timing-dual.py
+++ b/tests/configs/realview64-simple-timing-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
-                        mem_mode='timing',
+root = LinuxArmFSSystem(mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
                         num_cpus=2).create_root()

diff --git a/tests/configs/realview64-simple-timing-ruby.py b/tests/configs/realview64-simple-timing-ruby.py
index f2ec90fbae69f6799d64a04ed238c2b5eed0945d..9d4138fda3f783500a8f17fea00fc6b6e131e3b3 100644 (file)
--- a/tests/configs/realview64-simple-timing-ruby.py
+++ b/tests/configs/realview64-simple-timing-ruby.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 ARM Limited
+# Copyright (c) 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,8 +38,7 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU,
                                     use_ruby=True).create_root()

diff --git a/tests/configs/realview64-simple-timing.py b/tests/configs/realview64-simple-timing.py
index fb2844e96bc479e6f7288d1a271b8f2f413227e4..8a1eda29c868db62414c2b7835bd6a11f2aa7200 100644 (file)
--- a/tests/configs/realview64-simple-timing.py
+++ b/tests/configs/realview64-simple-timing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -38,7 +38,6 @@
 from m5.objects import *
 from arm_generic import *
 
-root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
-                                    mem_mode='timing',
+root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU).create_root()

diff --git a/tests/configs/realview64-switcheroo-atomic.py b/tests/configs/realview64-switcheroo-atomic.py
index 5aa46998a11b4496e56b01b03173429855dc57d0..69767cb317470225cc759934a4c1986367135080 100644 (file)
--- a/tests/configs/realview64-switcheroo-atomic.py
+++ b/tests/configs/realview64-switcheroo-atomic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,7 +40,6 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    machine_type='VExpress_EMM64',
     mem_class=SimpleMemory,
     cpu_classes=(AtomicSimpleCPU, AtomicSimpleCPU)
     ).create_root()

diff --git a/tests/configs/realview64-switcheroo-full.py b/tests/configs/realview64-switcheroo-full.py
index 6033e4992f526791f441fc59f0ec335f4e4343e2..93bc95a46c3b76ef05d4482693946d70f88dec33 100644 (file)
--- a/tests/configs/realview64-switcheroo-full.py
+++ b/tests/configs/realview64-switcheroo-full.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,7 +40,6 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    machine_type='VExpress_EMM64',
     mem_class=DDR3_1600_8x8,
     cpu_classes=(AtomicSimpleCPU, TimingSimpleCPU, MinorCPU, DerivO3CPU)
     ).create_root()

diff --git a/tests/configs/realview64-switcheroo-o3.py b/tests/configs/realview64-switcheroo-o3.py
index 065e1e004031759e36b454b5ea46935d023be36d..4045959b55acd98427cae00f1d876dd3eea20924 100644 (file)
--- a/tests/configs/realview64-switcheroo-o3.py
+++ b/tests/configs/realview64-switcheroo-o3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,7 +40,6 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    machine_type='VExpress_EMM64',
     mem_class=DDR3_1600_8x8,
     cpu_classes=(DerivO3CPU, DerivO3CPU)
     ).create_root()

diff --git a/tests/configs/realview64-switcheroo-timing.py b/tests/configs/realview64-switcheroo-timing.py
index 6be68339db71ff1f43bd4363429ff54c578b0bb9..1fd8714d5f73cbc8585f1acad3d80d298a26a7a8 100644 (file)
--- a/tests/configs/realview64-switcheroo-timing.py
+++ b/tests/configs/realview64-switcheroo-timing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,7 +40,6 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    machine_type='VExpress_EMM64',
     mem_class=DDR3_1600_8x8,
     cpu_classes=(TimingSimpleCPU, TimingSimpleCPU)
     ).create_root()

diff --git a/tests/gem5/fs/linux/arm/test.py b/tests/gem5/fs/linux/arm/test.py
index aaed764e4c61dd3d31d5b4b028bad7359f090182..4ed58ae25981cc2d0b14df7c4329d6e1f0bb87b9 100644 (file)
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -83,7 +83,7 @@ arm_fs_long_tests = [
     'realview64-simple-timing-dual-ruby',
 ]
 
-tarball = 'aarch-system-2014-10.tar.bz2'
+tarball = 'aarch-system-201901106.tar.bz2'
 url = "http://gem5.org/dist/current/arm/" + tarball
 path = os.path.dirname(os.path.abspath(__file__))
 arm_fs_binaries = DownloadedArchive(url, path, tarball)