Changeset 61848 in vbox

Timestamp:

Jun 23, 2016 12:20:44 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Use RZ {R0,RC} for the stat counters rather than separate R0, RC members with only using one of them while running the VM.

Location:

trunk/src/VBox

Files:

• Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)
• VMM/VMMAll/APICAll.cpp (modified) (4 diffs)
• VMM/VMMR3/APIC.cpp (modified) (3 diffs)
• VMM/include/APICInternal.h (modified) (1 diff)

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -785 +785 @@
     GEN_CHECK_OFF(APICCPU, uHintedTimerShift);
 # ifdef VBOX_WITH_STATISTICS
-    GEN_CHECK_OFF(APICCPU, StatMmioReadR0);
+    GEN_CHECK_OFF(APICCPU, StatMmioReadRZ);
     GEN_CHECK_OFF(APICCPU, StatMmioReadR3);
-    GEN_CHECK_OFF(APICCPU, StatMmioReadRC);
-    GEN_CHECK_OFF(APICCPU, StatMmioWriteR0);
+    GEN_CHECK_OFF(APICCPU, StatMmioWriteRZ);
     GEN_CHECK_OFF(APICCPU, StatMmioWriteR3);
-    GEN_CHECK_OFF(APICCPU, StatMmioWriteRC);
-    GEN_CHECK_OFF(APICCPU, StatMsrReadR0);
+    GEN_CHECK_OFF(APICCPU, StatMsrReadRZ);
     GEN_CHECK_OFF(APICCPU, StatMsrReadR3);
-    GEN_CHECK_OFF(APICCPU, StatMsrReadRC);
-    GEN_CHECK_OFF(APICCPU, StatMsrWriteR0);
+    GEN_CHECK_OFF(APICCPU, StatMsrWriteRZ);
     GEN_CHECK_OFF(APICCPU, StatMsrWriteR3);
-    GEN_CHECK_OFF(APICCPU, StatMsrWriteRC);
     GEN_CHECK_OFF(APICCPU, StatUpdatePendingIntrs);
     GEN_CHECK_OFF(APICCPU, StatPostIntr);

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

@@ -1830 +1830 @@
 #endif
 
-    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMsrRead));
+    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF_Z(StatMsrRead));
 
     VBOXSTRICTRC rcStrict = VINF_SUCCESS;
@@ -1936 +1936 @@
 #endif
 
