Changeset 77380 in vbox for trunk/src

Timestamp:

Feb 20, 2019 1:40:22 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Further improvments on the IEM timer polling by making it fully configurable. Sideeffect is that EMSTATE_IEM_THEN_REM has now become more accurate and will execute fewer instructions (exactly 1024 rather than up to 1023+4096) before switching to REM.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (4 diffs)
• VMMR3/EM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -14337 +14337 @@
 
 
-VMMDECL(VBOXSTRICTRC) IEMExecLots(PVMCPU pVCpu, uint32_t *pcInstructions)
+VMMDECL(VBOXSTRICTRC) IEMExecLots(PVMCPU pVCpu, uint32_t cMaxInstructions, uint32_t cPollRate, uint32_t *pcInstructions)
 {
     uint32_t const cInstructionsAtStart = pVCpu->iem.s.cInstructions;
+    AssertMsg(RT_IS_POWER_OF_TWO(cPollRate + 1), ("%#x\n", cPollRate));
 
     /*
@@ -14386 +14387 @@
      * Initial decoder init w/ prefetch, then setup setjmp.
      */
-    unsigned     cTimerPoll = 0;
     VBOXSTRICTRC rcStrict = iemInitDecoderAndPrefetchOpcodes(pVCpu, false);
     if (rcStrict == VINF_SUCCESS)
@@ -14401 +14401 @@
              * The run loop.  We limit ourselves to 4096 instructions right now.
              */
-            PVM         pVM    = pVCpu->CTX_SUFF(pVM);
-            uint32_t    cInstr = 4096;
+            PVM pVM = pVCpu->CTX_SUFF(pVM);
             for (;;)
             {
@@ -14442 +14441 @@
                                       && !VM_FF_IS_ANY_SET(pVM, VM_FF_ALL_MASK) ))
                         {
-                            if (cInstr-- > 0)
+                            if (cMaxInstructions-- > 0)
                             {
-                                /* Poll timers every 128 call*/
-                                if (   (++cTimerPoll & 0x7f) != 0
+                                /* Poll timers every 2048 instructions. */
+                                if (   (cMaxInstructions & cPollRate) != 0
                                     || !TMTimerPollBool(pVM, pVCpu))
                                 {

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1206 +1206 @@
             rc = REMR3Run(pVM, pVCpu);
 #else
-            rc = VBOXSTRICTRC_TODO(IEMExecLots(pVCpu, NULL /*pcInstructions*/));
+            rc = VBOXSTRICTRC_TODO(IEMExecLots(pVCpu, 8192 /*cMaxInstructions*/, 4095 /*cPollRate*/, NULL /*pcInstructions*/));
 #endif
             STAM_PROFILE_STOP(&pVCpu->em.s.StatREMExec, c);
@@ -1374 +1374 @@
     {
         uint32_t     cInstructions;
-        VBOXSTRICTRC rcStrict = IEMExecLots(pVCpu, &cInstructions);
+        VBOXSTRICTRC rcStrict = IEMExecLots(pVCpu, 1024 - pVCpu->em.s.cIemThenRemInstructions /*cMaxInstructions*/,
+                                            UINT32_MAX/2 /*cPollRate*/, &cInstructions);
         pVCpu->em.s.cIemThenRemInstructions += cInstructions;
         if (rcStrict != VINF_SUCCESS)
@@ -2894 +2895 @@
                 case EMSTATE_IEM:
                 {
+                    uint32_t cInstructions = 0;
 #if 0 /* For testing purposes. */
                     STAM_PROFILE_START(&pVCpu->em.s.StatHmExec, x1);
@@ -2902 +2904 @@
                     else if (rc == VERR_EM_CANNOT_EXEC_GUEST)
 #endif
-                        rc = VBOXSTRICTRC_TODO(IEMExecLots(pVCpu, NULL /*pcInstructions*/));
+                        rc = VBOXSTRICTRC_TODO(IEMExecLots(pVCpu, 4096 /*cMaxInstructions*/, 2047 /*cPollRate*/, &cInstructions));
                     if (pVM->em.s.fIemExecutesAll)
                     {
@@ -2908 +2910 @@
                         Assert(rc != VINF_EM_RESCHEDULE_RAW);
                         Assert(rc != VINF_EM_RESCHEDULE_HM);
+#ifdef VBOX_HIGH_RES_TIMERS_HACK
+                        if (cInstructions < 2048)
+                            TMTimerPollVoid(pVM, pVCpu);
+#endif
                     }
                     fFFDone = false;