Changeset 103964 in vbox

Timestamp:

Mar 20, 2024 3:01:46 PM (11 months ago)

Author:

vboxsync

Message:

VMM/IEM: Some statistics on the SIMD register allocator and some fixes, bugref:10614

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompiler.cpp (modified) (9 diffs)
• VMMR3/IEMR3.cpp (modified) (1 diff)
• include/IEMInternal.h (modified) (2 diffs)

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

@@ -4121 +4121 @@
             uint32_t const idxVar = ASMBitFirstSetU32(fVars) - 1;
             uint8_t const  idxReg = pReNative->Core.aVars[idxVar].idxReg;
+#ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
+            if (pReNative->Core.aVars[idxVar].fSimdReg) /* Need to ignore SIMD variables here or we end up freeing random registers. */
+                continue;
+#endif
+
             if (   idxReg < RT_ELEMENTS(pReNative->Core.aHstRegs)
                 && (RT_BIT_32(idxReg) & fRegMask)
@@ -5334 +5339 @@
                                              uint32_t fRegMask = IEMNATIVE_HST_SIMD_REG_MASK & ~IEMNATIVE_SIMD_REG_FIXED_MASK)
 {
-    //STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeRegFindFree);
+    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeSimdRegFindFree);
     Assert(!(fRegMask & ~IEMNATIVE_HST_SIMD_REG_MASK));
     Assert(!(fRegMask & IEMNATIVE_SIMD_REG_FIXED_MASK));
@@ -5344 +5349 @@
     if (fRegs)
     {
-        //STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeRegFindFreeNoVar);
+        STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeSimdRegFindFreeNoVar);
 
 #if 0 /** @todo def IEMNATIVE_WITH_LIVENESS_ANALYSIS */
@@ -5377 +5382 @@
             if (pReNative->Core.bmGstRegShadows & fToFreeMask)
             {
-                STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeRegFindFreeLivenessUnshadowed);
+                STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeSimdRegFindFreeLivenessUnshadowed);
                 iemNativeRegFlushGuestShadows(pReNative, fToFreeMask);
                 Assert(fRegs == (~pReNative->Core.bmHstRegs & fRegMask)); /* this shall not change. */
@@ -5385 +5390 @@
                 if (fUnshadowedRegs)
                 {
-                    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeRegFindFreeLivenessHelped);
+                    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeSimdRegFindFreeLivenessHelped);
                     return (fPreferVolatile
                             ? ASMBitFirstSetU32(fUnshadowedRegs)
@@ -5428 +5433 @@
     }
 
+    AssertFailed(); /** @todo The following needs testing when it actually gets hit. */
+
     /*
      * Try free up a variable that's in a register.
@@ -5434 +5441 @@
      * saved on the stack, then in the second round move things to the stack.
      */
-    //STAM_REL_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeRegFindFreeVar);
-    AssertReleaseFailed(); /** @todo No variable support right now. */
-#if 0
+    STAM_REL_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeSimdRegFindFreeVar);
     for (uint32_t iLoop = 0; iLoop < 2; iLoop++)
     {
-        uint32_t fVars = pReNative->Core.bmSimdVars;
+        uint32_t fVars = pReNative->Core.bmVars;
         while (fVars)
         {
             uint32_t const idxVar = ASMBitFirstSetU32(fVars) - 1;
-            uint8_t const  idxReg = pReNative->Core.aSimdVars[idxVar].idxReg;
+            uint8_t const  idxReg = pReNative->Core.aVars[idxVar].idxReg;
+            if (!pReNative->Core.aVars[idxVar].fSimdReg) /* Ignore non SIMD variables here. */
+                continue;
+
             if (   idxReg < RT_ELEMENTS(pReNative->Core.aHstSimdRegs)
                 && (RT_BIT_32(idxReg) & fRegMask)
                 && (  iLoop == 0
-                    ? pReNative->Core.aSimdVars[idxVar].enmKind != kIemNativeVarKind_Stack
-                    : pReNative->Core.aSimdVars[idxVar].enmKind == kIemNativeVarKind_Stack)
-                && !pReNative->Core.aSimdVars[idxVar].fRegAcquired)
+                    ? pReNative->Core.aVars[idxVar].enmKind != kIemNativeVarKind_Stack
+                    : pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Stack)
+                && !pReNative->Core.aVars[idxVar].fRegAcquired)
             {
-                Assert(pReNative->Core.bmHstRegs & RT_BIT_32(idxReg));
+                Assert(pReNative->Core.bmHstSimdRegs & RT_BIT_32(idxReg));
                 Assert(   (pReNative->Core.bmGstSimdRegShadows & pReNative->Core.aHstSimdRegs[idxReg].fGstRegShadows)
                        == pReNative->Core.aHstSimdRegs[idxReg].fGstRegShadows);
-                Assert(pReNative->Core.bmGstSimdRegShadows < RT_BIT_64(kIemNativeGstReg_End));
-                Assert(   RT_BOOL(pReNative->Core.bmHstRegsWithGstShadow & RT_BIT_32(idxReg))
+                Assert(pReNative->Core.bmGstSimdRegShadows < RT_BIT_64(kIemNativeGstSimdReg_End));
+                Assert(   RT_BOOL(pReNative->Core.bmHstSimdRegsWithGstShadow & RT_BIT_32(idxReg))
                        == RT_BOOL(pReNative->Core.aHstSimdRegs[idxReg].fGstRegShadows));
 
-                if (pReNative->Core.aSimdVars[idxVar].enmKind == kIemNativeVarKind_Stack)
+                if (pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Stack)
                 {
                     uint8_t const idxStackSlot = iemNativeVarGetStackSlot(pReNative, IEMNATIVE_VAR_IDX_PACK(idxVar));
@@ -5464 +5472 @@
                 }
 
-                pReNative->Core.aSimdVars[idxVar].idxReg    = UINT8_MAX;
+                pReNative->Core.aVars[idxVar].idxReg        = UINT8_MAX;
                 pReNative->Core.bmHstSimdRegs              &= ~RT_BIT_32(idxReg);
 
                 pReNative->Core.bmHstSimdRegsWithGstShadow &= ~RT_BIT_32(idxReg);
-                pReNative->Core.bmGstSimdRegShadows        &= ~pReNative->Core.aHstSimdRegs[idxReg].fGstRegShadows;
+                pReNative->Core.bmGstSimdRegShadows        &= ~pReNative->Core.aHstRegs[idxReg].fGstRegShadows;
                 pReNative->Core.aHstSimdRegs[idxReg].fGstRegShadows = 0;
                 return idxReg;
@@ -5475 +5483 @@
         }
     }
