Changeset 92269 in vbox for trunk

Timestamp:

Nov 8, 2021 2:37:50 PM (3 years ago)

Author:

vboxsync

Message:

ValKit: New test driver: tdBenchmark2.py. This does some simple guest RAM allocation benchmarking using bs3-memalloc-1. It should also help make sure we work with max memory configs. bugref:10093

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxwrappers.py (modified) (1 diff)
• tests/benchmarks/Makefile.kmk (modified) (1 diff)
• tests/benchmarks/tdBenchmark2.py (copied) (copied from trunk/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark1.py ) (3 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1721 +1721 @@
         return fRc;
 
+    def setLargePages(self, fUseLargePages):
+        """
+        Configures whether the VM should use large pages or not.
+        Returns True on success and False on failure.  Error information is logged.
+        """
+        fRc = True;
+        try:
+            self.o.machine.setHWVirtExProperty(vboxcon.HWVirtExPropertyType_LargePages, fUseLargePages);
+        except:
+            reporter.errorXcpt('failed to set large pages of "%s" to %s' % (self.sName, fUseLargePages));
+            fRc = False;
+        else:
+            reporter.log('set the large pages of "%s" to %s' % (self.sName, fUseLargePages));
+        self.oTstDrv.processPendingEvents();
+        return fRc;
+
     def setVRamSize(self, cMB):
         """

trunk/src/VBox/ValidationKit/tests/benchmarks/Makefile.kmk

@@ -33 +33 @@
 ValidationKitTestsBenchmarks_INST = $(INST_VALIDATIONKIT)tests/benchmarks/
 ValidationKitTestsBenchmarks_EXEC_SOURCES := \
-        $(PATH_SUB_CURRENT)/tdBenchmark1.py
+        $(PATH_SUB_CURRENT)/tdBenchmark1.py \
+        $(PATH_SUB_CURRENT)/tdBenchmark2.py
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsBenchmarks_EXEC_SOURCES)

trunk/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark2.py

@@ -44 +44 @@
 from testdriver import reporter;
 from testdriver import vbox;
+from testdriver import vboxcon;
 from testdriver import vboxtestvms;
 
 
-class tdBenchmark1(vbox.TestDriver):
+class tdBenchmark2(vbox.TestDriver):
     """
-    Benchmark #1.
+    Benchmark #2 - Memory.
     """
 
     def __init__(self):
         vbox.TestDriver.__init__(self);
-        oTestVm = vboxtestvms.BootSectorTestVm(self.oTestVmSet, 'tst-bs-test1',
-                                               os.path.join(self.sVBoxBootSectors, 'bootsector2-test1.img'));
+        oTestVm = vboxtestvms.BootSectorTestVm(self.oTestVmSet, 'tst-bs-memalloc-1',
+                                               os.path.join(self.sVBoxBootSectors, 'bs3-memalloc-1.img'));
         self.oTestVmSet.aoTestVms.append(oTestVm);
 
@@ -86 +87 @@
         fRc = False;
 
-        sXmlFile = self.prepareResultFile();
-        asEnv = [ 'IPRT_TEST_FILE=' + sXmlFile];
+        #
+        # Determin the RAM configurations we want to test.
+        #
+        cMbMaxGuestRam = self.oVBox.systemProperties.maxGuestRAM;
+        cMbHostAvail   = self.oVBox.host.memoryAvailable;
+        cMbHostTotal   = self.oVBox.host.memorySize;
+        reporter.log('cMbMaxGuestRam=%s cMbHostAvail=%s cMbHostTotal=%s' % (cMbMaxGuestRam, cMbHostAvail, cMbHostTotal,));
 
-        self.logVmInfo(oVM);
-        oSession = self.startVm(oVM, sName = oTestVm.sVmName, asEnv = asEnv);
-        if oSession is not None:
-            cMsTimeout = 15*60*1000;
-            if not reporter.isLocal(): ## @todo need to figure a better way of handling timeouts on the testboxes ...
-                cMsTimeout = self.adjustTimeoutMs(180 * 60000);
+        cMbHostAvail -= cMbHostAvail // 10; # Rough 10% safety/overhead margin.
+        if cMbMaxGuestRam < cMbHostAvail:
+            # Currently: 2048 GiB, 1536 GiB, 1024 GiB, 512 GiB, 256 GiB, 128 GiB
+            acMbRam = [ cMbMaxGuestRam, cMbMaxGuestRam // 4 * 3, cMbMaxGuestRam // 2, cMbMaxGuestRam // 4,
+                        cMbMaxGuestRam // 8, cMbMaxGuestRam // 16 ];
+        elif cMbHostAvail > 8*1024:
+            # First entry is available memory rounded down to the nearest 8 GiB
+            cMbHostAvail = cMbHostAvail & ~(8 * 1024 - 1);
+            acMbRam = [ cMbHostAvail, ];
 
-            oRc = self.waitForTasks(cMsTimeout);
-            if oRc == oSession:
-                fRc = oSession.assertPoweredOff();
-            else:
-                reporter.error('oRc=%s, expected %s' % (oRc, oSession));
+            # The remaining entries are powers of two below that, up to 6 of these stopping at 16 GiB.
+            cMb = 8*1024;
+            while cMb < cMbHostAvail:
+                cMb *= 2;
+            while len(acMbRam) < 7 and cMb > 16 * 1024:
+                cMb //= 2;
+                acMbRam.append(cMb);
+        else:
+            reporter.log("Less than 8GB of host RAM available for VMs, skipping test");
+            return None;
+        reporter.log("RAM configurations: %s" % (acMbRam));
 
-            reporter.addSubXmlFile(sXmlFile);
-            self.terminateVmBySession(oSession);
+        # Large pages only work with nested paging.
+        afLargePages = [False, ];
+        try:
+            if oVM.getHWVirtExProperty(vboxcon.HWVirtExPropertyType_NestedPaging):
+                afLargePages = [True, False];
+        except:
+            return reporter.errorXcpt("Failed to get HWVirtExPropertyType_NestedPaging");
+
+        #
+        # Test the RAM configurations.
+        #
+        for fLargePages in afLargePages:
+            sLargePages = 'large pages' if fLargePages is True else 'no large pages';
+            for cMbRam in acMbRam:
+                reporter.testStart('%s MiB, %s' % (cMbRam, sLargePages));
+
+                # Reconfigure the VM:
+                fRc = False
+                oSession = self.openSession(oVM);
+                if oSession:
+                    fRc = oSession.setRamSize(cMbRam);
+                    fRc = oSession.setLargePages(fLargePages) and fRc;
+                    if fRc:
+                        fRc = oSession.saveSettings();
+                    if not fRc:
+                        oSession.discardSettings(True);
+                    oSession.close();
+                if fRc:
+                    # Set up the result file
+                    sXmlFile = self.prepareResultFile();
+                    asEnv = [ 'IPRT_TEST_FILE=' + sXmlFile, ];
+
+                    # Do the test:
+                    self.logVmInfo(oVM);
+                    oSession = self.startVm(oVM, sName = oTestVm.sVmName, asEnv = asEnv);
+                    if oSession is not None:
+                        cMsTimeout = 15 * 60000 + cMbRam / 256;
+                        if not reporter.isLocal(): ## @todo need to figure a better way of handling timeouts on the testboxes ...
+                            cMsTimeout = self.adjustTimeoutMs(180 * 60000 + cMbRam / 256);
+
+                        oRc = self.waitForTasks(cMsTimeout);
+                        if oRc == oSession:
+                            fRc = oSession.assertPoweredOff();
+                        else:
+                            reporter.error('oRc=%s, expected %s' % (oRc, oSession));
+
+                        reporter.addSubXmlFile(sXmlFile);
+                        self.terminateVmBySession(oSession);
+                else:
+                    reporter.errorXcpt("Failed to set memory size to %s MiB or setting largePages to %s" % (cMbRam, fLargePages));
+                reporter.testDone();
+
         return fRc;
 
@@ -109 +174 @@
 
 if __name__ == '__main__':
-    sys.exit(tdBenchmark1().main(sys.argv));
+    sys.exit(tdBenchmark2().main(sys.argv));