-    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMsrWrite));
+    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF_Z(StatMsrWrite));
 
     /*
@@ -2552 +2552 @@
     uint32_t uValue   = 0;
 
-    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMmioRead));
+    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF_Z(StatMmioRead));
 
     int rc = VBOXSTRICTRC_VAL(apicReadRegister(pApicDev, pVCpu, offReg, &uValue));
@@ -2576 +2576 @@
     uint32_t uValue   = *(uint32_t *)pv;
 
-    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMmioWrite));
+    STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF_Z(StatMmioWrite));
 
     Log2(("APIC%u: apicWriteMmio: offReg=%#RX16 uValue=%#RX32\n", pVCpu->idCpu, offReg, uValue));

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

@@ -1797 +1797 @@
     } while(0)
 
-    bool const fHasRC = !HMIsEnabledNotMacro(pVM);
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {
@@ -1803 +1802 @@
         PAPICCPU pApicCpu  = VMCPU_TO_APICCPU(pVCpu);
 
-        APIC_REG_COUNTER(&pApicCpu->StatMmioReadR0,  "Number of APIC MMIO reads in R0.",  "/Devices/APIC/%u/R0/MmioRead");
-        APIC_REG_COUNTER(&pApicCpu->StatMmioWriteR0, "Number of APIC MMIO writes in R0.", "/Devices/APIC/%u/R0/MmioWrite");
-        APIC_REG_COUNTER(&pApicCpu->StatMsrReadR0,   "Number of APIC MSR reads in R0.",   "/Devices/APIC/%u/R0/MsrRead");
-        APIC_REG_COUNTER(&pApicCpu->StatMsrWriteR0,  "Number of APIC MSR writes in R0.",  "/Devices/APIC/%u/R0/MsrWrite");
+        APIC_REG_COUNTER(&pApicCpu->StatMmioReadRZ,  "Number of APIC MMIO reads in RZ.",  "/Devices/APIC/%u/RZ/MmioRead");
+        APIC_REG_COUNTER(&pApicCpu->StatMmioWriteRZ, "Number of APIC MMIO writes in RZ.", "/Devices/APIC/%u/RZ/MmioWrite");
+        APIC_REG_COUNTER(&pApicCpu->StatMsrReadRZ,   "Number of APIC MSR reads in RZ.",   "/Devices/APIC/%u/RZ/MsrRead");
+        APIC_REG_COUNTER(&pApicCpu->StatMsrWriteRZ,  "Number of APIC MSR writes in RZ.",  "/Devices/APIC/%u/RZ/MsrWrite");
 
         APIC_REG_COUNTER(&pApicCpu->StatMmioReadR3,  "Number of APIC MMIO reads in R3.",  "/Devices/APIC/%u/R3/MmioReadR3");
@@ -1812 +1811 @@
         APIC_REG_COUNTER(&pApicCpu->StatMsrReadR3,   "Number of APIC MSR reads in R3.",   "/Devices/APIC/%u/R3/MsrReadR3");
         APIC_REG_COUNTER(&pApicCpu->StatMsrWriteR3,  "Number of APIC MSR writes in R3.",  "/Devices/APIC/%u/R3/MsrWriteR3");
-
-        if (fHasRC)
-        {
-            APIC_REG_COUNTER(&pApicCpu->StatMmioReadRC,  "Number of APIC MMIO reads in RC.",  "/Devices/APIC/%u/RC/MmioRead");
-            APIC_REG_COUNTER(&pApicCpu->StatMmioWriteRC, "Number of APIC MMIO writes in RC.", "/Devices/APIC/%u/RC/MmioWrite");
-            APIC_REG_COUNTER(&pApicCpu->StatMsrReadRC,   "Number of APIC MSR reads in RC.",   "/Devices/APIC/%u/RC/MsrRead");
-            APIC_REG_COUNTER(&pApicCpu->StatMsrWriteRC,  "Number of APIC MSR writes in RC.",  "/Devices/APIC/%u/RC/MsrWrite");
-        }
 
         APIC_PROF_COUNTER(&pApicCpu->StatUpdatePendingIntrs, "Profiling of APICUpdatePendingInterrupts",

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

@@ -1319 +1319 @@
     /** @name APIC statistics.
      * @{ */
-    /** Number of MMIO reads in R0. */
-    STAMCOUNTER                 StatMmioReadR0;
+    /** Number of MMIO reads in RZ. */
+    STAMCOUNTER                 StatMmioReadRZ;
     /** Number of MMIO reads in R3. */
     STAMCOUNTER                 StatMmioReadR3;
-    /** Number of MMIO reads in RC. */
-    STAMCOUNTER                 StatMmioReadRC;
-
-    /** Number of MMIO writes in R0. */
-    STAMCOUNTER                 StatMmioWriteR0;
+
+    /** Number of MMIO writes in RZ. */
+    STAMCOUNTER                 StatMmioWriteRZ;
     /** Number of MMIO writes in R3. */
     STAMCOUNTER                 StatMmioWriteR3;
-    /** Number of MMIO writes in RC. */
-    STAMCOUNTER                 StatMmioWriteRC;
-
-    /** Number of MSR reads in R0. */
-    STAMCOUNTER                 StatMsrReadR0;
+
+    /** Number of MSR reads in RZ. */
+    STAMCOUNTER                 StatMsrReadRZ;
     /** Number of MSR reads in R3. */
     STAMCOUNTER                 StatMsrReadR3;
-    /** Number of MSR reads in RC. */
-    STAMCOUNTER                 StatMsrReadRC;
-
-    /** Number of MSR writes in R0. */
-    STAMCOUNTER                 StatMsrWriteR0;
+
+    /** Number of MSR writes in RZ. */
+    STAMCOUNTER                 StatMsrWriteRZ;
     /** Number of MSR writes in R3. */
     STAMCOUNTER                 StatMsrWriteR3;
-    /** Number of MSR writes in RC. */
-    STAMCOUNTER                 StatMsrWriteRC;
 
     /** Profiling of APICUpdatePendingInterrupts().  */