-#endif
 
     AssertFailed();

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

@@ -543 +543 @@
 
 #ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeSimdRegFindFree, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                        "Number of calls to iemNativeSimdRegAllocFindFree.",
+                        "/IEM/CPU%u/re/NativeSimdRegFindFree", idCpu);
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeSimdRegFindFreeVar, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                        "Number of times iemNativeSimdRegAllocFindFree needed to free a variable.",
+                        "/IEM/CPU%u/re/NativeSimdRegFindFreeVar", idCpu);
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeSimdRegFindFreeNoVar, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                        "Number of times iemNativeSimdRegAllocFindFree did not needed to free any variables.",
+                        "/IEM/CPU%u/re/NativeSimdRegFindFreeNoVar", idCpu);
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeSimdRegFindFreeLivenessUnshadowed, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                        "Times liveness info freeed up shadowed guest registers in iemNativeSimdRegAllocFindFree.",
+                        "/IEM/CPU%u/re/NativeSimdRegFindFreeLivenessUnshadowed", idCpu);
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeSimdRegFindFreeLivenessHelped,    STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                        "Times liveness info helped finding the return register in iemNativeSimdRegAllocFindFree.",
+                        "/IEM/CPU%u/re/NativeSimdRegFindFreeLivenessHelped", idCpu);
+
         STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeMaybeDeviceNotAvailXcptCheckPotential, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "Potential IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE() checks", "/IEM/CPU%u/re/NativeMaybeDeviceNotAvailXcptCheckPotential", idCpu);
         STAMR3RegisterF(pVM, &pVCpu->iem.s.StatNativeMaybeSseXcptCheckPotential,            STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "Potential IEM_MC_MAYBE_RAISE_SSE_RELATED_XCPT() checks",     "/IEM/CPU%u/re/NativeMaybeSseXcptCheckPotential", idCpu);

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -1901 +1901 @@
 
 #ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
+    /** Native recompiler: Number of calls to iemNativeSimdRegAllocFindFree. */
+    STAMCOUNTER             StatNativeSimdRegFindFree;
+    /** Native recompiler: Number of times iemNativeSimdRegAllocFindFree needed
+     *  to free a variable. */
+    STAMCOUNTER             StatNativeSimdRegFindFreeVar;
+    /** Native recompiler: Number of times iemNativeSimdRegAllocFindFree did
+     *  not need to free any variables. */
+    STAMCOUNTER             StatNativeSimdRegFindFreeNoVar;
+    /** Native recompiler: Liveness info freed shadowed guest registers in
+     * iemNativeSimdRegAllocFindFree. */
+    STAMCOUNTER             StatNativeSimdRegFindFreeLivenessUnshadowed;
+    /** Native recompiler: Liveness info helped with the allocation in
+     *  iemNativeSimdRegAllocFindFree. */
+    STAMCOUNTER             StatNativeSimdRegFindFreeLivenessHelped;
+
     /** Native recompiler: Number of potential IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE() checks. */
     STAMCOUNTER             StatNativeMaybeDeviceNotAvailXcptCheckPotential;
@@ -1916 +1931 @@
 #endif
 
-    uint64_t                au64Padding[2];
+    uint64_t                au64Padding[5];
     /** @} */