Changeset 91263 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 15, 2021 7:26:20 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Moved instruction stats from the hyper heap and into the VM structure. bugref:10093

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -12412 +12412 @@
  */
 #ifdef VBOX_WITH_STATISTICS
-# define IEMOP_INC_STATS(a_Stats) do { pVCpu->iem.s.CTX_SUFF(pStats)->a_Stats += 1; } while (0)
+# ifdef IN_RING3
+#  define IEMOP_INC_STATS(a_Stats) do { pVCpu->iem.s.StatsR3.a_Stats += 1; } while (0)
+# else
+#  define IEMOP_INC_STATS(a_Stats) do { pVCpu->iem.s.StatsRZ.a_Stats += 1; } while (0)
+# endif
 #else
 # define IEMOP_INC_STATS(a_Stats) do { } while (0)
@@ -14103 +14107 @@
 VMMDECL(VBOXSTRICTRC) IEMExecOne(PVMCPUCC pVCpu)
 {
+    AssertCompile(sizeof(pVCpu->iem.s) <= sizeof(pVCpu->iem.padding)); /* (tstVMStruct can't do it's job w/o instruction stats) */
 #ifdef LOG_ENABLED
     iemLogCurInstr(pVCpu, true, "IEMExecOne");

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

@@ -67 +67 @@
     {
         PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+        AssertCompile(sizeof(pVCpu->iem.s) <= sizeof(pVCpu->iem.padding)); /* (tstVMStruct can't do it's job w/o instruction stats) */
 
         pVCpu->iem.s.CodeTlb.uTlbRevision = pVCpu->iem.s.DataTlb.uTlbRevision = uInitialTlbRevision;
@@ -113 +114 @@
 
 #if defined(VBOX_WITH_STATISTICS) && !defined(DOXYGEN_RUNNING)
-        /* Allocate instruction statistics and register them. */
-        pVCpu->iem.s.pStatsR3 = (PIEMINSTRSTATS)MMR3HeapAllocZ(pVM, MM_TAG_IEM, sizeof(IEMINSTRSTATS));
-        AssertLogRelReturn(pVCpu->iem.s.pStatsR3, VERR_NO_MEMORY);
-        int rc = MMHyperAlloc(pVM, sizeof(IEMINSTRSTATS), sizeof(uint64_t), MM_TAG_IEM, (void **)&pVCpu->iem.s.pStatsCCR3);
-        AssertLogRelRCReturn(rc, rc);
-        pVCpu->iem.s.pStatsR0 = MMHyperR3ToR0(pVM, pVCpu->iem.s.pStatsCCR3);
+        /* Instruction statistics: */
 # define IEM_DO_INSTR_STAT(a_Name, a_szDesc) \
-            STAMR3RegisterF(pVM, &pVCpu->iem.s.pStatsCCR3->a_Name, STAMTYPE_U32_RESET, STAMVISIBILITY_USED, \
+            STAMR3RegisterF(pVM, &pVCpu->iem.s.StatsRZ.a_Name, STAMTYPE_U32_RESET, STAMVISIBILITY_USED, \
                             STAMUNIT_COUNT, a_szDesc, "/IEM/CPU%u/instr-RZ/" #a_Name, idCpu); \
-            STAMR3RegisterF(pVM, &pVCpu->iem.s.pStatsR3->a_Name, STAMTYPE_U32_RESET, STAMVISIBILITY_USED, \
+            STAMR3RegisterF(pVM, &pVCpu->iem.s.StatsR3.a_Name, STAMTYPE_U32_RESET, STAMVISIBILITY_USED, \
                             STAMUNIT_COUNT, a_szDesc, "/IEM/CPU%u/instr-R3/" #a_Name, idCpu);
 # include "IEMInstructionStatisticsTmpl.h"
@@ -193 +189 @@
 {
     NOREF(pVM);
-#if defined(VBOX_WITH_STATISTICS) && !defined(DOXYGEN_RUNNING)
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
-        MMR3HeapFree(pVCpu->iem.s.pStatsR3);
-        pVCpu->iem.s.pStatsR3 = NULL;
-    }
-#endif
     return VINF_SUCCESS;
 }

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

@@ -612 +612 @@
     IEMTLB                  CodeTlb;
 
-    /** Pointer to instruction statistics for ring-0 context. */
-    R0PTRTYPE(PIEMINSTRSTATS) pStatsR0;
-    /** Ring-3 pointer to instruction statistics for non-ring-3 code. */
-    R3PTRTYPE(PIEMINSTRSTATS) pStatsCCR3;
-    /** Pointer to instruction statistics for ring-3 context. */
-    R3PTRTYPE(PIEMINSTRSTATS) pStatsR3;
+#if defined(VBOX_WITH_STATISTICS) && !defined(IN_TSTVMSTRUCT) && !defined(DOXYGEN_RUNNING)
+    /** Instruction statistics for ring-0/raw-mode. */
+    IEMINSTRSTATS           StatsRZ;
+    /** Instruction statistics for ring-3. */
+    IEMINSTRSTATS           StatsR3;
+#endif
 } IEMCPU;
 AssertCompileMemberOffset(IEMCPU, fCurXcpt, 0x48);