[gem5-dev] changeset in gem5: tests: Add support for testing KVM-based CPUs

[Andreas Sandberg]

changeset 64b653b3d72f in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=64b653b3d72f
description:
        tests: Add support for testing KVM-based CPUs

        This changeset adds support for initializing a KVM VM in the
        BaseSystem test class and adds the following methods in run.py:

        require_file -- Test if a file exists and abort/skip if not.
        require_kvm -- Test if KVM support has been compiled into gem5 (i.e.,
                       BaseKvmCPU exists) and the KVM device exists on the
                       host.

diffstat:

 tests/configs/base_config.py |  14 ++++++++++++++
 tests/run.py                 |  42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diffs (97 lines):

diff -r 5307d06e1d0e -r 64b653b3d72f tests/configs/base_config.py
--- a/tests/configs/base_config.py      Mon Apr 22 13:20:32 2013 -0400
+++ b/tests/configs/base_config.py      Mon Apr 22 13:20:32 2013 -0400
@@ -43,6 +43,8 @@
 import FSConfig
 from Caches import *
 
+_have_kvm_support = 'BaseKvmCPU' in globals()
+
 class BaseSystem(object):
     """Base system builder.
 
@@ -111,6 +113,14 @@
         """
         cpu.createInterruptController()
 
+    def init_kvm(self, system):
+        """Do KVM-specific system initialization.
+
+        Arguments:
+          system -- System to work on.
+        """
+        system.vm = KvmVM()
+
     def init_system(self, system):
         """Initialize a system.
 
@@ -119,6 +129,10 @@
         """
         system.cpu = self.create_cpus()
 
+        if _have_kvm_support and \
+                any([isinstance(c, BaseKvmCPU) for c in system.cpu]):
+            self.init_kvm(system)
+
         sha_bus = self.create_caches_shared(system)
         for cpu in system.cpu:
             if not cpu.switched_out:
diff -r 5307d06e1d0e -r 64b653b3d72f tests/run.py
--- a/tests/run.py      Mon Apr 22 13:20:32 2013 -0400
+++ b/tests/run.py      Mon Apr 22 13:20:32 2013 -0400
@@ -44,6 +44,8 @@
 import string
 
 from os.path import join as joinpath
+import os.path
+import os
 
 import m5
 
@@ -93,6 +95,46 @@
         else:
             skip_test(msg)
 
+
+def require_file(path, fatal=False, mode=os.F_OK):
+    """Test if a file exists and abort/skip test if not.
+
+    Arguments:
+      path -- File to test for.
+
+    Keyword arguments:
+      fatal -- Set to True to indicate that the test should fail
+               instead of being skipped.
+      modes -- Mode to test for, default to existence. See the
+               Python documentation for os.access().
+    """
+
+    if os.access(path, mode):
+        return
+    else:
+        msg = "Test requires '%s'" % path
+        if not os.path.exists(path):
+            msg += " which does not exist."
+        else:
+            msg += " which has incorrect permissions."
+
+        if fatal:
+            m5.fatal(msg)
+        else:
+            skip_test(msg)
+
+def require_kvm(kvm_dev="/dev/kvm", fatal=False):
+    """Test if KVM is available.
+
+    Keyword arguments:
+      kvm_dev -- Device to test (normally /dev/kvm)
+      fatal -- Set to True to indicate that the test should fail
+               instead of being skipped.
+    """
+
+    require_sim_object("BaseKvmCPU", fatal=fatal)
+    require_file(kvm_dev, fatal=fatal, mode=os.R_OK | os.W_OK)
+
 def run_test(root):
     """Default run_test implementations. Scripts can override it."""
 
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev