Changeset 106300 in vbox

Timestamp:

Oct 12, 2024 4:40:07 AM (7 weeks ago)

Author:

vboxsync

Message:

ValidationKit/bootsectors: always display final micro-tests tally; backport SKIPIT changes to run-bs3-instr-3; bugref:10658; bugref 9898

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-instr-3.c32 (modified) (6 diffs)
• bs3-cpu-instr-4.c32 (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32

@@ -575 +575 @@
 
 
-/*
- * Code to make testing the tests faster.  `bs3CpuInstr3_SkipIt()' randomly
- * skips a large fraction of the micro-tests.  It is sufficiently random
- * that over a large number of runs, all micro-tests will be hit.
- *
- * This improves the runtime of the worst case (`#define ALL_TESTS' on a
- * debug build, run with '--execute-all-in-iem') from ~9000 to ~800 seconds
- * (on an Intel Core i7-10700, fwiw).
- *
- * To activate this 'developer's speed-testing mode', turn on
- * `#define BS3_SKIPIT_DO_SKIP' here.
- *
- * BS3_SKIPIT_AVG_SKIP governs approximately how many micro-tests are
- * skipped in a row; e.g. the default of 26 means about every 27th
- * micro-test is run during a particular test run.  (This is not 27x
- * faster due to other activities which are not skipped!)  Note this is
- * only an average; the actual skips are random.
- *
- * You can also modify bs3CpuInstr3_SkipIt() to focus on specific sub-tests,
- * using its (currently ignored) `bRing, iCfg, iTest, iVal, iVariant' args
- * (to enable this: turn on `#define BS3_SKIPIT_DO_ARGS': which costs about
- * 3% performance).
- *
- * Note! The skipping is not compatible with testing the native recompiler as
- *       it requires the test code to be run a number of times before it kicks
- *       in and does the native recompilation (currently around 16 times).
- */
-#define BS3_SKIPIT_AVG_SKIP     26
-#define BS3_SKIPIT_REPORT_COUNT 150000
-#undef  BS3_SKIPIT_DO_SKIP
-#undef  BS3_SKIPIT_DO_ARGS
-
-#ifndef BS3_SKIPIT_DO_SKIP
-# define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) (false)
-#else
-# include <iprt/asm-amd64-x86.h>
-# include <iprt/asm-math.h>
-
-DECLINLINE(uint32_t) bs3CpuInstr3_SimpleRand(void)
+#include <iprt/asm-amd64-x86.h>
+#include <iprt/asm-math.h>
+
+DECLINLINE(uint32_t) bs3CpuInstrX_SimpleRand(void)
 {
     /*
@@ -631 +596 @@
     uint32_t uVal = s_uSeedMemory;
     if (!uVal)
+    {
         uVal = (uint32_t)ASMReadTSC();
+        Bs3TestPrintf("PRNG initial seed: 0x%08lx\n", uVal);
+    }
     uVal = ASMModU64ByU32RetU32(ASMMult2xU32RetU64(uVal, 16807), INT32_MAX);
     s_uSeedMemory = uVal;
@@ -637 +605 @@
 }
 
+
+/*
+ * Code to make testing the tests faster. `bs3CpuInstrX_SkipIt()' randomly
+ * skips a fraction of the micro-tests.  It is sufficiently random that
+ * over a large number of runs, all micro-tests will be hit.
+ *
+ * Full test runs take ever longer as we add more instructions and fancier
+ * ways of testing them.  In one example scenario, a debug build running
+ * bs3-cpu-instr-3 under interpreted IEM went from 9000 to 800 seconds,
+ * with BS3_SKIPIT_AVG_SKIP set to 26.
+ *
+ * To activate this 'developer's speed-testing mode', define
+ * `BS3_SKIPIT_AVG_SKIP' to a positive integer like 10 or 200.
+ *
+ * BS3_SKIPIT_AVG_SKIP governs approximately how many micro-tests are
+ * skipped in a row; e.g. if set to 100, an average of 100 micro-tests
+ * in a row are skipped.  (This is not a full 100x faster, due to other
+ * activities which are not skipped!)  Note this is only an average;
+ * the actual skips are random.
+ *
+ * You can also modify bs3CpuInstrX_SkipIt() to focus on specific sub-tests,
+ * using its (currently ignored) `bRing, iCfg, iTest, iVal, iVariant' args
+ * (to enable this: turn on `#define BS3_SKIPIT_DO_ARGS': which costs about
+ * 3% performance).
+ *
+ * Note!  For testing the native recompiler, configure the VM to invoke
+ * native recompilation quickly with:
+ *
+ *     VBoxManage setextradata vmname VBoxInternal/Devices/VMMDev/0/Config/TestingEnabled 1
+ *     VBoxManage setextradata vmname VBoxInternal/Devices/VMMDev/0/Config/TestingThresholdNativeRecompiler 2
+ *     VBoxManage setextradata vmname VBoxInternal/IEM/NativeRecompileAtUsedCount 1
+ */
+#define BS3_SKIPIT_AVG_SKIP           0
+#define BS3_SKIPIT_REPORT_COUNT 1000000
+#undef  BS3_SKIPIT_DO_ARGS
+
 static unsigned g_cSeen, g_cSkipped;
 
-static void bs3CpuInstr3_ShowTallies(void)
-{
+static void bs3CpuInstrX_ShowTallies(bool always)
+{
+    if (!g_cSkipped && !always) return;
     Bs3TestPrintf("Micro-tests %d: tested %d / skipped %d\n", g_cSeen, g_cSeen - g_cSkipped, g_cSkipped);
 }
 
 # ifdef BS3_SKIPIT_DO_ARGS
-#  define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) bs3CpuInstr3_SkipIt(bRing, iCfg, iTest, iVal, iVariant)
-static bool bs3CpuInstr3_SkipIt(uint8_t bRing, unsigned iCfg, unsigned iTest, unsigned iVal, unsigned iVariant)
+#  define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) bs3CpuInstrX_SkipIt(bRing, iCfg, iTest, iVal, iVariant)
+static bool bs3CpuInstrX_SkipIt(uint8_t bRing, unsigned iCfg, unsigned iTest, unsigned iVal, unsigned iVariant)
 # else
-#  define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) bs3CpuInstr3_SkipIt()
-static bool bs3CpuInstr3_SkipIt(void)
+#  define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) bs3CpuInstrX_SkipIt()
+static bool bs3CpuInstrX_SkipIt(void)
 # endif
 {
@@ -657 +662 @@
     /* Cache calls to the relatively expensive random routine */
     if (!s_uTimes)
-        s_uTimes = bs3CpuInstr3_SimpleRand() % (BS3_SKIPIT_AVG_SKIP * 2 + 1) + 1;
+        s_uTimes = bs3CpuInstrX_SimpleRand() % (BS3_SKIPIT_AVG_SKIP * 2 + 1) + 1;
     fSkip = --s_uTimes > 0;
     if (fSkip)
@@ -663 +668 @@
 
     if (++g_cSeen % BS3_SKIPIT_REPORT_COUNT == 0)
-        bs3CpuInstr3_ShowTallies();
+        bs3CpuInstrX_ShowTallies(false);
     return fSkip;
 }
-
-#endif /* BS3_SKIPIT_DO_SKIP */
 
 
@@ -16246 +16249 @@
              */
             Bs3TestDoModesByOne_pe32(g_aTests, RT_ELEMENTS(g_aTests), BS3TESTMODEBYONEENTRY_F_REAL_MODE_READY);
-#ifdef BS3_SKIPIT_DO_SKIP
-            bs3CpuInstr3_ShowTallies();
-#endif
+            bs3CpuInstrX_ShowTallies(true);
         }
         else

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-4.c32

@@ -2273 +2273 @@
  * ways of testing them.  In one example scenario, a debug build running
  * bs3-cpu-instr-3 under interpreted IEM went from 9000 to 800 seconds,
- * with BS3_SKIPIT_AVG_SKIP on the default 26.
+ * with BS3_SKIPIT_AVG_SKIP set to 26.
  *
- * To activate this 'developer's speed-testing mode', turn on
- * `#define BS3_SKIPIT_DO_SKIP' here.
+ * To activate this 'developer's speed-testing mode', define
+ * `BS3_SKIPIT_AVG_SKIP' to a positive integer like 10 or 200.
  *
  * BS3_SKIPIT_AVG_SKIP governs approximately how many micro-tests are
- * skipped in a row; e.g. the default of 26 means that on average, every
- * 26th micro-test is run during a particular test run.  (This is not 26x
- * faster, due to other activities which are not skipped!)  Note this is
- * only an average; the actual skips are random.
+ * skipped in a row; e.g. if set to 100, an average of 100 micro-tests
+ * in a row are skipped.  (This is not a full 100x faster, due to other
+ * activities which are not skipped!)  Note this is only an average;
+ * the actual skips are random.
  *
  * You can also modify bs3CpuInstrX_SkipIt() to focus on specific sub-tests,
@@ -2296 +2296 @@
  *     VBoxManage setextradata vmname VBoxInternal/IEM/NativeRecompileAtUsedCount 1
  */
-#define BS3_SKIPIT_AVG_SKIP          26
+#define BS3_SKIPIT_AVG_SKIP           0
 #define BS3_SKIPIT_REPORT_COUNT 1000000
-#undef  BS3_SKIPIT_DO_SKIP
 #undef  BS3_SKIPIT_DO_ARGS
 
 #ifdef DEBUG_ramshankar
-# undef  BS3_SKIPIT_DO_SKIP
-# define BS3_SKIPIT_DO_SKIP
 # undef  BS3_SKIPIT_AVG_SKIP
-# define BS3_SKIPIT_AVG_SKIP        80
+# define BS3_SKIPIT_AVG_SKIP         80
 #endif
 
-#ifndef BS3_SKIPIT_DO_SKIP
-# define BS3_SKIPIT(bRing, iCfg, iTest, iVal, iVariant) (false)
-#else
 static unsigned g_cSeen, g_cSkipped;
 
-static void bs3CpuInstrX_ShowTallies(void)
+static void bs3CpuInstrX_ShowTallies(bool always)
 {
+    if (!g_cSkipped && !always) return;
     Bs3TestPrintf("Micro-tests %d: tested %d / skipped %d\n", g_cSeen, g_cSeen - g_cSkipped, g_cSkipped);
 }
@@ -2337 +2332 @@
 
     if (++g_cSeen % BS3_SKIPIT_REPORT_COUNT == 0)
-        bs3CpuInstrX_ShowTallies();
+        bs3CpuInstrX_ShowTallies(false);
     return fSkip;
 }
 
-#endif /* BS3_SKIPIT_DO_SKIP */
 
 /*
@@ -14741 +14735 @@
                  */
                 Bs3TestDoModesByOne_pe32(g_aTests, RT_ELEMENTS(g_aTests), BS3TESTMODEBYONEENTRY_F_REAL_MODE_READY);
-#ifdef BS3_SKIPIT_DO_SKIP
-                bs3CpuInstrX_ShowTallies();
-#endif
+                bs3CpuInstrX_ShowTallies(true);
             }
             else