harness: armv7 fvp: add 4 core machine
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Wed, 9 Nov 2016 12:38:32 +0000 (13:38 +0100)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Thu, 10 Nov 2016 10:14:47 +0000 (11:14 +0100)
Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

tools/harness/machines/fvp.py

index 3d44875..d14f6e9 100644 (file)
@@ -13,7 +13,7 @@ from machines import ARMSimulatorBase
 
 FVP_PATH = '/home/netos/tools/DS-5_v5.24.0/bin'
 FVP_LICENSE = '8224@sgv-license-01.ethz.ch'
-FVP_START_TIMEOUT = 5 # in seconds
+FVP_START_TIMEOUT = 2 # in seconds
 
 class FVPMachineBase(ARMSimulatorBase):
     imagename = "armv7_a9ve_1_image"
@@ -87,3 +87,24 @@ class FVPMachineARMv7SingleCore(FVPMachineARMv7):
                 "-C", "motherboard.terminal_0.start_telnet=0",
                 "-C", "motherboard.terminal_0.start_port=%d"%self.telnet_port,
                 self.kernel_img]
+
+@machines.add_machine
+class FVPMachineARMv7QuadCore(FVPMachineARMv7):
+    name = 'armv7_fvp_4'
+
+    def get_ncores(self):
+        return 4
+
+    def get_cores_per_socket(self):
+        return 4
+
+    def _get_cmdline(self):
+        self.get_free_port()
+
+        return [os.path.join(FVP_PATH, "FVP_VE_Cortex-A9x4"),
+                # Don't try to pop an LCD window up
+                "-C", "motherboard.vis.disable_visualisation=1",
+                # Don't start a telnet xterm
+                "-C", "motherboard.terminal_0.start_telnet=0",
+                "-C", "motherboard.terminal_0.start_port=%d"%self.telnet_port,
+                self.kernel_img]