Changeset 14868 in vbox for trunk/src

Timestamp:

Dec 1, 2008 3:20:06 PM (16 years ago)

Author:

vboxsync

Message:

PGMR0DynMap: some predictions based on statistics, 5 more stats.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMR0/PGMR0DynMap.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1603 +1603 @@
     STAM_REG(pVM, &pPGM->StatR0DynMapMigrateInvlPg,         STAMTYPE_COUNTER, "/PGM/R0/DynMapMigrateInvlPg",        STAMUNIT_OCCURENCES,     "invlpg count in PGMDynMapMigrateAutoSet.");
     STAM_REG(pVM, &pPGM->StatR0DynMapPage,                  STAMTYPE_COUNTER, "/PGM/R0/DynMapPage",                 STAMUNIT_OCCURENCES,     "Calls to pgmR0DynMapPage");
+    STAM_REG(pVM, &pPGM->StatR0DynMapPageHit0,              STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/Hit0",            STAMUNIT_OCCURENCES,     "Hit at iPage+0");
+    STAM_REG(pVM, &pPGM->StatR0DynMapPageHit1,              STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/Hit1",            STAMUNIT_OCCURENCES,     "Hit at iPage+1");
+    STAM_REG(pVM, &pPGM->StatR0DynMapPageHit2,              STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/Hit2",            STAMUNIT_OCCURENCES,     "Hit at iPage+2");
+    STAM_REG(pVM, &pPGM->StatR0DynMapPageHit3,              STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/Hit3",            STAMUNIT_OCCURENCES,     "Hit at iPage+3");
     STAM_REG(pVM, &pPGM->StatR0DynMapPageInvlPg,            STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/InvlPg",          STAMUNIT_OCCURENCES,     "invlpg count in pgmR0DynMapPageSlow.");
     STAM_REG(pVM, &pPGM->StatR0DynMapPageSlow,              STAMTYPE_COUNTER, "/PGM/R0/DynMapPage/Slow",            STAMUNIT_OCCURENCES,     "Calls to pgmR0DynMapPageSlow - subtract this from pgmR0DynMapPage to get 1st level hits.");

trunk/src/VBox/VMM/PGMInternal.h

@@ -2567 +2567 @@
     STAMCOUNTER StatR0DynMapMigrateInvlPg;          /**< R0: invlpg in PGMDynMapMigrateAutoSet. */
     STAMCOUNTER StatR0DynMapPage;                   /**< R0: Calls to pgmR0DynMapPage. */
+    STAMCOUNTER StatR0DynMapPageHit0;               /**< R0: Hit at iPage+0. */
+    STAMCOUNTER StatR0DynMapPageHit1;               /**< R0: Hit at iPage+1. */
+    STAMCOUNTER StatR0DynMapPageHit2;               /**< R0: Hit at iPage+2. */
+    STAMCOUNTER StatR0DynMapPageHit3;               /**< R0: Hit at iPage+3. */
     STAMCOUNTER StatR0DynMapPageInvlPg;             /**< R0: invlpg. */
     STAMCOUNTER StatR0DynMapPageSlow;               /**< R0: Calls to pgmR0DynMapPageSlow. */

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -3233 +3233 @@
             Assert(pgmShwGet32BitPDEPtr(&pVM->pgm.s, (uint32_t)iPD << SHW_PD_SHIFT) == pPDEDst);
 #  elif PGM_SHW_TYPE == PGM_TYPE_PAE
-#   ifdef VBOX_STRICT
+#   if defined(VBOX_STRICT) && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) /* Unfortuantely not reliable with PGMR0DynMap and multiple VMs. */
             RTGCPTR GCPtrStrict = (uint32_t)iPD << GST_PD_SHIFT;
 #    if PGM_GST_TYPE == PGM_TYPE_PAE

trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp

@@ -1174 +1174 @@
 
     /*
-     * Check if any of the first 5 pages are unreferenced since the caller
+     * Check if any of the first 4 pages are unreferenced since the caller
      * already has made sure they aren't matching.
      */
@@ -1191 +1191 @@
     else if (!paPages[(iPage + 3) % cPages].cRefs)
         iFreePage   = (iPage + 3) % cPages;
-    else if (!paPages[(iPage + 4) % cPages].cRefs)
-        iFreePage   = (iPage + 4) % cPages;
     else
     {
@@ -1198 +1196 @@
          * Search for an unused or matching entry.
          */
-        iFreePage = (iPage + 5) % cPages;
+        iFreePage = (iPage + 4) % cPages;
         for (;;)
         {
@@ -1224 +1222 @@
     /* Check for lost hits. */
     if (!fLooped)
-        for (uint32_t iPage2 = (iPage + 5) % cPages; iPage2 != iPage; iPage2 = (iPage2 + 1) % cPages)
+        for (uint32_t iPage2 = (iPage + 4) % cPages; iPage2 != iPage; iPage2 = (iPage2 + 1) % cPages)
             if (paPages[iPage2].HCPhys == HCPhys)
                 STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageSlowLostHits);
@@ -1281 +1279 @@
      * Find an entry, if possible a matching one. The HCPhys address is hashed
      * down to a page index, collisions are handled by linear searching. Optimize
-     * for a hit in the first 5 pages.
+     * for a hit in the first 4 pages.
      *
      * To the cheap hits here and defer the tedious searching and inserting
@@ -1289 +1287 @@
     uint32_t            iPage   = (HCPhys >> PAGE_SHIFT) % cPages;
     PPGMR0DYNMAPENTRY   paPages = pThis->paPages;
-    if (paPages[iPage].HCPhys != HCPhys)
-    {
-        uint32_t    iPage2 = (iPage + 1) % cPages;
-        if (paPages[iPage2].HCPhys != HCPhys)
+    if (RT_LIKELY(paPages[iPage].HCPhys == HCPhys))
+        STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageHit0);
+    else
+    {
+        uint32_t        iPage2 = (iPage + 1) % cPages;
+        if (RT_LIKELY(paPages[iPage2].HCPhys == HCPhys))
+        {
+            iPage = iPage2;
+            STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageHit1);
+        }
+        else
         {
             iPage2 = (iPage + 2) % cPages;
-            if (paPages[iPage2].HCPhys != HCPhys)
+            if (paPages[iPage2].HCPhys == HCPhys)
+            {
+                iPage = iPage2;
+                STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageHit2);
+            }
+            else
             {
                 iPage2 = (iPage + 3) % cPages;
-                if (paPages[iPage2].HCPhys != HCPhys)
+                if (paPages[iPage2].HCPhys == HCPhys)
                 {
-                    iPage2 = (iPage + 4) % cPages;
-                    if (paPages[iPage2].HCPhys != HCPhys)
-                    {
-                        iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage, pVM);
-                        if (RT_UNLIKELY(iPage == UINT32_MAX))
-                        {
-                            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-                            return iPage;
-                        }
-                    }
-                    else
-                        iPage = iPage2;
+                    iPage = iPage2;
+                    STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageHit3);
                 }
                 else
-                    iPage = iPage2;
-            }
-            else
-                iPage = iPage2;
-        }
-        else
-            iPage = iPage2;
+                {
+                    iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage, pVM);
+                    if (RT_UNLIKELY(iPage == UINT32_MAX))
+                    {
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                        return iPage;
+                    }
+                }
+            }
+        }
     }
 
@@ -1347 +1350 @@
     RTCPUID idRealCpu = RTMpCpuId();
     bool fInvalidateIt = RTCpuSetIsMember(&paPages[iPage].PendingSet, idRealCpu);
-    if (fInvalidateIt)
+    if (RT_UNLIKELY(fInvalidateIt))
         RTCpuSetDel(&paPages[iPage].PendingSet, idRealCpu);
 
@@ -1355 +1358 @@
      * Do the actual invalidation outside the spinlock.
      */
-    if (fInvalidateIt)
+    if (RT_UNLIKELY(fInvalidateIt))
     {
         STAM_COUNTER_INC(&pVM->pgm.s.StatR0DynMapPageInvlPg);
@@ -1709 +1712 @@
         pSet->aEntries[i - 4].cRefs++;
     /* Don't bother searching unless we're above a 75% load. */
-    else if (i <= (int32_t)RT_ELEMENTS(pSet->aEntries) / 4 * 3)
+    else if (RT_LIKELY(i <= (int32_t)RT_ELEMENTS(pSet->aEntries) / 4 * 3))
     {
         pSet->aEntries[pSet->cEntries].cRefs = 1;